[gentoo-commits] gentoo-x86 commit in media-libs/mediastreamer/files: mediastreamer-2.8.2-v4l-automagic.patch

[gentoo-commits] gentoo-x86 commit in media-libs/mediastreamer/files: mediastreamer-2.8.2-v4l-automagic.patch

[Michal Gorny (mgorny)]

mgorny      12/11/22 14:08:52

  Modified:             mediastreamer-2.8.2-v4l-automagic.patch
  Log:
  Replace the V4L patch with a correct one.
  
  (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 42B9401D)

Revision  Changes    Path
1.2                  media-libs/mediastreamer/files/mediastreamer-2.8.2-v4l-automagic.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mediastreamer/files/mediastreamer-2.8.2-v4l-automagic.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mediastreamer/files/mediastreamer-2.8.2-v4l-automagic.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mediastreamer/files/mediastreamer-2.8.2-v4l-automagic.patch?r1=1.1&r2=1.2

Index: mediastreamer-2.8.2-v4l-automagic.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/files/mediastreamer-2.8.2-v4l-automagic.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mediastreamer-2.8.2-v4l-automagic.patch	19 Nov 2012 21:28:03 -0000	1.1
+++ mediastreamer-2.8.2-v4l-automagic.patch	22 Nov 2012 14:08:51 -0000	1.2
@@ -1,6 +1,17 @@
---- configure.ac.orig	2012-02-22 20:29:04.000000000 +0400
-+++ configure.ac	2012-05-15 16:13:02.979041146 +0400
-@@ -624,6 +624,16 @@
+From 93362c849d4a3ba1748d033369f76e93557f1c06 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 22 Nov 2012 15:02:21 +0100
+Subject: [PATCH] Support disabling V4L support completely.
+
+---
+ mediastreamer-2.8.2/configure.ac | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/mediastreamer-2.8.2/configure.ac b/mediastreamer-2.8.2/configure.ac
+index d5be955..86703a0 100644
+--- a/mediastreamer-2.8.2/configure.ac
++++ b/mediastreamer-2.8.2/configure.ac
+@@ -624,6 +624,16 @@ PACKAGE_DATA_DIR="$prefix/share"
  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,  "${package_prefix}/share" ,[path of data])
  AC_SUBST(PACKAGE_DATA_DIR)
  
@@ -17,14 +28,27 @@
  dnl check for video4linux headers
  AC_CHECK_HEADERS(linux/videodev.h linux/videodev2.h)
  if test "${ac_cv_header_linux_videodev_h}" = "yes" ; then
-@@ -690,6 +700,10 @@
-       esac],[tests=yes])
- AM_CONDITIONAL(ENABLE_TESTS, test x$tests = xyes)
+@@ -637,9 +647,6 @@ else
+ 	found_v4l2=no
+ fi
+ 
+-AM_CONDITIONAL(BUILD_V4L1, test x$found_v4l1 = xyes )
+-AM_CONDITIONAL(BUILD_V4L2, test x$found_v4l2 = xyes )
+-
+ AC_ARG_ENABLE(libv4l1,
+       [  --disable-libv4l1    Disable usage of libv4l1, really discouraged],
+       [case "${enableval}" in
+@@ -680,6 +687,10 @@ this check.
+ 	fi
+ fi
  
 +fi
 +
-+AM_CONDITIONAL(BUILD_V4L, test x$found_v4l = xyes )
-+
++AM_CONDITIONAL(BUILD_V4L1, test x$found_v4l1 = xyes )
++AM_CONDITIONAL(BUILD_V4L2, test x$found_v4l2 = xyes )
  
- dnl ##################################################
- dnl # Check for doxygen
+ AC_ARG_ENABLE(tests,
+       [  --enable-tests    Disable compilation of tests],
+-- 
+1.8.0
+