Fix compilation and linking on Darwin

(Portage version: 2.2.00.15200-prefix/cvs/Darwin powerpc)

3 files changed, 55 insertions, 1 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/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"
+}