diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2006-09-14 09:59:52 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2006-09-14 09:59:52 +0000 |
| commit | ea4b8206bf35c2952c5c453282c3166c61d29de8 (patch) | |
| tree | febaa363adba761b38ebaad63c518137882ac234 | |
| parent | Fixed bug #139327; commit approved by tantive (diff) | |
| download | gentoo-2-ea4b8206bf35c2952c5c453282c3166c61d29de8.tar.gz gentoo-2-ea4b8206bf35c2952c5c453282c3166c61d29de8.tar.bz2 gentoo-2-ea4b8206bf35c2952c5c453282c3166c61d29de8.zip | |
Added patch to make it link with --as-needed, Bug #145684.
(Portage version: 2.1.1)
| -rw-r--r-- | media-video/avidemux/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/avidemux/avidemux-2.0.42-r1.ebuild | 3 | ||||
| -rw-r--r-- | media-video/avidemux/files/avidemux-2.0.42-as-needed.patch | 23 |
3 files changed, 30 insertions, 2 deletions
diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog index b04d4405fb42..518ac64643ee 100644 --- a/media-video/avidemux/ChangeLog +++ b/media-video/avidemux/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/avidemux # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.100 2006/09/07 04:02:31 tsunam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.101 2006/09/14 09:59:51 zzam Exp $ + + 14 Sep 2006; Matthias Schwarzott <zzam@gentoo.org> + +files/avidemux-2.0.42-as-needed.patch, avidemux-2.0.42-r1.ebuild: + Added patch to make it link with --as-needed, Bug #145684. 07 Sep 2006; Joshua Jackson <tsunam@gentoo.org> avidemux-2.0.42-r1.ebuild: stable x86; bug #140715 diff --git a/media-video/avidemux/avidemux-2.0.42-r1.ebuild b/media-video/avidemux/avidemux-2.0.42-r1.ebuild index 2c3b02557be0..9a8b8a026e27 100644 --- a/media-video/avidemux/avidemux-2.0.42-r1.ebuild +++ b/media-video/avidemux/avidemux-2.0.42-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/avidemux/avidemux-2.0.42-r1.ebuild,v 1.7 2006/09/07 04:02:31 tsunam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.42-r1.ebuild,v 1.8 2006/09/14 09:59:51 zzam Exp $ inherit eutils flag-o-matic fixheadtails @@ -71,6 +71,7 @@ src_unpack() { epatch "${FILESDIR}"/avidemux-extra-qualification.diff epatch "${FILESDIR}"/avidemux-altivec.patch + epatch "${FILESDIR}"/${P}-as-needed.patch cp ${WORKDIR}/${PV}/m4/* ${S}/m4 || die "cp m4 failed" diff --git a/media-video/avidemux/files/avidemux-2.0.42-as-needed.patch b/media-video/avidemux/files/avidemux-2.0.42-as-needed.patch new file mode 100644 index 000000000000..8d123cf7c5a6 --- /dev/null +++ b/media-video/avidemux/files/avidemux-2.0.42-as-needed.patch @@ -0,0 +1,23 @@ +diff -ru avidemux-2.0.42-orig/avidemux/Makefile.am avidemux-2.0.42/avidemux/Makefile.am +--- avidemux-2.0.42-orig/avidemux/Makefile.am 2006-09-14 11:52:16.442677508 +0200 ++++ avidemux-2.0.42/avidemux/Makefile.am 2006-09-14 11:53:03.135209474 +0200 +@@ -3,9 +3,9 @@ + + ## INCLUDES were found outside kdevelop specific part + +-avidemux2_SOURCES = gui_keyframes.cpp support.cpp guiplay.cpp gui_xv.cpp \ ++avidemux2_SOURCES = main.cpp gui_keyframes.cpp support.cpp guiplay.cpp gui_xv.cpp \ + gui_savenew.cpp gui_rgb.cpp gui_navigate.cpp gtk_gui.cpp callbacks.cpp avilist.cpp \ +- main.cpp prefs.cpp ADM_guiBitrate.cpp ADM_requantize.cpp ADM_pp.cpp \ ++ prefs.cpp ADM_guiBitrate.cpp ADM_requantize.cpp ADM_pp.cpp \ + ADM_memsupport.cpp + #avidemux_LDADD = ./ADM_library/libADM_library.a ./ADM_audio/libADM_audio.a ./ADM_audiocodec/libADM_audiocodec.a ./ADM_audiofilter/libADM_audiofilter.a ./ADM_codecs/libADM_codecs.a ./ADM_colorspace/libADM_colorspace.a ./ADM_editor/libADM_editor.a ./ADM_encoder/libADM_encoder.a ./ADM_filter/libADM_filter.a ../ADM_gui2/libADM_gui2.a /ADM_gui/libADM_gui.a ./ADM_inpics/libADM_inpics.a ./ADM_nuv/libADM_nuv.a ./ADM_toolkit/libADM_toolkit.a ./oplug_mpeg/liboplug_mpeg.a ./ADM_video/libADM_video.a ./oplug_avi/liboplug_avi.a ./ADM_audiodevice/libADM_audiodevice.a ./ADM_vp32/libADM_vp32.a ./ADM_mpeg2dec/libADM_mpeg2dec.a ./ADM_mpegindexer/libADM_mpegindexer.a ./libMpeg2Dec/liblibMpeg2Dec.a ./oplug_mpegFF/liboplug_mpegFF.a -L/usr/X11R6/lib -lm -lXext -lX11 + +@@ -62,6 +62,6 @@ + INCLUDES= $(all_includes) $(GTK_CFLAGS) $(XML_CFLAGS) $(VORBIS_CFLAGS) $(LIBMAD_CFLAGS) -DADMLOCALE='"'$(ADM_LOCALEDIR)'"' + + # the library search path. +-avidemux2_LDFLAGS = $(all_libraries) -L/usr/X11R6/lib $(SDL_LIBS) $(GTK_LIBS) $(FREETYPE_LIBS) $(ARTS_LIBS) $(XML_LIBS) $(VORBIS_LIBS) $(LIBMAD_LIBS) ../adm_lavcodec/libavcodec.a -lX11 -lXext ++avidemux2_LDADD += $(all_libraries) -L/usr/X11R6/lib $(SDL_LIBS) $(GTK_LIBS) $(FREETYPE_LIBS) $(ARTS_LIBS) $(XML_LIBS) $(VORBIS_LIBS) $(LIBMAD_LIBS) ../adm_lavcodec/libavcodec.a -lX11 -lXext + + noinst_HEADERS = ADM_pp.h admmangle.h |