diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2006-08-25 13:45:53 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2006-08-25 13:45:53 +0000 |
| commit | 8bbd4e4325d85c982fad56a579f343ac47a88812 (patch) | |
| tree | ecc080d567778c2e238fd4ecd8a423de56f9ec06 /media-video/mjpegtools | |
| parent | initial import by me (diff) | |
| download | gentoo-2-8bbd4e4325d85c982fad56a579f343ac47a88812.tar.gz gentoo-2-8bbd4e4325d85c982fad56a579f343ac47a88812.tar.bz2 gentoo-2-8bbd4e4325d85c982fad56a579f343ac47a88812.zip | |
Fixed linking with --as-needed, see bug #144656.
(Portage version: 2.1.1_pre5-r3)
Diffstat (limited to 'media-video/mjpegtools')
| -rw-r--r-- | media-video/mjpegtools/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mjpegtools/files/mjpegtools-1.8.0-as-needed.patch | 19 | ||||
| -rw-r--r-- | media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild | 3 |
3 files changed, 26 insertions, 2 deletions
diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog index 6b28c476dcaa..6b228da73da7 100644 --- a/media-video/mjpegtools/ChangeLog +++ b/media-video/mjpegtools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mjpegtools # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.116 2006/08/25 12:21:43 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.117 2006/08/25 13:45:53 zzam Exp $ + + 25 Aug 2006; Matthias Schwarzott <zzam@gentoo.org> + +files/mjpegtools-1.8.0-as-needed.patch, mjpegtools-1.8.0-r1.ebuild: + Fixed linking with --as-needed, see bug #144656. 25 Aug 2006; Matthias Schwarzott <zzam@gentoo.org> +files/mjpegtools-1.8.0-pkg-config.patch, mjpegtools-1.8.0-r1.ebuild: diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-as-needed.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-as-needed.patch new file mode 100644 index 000000000000..c639b3012546 --- /dev/null +++ b/media-video/mjpegtools/files/mjpegtools-1.8.0-as-needed.patch @@ -0,0 +1,19 @@ +diff -ru mjpegtools-1.8.0-orig/lavtools/Makefile.am mjpegtools-1.8.0/lavtools/Makefile.am +--- mjpegtools-1.8.0-orig/lavtools/Makefile.am 2006-08-25 15:09:51.542109878 +0200 ++++ mjpegtools-1.8.0/lavtools/Makefile.am 2006-08-25 15:11:37.920337695 +0200 +@@ -51,10 +51,15 @@ + liblavrec_la_SOURCES = liblavrec.c audiolib.c frequencies.c + liblavrec_la_CPPFLAGS = $(AM_CPPFLAGS) # so automake doesn't complain about audiolib & frequencies + liblavrec_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) ++liblavrec_la_LIBADD = -llavfile -llavjpeg + + liblavplay_la_SOURCES = liblavplay.c audiolib.c + liblavplay_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(X_CFLAGS) + liblavplay_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) ++liblavplay_la_LIBADD = -llavfile $(SDL_LIBS) -llavjpeg ++if HAVE_X ++ liblavplay_la_LIBADD += $(X_LIBS) -lX11 ++endif + + # ********************************************************************* + # The tools themselves diff --git a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild index ed0604f0da99..fdf1209c94ba 100644 --- a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild +++ b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.17 2006/08/25 12:21:43 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.18 2006/08/25 13:45:53 zzam Exp $ inherit flag-o-matic toolchain-funcs eutils libtool autotools @@ -45,6 +45,7 @@ src_unpack() { epatch "${FILESDIR}/${P}-gcc41.patch" epatch "${FILESDIR}/${P}-parallelmake.patch" epatch "${FILESDIR}/${P}-pkg-config.patch" + epatch "${FILESDIR}/${P}-as-needed.patch" has_version ">=media-libs/libquicktime-0.9.9" && epatch "${FILESDIR}/${P}-libquicktime.patch" # eautoreconf instead of elibtoolize |