diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-11-22 14:08:52 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-11-22 14:08:52 +0000 |
| commit | efc008cd5423f7193a9b9282e4b174a2f29e3811 (patch) | |
| tree | 24b57f883b22a76f76d52226825cc910916672ed /media-libs/mediastreamer | |
| parent | Stable on amd64, wrt bug #443500 (diff) | |
| download | gentoo-2-efc008cd5423f7193a9b9282e4b174a2f29e3811.tar.gz gentoo-2-efc008cd5423f7193a9b9282e4b174a2f29e3811.tar.bz2 gentoo-2-efc008cd5423f7193a9b9282e4b174a2f29e3811.zip | |
Replace the V4L patch with a correct one.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 42B9401D)
Diffstat (limited to 'media-libs/mediastreamer')
| -rw-r--r-- | media-libs/mediastreamer/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/mediastreamer/files/mediastreamer-2.8.2-v4l-automagic.patch | 44 |
2 files changed, 39 insertions, 11 deletions
diff --git a/media-libs/mediastreamer/ChangeLog b/media-libs/mediastreamer/ChangeLog index 08c50599047d..df7f98d8920e 100644 --- a/media-libs/mediastreamer/ChangeLog +++ b/media-libs/mediastreamer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/mediastreamer # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.56 2012/11/19 21:28:03 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.57 2012/11/22 14:08:52 mgorny Exp $ + + 22 Nov 2012; Michał Górny <mgorny@gentoo.org> + files/mediastreamer-2.8.2-v4l-automagic.patch: + Replace the V4L patch with a correct one. *mediastreamer-2.8.2 (19 Nov 2012) diff --git a/media-libs/mediastreamer/files/mediastreamer-2.8.2-v4l-automagic.patch b/media-libs/mediastreamer/files/mediastreamer-2.8.2-v4l-automagic.patch index 0c33274dd798..f35660ea8c0c 100644 --- a/media-libs/mediastreamer/files/mediastreamer-2.8.2-v4l-automagic.patch +++ b/media-libs/mediastreamer/files/mediastreamer-2.8.2-v4l-automagic.patch @@ -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 + |