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.

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

4 files changed, 61 insertions, 9 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/Manifest b/media-libs/mediastreamer/Manifest
index 070fa61ce376..10bb221a36b5 100644
--- a/media-libs/mediastreamer/Manifest
+++ b/media-libs/mediastreamer/Manifest
@@ -1,4 +1,5 @@
 AUX mediastreamer-2.2.3_p1-autodeps.patch 4398 RMD160 cc3a98a9d7446e15a3fb5f851a18d6f5342e0908 SHA1 7d00b34a333b273680c612b6f0d0ffa092fb66ba SHA256 0cc00eefe8ed05ff63f3a8928c2d5a3d0fe87719c97bfd52c5057a1bba4bcb9c
+AUX mediastreamer-2.7.3-v4l-automagic.patch 1083 RMD160 7525df8acec6073afc9d249e124a5a0abca38fa0 SHA1 96b8169fde8375b05aaa7d275089a99117398317 SHA256 697cc9697504e57bb5810b7844eac34bfbae9c909f299ca5bb056b352c26bcfe
 DIST mediastreamer-2.2.3.tar.gz 581001 RMD160 ca84cf2f415099ad2fb9219aadfebc1aa2cb3381 SHA1 e3a6d4e5314043ad690da6c1ed55a81e70282941 SHA256 203ab2508efa37831cf2bef76ef222c01e51bf250fd14db1ae85e442ed87cd48
 DIST mediastreamer-2.2.3_p1-linphone-3.1.1.patch.tgz 67833 RMD160 4b6096a989eeea869f10376fd6632b1ffb655054 SHA1 ce4141723c40d36f856723e3073d110577fcbb68 SHA256 1aef7c853e6e76f9137dbaf6c575995a2c9816ae464770e819eadacb81778f67
 DIST mediastreamer-2.3.0.tar.gz 669093 RMD160 8d656df1008025b91c3905ef69eb88c35c8741ab SHA1 eae7032fbbf5d31b3c47a54566d34a8b97e38405 SHA256 67b87a094da0b17be43919e67dffe7b5347bc4299f4d87165a8f27282ea7afbd
@@ -9,6 +10,6 @@ EBUILD mediastreamer-2.2.3_p1-r1.ebuild 3818 RMD160 bd2c86eb7f73d3baaadca3c30890
 EBUILD mediastreamer-2.3.0-r1.ebuild 3847 RMD160 6476120db21958071d930f1dbc43bc1db3b1ea2d SHA1 084a373e4139c782c5c784625b6cd1b7bb082f6c SHA256 33c8f48eba5ee865de37eab53cf185d3e8f0587ea666e21c33c20a95a72559d6
 EBUILD mediastreamer-2.5.0.ebuild 4166 RMD160 1be347cc0366f575ee77befb44a3995dad7642cb SHA1 486f1b49dfbc65cb719b364373e9491d669308b4 SHA256 fe26d84b36f3eaf1bc17949e376ac9d9228e811df295ba62106fbbd1966c15bb
 EBUILD mediastreamer-2.6.0.ebuild 4095 RMD160 e9c25b2c8a6b561a57cd02749d6d36a9469c1db1 SHA1 2d984bda4aff26e62a11ee2e2ec64a798876858e SHA256 dfb22069c4e698d7c609756babc8a4b76c5607f9a967b23ec9dfdbb31c02f467
-EBUILD mediastreamer-2.7.3.ebuild 3493 RMD160 3dce5b93ee2ae6d7e783eaedada2eda0ff9bd957 SHA1 5cdad35203deec686ea2fd6341504f7d5f592779 SHA256 97048753314d8c79054711b910aa26695205b75ab080a9243e7759374a0ccce1
-MISC ChangeLog 5087 RMD160 9333e228b61ef92e687fa8812b53fbe9f2d4a926 SHA1 86a77a632b7291105e4756020e258e9d1157ea12 SHA256 f3f7f795968671491057e11511135be68bef3f3c7308fce56e9bc2b9bb340383
+EBUILD mediastreamer-2.7.3.ebuild 3691 RMD160 7a6850e8bf7cd053e5210981cd48a83b75ffcc3c SHA1 2047bf86866a44d909cf9a7d73b7748e28ef7517 SHA256 4b4904e0922aec0c5a78192c82339c15d868375b597acbba4ab3b75ced41fd2c
+MISC ChangeLog 5382 RMD160 5a13fc10d7f45d347c053df8ff1c96d26718ba63 SHA1 0145ff5366a482ff918f55026bc40c0604575e83 SHA256 1089c45ea1e82817e3f3f86015f7194bb72718ce5201b3a56c7db6aeb3867534
 MISC metadata.xml 380 RMD160 24797b26f9f2ef16ea5261c536ebed58e3903e97 SHA1 74bcc7d7e8bd26a92450ee714743a975ed595de0 SHA256 5cd96440722093ad63d25758891be2656d8c7f8b570eddfee1fbdce5860d237a
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)