From 2339bbc4d358c64c0455826fcd356cd00b60ceb9 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 29 Sep 2008 13:14:03 +0000 Subject: [PATCH] - Prevent the needs to re-run autotools --- vlc-0.9.3-libv4l2.patch | 17 +++++++++++++++++ vlc.spec | 9 ++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/vlc-0.9.3-libv4l2.patch b/vlc-0.9.3-libv4l2.patch index 4b40e7d..c44e188 100644 --- a/vlc-0.9.3-libv4l2.patch +++ b/vlc-0.9.3-libv4l2.patch @@ -9,6 +9,23 @@ diff -up vlc-0.9.3/configure.ac.libv4l2 vlc-0.9.3/configure.ac CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}" AC_CHECK_HEADERS(linux/videodev2.h, [ VLC_ADD_PLUGIN([v4l2]) +diff -up vlc-0.9.3/configure.libv4l2 vlc-0.9.3/configure +--- vlc-0.9.3/configure.libv4l2 2008-09-29 15:00:35.000000000 +0200 ++++ vlc-0.9.3/configure 2008-09-29 15:00:51.000000000 +0200 +@@ -45416,6 +45416,12 @@ _ACEOF + + fi + ++ ++ for element in v4l2; do ++ eval "LDFLAGS_${element}="'"'"-lv4l2 "'$'"{LDFLAGS_${element}} "'"' ++ am_modules_with_ldflags="${am_modules_with_ldflags} ${element}" ++ done ++ + CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}" + + for ac_header in linux/videodev2.h + diff -up vlc-0.9.3/modules/access/v4l2/v4l2.c.libv4l2 vlc-0.9.3/modules/access/v4l2/v4l2.c --- vlc-0.9.3/modules/access/v4l2/v4l2.c.libv4l2 2008-09-18 23:03:35.000000000 +0200 +++ vlc-0.9.3/modules/access/v4l2/v4l2.c 2008-09-27 19:45:58.000000000 +0200 diff --git a/vlc.spec b/vlc.spec index ad75c54..4c1c464 100644 --- a/vlc.spec +++ b/vlc.spec @@ -20,7 +20,7 @@ Version: 1.0.0 %else Version: 0.9.3 %define _version %{version} -%define release_tag 2 +%define release_tag 3 %endif Release: %{release_tag}%{?dist} License: GPLv2+ @@ -91,7 +91,9 @@ BuildRequires: libtar-devel BuildRequires: libtheora-devel BuildRequires: libtiff-devel BuildRequires: libupnp-devel +%if 0%{?fedora} > 8 BuildRequires: libv4l-devel +%endif BuildRequires: libvorbis-devel BuildRequires: libxml2-devel BuildRequires: lirc-devel @@ -248,6 +250,8 @@ VLC plugins for libdc1394 %patch1 -p1 -b .pulse_default %if 0%{?fedora} > 8 %patch2 -p1 -b .libv4l2 +touch -r configure.ac.libv4l2 configure.ac +touch -r configure.libv4l2 configure %endif @@ -505,6 +509,9 @@ fi || : %changelog +* Mon Sep 29 2008 kwizart < kwizart at gmail.com > - 0.9.3-3 +- Prevent the needs to re-run autotools + * Mon Sep 29 2008 kwizart < kwizart at gmail.com > - 0.9.3-2 - Add libv4l2 patch from Hans de Goede