BSD compile fix, thanks to Timothy Redaelli <drizzt@gentoo.org>, bug #159240

Package-Manager: portage-2.1.2_rc4-r5

4 files changed, 77 insertions, 12 deletions

diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index 51963b276618..dca11ea335d8 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/gpac
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.30 2006/12/21 14:26:09 corsair Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.31 2007/01/06 00:50:12 aballier Exp $
+
+  06 Jan 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/gpac-0.4.2-bsd.patch, gpac-0.4.2-r1.ebuild:
+  BSD compile fix, thanks to Timothy Redaelli <drizzt@gentoo.org>, bug #159240
 
   21 Dec 2006; Markus Rothe <corsair@gentoo.org> gpac-0.4.2-r1.ebuild:
   Stable on ppc64; bug #157814
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 09c961bc210a..32ad4d80e05a 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gpac-0.4.0-downloader.patch 508 RMD160 0c59dcc820dd4855c92458464fb20ded6b37eb22 SHA1 64ebd112159d4ad872421e6a9df1e85d3305397e SHA256 125115249fa40432e014a6fbf443c579b411cb20c010bd671a22d4f82b3126e7
 MD5 1c649e710e682d92d42ffa69d945c8f1 files/gpac-0.4.0-downloader.patch 508
 RMD160 0c59dcc820dd4855c92458464fb20ded6b37eb22 files/gpac-0.4.0-downloader.patch 508
@@ -14,6 +17,10 @@ AUX gpac-0.4.2-DESTDIR.patch 4467 RMD160 f84464703edc26fb70136e8cdf4343aae586f6b
 MD5 0527bbd9606bb7c2fefa5a973838283c files/gpac-0.4.2-DESTDIR.patch 4467
 RMD160 f84464703edc26fb70136e8cdf4343aae586f6b8 files/gpac-0.4.2-DESTDIR.patch 4467
 SHA256 036d2f787583ee7ed5998c0cf78cb2117365e1a00cabb743f08e0e8863ce7d40 files/gpac-0.4.2-DESTDIR.patch 4467
+AUX gpac-0.4.2-bsd.patch 1719 RMD160 ed41bd19750ab63a77871f8eb08c34fa394276db SHA1 0914e23cc46a956ea17f350000b69652dc7acd0d SHA256 eb4eb36f06ad147881350dd8127eb534e5ec7be6b93899ddece8876234c326fa
+MD5 1908ea5b3ecfa72219b3d38234d3ea8a files/gpac-0.4.2-bsd.patch 1719
+RMD160 ed41bd19750ab63a77871f8eb08c34fa394276db files/gpac-0.4.2-bsd.patch 1719
+SHA256 eb4eb36f06ad147881350dd8127eb534e5ec7be6b93899ddece8876234c326fa files/gpac-0.4.2-bsd.patch 1719
 AUX gpac-0.4.2-configure-ogg.patch 917 RMD160 075b0adac5e3b309219bbe70dd54e2c91e149895 SHA1 6f50df996f06444f5cb90904747643e777505837 SHA256 03527ecaef5de7435bf840804447f9c323361e85db5be406c0690eb090eb3794
 MD5 79f273f198d200bc7f453e48c75f5055 files/gpac-0.4.2-configure-ogg.patch 917
 RMD160 075b0adac5e3b309219bbe70dd54e2c91e149895 files/gpac-0.4.2-configure-ogg.patch 917
@@ -58,18 +65,18 @@ EBUILD gpac-0.4.1_pre20060122.ebuild 3816 RMD160 e7691173882105478404d29fa575258
 MD5 bfdee026e0b9fd53544b5f148f8acfdd gpac-0.4.1_pre20060122.ebuild 3816
 RMD160 e7691173882105478404d29fa5752589123c0153 gpac-0.4.1_pre20060122.ebuild 3816
 SHA256 5d106a90a5a1b1aab606a4719a7a0c7f14c8728bc24fce78ef14f6e6330f946a gpac-0.4.1_pre20060122.ebuild 3816
-EBUILD gpac-0.4.2-r1.ebuild 3941 RMD160 9e8043e2ba1ba3033a79647b10c9e7edbdd7c7f4 SHA1 e30dd79922352f31167687b22ea294fb07a47343 SHA256 261f46adf1baf0bae049398409fdecde8a4ad77d6c15033724a25228bb127569
-MD5 d099b72cdabe5c30e8be1fdac6f7316f gpac-0.4.2-r1.ebuild 3941
-RMD160 9e8043e2ba1ba3033a79647b10c9e7edbdd7c7f4 gpac-0.4.2-r1.ebuild 3941
-SHA256 261f46adf1baf0bae049398409fdecde8a4ad77d6c15033724a25228bb127569 gpac-0.4.2-r1.ebuild 3941
+EBUILD gpac-0.4.2-r1.ebuild 3979 RMD160 e2182b0648e9f832c06ccf0ff29c8f937024b21e SHA1 7d5963e6745845103f9935ea56f61486c416b75f SHA256 c5fb15921b2a1efdb9ce58e7e6a9d3aba47c536992965d651944a17521869c21
+MD5 aa76e6daeaca0b55220a2f034ff19218 gpac-0.4.2-r1.ebuild 3979
+RMD160 e2182b0648e9f832c06ccf0ff29c8f937024b21e gpac-0.4.2-r1.ebuild 3979
+SHA256 c5fb15921b2a1efdb9ce58e7e6a9d3aba47c536992965d651944a17521869c21 gpac-0.4.2-r1.ebuild 3979
 EBUILD gpac-0.4.2.ebuild 3906 RMD160 1537ad051caabd9b833890dfa29a1c82ade5e40c SHA1 c08146da9baec53cc81f81250904cb75ac7fc9b6 SHA256 bb962564ec34871c9028f55bbdad4ee420f91837eded3341050ad136eed7ed7e
 MD5 7ae88a1cc4647a4e9aa5266afb9b1e05 gpac-0.4.2.ebuild 3906
 RMD160 1537ad051caabd9b833890dfa29a1c82ade5e40c gpac-0.4.2.ebuild 3906
 SHA256 bb962564ec34871c9028f55bbdad4ee420f91837eded3341050ad136eed7ed7e gpac-0.4.2.ebuild 3906
-MISC ChangeLog 4714 RMD160 1fbb26d09805929abd68983155a23e167d6d6d3b SHA1 5f469485b1b69e173c6659286ef009a0355b2643 SHA256 bbc963ba5414285f53fee87639120979d763c3fd56865061e95edef82d513c39
-MD5 2e530f51a22351491ee20c3a7f3e4422 ChangeLog 4714
-RMD160 1fbb26d09805929abd68983155a23e167d6d6d3b ChangeLog 4714
-SHA256 bbc963ba5414285f53fee87639120979d763c3fd56865061e95edef82d513c39 ChangeLog 4714
+MISC ChangeLog 4900 RMD160 632f433ad8035bb6242a47d6915f4211fe0dba79 SHA1 d396501e62946b1a7818b139fa98ade4a97d9ba9 SHA256 56bc31dfc61ceb5a076cbd71387ce628796ec67e593d75567e8ca1aa1f9365f9
+MD5 51ce2864f749a0ab226fd3b7c0a33f81 ChangeLog 4900
+RMD160 632f433ad8035bb6242a47d6915f4211fe0dba79 ChangeLog 4900
+SHA256 56bc31dfc61ceb5a076cbd71387ce628796ec67e593d75567e8ca1aa1f9365f9 ChangeLog 4900
 MISC metadata.xml 347 RMD160 41aa55c1c1abb3244d641ac280b0ff134fd20720 SHA1 08f88c0a9437bad24a2c6655e8e370870145c833 SHA256 702b878c0a6c23d19442ee367c51725d5f7c0a61e0c7b2a57a2708f4622ba8fc
 MD5 cb378e7131783653c967c6365ca31a16 metadata.xml 347
 RMD160 41aa55c1c1abb3244d641ac280b0ff134fd20720 metadata.xml 347
@@ -92,3 +99,10 @@ SHA256 0ada340d415657a975207e0bfca075dc0abc7c38d2ab04d01adcfd843a3d21ce files/di
 MD5 55c51bbc91cbdf60550e92e71ae627f5 files/digest-gpac-0.4.2-r1 928
 RMD160 1c9ad78dc0dba2b8cdbd9a05cfdf515a721d85ad files/digest-gpac-0.4.2-r1 928
 SHA256 397999a1e7316e095eabeb09481b0c7ef90c0917bdba649ad4e3040a093b76ce files/digest-gpac-0.4.2-r1 928
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFnvJPvFcC4BYPU0oRAh+ZAJ9EkIGrVPWEiHmfoA2i9X99VG/qxgCgkLCa
+20XMDgdTu2icvPaFxOTZDxA=
+=EiPo
+-----END PGP SIGNATURE-----
diff --git a/media-video/gpac/files/gpac-0.4.2-bsd.patch b/media-video/gpac/files/gpac-0.4.2-bsd.patch
new file mode 100644
index 000000000000..e7898318d280
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.4.2-bsd.patch
@@ -0,0 +1,46 @@
+diff -Nur gpac.old/applications/mp4box/Makefile gpac/applications/mp4box/Makefile
+--- gpac.old/applications/mp4box/Makefile	2006-12-27 22:59:08.000000000 +0100
++++ gpac/applications/mp4box/Makefile	2006-12-27 22:59:40.000000000 +0100
+@@ -45,7 +45,7 @@
+ all: $(PROG)
+ 
+ $(PROG): $(OBJS)
+-	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(LINKFLAGS)
++	$(CC) $(LDFLAGS) -pthread -o ../../bin/gcc/$@ $(OBJS) $(LINKFLAGS)
+ 
+ 
+ %.o: %.c
+diff -Nur gpac.old/applications/mp4client/Makefile gpac/applications/mp4client/Makefile
+--- gpac.old/applications/mp4client/Makefile	2006-12-27 22:59:08.000000000 +0100
++++ gpac/applications/mp4client/Makefile	2006-12-27 23:03:40.000000000 +0100
+@@ -40,7 +40,7 @@
+ all: $(PROG)
+ 
+ MP4Client$(EXE): $(OBJS)
+-	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac -lz
++	$(CC) $(LDFLAGS) -pthread -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac -lz
+ 
+ %.o: %.c
+ 	$(CC) $(CFLAGS) $(INSTALL_FLAGS) -c -o $@ $< 
+@@ -48,8 +48,8 @@
+ clean: 
+ 	rm -f $(OBJS) ../../bin/gcc/$(PROG)
+ 
+-install: clean
+-	make -override BUILD_INSTALL=yes all
++install:
++	$(MAKE) -override BUILD_INSTALL=yes all
+ 	install -c -m 755 ../../bin/gcc/MP4Client "$(DESTDIR)$(prefix)/bin"
+ 
+ uninstall:
+diff -Nur gpac.old/applications/osmo4_wx/Makefile gpac/applications/osmo4_wx/Makefile
+--- gpac.old/applications/osmo4_wx/Makefile	2006-12-27 22:59:08.000000000 +0100
++++ gpac/applications/osmo4_wx/Makefile	2006-12-27 22:59:40.000000000 +0100
+@@ -64,7 +64,7 @@
+ 	echo -n 'APPLOsm4' > $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/PkgInfo
+ else
+ 	rm -f wxOsmo4.o
+-	make -override BUILD_INSTALL=yes all
++	$(MAKE) -override BUILD_INSTALL=yes all
+ 	install -c -m 755 ../../bin/gcc/Osmo4 "$(DESTDIR)$(prefix)/bin"
+ endif
\ No newline at end of file
diff --git a/media-video/gpac/gpac-0.4.2-r1.ebuild b/media-video/gpac/gpac-0.4.2-r1.ebuild
index f649fd976ab1..9c0737199718 100644
--- a/media-video/gpac/gpac-0.4.2-r1.ebuild
+++ b/media-video/gpac/gpac-0.4.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.2-r1.ebuild,v 1.3 2006/12/21 14:26:09 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.2-r1.ebuild,v 1.4 2007/01/06 00:50:12 aballier Exp $
 
 inherit eutils wxwidgets flag-o-matic multilib toolchain-funcs
 
@@ -100,6 +100,7 @@ src_unpack() {
 	sed -i 's:/lib/gpac:/'$(get_libdir)'/gpac:' configure
 
 	epatch "${WORKDIR}/${P}-pic.patch"
+	epatch "${FILESDIR}/${P}-bsd.patch"
 }
 
 src_compile() {