Added a patch to build PIC libs wrt bug #156016, removed -fPIC append-cflag for amd64...

Package-Manager: portage-2.1.2_rc2-r1

diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index 571b4d675bce96967ad4144eb65d7d123abec366..469fca9bcf645a132fef010b86bbf76dfe29abe2 100644 (file)
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,12 @@
 # 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.27 2006/10/09 21:42:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.28 2006/11/23 19:57:37 aballier Exp $
+
+*gpac-0.4.2-r1 (23 Nov 2006)
+
+  23 Nov 2006; Alexis Ballier <aballier@gentoo.org> +gpac-0.4.2-r1.ebuild:
+  Added a patch to build PIC libs wrt bug #156016, removed -fPIC append-cflag
+  for amd64, moved relevant stuff to src_unpack, made a patchset tarball
 
   09 Oct 2006; Alexis Ballier <aballier@gentoo.org>
   +files/gpac-0.4.2-ffmpeg-snapshots-compat.patch, gpac-0.4.2.ebuild:

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 2761135665f84aa565fcc27252bc74343f4f0e0a..e2df0d1fb8e4e31a8909965e8493533d35018388 100644 (file)
--- 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
@@ -39,6 +42,7 @@ DIST 26204-600.zip 255764 RMD160 d85a1879e60deeaa9b371646a1d43dd07ae07777 SHA1 f
 DIST gpac-0.2.1.tar.gz 2227080 RMD160 13c1c02a530b8567ecb98a95d0dd75b2c40ac5ee SHA1 a83d5e2b31bd0ad61c6076259cb8b26938ad2936 SHA256 26b375fb653d9757774aee6956e053d99c7a9fc19a313d5e5242b1e0a5be3c7a
 DIST gpac-0.4.0.tar.gz 2836606 RMD160 9b8159d26028a2f620bd1b30817b187079b54ddf SHA1 e62f32a879c725c5bb7ec7ec2489732b71b1efeb SHA256 540f236252c4b58bcc3b286cf4168341416deeb58ad1cad2e30f7ecd70c8ae50
 DIST gpac-0.4.1_pre20060122.tar.bz2 2455736 RMD160 9bf7f5e26255edf843b5ad02e86ecd8e1740a4b4 SHA1 e0b10233c5b5a782828289e017da35c72e8d436b SHA256 ff543380a2408b28df00d91611a0004ca88540af01f23a4bdc4f87eba64b531a
+DIST gpac-0.4.2-patches.tar.bz2 3899 RMD160 42f9de741f27ca2a942728640582978a497e8721 SHA1 d29abbb5d1aa563e95e45647b5b265bdbbe21a9b SHA256 d0316a55dfc6077437645b8b11a6b0f77ff9d896efd31c8b6fae4d827e7e0e84
 DIST gpac-0.4.2.tar.gz 3916608 RMD160 17d2691651b633497ae96ec71912cfafa864c90a SHA1 800db66f33849886888b24414fb580eaa034a134 SHA256 0e300b02824f12767e5fa0c70b138b6a17375c3d6000aea2568464a9bb1cd956
 DIST gpac_extra_libs-0.1.3_linux.tar.gz 7293588 RMD160 0606cca1becfd489c479f9dd9daf8dc941c4c617 SHA1 0d66955f7c56c29befdcf22364a00772b42be2f2 SHA256 1ee8c2fcd9a02467d07cda9bd5fed0ca8130e84ca96db652e268e48eefc406a3
 EBUILD gpac-0.2.1.ebuild 2365 RMD160 b803d1191362b4567f4fe4aa9f638386dec30834 SHA1 8c7288dd47c0c76bdda7a8f957037d1dc56bae4f SHA256 d70184ffe58c0b1b5de54fafd61eca1e47783ab1ed2b2aaf067aa611346c2b12
@@ -57,14 +61,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 3912 RMD160 dcc59fa1d59cc84953ed765ee95c120e45c4e0cb SHA1 2bd3363dec67fa13a8ac40b69bf307623606804e SHA256 250d5d02afd2bb1ecdfe9e4dd421c7afdf827aaffda78ae26e0c0886ca32c2c9
+MD5 48ff1df6c5d2ac4db8802145908ac0d3 gpac-0.4.2-r1.ebuild 3912
+RMD160 dcc59fa1d59cc84953ed765ee95c120e45c4e0cb gpac-0.4.2-r1.ebuild 3912
+SHA256 250d5d02afd2bb1ecdfe9e4dd421c7afdf827aaffda78ae26e0c0886ca32c2c9 gpac-0.4.2-r1.ebuild 3912
 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 4228 RMD160 6cbc46829be2155289d47c26e2b071e5cb34e3b0 SHA1 368d16e477785d034b897caa2ab9db810248fa01 SHA256 13d164f4bc094d23200118af34ce9c1095b5a35a8209d0bcedd43f623d13f52d
-MD5 80bca8350596175f8a6d08039013eb3b ChangeLog 4228
-RMD160 6cbc46829be2155289d47c26e2b071e5cb34e3b0 ChangeLog 4228
-SHA256 13d164f4bc094d23200118af34ce9c1095b5a35a8209d0bcedd43f623d13f52d ChangeLog 4228
+MISC ChangeLog 4485 RMD160 a04dc0c35c792377b87822d8360fc1b3812b4212 SHA1 2cee02be5589067755ab1c5e15d122f9e56aed6c SHA256 456efb188b66c806b39f9617cb56a46764419c9e38173614cec1f7802a8685c4
+MD5 652ae99f3dce4975ff719d180d2e99b1 ChangeLog 4485
+RMD160 a04dc0c35c792377b87822d8360fc1b3812b4212 ChangeLog 4485
+SHA256 456efb188b66c806b39f9617cb56a46764419c9e38173614cec1f7802a8685c4 ChangeLog 4485
 MISC metadata.xml 347 RMD160 41aa55c1c1abb3244d641ac280b0ff134fd20720 SHA1 08f88c0a9437bad24a2c6655e8e370870145c833 SHA256 702b878c0a6c23d19442ee367c51725d5f7c0a61e0c7b2a57a2708f4622ba8fc
 MD5 cb378e7131783653c967c6365ca31a16 metadata.xml 347
 RMD160 41aa55c1c1abb3244d641ac280b0ff134fd20720 metadata.xml 347
@@ -84,3 +92,13 @@ SHA256 e372e8b2d3d7f27b263be4d38163966a7922e8c9143c1f72f7b906ea5ea9b437 files/di
 MD5 9bae7ac4aa56b98885916f13ed918c84 files/digest-gpac-0.4.2 675
 RMD160 7b216e4177b74f287bc1eb06bf7503293cf8c56b files/digest-gpac-0.4.2 675
 SHA256 0ada340d415657a975207e0bfca075dc0abc7c38d2ab04d01adcfd843a3d21ce files/digest-gpac-0.4.2 675
+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 v1.4.5 (GNU/Linux)
+
+iD8DBQFFZfz7vFcC4BYPU0oRArJyAJ97EpbYY02MgqaOFN7jS9sjziWkQwCgumE+
+jr16tYsfyuF14T2UnrIJKcI=
+=pLmr
+-----END PGP SIGNATURE-----

diff --git a/media-video/gpac/files/digest-gpac-0.4.2-r1 b/media-video/gpac/files/digest-gpac-0.4.2-r1
new file mode 100644 (file)
index 0000000..b12762f
--- /dev/null
+++ b/media-video/gpac/files/digest-gpac-0.4.2-r1
@@ -0,0 +1,12 @@
+MD5 cfd9012bff83afdf5ad069b86d3063b6 26104-610.zip 292640
+RMD160 84b2642709ca072c30658a71a6d8bec50fceb2fe 26104-610.zip 292640
+SHA256 8dc9453f9b93202247b4800a1d946ae6eaa3b9d0c48237ae8848144feb88399e 26104-610.zip 292640
+MD5 e78e35eabe09eea50198f1a27b81eb60 26204-600.zip 255764
+RMD160 d85a1879e60deeaa9b371646a1d43dd07ae07777 26204-600.zip 255764
+SHA256 01513a7ae5d26ff16a37fba5deec2994a1992829180b4a15d9c646c51eb8fcdb 26204-600.zip 255764
+MD5 7c40146553ab621154e52a8c43344083 gpac-0.4.2-patches.tar.bz2 3899
+RMD160 42f9de741f27ca2a942728640582978a497e8721 gpac-0.4.2-patches.tar.bz2 3899
+SHA256 d0316a55dfc6077437645b8b11a6b0f77ff9d896efd31c8b6fae4d827e7e0e84 gpac-0.4.2-patches.tar.bz2 3899
+MD5 834910b42ef007410fcc49a5acd4656b gpac-0.4.2.tar.gz 3916608
+RMD160 17d2691651b633497ae96ec71912cfafa864c90a gpac-0.4.2.tar.gz 3916608
+SHA256 0e300b02824f12767e5fa0c70b138b6a17375c3d6000aea2568464a9bb1cd956 gpac-0.4.2.tar.gz 3916608

diff --git a/media-video/gpac/gpac-0.4.2-r1.ebuild b/media-video/gpac/gpac-0.4.2-r1.ebuild
new file mode 100644 (file)
index 0000000..541cbab
--- /dev/null
+++ b/media-video/gpac/gpac-0.4.2-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2006 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.1 2006/11/23 19:57:37 aballier Exp $
+
+inherit eutils wxwidgets flag-o-matic multilib
+
+DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard developed from scratch in ANSI C."
+HOMEPAGE="http://gpac.sourceforge.net/"
+NBV="610"
+WBV="600"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+       mirror://gentoo/${P}-patches.tar.bz2
+       amr? ( http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-${NBV}.zip
+               http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-${WBV}.zip )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="aac amr debug ffmpeg jpeg javascript mad ogg opengl oss png sdl ssl theora truetype vorbis wxwindows xml xvid"
+
+S="${WORKDIR}/${PN}"
+
+RDEPEND="aac? ( media-libs/faad2 )
+       ffmpeg? ( media-video/ffmpeg )
+       jpeg? ( media-libs/jpeg )
+       javascript? ( dev-lang/spidermonkey )
+       mad? ( media-libs/libmad )
+       opengl? ( virtual/opengl )
+       ogg? ( media-libs/libogg )
+       png? ( media-libs/libpng )
+       vorbis? ( media-libs/libvorbis )
+       theora? ( media-libs/libtheora )
+       truetype? ( >=media-libs/freetype-2.1 )
+       wxwindows? ( >=x11-libs/wxGTK-2.6.0 )
+       xml? ( >=dev-libs/libxml2-2.6.0 )
+       xvid? ( >=media-libs/xvid-1.0.1 )
+       sdl? ( media-libs/libsdl )
+               || ( (
+                       x11-libs/libXt
+                       x11-libs/libX11
+                       x11-libs/libXext
+               ) virtual/x11 )"
+
+DEPEND="${RDEPEND}"
+
+my_use() {
+       local flag="$1" pflag="${2:-$1}"
+       if use ${flag}; then
+               echo "--use-${pflag}=system"
+       else
+               echo "--use-${pflag}=no"
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       epatch "${WORKDIR}/${P}-configure-ogg.patch"
+       epatch "${WORKDIR}/${P}-DESTDIR.patch"
+       epatch "${WORKDIR}/${P}-static-defs.patch"
+       epatch "${WORKDIR}/${P}-nostrip.patch"
+       epatch "${WORKDIR}/${P}-soname.patch"
+       epatch "${WORKDIR}/${P}-ffmpeg-snapshots-compat.patch"
+       sed -ie '/ldconfig / d' "${S}/Makefile"
+
+       if use amr; then
+               cd modules/amr_float_dec
+               unzip -jaq ${WORKDIR}/26104-${NBV}_ANSI_C_source_code.zip -d amr_nb_ft
+               unzip -jaq ${WORKDIR}/26204-${WBV}_ANSI-C_source_code.zip -d amr_wb_ft
+       fi
+
+       cd "${S}"
+
+       chmod +x configure
+       # make sure configure looks for wx-2.6
+       if use wxwindows; then
+               sed -i -e 's/wx-config/wx-config-2.6/' configure
+       else
+               sed -i 's:^has_wx="yes:has_wx="no:' configure
+       fi
+
+       use !sdl && sed -i 's:^has_sdl=yes:has_sdl=no:' configure
+
+       # fix hardcoded paths in source
+       sed -i -e \
+               "s:\([^f]\)\ M4_PLUGIN_PATH:\1 \"/usr/$(get_libdir)\":" \
+               applications/mp4client/main.c \
+               applications/osmo4_wx/wxOsmo4.cpp \
+               || die "path fixation failed"
+
+       # make sure mozilla won't be used
+       sed -i -e 's/osmozilla//g' applications/Makefile
+
+       # use this to cute down on the warnings noise
+       append-flags -fno-strict-aliasing
+
+       # multilib libdir fix
+       sed -i 's:$(prefix)/lib:$(prefix)/'$(get_libdir)':' Makefile src/Makefile
+       sed -i 's:/lib/gpac:/'$(get_libdir)'/gpac:' configure
+
+       epatch "${WORKDIR}/${P}-pic.patch"
+}
+
+src_compile() {
+       if use ogg; then
+               myconf="${myconf} --use-ogg=system"
+               if use vorbis; then
+                       myconf="${myconf} --use-vorbis=system"
+               fi
+               if use theora; then
+                       myconf="${myconf} --use-theora=system"
+               fi
+       else
+               myconf="${myconf} --use-ogg=no"
+       fi
+
+       econf \
+               --enable-svg \
+               $(use_enable amr) \
+               $(use_enable debug) \
+               $(use_enable opengl) \
+               $(use_enable oss oss-audio) \
+               $(use_enable ssl) \
+               $(my_use ffmpeg) \
+               $(my_use aac faad) \
+               $(my_use jpeg) \
+               $(my_use mad) \
+               $(my_use javascript js) \
+               $(my_use png) \
+               $(my_use truetype ft) \
+               $(my_use xvid) \
+               ${myconf} || die "configure died"
+
+       make OPTFLAGS="${CFLAGS}" || die "emake failed."
+}
+
+src_install() {
+       make OPTFLAGS="${CFLAGS}" DESTDIR="${D}" install || die
+       make OPTFLAGS="${CFLAGS}" DESTDIR="${D}" install-lib || die
+       dodoc AUTHORS BUGS Changelog README TODO
+       dodoc doc/*.html doc/*.txt doc/libisomedia_license doc/SGGen
+}