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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-libs/openjpeg/ChangeLog b/media-libs/openjpeg/ChangeLog
index 56d3cc6d15aa0ed9897afce1510441dda68dfaae..bdbae4809f51958d8adc0cc92d768f3356cb952e 100644 (file)
--- 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/Manifest b/media-libs/openjpeg/Manifest
index c4fbf8c9fd1c20cb2ebf5eefd4908edac6e2a4bd..9e3fbaea50aabebbbb2d8bf88f863b9adc161225 100644 (file)
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX openjpeg-1.1.1-Makefile.patch 558 RMD160 485ed66f0db6df3e657fa7fb09a333eae12f9cdb SHA1 5d78c5d2230cc03605e28437a7d84edfb4c230a6 SHA256 216925794ff95f720f910ef414256abf41cf2fb50a1b4cc9e65e3eb812f1b758
 AUX openjpeg-1.2-Makefile.patch 999 RMD160 0088fbadaea6401409071df76591ab6b1c006665 SHA1 79026cb2ea5fb9eafe187b03edad7f21e132a03b SHA256 39d427776b30026aa6ca03df4c52f13ffded210cb8327e351db1c9f170db5040
@@ -7,15 +7,17 @@ AUX openjpeg-1.3-Makefile.patch 1560 RMD160 236c30638730961aae37d384484e8b7a3220
 AUX openjpeg-1.3-codec-Makefile 722 RMD160 fdc0880dfab7f82d56716afb9b73a283953f0917 SHA1 b38ab6acda4676bba922167a06104f6c6564bdf2 SHA256 6554a08e1cd69476ad3c06cc6322ed28c010ac947a43489b14748c4e51d2a0a4
 AUX openjpeg-1.3-darwin.patch 1176 RMD160 b05ce81dfecfa41f15a4f70041a3fa04c70926cb SHA1 49b47307bc11334010c23082ccedc56fd8ba085d SHA256 f23683a40a73745ab1a1914ff75f4bd6da3aaccaeef088cf8c8a9ac6f6673a62
 AUX openjpeg-1.3-freebsd.patch 672 RMD160 b368524439bd11d3c68bc6e2b4aa129c08e7dd5a SHA1 8d51276c8d1ade2a7fe8ff76937d87c69daa7e51 SHA256 ea7113fbe3cdc2bc3d9199b266824be74f3556025a512c0cd2435797aa385809
+AUX openjpeg-1.3-r3-codec-Makefile 520 RMD160 c531f8b8d7bbd3b24606e52ad1d3cb32c485e08e SHA1 91fa1601c45549a4b6a4f7953339033afdc91a7f SHA256 4e9e389ad7cc05d41df63f0e4cb4a6fc5d107a02933dae14a40a5f788d9460cf
 DIST openjpeg_v1_3.tar.gz 1004678 RMD160 2a22cc123058b1974cd1bf3898044acabceba26c SHA1 8d6870d9500ea09e0b1d30b981bea1c8de534de4 SHA256 3bca2e1e040f9dcbbcb1e0627f17a76eeb95e153bf663d082070c044a21202bd
 EBUILD openjpeg-1.3-r2.ebuild 1377 RMD160 fdcd0f029eb7a6928b0466422a4f4a164cafb0ba SHA1 31fa28b2a3bab59a12c8051901a6efd05c4d6a51 SHA256 71c074f8d020d6cb61db8a8c0fc31ccf891c991d72ec8f30aa1009df46128be4
+EBUILD openjpeg-1.3-r3.ebuild 1618 RMD160 3a66fafb2b0d331a78fcfb3795814fd3d9a8575e SHA1 5f8b74be8bd5698bb07dc6f5c83376cac3d41cad SHA256 356b02611918a77570a2cf5f3178c51688b5c3631c763da90989f6fe535de210
 EBUILD openjpeg-1.3.ebuild 1219 RMD160 5e7b3d3a7c6d589caf0817ba98400960e99b7afa SHA1 f31d8abaa4b7c6904da50d345ec61d5ebe5c44e7 SHA256 579e8185a32741b71355f8aa86252f714eee7fcc89f0640eb0a65f8fb7ecf080
-MISC ChangeLog 4777 RMD160 ca43d7770f076e2b5e257d5e93e2e9a88a4c05b2 SHA1 d69f300e7cc14eba39a93babbad020bbb906000f SHA256 c7ce3cd5e74cc1d333af85c02c04197afa2f19d9dbf868718a0b1b2ef8cc7371
+MISC ChangeLog 5024 RMD160 cb5ab08c2867653c279bb8a0fdc9f3135c32ead8 SHA1 b3b336bef9159bed4a2365ed9770e8ebaaab8f15 SHA256 47f30d931d341893ac79b3457f525caaaac02f3b39522483f86356572d70c96b
 MISC metadata.xml 257 RMD160 80c1eb9046b53f99e237da460c933b844ccc7b63 SHA1 84398d153001807fcb12f140046c03c71f81afb3 SHA256 f59744ea0de26f01b0beefb513cb99989c8d295b37b738fbc7814a43ccfb9e59
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkrcuusACgkQvFcC4BYPU0rLOwCfW4iQ4Hy7rkb8iSFIpxYm+8OW
-L3kAoIH7NPFCzsnE/7GThQwEc/BTQypT
-=w1QP
+iF4EAREIAAYFAkulD+UACgkQTwhj9JtAlp4J8gD9EIMFhS0zlaIDjmwtxrEzcrtf
+OEE/Nt/zwxWoBrWedgwBAJiS1IOQGUHQ3bh9aP2bnDYCQjYr0fQ5Pw5teMJNkfnq
+=gRIo
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..131614c
--- /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 (file)
index 0000000..42ac106
--- /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
+}