Hello community, here is the log from the commit of package pwlib for openSUSE:Factory checked in at Thu Jul 7 16:00:54 CEST 2011.
-------- --- pwlib/pwlib.changes 2010-11-20 02:20:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/pwlib/pwlib.changes 2011-07-07 12:56:11.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 7 10:46:43 UTC 2011 - [email protected] + +- Add pwlib-v4l-2.6.38.patch: use new v4l interface + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- pwlib-v4l-2.6.38.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pwlib.spec ++++++ --- /var/tmp/diff_new_pack.poi7Nx/_old 2011-07-07 16:00:23.000000000 +0200 +++ /var/tmp/diff_new_pack.poi7Nx/_new 2011-07-07 16:00:23.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package pwlib (Version 1.11.0) +# spec file for package pwlib # -# 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 @@ -21,7 +21,7 @@ Name: pwlib Summary: Portable Windows Library from Equivalence Pty. Ltd Version: 1.11.0 -Release: 8 +Release: 13 %define package_version v1_11_0 License: MPL .. Group: System/Libraries @@ -35,6 +35,7 @@ Patch2: %{name}-v1_11_0-pstring-fix.patch Patch3: %{name}-v1_11_0-ldap.patch Patch4: %{name}-v1_11_0-openssl.patch +Patch5: %{name}-v4l-2.6.38.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison flex gcc-c++ BuildRequires: SDL-devel @@ -42,6 +43,9 @@ BuildRequires: libdv-devel BuildRequires: libexpat-devel BuildRequires: openldap2-devel +%if 0%{?suse_version} >= 1210 +BuildRequires: libv4l-devel >= 0.8.4 +%endif Provides: %{name}-plugins-alsa %{name}-plugins-oss %{name}-plugins-v4l Obsoletes: %{name}-plugins-alsa %{name}-plugins-oss %{name}-plugins-v4l @@ -99,6 +103,9 @@ %if 0%{?suse_version} > 1120 %patch4 -p1 %endif +%if 0%{?suse_version} >= 1210 +%patch5 -p1 +%endif %build #autoreconf --force --install @@ -110,7 +117,7 @@ cd .. #automake --force-missing %{?suse_update_config:%{suse_update_config -f}} -PWINSTDIR=%{_datadir}/%{name} X11LIBDIR=/usr/X11R6/%_lib ./configure \ +PWINSTDIR=%{_datadir}/%{name} ./configure \ --prefix=/usr \ --libdir=%{_libdir} \ --mandir=%{_mandir} \ ++++++ pwlib-v4l-2.6.38.patch ++++++ diff -ur pwlib_v1_11_0.orig/configure.ac pwlib_v1_11_0/configure.ac --- pwlib_v1_11_0.orig/configure.ac 2011-07-07 12:44:57.529088939 +0200 +++ pwlib_v1_11_0/configure.ac 2011-07-07 12:45:37.910088934 +0200 @@ -1548,7 +1548,7 @@ dnl ######################################################################## dnl check for video capture support. -dnl videodev.h on linux +dnl libv4l1-videodev.h on linux dnl machine/ioctl_meteor on FreeBSD dnl i386/ioctl_meteor on OpenBSD dnl dev/ic/bt8xx on NetBSD @@ -1574,7 +1574,7 @@ HAS_VIDEO=1 HAS_VIDEO_CAPTURE=1 else - AC_CHECK_HEADER(linux/videodev.h, HAS_VIDEO_CAPTURE=1) + AC_CHECK_HEADER(libv4l1-videodev.h, HAS_VIDEO_CAPTURE=1) dnl AC_CHECK_HEADER(machine/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1) dnl AC_CHECK_HEADER(i386/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1) dnl AC_CHECK_HEADER(dev/ic/bt8xx.h, HAS_VIDEO_CAPTURE=1) diff -ur pwlib_v1_11_0.orig/include/ptlib/unix/ptlib/videoio.h pwlib_v1_11_0/include/ptlib/unix/ptlib/videoio.h --- pwlib_v1_11_0.orig/include/ptlib/unix/ptlib/videoio.h 2011-07-07 12:44:57.578088939 +0200 +++ pwlib_v1_11_0/include/ptlib/unix/ptlib/videoio.h 2011-07-07 12:46:15.830088929 +0200 @@ -103,7 +103,7 @@ */ #if defined(P_LINUX) && !defined(NO_VIDEO_CAPTURE) -#include <linux/videodev.h> /* change this to "videodev2.h" for v4l2 */ +#include <libv4l1-videodev.h> /* change this to "videodev2.h" for v4l2 */ #endif #if defined(P_FREEBSD) diff -ur pwlib_v1_11_0.orig/plugins/configure.in pwlib_v1_11_0/plugins/configure.in --- pwlib_v1_11_0.orig/plugins/configure.in 2011-07-07 12:44:57.580088939 +0200 +++ pwlib_v1_11_0/plugins/configure.in 2011-07-07 12:53:21.555088876 +0200 @@ -111,7 +111,7 @@ AC_ARG_ENABLE(v4l, [ --enable-v4l enable V4L video support],,enable_v4l=yes) if test "${enable_v4l}z" = "yesz" ; then - AC_CHECK_HEADER(linux/videodev.h, V4LHDR=1) + AC_CHECK_HEADER(libv4l1-videodev.h, V4LHDR=1) AC_MSG_CHECKING(for V4L video support) if test "${V4LHDR}z" != "z"; then AC_SUBST(HAS_V4L, 1) diff -ur pwlib_v1_11_0.orig/plugins/vidinput_v4l/vidinput_v4l.h pwlib_v1_11_0/plugins/vidinput_v4l/vidinput_v4l.h --- pwlib_v1_11_0.orig/plugins/vidinput_v4l/vidinput_v4l.h 2011-07-07 12:44:57.580088939 +0200 +++ pwlib_v1_11_0/plugins/vidinput_v4l/vidinput_v4l.h 2011-07-07 12:45:53.582088932 +0200 @@ -6,7 +6,7 @@ #include <ptlib/videoio.h> #include <ptlib/vconvert.h> -#include <linux/videodev.h> +#include <libv4l1-videodev.h> class PVideoInputDevice_V4L: public PVideoInputDevice { diff -ur pwlib_v1_11_0.orig/plugins/vidinput_v4l2/vidinput_v4l2.h pwlib_v1_11_0/plugins/vidinput_v4l2/vidinput_v4l2.h --- pwlib_v1_11_0.orig/plugins/vidinput_v4l2/vidinput_v4l2.h 2011-07-07 12:44:57.581088939 +0200 +++ pwlib_v1_11_0/plugins/vidinput_v4l2/vidinput_v4l2.h 2011-07-07 12:55:12.650088866 +0200 @@ -69,7 +69,8 @@ #include <ptlib/videoio.h> #include <ptlib/vconvert.h> -#include <linux/videodev.h> +#include <libv4l1-videodev.h> +#include <linux/videodev2.h> #ifndef V4L2_PIX_FMT_SBGGR8 #define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B','A','8','1') /* 8 BGBG.. GRGR.. */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
