diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2006-08-28 21:16:27 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2006-08-28 21:16:27 +0000 |
| commit | b387a5267a0115caac21c01198b99a7e28f9f7b0 (patch) | |
| tree | b8b2008988ca66ad466fbc1720f4a952b17b7a95 /media-video/mjpegtools | |
| parent | touchups (diff) | |
| download | gentoo-2-b387a5267a0115caac21c01198b99a7e28f9f7b0.tar.gz gentoo-2-b387a5267a0115caac21c01198b99a7e28f9f7b0.tar.bz2 gentoo-2-b387a5267a0115caac21c01198b99a7e28f9f7b0.zip | |
Added the make-dependencies which broke parallel building when having the as-needed patch applied. Bug #145265.
(Portage version: 2.1.1_rc1-r1)
Diffstat (limited to 'media-video/mjpegtools')
| -rw-r--r-- | media-video/mjpegtools/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/mjpegtools/files/mjpegtools-1.8.0-as-needed.patch | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog index 6b228da73da7..90379f95c130 100644 --- a/media-video/mjpegtools/ChangeLog +++ b/media-video/mjpegtools/ChangeLog @@ -1,6 +1,11 @@ # 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.117 2006/08/25 13:45:53 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.118 2006/08/28 21:16:27 zzam Exp $ + + 28 Aug 2006; Matthias Schwarzott <zzam@gentoo.org> + files/mjpegtools-1.8.0-as-needed.patch: + Added the make-dependencies which broke parallel building when having the + as-needed patch applied. Bug #145265. 25 Aug 2006; Matthias Schwarzott <zzam@gentoo.org> +files/mjpegtools-1.8.0-as-needed.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 index c639b3012546..d08ac625cbe6 100644 --- a/media-video/mjpegtools/files/mjpegtools-1.8.0-as-needed.patch +++ b/media-video/mjpegtools/files/mjpegtools-1.8.0-as-needed.patch @@ -1,16 +1,18 @@ 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 @@ +@@ -51,10 +51,17 @@ 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 ++liblavrec_la_DEPENDENCIES = liblavfile.la liblavjpeg.la 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 ++liblavplay_la_DEPENDENCIES = liblavfile.la liblavjpeg.la +if HAVE_X + liblavplay_la_LIBADD += $(X_LIBS) -lX11 +endif |