Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at Tue Jul 12 13:56:07 CEST 2011.
--------
--- mjpegtools/mjpegtools.changes 2011-04-15 20:42:39.000000000 +0200
+++ /mounts/work_src_done/STABLE/mjpegtools/mjpegtools.changes 2011-07-07
11:21:33.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jul 7 09:10:47 UTC 2011 - idon...@novell.com
+
+- Add mjpegtools-v4l-2.6.38.patch: use the new v4l interface
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
mjpegtools-v4l-2.6.38.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mjpegtools.spec ++++++
--- /var/tmp/diff_new_pack.smcs20/_old 2011-07-12 13:55:10.000000000 +0200
+++ /var/tmp/diff_new_pack.smcs20/_new 2011-07-12 13:55:10.000000000 +0200
@@ -20,6 +20,9 @@
Name: mjpegtools
BuildRequires: SDL-devel gcc-c++ libjpeg-devel libpng-devel
libquicktime-devel nasm
+%if 0%{?suse_version} >= 1210
+BuildRequires: libv4l-devel >= 0.8.4
+%endif
#BuildRequires: gtk1-compat-devel
#BuildRequires: libmovtar popt-devel
Url: http://mjpeg.sourceforge.net/
@@ -28,7 +31,7 @@
PreReq: %install_info_prereq
AutoReqProv: on
Version: 1.9.0
-Release: 18
+Release: 20
Summary: MJPEG Video Capture and Processing Tools
%if 0%{?BUILD_ORIG}
Source0: %{name}-%{version}.tar.bz2
@@ -50,6 +53,7 @@
Patch10: mjpegtools-fix_init.patch
Patch11: mjpegtools-fix_lib_versioning.patch
Patch12: mjpegtools-no_arch_tuning.patch
+Patch13: mjpegtools-v4l-2.6.38.patch
Patch100: %{name}-codecpatch.patch
%define lib_version %(echo %{version}|cut -d. -f1-2)
@@ -110,6 +114,9 @@
%patch10
%patch11
%patch12
+%if 0%{?suse_version} >= 1210
+%patch13 -p1
+%endif
%build
%if 0%{?BUILD_ORIG}
++++++ mjpegtools-v4l-2.6.38.patch ++++++
diff -ur mjpegtools-1.9.0.orig/configure.ac mjpegtools-1.9.0/configure.ac
--- mjpegtools-1.9.0.orig/configure.ac 2011-07-07 11:07:45.211089635 +0200
+++ mjpegtools-1.9.0/configure.ac 2011-07-07 11:18:42.513089556 +0200
@@ -155,11 +155,11 @@
have_video4linux=false
case $host in
*-*-linux*)
- AC_CHECK_HEADER(linux/videodev.h,
+ AC_CHECK_HEADER(libv4l1-videodev.h,
[have_video4linux=true
AC_DEFINE(HAVE_V4L, 1,
[Building for Linux - using the video4linux API])],
- [AC_MSG_ERROR([videodev.h not found - please install the
linux kernel headers])])
+ [AC_MSG_ERROR([libv4l1-videodev.h not found - please install
the v4l-utils devel package])])
;;
esac
AM_CONDITIONAL(HAVE_V4L, test x$have_video4linux = xtrue)
diff -ur mjpegtools-1.9.0.orig/lavtools/lavvideo.c
mjpegtools-1.9.0/lavtools/lavvideo.c
--- mjpegtools-1.9.0.orig/lavtools/lavvideo.c 2011-07-07 11:07:45.220089635
+0200
+++ mjpegtools-1.9.0/lavtools/lavvideo.c 2011-07-07 11:18:27.601089556
+0200
@@ -63,7 +63,7 @@
* errors here, check your linux/time.h && sys/time.h header setup.
*/
#define _LINUX_TIME_H
-#include <linux/videodev.h>
+#include <libv4l1-videodev.h>
#include <videodev_mjpeg.h>
#include <frequencies.h>
diff -ur mjpegtools-1.9.0.orig/lavtools/liblavplay.c
mjpegtools-1.9.0/lavtools/liblavplay.c
--- mjpegtools-1.9.0.orig/lavtools/liblavplay.c 2011-07-07 11:07:45.221089635
+0200
+++ mjpegtools-1.9.0/lavtools/liblavplay.c 2011-07-07 11:16:01.227089575
+0200
@@ -68,7 +68,8 @@
* errors here, check your linux/time.h && sys/time.h header setup.
*/
#define _LINUX_TIME_H
-#include <linux/videodev.h>
+#include <libv4l1-videodev.h>
+#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */
#else
#define VIDEO_MODE_PAL 0
#define VIDEO_MODE_NTSC 1
diff -ur mjpegtools-1.9.0.orig/lavtools/liblavrec.c
mjpegtools-1.9.0/lavtools/liblavrec.c
--- mjpegtools-1.9.0.orig/lavtools/liblavrec.c 2011-07-07 11:07:45.221089635
+0200
+++ mjpegtools-1.9.0/lavtools/liblavrec.c 2011-07-07 11:16:18.362089573
+0200
@@ -63,7 +63,8 @@
* errors here, check your linux/time.h && sys/time.h header setup.
*/
#define _LINUX_TIME_H
-#include <linux/videodev.h>
+#include <libv4l1-videodev.h>
+#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */
#ifdef HAVE_SYS_SOUNDCARD_H
#include <sys/soundcard.h>
#endif
diff -ur mjpegtools-1.9.0.orig/lavtools/testrec.c
mjpegtools-1.9.0/lavtools/testrec.c
--- mjpegtools-1.9.0.orig/lavtools/testrec.c 2011-07-07 11:07:45.220089635
+0200
+++ mjpegtools-1.9.0/lavtools/testrec.c 2011-07-07 11:19:56.128089546 +0200
@@ -89,7 +89,7 @@
* errors here, check your linux/time.h && sys/time.h header setup.
*/
#define _LINUX_TIME_H
-#include <linux/videodev.h>
+#include <libv4l1-videodev.h>
#include <linux/soundcard.h>
/* These are explicit prototypes for the compiler, to prepare separation of
audiolib.c */
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
