Added patch to make it link with --as-needed, Bug #145684.

Package-Manager: portage-2.1.1

4 files changed, 46 insertions, 14 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/Manifest b/media-video/avidemux/Manifest
index 44065bb60ed8..0ceb1e49626b 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX avidemux-2.0.42-as-needed.patch 2089 RMD160 6e738883de2d13e0e25ab92b0223355279e6aae2 SHA1 ff9e17c351b172f9c62ff0ffcb7a6e0836cd564e SHA256 c7d7b5c7d4d69543f09a9f9bceae867da4811cf3c917d8d9e13ee54f90b3284f
+MD5 2827b9dff4e9519e37be7898ef7e84f7 files/avidemux-2.0.42-as-needed.patch 2089
+RMD160 6e738883de2d13e0e25ab92b0223355279e6aae2 files/avidemux-2.0.42-as-needed.patch 2089
+SHA256 c7d7b5c7d4d69543f09a9f9bceae867da4811cf3c917d8d9e13ee54f90b3284f files/avidemux-2.0.42-as-needed.patch 2089
 AUX avidemux-altivec.patch 9371 RMD160 8347497a6888515169e80fb28cc5d768c8ef7b32 SHA1 4ac716eb8dffa2327c10d9d8927044790fae39f4 SHA256 74b2e5b86bbdf204636cbf1f339d339e14be1ef89f67b47cf3c2fd6fcad83bf2
 MD5 7709231a89b035414b4877681aa78dc1 files/avidemux-altivec.patch 9371
 RMD160 8347497a6888515169e80fb28cc5d768c8ef7b32 files/avidemux-altivec.patch 9371
@@ -18,18 +22,18 @@ EBUILD avidemux-2.0.24.ebuild 2480 RMD160 1bca89e4a8879f1b813bbd45e06e03b7172113
 MD5 3b3113b07006ae2d4ce602c1c897677a avidemux-2.0.24.ebuild 2480
 RMD160 1bca89e4a8879f1b813bbd45e06e03b71721133b avidemux-2.0.24.ebuild 2480
 SHA256 ce338c18cb2ee42cb59f001a7cb687aab3ac56e279ebf4ba7795249a16610830 avidemux-2.0.24.ebuild 2480
-EBUILD avidemux-2.0.42-r1.ebuild 3164 RMD160 adca2fa02d5cd43b2dd6689f4a1622fdac62e8b9 SHA1 b89b2ad639abee4b6328cc112d1358a615a0d88d SHA256 0ca36fcfea5ea36c3369ad0bb6ebc9ecc2190c7ec561585c708361528adcd180
-MD5 c67d09645871c076c7ed753f56b077b3 avidemux-2.0.42-r1.ebuild 3164
-RMD160 adca2fa02d5cd43b2dd6689f4a1622fdac62e8b9 avidemux-2.0.42-r1.ebuild 3164
-SHA256 0ca36fcfea5ea36c3369ad0bb6ebc9ecc2190c7ec561585c708361528adcd180 avidemux-2.0.42-r1.ebuild 3164
+EBUILD avidemux-2.0.42-r1.ebuild 3205 RMD160 60f1ecb97929657daee5f632b197ae154daf189b SHA1 2cd87cf6d4ba1b6df6b6245ed58e031a763f43d4 SHA256 0e20b20b132a3163d3c7e5a7c0fc608e58894e70c896eea3f2fd375750a286ed
+MD5 11d8401dc291365f3305be030640de28 avidemux-2.0.42-r1.ebuild 3205
+RMD160 60f1ecb97929657daee5f632b197ae154daf189b avidemux-2.0.42-r1.ebuild 3205
+SHA256 0e20b20b132a3163d3c7e5a7c0fc608e58894e70c896eea3f2fd375750a286ed avidemux-2.0.42-r1.ebuild 3205
 EBUILD avidemux-2.1_pre1.ebuild 3176 RMD160 54c922502dcba308b678b00c70552ecae71cf52b SHA1 c28bea2f903add5df58a0445b195852fae74af3b SHA256 b4a823ddae4345ad72a8acbe77dd0e13066030e39c6db8a44841b895d10a0b6d
 MD5 d72930ea6010f0cce101d8aeacff9acc avidemux-2.1_pre1.ebuild 3176
 RMD160 54c922502dcba308b678b00c70552ecae71cf52b avidemux-2.1_pre1.ebuild 3176
 SHA256 b4a823ddae4345ad72a8acbe77dd0e13066030e39c6db8a44841b895d10a0b6d avidemux-2.1_pre1.ebuild 3176
-MISC ChangeLog 18572 RMD160 b514318fea0eff2237a3a3f11e1ca87bcda01dea SHA1 b96a67d2a56e48dbef91bc50eb7690029e07f32d SHA256 71add59869923fcd7beab0ef48c4f297c1363904786cd5281cbb665e512064dd
-MD5 22e484a737cdfe8c24b1e543c50f8deb ChangeLog 18572
-RMD160 b514318fea0eff2237a3a3f11e1ca87bcda01dea ChangeLog 18572
-SHA256 71add59869923fcd7beab0ef48c4f297c1363904786cd5281cbb665e512064dd ChangeLog 18572
+MISC ChangeLog 18754 RMD160 b216c3bd2f80d80436442cb4a727a96832ebcdc6 SHA1 736350a1e2c8e84697d062d7d564c345476aaa95 SHA256 5bd3515a9a56c555c865b7fff6a34c53fb48a0ffbd6674603d656a268c1e9d9a
+MD5 5d5b542b05851a9250cbd02bd73294d2 ChangeLog 18754
+RMD160 b216c3bd2f80d80436442cb4a727a96832ebcdc6 ChangeLog 18754
+SHA256 5bd3515a9a56c555c865b7fff6a34c53fb48a0ffbd6674603d656a268c1e9d9a ChangeLog 18754
 MISC metadata.xml 251 RMD160 11462994b78856883a805c72334300d07101713d SHA1 a8362b29138cd87a592947af33840bf3210cfc59 SHA256 0e151c0a2781f2632c75a2f2c3b1a8d187aed329467472236c65627a7e0ba42f
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
 RMD160 11462994b78856883a805c72334300d07101713d metadata.xml 251
@@ -44,9 +48,9 @@ MD5 94a8995147d99f3116da72e837db209c files/digest-avidemux-2.1_pre1 518
 RMD160 8ddca1d00343cb61d51b90135422263f0ca3d988 files/digest-avidemux-2.1_pre1 518
 SHA256 644e49f2f95b30ddf41a9a0a11a1d3d3462980ab9228faf88925e8af348025d5 files/digest-avidemux-2.1_pre1 518
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE/5nz2ZWR0Jhg/EsRAptHAJ4g0VWy0WpgYO3HJAvCrP5OtAHe0wCfSnCb
-IxavaGfEiR4wxik5UFFPliw=
-=Dmzp
+iD8DBQFFCSgit2vP6XvVdOcRAkljAJ0RE9WGZY8o13YJeXjQVP2Wzcn+6ACfQc42
+h5Rkvj5lFfRCXm9kaTInmCc=
+=MNMK
 -----END PGP SIGNATURE-----
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