As-needed conform linking and respecting LDFLAGS, #282733

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 131 insertions, 3 deletions

diff --git a/media-video/mpeg-tools/ChangeLog b/media-video/mpeg-tools/ChangeLog
index f44f41787fa9..323a5a43eb69 100644
--- a/media-video/mpeg-tools/ChangeLog
+++ b/media-video/mpeg-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mpeg-tools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.23 2009/10/30 18:57:01 grobian Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.24 2010/02/04 23:43:33 jlec Exp $
+
+*mpeg-tools-1.5b-r4 (04 Feb 2010)
+
+  04 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +mpeg-tools-1.5b-r4.ebuild, +files/mpeg-tools-1.5b-as-needed.patch:
+  As-needed conform linking and respecting LDFLAGS, #282733
 
   30 Oct 2009; Fabian Groffen <grobian@gentoo.org>
   mpeg-tools-1.5b-r3.ebuild:
diff --git a/media-video/mpeg-tools/Manifest b/media-video/mpeg-tools/Manifest
index 1352ae6673ba..ceff49a735d2 100644
--- a/media-video/mpeg-tools/Manifest
+++ b/media-video/mpeg-tools/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mpeg-tools-1.5b-64bit_fixes.patch 6986 RMD160 7bfb2fdaf89846043d95074a5226c77f0f9ef98b SHA1 18bb11dac577a0a8cb4352ea12a0f2571de37065 SHA256 76e8add6d8241898abf20c27ff93655df05ee90866632a0eb852ff6665078d4e
+AUX mpeg-tools-1.5b-as-needed.patch 1526 RMD160 1f0e0de79dde5c44d555d083fe7dd4104fc640a0 SHA1 fcf635e9c3a47ca14767d0fd7bcdda778d53940b SHA256 204f1ca6fc2d30c1bd4c7ed69d2d0fc3792e819bcc31837c945ade680b333961
 AUX mpeg-tools-1.5b-build.patch 1414 RMD160 987151e4c0c30097c7bc993552dd7459686fba5b SHA1 e5eff3be21eca4da940a5d964e1704b0948fbea9 SHA256 0cbcc0e0de74f02b069059588334ba0766bf74769fdd63d37c1702d2e47eb1e5
 AUX mpeg-tools-1.5b-system-jpeg-7.patch 907 RMD160 5f4bee5cb8a663579d29a1ad944a2fabf7f91579 SHA1 06395853b6130d7e27e74224790428ae1f22a682 SHA256 de0815e2f9be14761b25cef0a6602d79eaed47411ce1148c4e64826c3cfd46dc
 AUX mpeg-tools-1.5b-system-jpeg.patch 893 RMD160 e32d6e6f0d355085f1781eef5b0569940fbd274e SHA1 25067d834bdc72e4709d9b01bb93ad2a88f48e2d SHA256 f0e9f99bf42c12b91cebb0e17c1a8567629d522b269e11c2adc6fffaed43afa8
@@ -7,5 +11,13 @@ AUX mpeg-tools-1.5b-tempfile-mpeg-encode.patch 2538 RMD160 3bc3e29da8cdd4d05de50
 AUX mpeg-tools-1.5b-tempfile-tests.patch 5256 RMD160 e292bfec28bb13bf35ec40e4f86702ff086dbc72 SHA1 dc3c2458a077bac43bd6fc6cf7d1d07f3c892163 SHA256 ba156158d92dc6f3803b40ad3b0e8e248b0e74c5b59415a91f55c1e775a6e5a4
 DIST mpeg_encode-1.5b-src.tar.gz 2028724 RMD160 24c0a1090076630c292936639c5fb275778f6470 SHA1 853cd175f73b8064ce28deb256e4b81159a684ed SHA256 dd8db42f88393bb0ff0d738defa271729a8aa9b8de24ed13bc6bd27014f2daf5
 EBUILD mpeg-tools-1.5b-r3.ebuild 1808 RMD160 b8336d836774e58db0e83ba71c03b87e357a23fa SHA1 39241ee4b32751d592193ee1d066b606ce5d9872 SHA256 e350f7ffaf5ab874c5f8bbeb5a3bd37f83e322728d6a015111b04781c69014e4
-MISC ChangeLog 3631 RMD160 e3bb2e5f9b5b5a5f1bf2bcd45239105c8b0d05c7 SHA1 0f401774248735a2821f9c73d4baafa7b9b70048 SHA256 04a9a5c2c9f4f3accd4da1d71d75fda3020f826a9e2694e7804d996fcf9bd423
+EBUILD mpeg-tools-1.5b-r4.ebuild 1884 RMD160 971586e1daa76df5831aee2ef276c0971aaeb78d SHA1 86f2cd27b5c840925803140b580e58c9dd102a2c SHA256 f441892080713c409d6ddefe30d2235267f11611aaa92023f3c3a407a5628684
+MISC ChangeLog 3848 RMD160 7217f03e556d5dc2415d920c921601ce3a08dba7 SHA1 a54fdf6c79ca6dbec4c9832470dc2981b2dc309c SHA256 b36ceedad55a1afa21e334c989fee7c66893b123243ffd07d1a7192e819e628e
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktrW6sACgkQgAnW8HDreRao9ACfT1fjwYVdvBw6kzBEfZYQgcSE
+yvsAn3X4NODz9DoDZU9GFLjez0QfTJUD
+=e5aO
+-----END PGP SIGNATURE-----
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-as-needed.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-as-needed.patch
new file mode 100644
index 000000000000..58c74e124f09
--- /dev/null
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-as-needed.patch
@@ -0,0 +1,47 @@
+--- convert/Makefile	2009-08-25 21:19:42.000000000 +0200
++++ convert/Makefile.new	2009-08-25 21:22:54.000000000 +0200
+@@ -53,13 +53,13 @@
+ all: $(TARGETS)
+ 
+ vidtoppm: vidtoppm.c
+-	$(CC) -lXvid -lX11 $(INCLUDE) -o vidtoppm vidtoppm.c 
++	$(CC) $(LDFLAGS) $(INCLUDE) $@.o -o $@  -lXvid -lX11
+ 
+ vidtojpeg: vidtojpeg.c
+-	$(CC) -lXvid -lX11 $(INCLUDE) -o vidtojpeg vidtojpeg.c
++	$(CC) $(LDFLAGS) $(INCLUDE) $@.o -o $@ -lXvid -lX11
+ 
+ vidtoeyuv: vidtoeyuv.c
+-	$(CC) -lXvid -lX11 $(INCLUDE) -o vidtoeyuv vidtoeyuv.c
++	$(CC) $(LDFLAGS) $(INCLUDE) $@.o -o $@ -lXvid -lX11
+ 
+ wc:;		wc -l *.[ch] *.pl *.table
+ clean:;		rm -f *.o core *~ gmon.out $(TARGETS)
+--- convert/mtv/Makefile	2009-08-25 21:19:42.000000000 +0200
++++ convert/mtv/Makefile.new	2009-08-25 21:24:31.000000000 +0200
+@@ -15,12 +15,12 @@
+ default: movieToVid
+ 
+ movieToVid: movieToVid.o
+-	$(CC) $(CFLAGS) -o movieToVid movieToVid.o
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.o
+ 
+ clean:
+ 	rm -f core lintout makeout tags Makefile.bak *.o \
+ 		movieToVid
+ 
+ purify:	$(OBJ)
+-	$(PURIFY) $(CC) $(OBJ) -o movieToVid.purify
++	$(PURIFY) $(CC) $(LDFLAGS) $(OBJ) -o movieToVid.purify
+ 
+--- mpeg_encode//Makefile	2009-08-25 21:19:43.000000000 +0200
++++ mpeg_encode//Makefile.new	2009-08-25 21:27:12.000000000 +0200
+@@ -203,7 +203,6 @@
+ ############
+ 
+ mpeg_encode: $(MP_ALL_OBJS) $(JPEG_LIB)
+-	$(PURIFY) $(CC) $(CFLAGS) -o $@ $(MP_ALL_OBJS) $(LIBDIRS) $(LIBS)
+-	strip mpeg_encode
++	$(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MP_ALL_OBJS) $(LIBDIRS) $(LIBS)
+ 
+ profile: $(MP_ALL_OBJS)
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
new file mode 100644
index 000000000000..aaaa75dfe7c4
--- /dev/null
+++ b/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild,v 1.1 2010/02/04 23:43:33 jlec Exp $
+
+inherit eutils toolchain-funcs
+
+MY_PN=mpeg_encode
+DESCRIPTION="Tools for MPEG video"
+HOMEPAGE="http://bmrc.berkeley.edu/research/mpeg/mpeg_encode.html"
+SRC_URI="ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/${MY_PN}-${PV}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	>=media-libs/jpeg-7"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_PN}
+
+src_unpack () {
+	unpack ${A}
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-64bit_fixes.patch
+	epatch "${FILESDIR}"/${P}-tempfile-convert.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	cd "${S}"
+	rm -r jpeg
+	epatch "${FILESDIR}"/${P}-system-jpeg.patch
+	epatch "${FILESDIR}"/${P}-system-jpeg-7.patch
+	epatch "${FILESDIR}"/${P}-tempfile-mpeg-encode.patch
+	epatch "${FILESDIR}"/${P}-tempfile-tests.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed"
+	emake -C convert CC="$(tc-getCC)" || die "emake convert failed"
+	emake -C convert/mtv CC="$(tc-getCC)" || die "emake convert/mtv failed"
+}
+
+src_install () {
+	dobin mpeg_encode || die "dobin mpeg_encode"
+	doman docs/*.1
+	dodoc BUGS CHANGES README TODO VERSION
+	dodoc docs/EXTENSIONS docs/INPUT.FORMAT docs/*.param docs/param-summary
+	docinto examples
+	dodoc examples/*
+
+	cd ../convert
+	dobin eyuvtojpeg jmovie2jpeg mpeg_demux mtv/movieToVid || die "dobin convert utils"
+	newdoc README README.convert
+	newdoc mtv/README README.mtv
+}
+
+pkg_postinst() {
+	if [[ -z $(best_version media-libs/netpbm) ]] ; then
+		elog "If you are looking for eyuvtoppm or ppmtoeyuv, please"
+		elog "emerge the netpbm package.  It has updated versions."
+	fi
+}