summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Kursawe <phosphan@gentoo.org>2004-03-17 13:55:50 +0000
committerPatrick Kursawe <phosphan@gentoo.org>2004-03-17 13:55:50 +0000
commitdfc67c85018ca72419027541d475396d8118f788 (patch)
tree3de131bf34da6b09e9270c319ea7d4b5cbef12a0 /media-video
parentVersion bump. (diff)
downloadhistorical-dfc67c85018ca72419027541d475396d8118f788.tar.gz
historical-dfc67c85018ca72419027541d475396d8118f788.tar.bz2
historical-dfc67c85018ca72419027541d475396d8118f788.zip
Fixing bug #42037
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mjpegtools/ChangeLog6
-rw-r--r--media-video/mjpegtools/Manifest4
-rw-r--r--media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 0544352ca57b..de1a95ced510 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mjpegtools
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.49 2004/03/15 12:18:47 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.50 2004/03/17 13:55:50 phosphan Exp $
+
+ 17 Mar 2004; Patrick Kursawe <phosphan@gentoo.org>
+ mjpegtools-1.6.1.90-r2.ebuild:
+ The no-x11-lib.patch should be only applied when not using X, see bug #42037.
*mjpegtools-1.6.2-r1 (15 Mar 2004)
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 313cdc08b549..a4ff53cb8afd 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -5,9 +5,9 @@ MD5 a72481aa50133608a6a02f030117a0b1 mjpegtools-1.6.2-r1.ebuild 2460
MD5 f95c2b5b9c6e541bacb0868e8d945de7 mjpegtools-1.6.2.ebuild 2153
MD5 1342615ce9c1eb99bc5fa4915c3950ec mjpegtools-1.6.0-r7.ebuild 2871
MD5 afafa62bb1c8e3b6f5a9875256068110 mjpegtools-1.6.1.92.ebuild 2124
-MD5 e821dde33c05123af34da1ccb84cfef2 ChangeLog 8991
+MD5 9d1b4ada7e4f488105a1b4b0dfded924 ChangeLog 9158
MD5 c9bb82e3c4de92ad8ed6ce7470250e6b metadata.xml 180
-MD5 ed9ede0c7db8ccafcc133dd9ddb3d663 mjpegtools-1.6.1.90-r2.ebuild 2185
+MD5 d9e847142abb54cca31f7d1d903a6077 mjpegtools-1.6.1.90-r2.ebuild 2194
MD5 fdbbda76e189c38a565baf19345e0516 mjpegtools-1.6.1.ebuild 2419
MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.2-fPIC.patch 555
MD5 0a37dfb174825ed9a9aeee24b8e3da84 files/digest-mjpegtools-1.6.1.90-r1 72
diff --git a/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild b/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild
index fa19f4545831..63f2e88c34f9 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild,v 1.1 2004/03/15 12:18:47 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild,v 1.2 2004/03/17 13:55:50 phosphan Exp $
inherit flag-o-matic gcc
@@ -29,7 +29,7 @@ DEPEND="media-libs/jpeg
src_unpack() {
unpack ${A} && cd "${S}"
- epatch "${FILESDIR}/no-x11-lib.patch"
+ use X || epatch "${FILESDIR}/no-x11-lib.patch"
}
src_compile() {