Fix stdbool.h/ppc+altivec issues #305333 by Leo Souza and clean up the build system in general.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 80 insertions, 2 deletions

diff --git a/media-libs/openjpeg/ChangeLog b/media-libs/openjpeg/ChangeLog
index 56d3cc6d15aa..bdbae4809f51 100644
--- a/media-libs/openjpeg/ChangeLog
+++ b/media-libs/openjpeg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/openjpeg
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.33 2009/10/19 19:15:49 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.34 2010/03/20 18:11:50 vapier Exp $
+
+*openjpeg-1.3-r3 (20 Mar 2010)
+
+  20 Mar 2010; Mike Frysinger <vapier@gentoo.org> +openjpeg-1.3-r3.ebuild,
+  +files/openjpeg-1.3-r3-codec-Makefile:
+  Fix stdbool.h/ppc+altivec issues #305333 by Leo Souza and clean up the
+  build system in general.
 
   19 Oct 2009; Alexis Ballier <aballier@gentoo.org> openjpeg-1.3-r2.ebuild:
   keyword ~sparc-fbsd
diff --git a/media-libs/openjpeg/files/openjpeg-1.3-r3-codec-Makefile b/media-libs/openjpeg/files/openjpeg-1.3-r3-codec-Makefile
new file mode 100644
index 000000000000..131614ccb100
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-1.3-r3-codec-Makefile
@@ -0,0 +1,22 @@
+# Makefile for the main OpenJPEG codecs: j2k_to_image and image_to_j2k
+
+CPPFLAGS += -I../libopenjpeg
+LDLIBS += -lopenjpeg -ltiff
+LDFLAGS += -L..
+
+PREFIX = /usr
+INSTALL_BINDIR = $(PREFIX)/bin
+
+all: j2k_to_image image_to_j2k
+
+common = index.o convert.o #compat/getopt.o
+
+j2k_to_image: j2k_to_image.o ${common}
+image_to_j2k: image_to_j2k.o ${common}
+
+clean:
+	rm -f *.o j2k_to_image image_to_j2k
+
+install: all
+	install -d '$(DESTDIR)$(INSTALL_BINDIR)'
+	install -m 755 j2k_to_image image_to_j2k '$(DESTDIR)$(INSTALL_BINDIR)'
diff --git a/media-libs/openjpeg/openjpeg-1.3-r3.ebuild b/media-libs/openjpeg/openjpeg-1.3-r3.ebuild
new file mode 100644
index 000000000000..42ac1062691a
--- /dev/null
+++ b/media-libs/openjpeg/openjpeg-1.3-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.3-r3.ebuild,v 1.1 2010/03/20 18:11:50 vapier Exp $
+
+inherit eutils toolchain-funcs multilib
+
+MY_PV=${PV//./_}
+DESCRIPTION="An open-source JPEG 2000 codec written in C"
+HOMEPAGE="http://www.openjpeg.org/"
+SRC_URI="http://www.openjpeg.org/openjpeg_v${MY_PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="tools"
+
+DEPEND="tools? ( >=media-libs/tiff-3.8.2 )"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/OpenJPEG_v${MY_PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-Makefile.patch #258373
+	cp "${FILESDIR}"/${PF}-codec-Makefile "${S}"/codec/Makefile
+	epatch "${FILESDIR}"/${P}-freebsd.patch #253012
+	epatch "${FILESDIR}"/${P}-darwin.patch # needs to go after freebsd patch
+	sed -i 's:defined(HAVE_STDBOOL_H):1:' libopenjpeg/openjpeg.h || die #305333
+}
+
+src_compile() {
+	tc-export CC AR
+	# XXX: the -fPIC is wrong because it builds the libopenjpeg.a
+	# as a PIC library too.  Should build up two sets of objects.
+	emake CC="$CC" AR="$AR" LIBRARIES="-lm" COMPILERFLAGS="${CFLAGS} ${CPPFLAGS} -fPIC" || die "emake failed"
+	if use tools ; then
+		ln -s libopenjpeg.so.* libopenjpeg.so || die
+		emake -C codec || die "emake failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_LIBDIR="/usr/$(get_libdir)" install || die "install failed"
+	if use tools ; then
+		emake -C codec DESTDIR="${D}" install || die "install failed"
+	fi
+	dodoc ChangeLog
+}