| 1 |
mgorny 12/11/22 14:08:52 |
| 2 |
|
| 3 |
Modified: mediastreamer-2.8.2-v4l-automagic.patch |
| 4 |
Log: |
| 5 |
Replace the V4L patch with a correct one. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 42B9401D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 media-libs/mediastreamer/files/mediastreamer-2.8.2-v4l-automagic.patch |
| 11 |
|
| 12 |
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 |
| 13 |
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 |
| 14 |
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 |
| 15 |
|
| 16 |
Index: mediastreamer-2.8.2-v4l-automagic.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/files/mediastreamer-2.8.2-v4l-automagic.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- mediastreamer-2.8.2-v4l-automagic.patch 19 Nov 2012 21:28:03 -0000 1.1 |
| 23 |
+++ mediastreamer-2.8.2-v4l-automagic.patch 22 Nov 2012 14:08:51 -0000 1.2 |
| 24 |
@@ -1,6 +1,17 @@ |
| 25 |
---- configure.ac.orig 2012-02-22 20:29:04.000000000 +0400 |
| 26 |
-+++ configure.ac 2012-05-15 16:13:02.979041146 +0400 |
| 27 |
-@@ -624,6 +624,16 @@ |
| 28 |
+From 93362c849d4a3ba1748d033369f76e93557f1c06 Mon Sep 17 00:00:00 2001 |
| 29 |
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 30 |
+Date: Thu, 22 Nov 2012 15:02:21 +0100 |
| 31 |
+Subject: [PATCH] Support disabling V4L support completely. |
| 32 |
+ |
| 33 |
+--- |
| 34 |
+ mediastreamer-2.8.2/configure.ac | 17 ++++++++++++++--- |
| 35 |
+ 1 file changed, 14 insertions(+), 3 deletions(-) |
| 36 |
+ |
| 37 |
+diff --git a/mediastreamer-2.8.2/configure.ac b/mediastreamer-2.8.2/configure.ac |
| 38 |
+index d5be955..86703a0 100644 |
| 39 |
+--- a/mediastreamer-2.8.2/configure.ac |
| 40 |
++++ b/mediastreamer-2.8.2/configure.ac |
| 41 |
+@@ -624,6 +624,16 @@ PACKAGE_DATA_DIR="$prefix/share" |
| 42 |
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${package_prefix}/share" ,[path of data]) |
| 43 |
AC_SUBST(PACKAGE_DATA_DIR) |
| 44 |
|
| 45 |
@@ -17,14 +28,27 @@ |
| 46 |
dnl check for video4linux headers |
| 47 |
AC_CHECK_HEADERS(linux/videodev.h linux/videodev2.h) |
| 48 |
if test "${ac_cv_header_linux_videodev_h}" = "yes" ; then |
| 49 |
-@@ -690,6 +700,10 @@ |
| 50 |
- esac],[tests=yes]) |
| 51 |
- AM_CONDITIONAL(ENABLE_TESTS, test x$tests = xyes) |
| 52 |
+@@ -637,9 +647,6 @@ else |
| 53 |
+ found_v4l2=no |
| 54 |
+ fi |
| 55 |
+ |
| 56 |
+-AM_CONDITIONAL(BUILD_V4L1, test x$found_v4l1 = xyes ) |
| 57 |
+-AM_CONDITIONAL(BUILD_V4L2, test x$found_v4l2 = xyes ) |
| 58 |
+- |
| 59 |
+ AC_ARG_ENABLE(libv4l1, |
| 60 |
+ [ --disable-libv4l1 Disable usage of libv4l1, really discouraged], |
| 61 |
+ [case "${enableval}" in |
| 62 |
+@@ -680,6 +687,10 @@ this check. |
| 63 |
+ fi |
| 64 |
+ fi |
| 65 |
|
| 66 |
+fi |
| 67 |
+ |
| 68 |
-+AM_CONDITIONAL(BUILD_V4L, test x$found_v4l = xyes ) |
| 69 |
-+ |
| 70 |
++AM_CONDITIONAL(BUILD_V4L1, test x$found_v4l1 = xyes ) |
| 71 |
++AM_CONDITIONAL(BUILD_V4L2, test x$found_v4l2 = xyes ) |
| 72 |
|
| 73 |
- dnl ################################################## |
| 74 |
- dnl # Check for doxygen |
| 75 |
+ AC_ARG_ENABLE(tests, |
| 76 |
+ [ --enable-tests Disable compilation of tests], |
| 77 |
+-- |
| 78 |
+1.8.0 |
| 79 |
+ |
Archives