diff --git a/xine-lib-v4l-2.6.38.patch b/xine-lib-v4l-2.6.38.patch new file mode 100644 index 0000000..ad7c85c --- /dev/null +++ b/xine-lib-v4l-2.6.38.patch @@ -0,0 +1,22 @@ +--- configure.ac.orig 2011-07-07 10:45:26.462089794 +0200 ++++ configure.ac 2011-07-07 10:46:04.415089790 +0200 +@@ -682,7 +682,7 @@ + have_v4l=no + have_v4l2=no + if test "x$enable_v4l" != "xno"; then +- AC_CHECK_HEADERS([linux/videodev.h], [have_v4l=yes], []) ++ AC_CHECK_HEADERS([libv4l1-videodev.h], [have_v4l=yes], []) + AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h sys/videodev2.h], [have_v4l2=yes], []) + AC_CHECK_HEADERS([asm/types.h]) + if test "x$enable_v4l" = "xyes" && test "x$have_v4l$have_v4l2" = "xnono"; then +--- src/input/input_v4l.c 2010-03-09 23:17:05.000000000 +0100 ++++ src/input/input_v4l.c 2011-07-07 10:46:27.694089788 +0200 +@@ -47,7 +47,7 @@ + */ + #define _LINUX_TIME_H + +-#include ++#include + #include + #include + #include diff --git a/xine-lib.changes b/xine-lib.changes index 43f30d2..cbcc73a 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 7 08:49:59 UTC 2011 - idonmez@novell.com + +- Add xine-lib-v4l-2.6.38.patch: use the new v4l interface + ------------------------------------------------------------------- Sat May 28 17:09:00 CET 2011 - Manfred.Tremmel@iiv.de diff --git a/xine-lib.spec b/xine-lib.spec index c0445fd..c4a2600 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -54,9 +54,13 @@ BuildRequires: libcdio-devel libdrm-devel libmng-devel libsmbclient BuildRequires: Mesa-devel libsmbclient-devel libtheora-devel libvorbis-devel BuildRequires: readline-devel update-desktop-files vcdimager-devel BuildRequires: speex-devel +%if 0%{suse_version} >= 1210 +BuildRequires: libv4l-devel >= 0.8.4 +%else %if 0%{suse_version} >= 1110 BuildRequires: libv4l-devel %endif +%endif %if 0%{suse_version} >= 1030 BuildRequires: lirc-devel %else @@ -136,6 +140,7 @@ Patch71: xine-lib-%{version}-demuxcheckfor_mad_ffmpeg.patch Patch72: xine-lib-%{version}-install-plugins-helper.diff Patch73: xine-lib-%{version}-assert.patch Patch74: xine-configure.diff +Patch75: xine-lib-v4l-2.6.38.patch # *** Only working for noncrippled source Patch80: xine-lib-various-noncrippled.diff Patch81: xine-lib-%{version}-ffmpeg_abi_change.diff @@ -662,6 +667,10 @@ sed -i 's|^noinst_HEADERS = input_vdr.h|xineinclude_HEADERS = input_vdr.h|' src/ %patch72 -p1 %patch73 -p1 %patch74 -p1 +%if 0%{suse_version} >= 1210 +%patch75 +%endif + rm -f m4/libtool15.m4 %build