[v4l-utils/el6] Build v4l-utils without needing libv4l

[mchehab]

commit 3f64c179bfc9b6bdce066498658ad8dcc27c46e9
Author: Mauro Carvalho Chehab <mchehab at redhat.com>
Date:   Fri Oct 7 15:29:05 2011 -0300

    Build v4l-utils without needing libv4l
    
    Some of the v4l-utils are dependent on the libv4l shipped with it.
    However, as RHEL6 ships its own version on it (generally a legacy
    one), change the build system to build only a local static copy of
    libv4l, and linkedit the tools that need it statically.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>

 .gitignore     |    1 +
 sources        |    2 +-
 v4l-utils.spec |   79 +++++++++++--------------------------------------------
 3 files changed, 18 insertions(+), 64 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9251380..75711a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /v4l-utils-0.8.3.tar.bz2
+/v4l-utils-0.9.0.git5f24b816.tar.bz2
diff --git a/sources b/sources
index 4131152..5d5ada1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f25ad639717d7411a58f10a9e378d7db  v4l-utils-0.8.3.tar.bz2
+b79b3fa554f799b2e82ce956c47f4100  v4l-utils-0.9.0.git5f24b816.tar.bz2
diff --git a/v4l-utils.spec b/v4l-utils.spec
index 18a9d81..edb25c4 100644
--- a/v4l-utils.spec
+++ b/v4l-utils.spec
@@ -1,5 +1,5 @@
 Name:           v4l-utils
-Version:        0.8.3
+Version:        0.9.0.git5f24b816
 Release:        2%{?dist}
 Summary:        Utilities for video4linux and DVB devices
 Group:          Applications/System
@@ -10,10 +10,9 @@ Source0:        http://linuxtv.org/downloads/v4l-utils/v4l-utils-%{version}.tar.
 Source1:        qv4l2.desktop
 Source2:        qv4l2.svg
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  qt4-devel libsysfs-devel kernel-headers desktop-file-utils
+BuildRequires:  qt4-devel kernel-headers desktop-file-utils
 # For /etc/udev/rules.d ownership
 Requires:       udev
-Requires:       libv4l = %{version}-%{release}
 
 %description
 v4l-utils is a collection of various video4linux (V4L) and DVB utilities. The
@@ -25,7 +24,6 @@ v4l2-sysfs-path.
 Summary:        Utilities for v4l2 / DVB driver development and debugging
 # decode_tm6000 is GPLv2 only
 License:        GPLv2+ and GPLv2
-Requires:       libv4l = %{version}-%{release}
 
 %description    devel-tools
 Utilities for v4l2 / DVB driver authors: decode_tm6000, v4l2-compliance and
@@ -35,51 +33,14 @@ v4l2-dbg.
 %package -n     qv4l2
 Summary:        QT v4l2 test control and streaming test application
 License:        GPLv2+
-Requires:       libv4l = %{version}-%{release}
 
 %description -n qv4l2
 QT v4l2 test control and streaming test application.
 
-
-%package -n     libv4l
-Summary:        Collection of video4linux support libraries 
-Group:          System Environment/Libraries
-# Some of the decompression helpers are GPLv2, the rest is LGPLv2+
-License:        LGPLv2+ and GPLv2
-URL:            http://hansdegoede.livejournal.com/3636.html
-
-%description -n libv4l
-libv4l is a collection of libraries which adds a thin abstraction layer on
-top of video4linux2 devices. The purpose of this (thin) layer is to make it
-easy for application writers to support a wide variety of devices without
-having to write separate code for different devices in the same class. libv4l
-consists of 3 different libraries: libv4lconvert, libv4l1 and libv4l2.
-
-libv4lconvert offers functions to convert from any (known) pixel-format
-to V4l2_PIX_FMT_BGR24 or V4l2_PIX_FMT_YUV420.
-
-libv4l1 offers the (deprecated) v4l1 API on top of v4l2 devices, independent
-of the drivers for those devices supporting v4l1 compatibility (which many
-v4l2 drivers do not).
-
-libv4l2 offers the v4l2 API on top of v4l2 devices, while adding for the
-application transparent libv4lconvert conversion where necessary.
-
-
-%package -n     libv4l-devel
-Summary:        Development files for libv4l
-Group:          Development/Libraries
-License:        LGPLv2+
-URL:            http://hansdegoede.livejournal.com/3636.html
-Requires:       libv4l = %{version}-%{release}
-
-%description -n libv4l-devel
-The libv4l-devel package contains libraries and header files for
-developing applications that use libv4l.
-
-
 %prep
-%setup -q
+%setup
+make
+./configure --disable-libv4l
 
 
 %build
@@ -103,10 +64,6 @@ install -p -m 644 %{SOURCE2} \
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -n libv4l -p /sbin/ldconfig
-
-%postun -n libv4l -p /sbin/ldconfig
-
 %post -n qv4l2
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
@@ -126,7 +83,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %dir %{_sysconfdir}/rc_keymaps
 %config(noreplace) %{_sysconfdir}/rc_keymaps/*
 %config(noreplace) %{_sysconfdir}/rc_maps.cfg
-%config(noreplace) %{_sysconfdir}/udev/rules.d/70-infrared.rules
+%config(noreplace) /lib/udev/rules.d/70-infrared.rules
+
 %{_bindir}/cx18-ctl
 %{_bindir}/ir-keytable
 %{_bindir}/ivtv-ctl
@@ -147,22 +105,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/qv4l2
 %{_datadir}/applications/qv4l2.desktop
 %{_datadir}/icons/hicolor/scalable/apps/qv4l2.svg
-
-%files -n libv4l
-%defattr(-,root,root,-)
-%doc COPYING.LIB COPYING ChangeLog README.lib TODO
-%{_libdir}/libv4l*.so.*
-%{_libdir}/libv4l
-
-%files -n libv4l-devel
-%defattr(-,root,root,-)
-%doc README.lib-multi-threading
-%{_includedir}/libv4l*.h
-%{_libdir}/libv4l*.so
-%{_libdir}/pkgconfig/libv4l*.pc
-
+%{_datadir}/icons/hicolor/16x16/apps/qv4l2.png
+%{_datadir}/icons/hicolor/24x24/apps/qv4l2.png
+%{_datadir}/icons/hicolor/32x32/apps/qv4l2.png
+%{_datadir}/icons/hicolor/64x64/apps/qv4l2.png
 
 %changelog
+* Fri Oct  7 2011 Mauro Carvalho Chehab <mchehab at redhat.com> 0.9.0.git5f24b816
+- Based on git changeset 5f24b816, this version will allow adding a v4l-utils
+  package without compiling the libv4l. This avoids a conflict with the
+  existing libv4l package that is part of the RHEL6 repositories.
+
 * Sat Mar 12 2011 Hans de Goede <hdegoede at redhat.com> 0.8.3-2
 - Add a .desktop file for qv4l2
 - Add fully versioned Requires on libv4l to other (sub)packages