Finally fix v4l1 automagic and inability to be built with linux-headers-2.6.38, bug 361107 thank Guillaume BINET for report and Ted Rodgers, hirakendu and for help.

(Portage version: 2.1.9.45/cvs/Linux x86_64)

3 files changed, 58 insertions, 7 deletions

diff --git a/media-libs/mediastreamer/ChangeLog b/media-libs/mediastreamer/ChangeLog
index 9fa5b7e4b33e..86e54b61f928 100644
--- a/media-libs/mediastreamer/ChangeLog
+++ b/media-libs/mediastreamer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/mediastreamer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.34 2011/04/09 06:31:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.35 2011/04/09 09:38:42 pva Exp $
+
+  09 Apr 2011; Peter Volkov <pva@gentoo.org> mediastreamer-2.7.3.ebuild,
+  +files/mediastreamer-2.7.3-v4l-automagic.patch:
+  Finally fix v4l1 automagic and inability to be built with
+  linux-headers-2.6.38, bug 361107 thank Guillaume BINET for report and Ted
+  Rodgers, hirakendu and for help.
 
 *mediastreamer-2.7.3 (09 Apr 2011)
 
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.7.3-v4l-automagic.patch b/media-libs/mediastreamer/files/mediastreamer-2.7.3-v4l-automagic.patch
new file mode 100644
index 000000000000..d103a07fd9af
--- /dev/null
+++ b/media-libs/mediastreamer/files/mediastreamer-2.7.3-v4l-automagic.patch
@@ -0,0 +1,40 @@
+=== modified file 'configure.ac'
+--- configure.ac	2011-04-09 08:17:33 +0000
++++ configure.ac	2011-04-09 08:31:18 +0000
+@@ -590,6 +590,15 @@
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,  "${package_prefix}/share" ,[path of data])
+ AC_SUBST(PACKAGE_DATA_DIR)
+ 
++AC_ARG_ENABLE(v4l,
++      [  --disable-v4l       Disable usage of v4l],
++      [case "${enableval}" in
++        yes) v4l=yes ;;
++        no)  v4l=no ;;
++        *) AC_MSG_ERROR(bad value ${enableval} for --disable-v4l) ;;
++      esac],[v4l=yes])
++
++if test "$v4l" = "yes" ; then
+ dnl check for video4linux headers
+ AC_CHECK_HEADERS(linux/videodev.h linux/videodev2.h)
+ if test "${ac_cv_header_linux_videodev_h}" = "yes" || \
+@@ -599,8 +608,6 @@
+ 	found_v4l=no
+ fi
+ 
+-AM_CONDITIONAL(BUILD_V4L, test x$found_v4l = xyes )
+-
+ AC_ARG_ENABLE(libv4l,
+       [  --disable-libv4l    Disable usage of libv4l, really discouraged],
+       [case "${enableval}" in
+@@ -632,6 +639,10 @@
+ ])
+ 	fi
+ fi
++fi
++
++AM_CONDITIONAL(BUILD_V4L, test x$found_v4l = xyes )
++
+ 
+ dnl ##################################################
+ dnl # Check for doxygen
+
diff --git a/media-libs/mediastreamer/mediastreamer-2.7.3.ebuild b/media-libs/mediastreamer/mediastreamer-2.7.3.ebuild
index 67f9097eb626..a63332a5a89d 100644
--- a/media-libs/mediastreamer/mediastreamer-2.7.3.ebuild
+++ b/media-libs/mediastreamer/mediastreamer-2.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.7.3.ebuild,v 1.1 2011/04/09 06:31:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.7.3.ebuild,v 1.2 2011/04/09 09:38:42 pva Exp $
 
 EAPI="4"
 
@@ -17,8 +17,9 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos"
 # not built with v4l2 support (taken from configure.ac)
 # TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
 IUSE="+alsa coreaudio debug examples gsm ilbc ipv6 jack oss portaudio pulseaudio
-sdl +speex theora video x264 X xv"
-REQUIRED_USE="|| ( oss alsa jack portaudio coreaudio ) theora? ( video ) X? ( video ) xv? ( X )"
+sdl +speex theora v4l2 video x264 X xv"
+REQUIRED_USE="|| ( oss alsa jack portaudio coreaudio ) theora? ( video ) X? (
+video ) xv? ( X ) v4l2? ( video )"
 
 RDEPEND=">=net-libs/ortp-0.16.2[ipv6?]
 	alsa? ( media-libs/alsa-lib )
@@ -29,9 +30,9 @@ RDEPEND=">=net-libs/ortp-0.16.2[ipv6?]
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
 	speex? ( >=media-libs/speex-1.2_beta3 )
 	video? (
-		media-libs/libv4l
-		sys-kernel/linux-headers
 		virtual/ffmpeg
+		v4l2? ( media-libs/libv4l
+			sys-kernel/linux-headers )
 		theora? ( media-libs/libtheora )
 		sdl? ( media-libs/libsdl[video,X] )
 		X? ( x11-libs/libX11
@@ -58,6 +59,9 @@ src_prepare() {
 	sed -i -e "s:\(doc_htmldir=\).*:\1\$(htmldir):" help/Makefile.am \
 		|| die "patching help/Makefile.am failed"
 
+	epatch "${FILESDIR}/${PN}-2.7.3-v4l-automagic.patch"
+	# linux/videodev.h dropped in 2.6.38
+	sed -i -e 's:msv4l.c::' src/Makefile.am || die
 	eautoreconf
 
 	# don't build examples in tests/
@@ -96,7 +100,8 @@ src_configure() {
 		$(use_enable speex) \
 		$(use_enable theora) \
 		$(use_enable video) \
-		$(use_enable video libv4l) \
+		$(use_enable v4l2 v4l) \
+		$(use_enable v4l2 libv4l) \
 		$(use_enable sdl) \
 		$(use_enable X x11) \
 		$(use_enable xv)