summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2006-08-25 13:45:53 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2006-08-25 13:45:53 +0000
commit8bbd4e4325d85c982fad56a579f343ac47a88812 (patch)
treeecc080d567778c2e238fd4ecd8a423de56f9ec06 /media-video/mjpegtools/files
parentinitial import by me (diff)
downloadgentoo-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/files')
-rw-r--r--media-video/mjpegtools/files/mjpegtools-1.8.0-as-needed.patch19
1 files changed, 19 insertions, 0 deletions
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