From 7c0a6e6f9281567f9aa280c68956077d988b2275 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Olivier=20Cr=C3=AAte?= <tester@gentoo.org>
Date: Thu, 6 Jan 2005 20:11:21 +0000
Subject: [PATCH] enable-v4l2 now works ok too

---
 media-video/mpeg4ip/ChangeLog          |  5 ++++-
 media-video/mpeg4ip/Manifest           | 10 +++++-----
 media-video/mpeg4ip/mpeg4ip-1.2.ebuild |  6 +++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog
index 403cd916cbe5..468d33215b72 100644
--- a/media-video/mpeg4ip/ChangeLog
+++ b/media-video/mpeg4ip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mpeg4ip
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.19 2005/01/04 03:05:51 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.20 2005/01/06 20:11:21 tester Exp $
+
+  06 Jan 2005; Olivier Crête <tester@gentoo.org> mpeg4ip-1.2.ebuild:
+  enable-v4l2 now works ok too
 
   03 Jan 2005; Olivier Crête <tester@gentoo.org> mpeg4ip-1.2.ebuild:
   Really fix compilation without X, changed use flag from gtk to X
diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest
index 14ef45ba39e4..d4e4553b2cbf 100644
--- a/media-video/mpeg4ip/Manifest
+++ b/media-video/mpeg4ip/Manifest
@@ -3,9 +3,9 @@ Hash: SHA1
 
 MD5 70d18ba0532a78593282eb879d3c1274 mpeg4ip-1.1.ebuild 1642
 MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255
-MD5 985a2265fb21cb141a8b726a1515b698 ChangeLog 3613
+MD5 5abef84b75c34fbbd565139eb761ca96 ChangeLog 3715
 MD5 a74537cea5ff250264109426ab1861f4 mpeg4ip-1.0.ebuild 2205
-MD5 4392010baaf5428fcf10f3cbe7bd25a7 mpeg4ip-1.2.ebuild 2664
+MD5 6a6ae818dcd0f220c397d6c57e2f47bd mpeg4ip-1.2.ebuild 2639
 MD5 47b75e71dec24165d7bcf3a5b55d785d files/mpeg4ip-1.1-gentoo-fixes.patch 844
 MD5 e1adf5b673be8f3eede637fc5ea66aa3 files/digest-mpeg4ip-1.2 64
 MD5 bf208b3fef7857814d19fd17e38cbd66 files/digest-mpeg4ip-1.1 64
@@ -15,7 +15,7 @@ MD5 5362a4e7d4ecc6778c030d2de9070f14 files/mpeg4ip-1.2-mp4encode-template-path.p
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFB2gg/wDHaUUJ0mYMRAvvOAJsHKDx7qiymdwxkYPfuSw0l2orwLgCfa3Pv
-l31IwJeNaMis0eVzoCWUNwA=
-=YUWo
+iD8DBQFB3ZuSwDHaUUJ0mYMRAt8oAKCCPmlj6D3VSXmPSoJSjLZg5OaWMACfeYTd
+aRVm4NHPksLxr4f3h/jL8jw=
+=e4Cb
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpeg4ip/mpeg4ip-1.2.ebuild b/media-video/mpeg4ip/mpeg4ip-1.2.ebuild
index 4c041c260e69..84eb67755bc6 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.2.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.2.ebuild,v 1.4 2005/01/04 03:05:51 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.2.ebuild,v 1.5 2005/01/06 20:11:21 tester Exp $
 
 inherit eutils
 
@@ -69,8 +69,8 @@ src_compile() {
 			$(use_enable arts)
 			$(use_enable X gtk-glib)
 			$(use_enable X player)
-			$(use_enable X mp4live)"
-	use v4l2 || myconf="${myconf} --disable-v4l2"
+			$(use_enable X mp4live)
+			$(use_enable v4l2)"
 
 	# ffmpeg support doesnt build even on gcc 3.3
 	# and the configure script is broken so --disable doesnt work
-- 
2.26.2