Fix compilation and linking on Darwin

Package-Manager: portage-2.2.00.15200-prefix/cvs/Darwin powerpc

4 files changed, 58 insertions, 12 deletions

diff --git a/media-libs/libfpx/ChangeLog b/media-libs/libfpx/ChangeLog
index 45c713ac21cb..ccc9cd36f8ba 100644
--- a/media-libs/libfpx/ChangeLog
+++ b/media-libs/libfpx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libfpx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfpx/ChangeLog,v 1.20 2010/01/15 09:32:29 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfpx/ChangeLog,v 1.21 2010/01/16 12:21:55 grobian Exp $
+
+*libfpx-1.3.0-r1 (16 Jan 2010)
+
+  16 Jan 2010; Fabian Groffen <grobian@gentoo.org>
+  +files/libfpx-1.2.0.13-export-symbols.patch, +libfpx-1.3.0-r1.ebuild:
+  Fix compilation and linking on Darwin
 
   15 Jan 2010; Christian Faulhammer <fauli@gentoo.org> libfpx-1.3.0.ebuild:
   Transfer Prefix keywords
diff --git a/media-libs/libfpx/Manifest b/media-libs/libfpx/Manifest
index 2c6f02a317ac..fdf5e93ea66b 100644
--- a/media-libs/libfpx/Manifest
+++ b/media-libs/libfpx/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX libfpx-1.2.0.13-export-symbols.patch 343 RMD160 fb3f5b57910c5099880c1e43462ddd3a73eca608 SHA1 e11ff79557890bacfcdf654634bc242ef726a38b SHA256 e06b7ffd990e3e35132fd239ce856157a0d135bd43cc398e3c1f7fd5fb9373f2
 DIST libfpx-1.2.0.13.tar.bz2 2259745 RMD160 72e626c2b661606bece9b5a51c43ae7d111748ad SHA1 e0fe5830673f3126ea30ed52d0a83f2ef91d2c63 SHA256 7f45582ec73588a6ea102a6f51dec5260c6f54951e6b2356a618b139cd3d8f50
 DIST libfpx-1.2.0.9.tar.bz2 2240442 RMD160 f0fc74cdf8e1ba950bc24e9c93aa65095a6d9a2f SHA1 8f37c8a468f5bdc3aaa27f3e95a378c9282c7f58 SHA256 a7e475f14b1110c79d49e777a7d70341f6e2335ef8a28825295a6a279eca701e
 DIST libfpx-1.3.0-1.tar.bz2 2285921 RMD160 0a1a55f571f6d28730a4957ca607091638418e39 SHA1 ee96623144c6ad51dba24dae20a27fb646590bc8 SHA256 0cc240e9458d099c0a50db9c771b3e5b109164472c08f40f31e1190716af48b6
 EBUILD libfpx-1.2.0.13.ebuild 800 RMD160 c6ac4b005182fbc8fd80c71a7d8c24edc3dee3fa SHA1 8f692ec8edfa51c9cd822cda3ba7053d7d665131 SHA256 c95695d1350569cdcbe35c49e8acdfcce5b71a616a9a595f6295be252a4b1fb7
 EBUILD libfpx-1.2.0.9.ebuild 759 RMD160 3d1f22288cfbfcd666d924f7bfb746365b66e54c SHA1 1d42130975fa065a7f92c01392159cb9fe51ddab SHA256 d700444e3842f957924a3fc57d7c5d565436ecb7f50a8259b1cad219ccd4e827
+EBUILD libfpx-1.3.0-r1.ebuild 1109 RMD160 e1efa3915c328e58e43c203cc9422230c4884682 SHA1 0f2f19f8af20ee48296a41757a0ed1d7da172245 SHA256 7d4e3e005279f363d2cc7fec8e76e8a8cca03f95dfad651a2f51bad503fab20d
 EBUILD libfpx-1.3.0.ebuild 904 RMD160 65bb4e3fc67765c8a941914f9f3dd21239d42e60 SHA1 73a4acebc78fb1d323ffb55c38488c2298a04681 SHA256 3f9fb7b5330fc3b0dfc0a52a12127ed2cf6545896fe73193468a2afc554a9bf4
-MISC ChangeLog 2511 RMD160 4659335273885228b3420b32a9a8ef59ad4f934f SHA1 46dc9be30984c2b757fe415cac21275fceec9bbf SHA256 bb81ffc565a899fa1c03557f1e0e84fd2f84a0313acb68191364d5d7f01e9cd1
+MISC ChangeLog 2709 RMD160 4e3a1c02eec3897aa0c16639360b50be643afa2f SHA1 bf62f5d3b72e574f96f6f09ed3187ffa99747bdd SHA256 045181425490b91c986b1fd86ffaa8f047ece5493e0f1dd00ed6b9b5efb1740d
 MISC metadata.xml 163 RMD160 9cdda004bed83a887f4a756cb1550fab6ce563ce SHA1 bfc4f31690e338a159152dcd46d56ff7fd6b6e1b SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktQNjMACgkQNQqtfCuFnePRPACeJXfq6VwpPY0Imt2873EJYVaq
-+NEAnjld9RIBGwL9gGEbqHYPP0VsKz0i
-=H4v5
------END PGP SIGNATURE-----
diff --git a/media-libs/libfpx/files/libfpx-1.2.0.13-export-symbols.patch b/media-libs/libfpx/files/libfpx-1.2.0.13-export-symbols.patch
new file mode 100644
index 000000000000..9e0f16325500
--- /dev/null
+++ b/media-libs/libfpx/files/libfpx-1.2.0.13-export-symbols.patch
@@ -0,0 +1,14 @@
+* At least the Darwin linker doesn't like double symbols during the
+  final linking stage...
+
+--- jpeg/jpegconf.h
++++ jpeg/jpegconf.h
+@@ -27,6 +27,6 @@
+ #   pragma warning(disable : 4244)
+ #   pragma warning(disable : 4142)
+ #else
+-#   define JPEGEXPORT
+-#   define FPXEXPORT
++#   define JPEGEXPORT extern
++#   define FPXEXPORT extern
+ #endif
diff --git a/media-libs/libfpx/libfpx-1.3.0-r1.ebuild b/media-libs/libfpx/libfpx-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..5cee901c8b25
--- /dev/null
+++ b/media-libs/libfpx/libfpx-1.3.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfpx/libfpx-1.3.0-r1.ebuild,v 1.1 2010/01/16 12:21:55 grobian Exp $
+
+EAPI=2
+inherit eutils flag-o-matic libtool
+
+DESCRIPTION="A library for manipulating FlashPIX images"
+HOMEPAGE="http://www.i3a.org/"
+SRC_URI="ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/${P}-1.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.0.13-export-symbols.patch
+	# we're not windows, even though we don't define __unix by default
+	[[ ${CHOST} == *-darwin* ]] && append-flags -D__unix
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog doc/*.txt || die "dodoc failed"
+	insinto /usr/share/doc/${PF}/pdf
+	doins doc/*.pdf || die "doins failed"
+}