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 | 31be0ac456959be11dc1964e1a7cce5ba4265f18 (patch) | |
| tree | 38d5e9ceb0e4db54eb6c28a5a7b1359838863ba0 /media-video | |
| parent | Fixed a compilation bug. (Manifest recommit) (diff) | |
| download | gentoo-2-31be0ac456959be11dc1964e1a7cce5ba4265f18.tar.gz gentoo-2-31be0ac456959be11dc1964e1a7cce5ba4265f18.tar.bz2 gentoo-2-31be0ac456959be11dc1964e1a7cce5ba4265f18.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/files/no-x11-lib-2.patch | 11 | ||||
| -rw-r--r-- | media-video/mjpegtools/mjpegtools-1.6.1.93.ebuild | 4 |
3 files changed, 18 insertions, 3 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/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() { |