diff options
| author |   Patrick Kursawe <phosphan@gentoo.org> | 2004-03-17 16:46:15 +0000 |
|---|---|---|
| committer | Patrick Kursawe <phosphan@gentoo.org> | 2004-03-17 16:46:15 +0000 |
| commit | 372526e5a41be7186edb1c29683c005dcd89a979 (patch) | |
| tree | 35264a94f2f170630ace502795bea3490c1e3cba /media-video | |
| parent | Fixed a compilation bug. (diff) | |
| download | historical-372526e5a41be7186edb1c29683c005dcd89a979.tar.gz historical-372526e5a41be7186edb1c29683c005dcd89a979.tar.bz2 historical-372526e5a41be7186edb1c29683c005dcd89a979.zip | |
Adding no-x11-lib patch, see bug #36771
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mjpegtools/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mjpegtools/Manifest | 5 | ||||
| -rw-r--r-- | media-video/mjpegtools/files/no-x11-lib-2.patch | 11 | ||||
| -rw-r--r-- | media-video/mjpegtools/mjpegtools-1.6.1.93.ebuild | 4 |
4 files changed, 21 insertions, 5 deletions
diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog index de1a95ced510..a77e793c07b5 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.50 2004/03/17 13:55:50 phosphan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.51 2004/03/17 16:46:15 phosphan Exp $ + + 17 Mar 2004; Patrick Kursawe <phosphan@gentoo.org> + mjpegtools-1.6.1.93.ebuild, files/no-x11-lib-2.patch: + Adding no-x11-lib patch, see bug #36771 17 Mar 2004; Patrick Kursawe <phosphan@gentoo.org> mjpegtools-1.6.1.90-r2.ebuild: diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest index a4ff53cb8afd..414bd2b037b8 100644 --- a/media-video/mjpegtools/Manifest +++ b/media-video/mjpegtools/Manifest @@ -1,11 +1,11 @@ MD5 33a0236a9659a513f648305e17ae0a57 mjpegtools-1.6.1.91.ebuild 1934 MD5 3631956b92e796f9218423f19bc98af3 mjpegtools-1.6.1.90-r1.ebuild 1881 -MD5 ae66d0153f3aee8d39b16468d552dc56 mjpegtools-1.6.1.93.ebuild 2122 +MD5 e376fb1ae7fe4a05528f9072477f2c71 mjpegtools-1.6.1.93.ebuild 2133 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 9d1b4ada7e4f488105a1b4b0dfded924 ChangeLog 9158 +MD5 d6d88679009590c622b5ce1872eb637b ChangeLog 9310 MD5 c9bb82e3c4de92ad8ed6ce7470250e6b metadata.xml 180 MD5 d9e847142abb54cca31f7d1d903a6077 mjpegtools-1.6.1.90-r2.ebuild 2194 MD5 fdbbda76e189c38a565baf19345e0516 mjpegtools-1.6.1.ebuild 2419 @@ -13,6 +13,7 @@ MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.2-fPIC.patch 555 MD5 0a37dfb174825ed9a9aeee24b8e3da84 files/digest-mjpegtools-1.6.1.90-r1 72 MD5 0a37dfb174825ed9a9aeee24b8e3da84 files/digest-mjpegtools-1.6.1.90-r2 72 MD5 0d5f90e8ac4023e403bf79d2e14314cb files/mjpegtools-1.6.0-gcc3.patch 5086 +MD5 cbcc90f9de3aaf0ac12aa6bd1c4db025 files/no-x11-lib-2.patch 469 MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.91-fPIC.patch 555 MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.92-fPIC.patch 555 MD5 4a594198579130cfe453fffb532b2aef files/digest-mjpegtools-1.6.1 147 diff --git a/media-video/mjpegtools/files/no-x11-lib-2.patch b/media-video/mjpegtools/files/no-x11-lib-2.patch new file mode 100644 index 000000000000..cb506be98144 --- /dev/null +++ b/media-video/mjpegtools/files/no-x11-lib-2.patch @@ -0,0 +1,11 @@ +--- mjpegtools-1.6.1.91/lavtools/Makefile.in.old 2003-12-31 01:04:06.000000000 +0100 ++++ mjpegtools-1.6.1.91/lavtools/Makefile.in 2003-12-31 01:04:24.000000000 +0100 +@@ -334,7 +334,7 @@ + multiblend_flt_SOURCES = multiblend.flt.c + multiblend_flt_LDADD = $(top_builddir)/utils/libmjpegutils.a + +-@HAVE_X_TRUE@LAVPLAY_X_LIBS = $(X_LIBS) -lX11 ++@HAVE_X_TRUE@LAVPLAY_X_LIBS = $(X_LIBS) + + lavplay_SOURCES = lavplay.c + lavplay_LDADD = $(top_builddir)/utils/libmjpegutils.a \ diff --git a/media-video/mjpegtools/mjpegtools-1.6.1.93.ebuild b/media-video/mjpegtools/mjpegtools-1.6.1.93.ebuild index def89c8cb15d..db3a4ef86d22 100644 --- a/media-video/mjpegtools/mjpegtools-1.6.1.93.ebuild +++ b/media-video/mjpegtools/mjpegtools-1.6.1.93.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.93.ebuild,v 1.1 2004/01/18 18:45:46 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.93.ebuild,v 1.2 2004/03/17 16:46:15 phosphan Exp $ inherit flag-o-matic gcc @@ -36,7 +36,7 @@ src_unpack() { # See bug #36502, comment 8 [ "$ARCH" != x86 ] && epatch ${FILESDIR}/${P}-fPIC.patch -# epatch "${FILESDIR}/no-x11-lib.patch" + use X || epatch "${FILESDIR}/no-x11-lib-2.patch" } src_compile() { |