Hello community,

here is the log from the commit of package libdv for openSUSE:Factory
checked in at Thu Jul 14 10:13:12 CEST 2011.



--------
--- libdv/libdv.changes 2010-06-04 17:48:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/libdv/libdv.changes    2011-07-08 
16:45:04.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Jul  8 14:41:23 UTC 2011 - [email protected]
+
+- Apply libdv-v4l-2.6.38.patch on openSUSE >= 12.1 to enable v4l 
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  libdv-v4l-2.6.38.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libdv.spec ++++++
--- /var/tmp/diff_new_pack.4uN4t7/_old  2011-07-14 10:10:32.000000000 +0200
+++ /var/tmp/diff_new_pack.4uN4t7/_new  2011-07-14 10:10:32.000000000 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package libdv (Version 1.0.0)
+# spec file for package libdv
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,9 @@
 
 Name:           libdv
 BuildRequires:  SDL-devel gtk2-devel libstdc++-devel popt-devel
+%if 0%{?suse_version} >= 1210
+BuildRequires:  libv4l-devel >= 0.8.4
+%endif
 Url:            http://libdv.sourceforge.net/
 License:        GPLv2+
 Group:          Development/Libraries/Other
@@ -30,7 +33,7 @@
 %endif
 #
 Version:        1.0.0
-Release:        148
+Release:        158
 Summary:        The Quasar DV Codec
 Source:         %name-%version.tar.bz2
 Source2:        baselibs.conf
@@ -41,6 +44,7 @@
 Patch3:         libdv.non_x86-reorder_block.patch
 Patch4:         libdv-filesizecheck.patch
 Patch5:         libdv-1.0.0-textrels-selinux.patch
+Patch6:         libdv-v4l-2.6.38.patch
 
 %description
 The Quasar DV codec (libdv) is a software codec for DV video, the
@@ -122,6 +126,9 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%if 0%{?suse_version} >= 1210
+%patch6 -p1
+%endif
 
 %build
 autoreconf -fiv

++++++ libdv-v4l-2.6.38.patch ++++++
diff -ur libdv-1.0.0.orig/config.h.in libdv-1.0.0/config.h.in
--- libdv-1.0.0.orig/config.h.in        2011-07-08 16:39:36.355076949 +0200
+++ libdv-1.0.0/config.h.in     2011-07-08 16:40:04.411076945 +0200
@@ -39,8 +39,8 @@
 /* Define if you have the `Xv' library (-lXv). */
 #undef HAVE_LIBXV
 
-/* Define to 1 if you have the <linux/videodev.h> header file. */
-#undef HAVE_LINUX_VIDEODEV_H
+/* Define to 1 if you have the <libv4l1-videodev.h> header file. */
+#undef HAVE_LIBV4L1_VIDEODEV_H
 
 /* Define to 1 if you have the <machine/endian.h> header file. */
 #undef HAVE_MACHINE_ENDIAN_H
diff -ur libdv-1.0.0.orig/configure.ac libdv-1.0.0/configure.ac
--- libdv-1.0.0.orig/configure.ac       2011-07-08 16:39:36.354076949 +0200
+++ libdv-1.0.0/configure.ac    2011-07-08 16:40:20.147076945 +0200
@@ -230,7 +230,7 @@
 dnl Checks for header files.
 AC_PATH_X
 AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h linux/videodev.h sys/soundcard.h \
+AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h libv4l1-videodev.h 
sys/soundcard.h \
 endian.h machine/endian.h inttypes.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
diff -ur libdv-1.0.0.orig/libdv/enc_input.c libdv-1.0.0/libdv/enc_input.c
--- libdv-1.0.0.orig/libdv/enc_input.c  2011-07-08 16:39:36.357076949 +0200
+++ libdv-1.0.0/libdv/enc_input.c       2011-07-08 16:44:24.458076915 +0200
@@ -42,7 +42,7 @@
 #include <math.h>
 #endif
 
-#if HAVE_LINUX_VIDEODEV_H
+#if HAVE_LIBV4L1_VIDEODEV_H
 #define HAVE_DEV_VIDEO  1
 #endif
 
@@ -50,7 +50,8 @@
 #define _DEVICE_H_
 #define _LINUX_TIME_H
 #include <sys/types.h>
-#include <linux/videodev.h>
+#include <libv4l1-videodev.h>
+#include <linux/videodev2.h>
 #include <sys/time.h>
 #include <unistd.h>
 #include <fcntl.h>

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to