Fix wrt bug #211999.

Thanks to Jakub Moc for reporting.
Package-Manager: portage-2.1.4.4

5 files changed, 46 insertions, 34 deletions

diff --git a/media-libs/openjpeg/ChangeLog b/media-libs/openjpeg/ChangeLog
index 6f25d1104a33..dc6784cf0bcf 100644
--- a/media-libs/openjpeg/ChangeLog
+++ b/media-libs/openjpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/openjpeg
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.8 2008/03/01 11:39:48 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.9 2008/03/01 18:19:58 drizzt Exp $
+
+  01 Mar 2008; Timothy Redaelli <drizzt@gentoo.org>
+  +files/openjpeg-1.3-codec-Makefile,
+  -files/openjpeg-1.3-codec-Makefile.patch, openjpeg-1.3.ebuild:
+  Fix wrt bug #211999.
+  Thanks to Jakub Moc for reporting.
 
 *openjpeg-1.3 (01 Mar 2008)
 
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 2486966d1756..3a689e7457bd 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -3,19 +3,19 @@ Hash: SHA1
 
 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
-AUX openjpeg-1.3-codec-Makefile.patch 493 RMD160 61525a7b57471df93a7f48f4b747e393e019c8c5 SHA1 04e75f2ac69f0dde0ec590aecb387abf97a6a163 SHA256 228241c6b539f91fe7eb757fbefc5516778fa536cf6d2af791261f53a0e00642
+AUX openjpeg-1.3-codec-Makefile 722 RMD160 fdc0880dfab7f82d56716afb9b73a283953f0917 SHA1 b38ab6acda4676bba922167a06104f6c6564bdf2 SHA256 6554a08e1cd69476ad3c06cc6322ed28c010ac947a43489b14748c4e51d2a0a4
 DIST openjpeg_v1_1_1.tar.gz 1406460 RMD160 08b2318441075a8704d6b9b0ac3d9d277c44d85e SHA1 1de6f9ccebe8844c96416daca521a20a84df23f5 SHA256 6076db131bfaa966a691d718044e5b5cdbec028436be3b7a3f146d1a0e3a7ec6
 DIST openjpeg_v1_2.tar.gz 929866 RMD160 3ac46e0f4cd16bbb52e05ad23e0b4d395c333c27 SHA1 38008abd77972b8062693254cb2ea087eb877ebd SHA256 20294c8aefc15b455abfc8ab73747ac5345a1cbf6f7035dd36ef690d2188e2c4
 DIST openjpeg_v1_3.tar.gz 1004678 RMD160 2a22cc123058b1974cd1bf3898044acabceba26c SHA1 8d6870d9500ea09e0b1d30b981bea1c8de534de4 SHA256 3bca2e1e040f9dcbbcb1e0627f17a76eeb95e153bf663d082070c044a21202bd
 EBUILD openjpeg-1.1.1.ebuild 915 RMD160 0b53488eafaa585dfc3943c14782b570cef9befc SHA1 7fc881f953de08433031e783eeb53792f56e6533 SHA256 6cc342323afcc39dc5bf9d7fcbebafa9ec850167380c30bd599c44e13035db9e
 EBUILD openjpeg-1.2.ebuild 878 RMD160 44a6f3c9bfb1f7834f7bcbd69bb6eb5cd72ff733 SHA1 36ebdc1bca2233b8e994a24b6c5349f7345f2aff SHA256 21ced9e9b38e96af0a1da1cd878191c4b11ffb2696e49778270a0203ad1b9a26
-EBUILD openjpeg-1.3.ebuild 1028 RMD160 ae19a8caf189e38996f96d055d779fa74225407a SHA1 b0f4e95783297ddd8b43634689ac2d4085a054c5 SHA256 cece1fc58b428c848ba7f2cfe3aed17d8586c37c3fdb6164d4797c0f632f5ae9
-MISC ChangeLog 1548 RMD160 36088191b0398bcaa6d212a375c03c562c771f2d SHA1 0f8e96e6ffd8d1cdcadc191298b4bf0f2e64a00b SHA256 11f8baa2e8211e0348df074dbe82d6354ae056c52c358f729afe66b2a53481fa
+EBUILD openjpeg-1.3.ebuild 1183 RMD160 97b2418c8560634c2f56b1b06a20d77e5bd95738 SHA1 4a8bbe439a6320aa57e04a8a046b260984defd2f SHA256 c8fcc74cc07ec048e15a74d8c01c5f1a7e66f2fd173aa1cf35e689c1770a9d30
+MISC ChangeLog 1764 RMD160 21ea196b6baa14325b8c19f54198ddb12c0ee8b6 SHA1 cb3df3f1db3850e1b248aa54524b6d090b271bd8 SHA256 fc39810f4fd9635410f0a948e01e35291c46b714bc016d0b6d0cd9d4980282ca
 MISC metadata.xml 222 RMD160 c0fe8198bb72a6bed198a1dd7005ed607711db2a SHA1 a3b2631fffe918fa2b814a269297dfc9e6c355cb SHA256 35319607d0186f4c2b026c636392c56bafa68c71a17a67364e5c530156eb22b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHyUCKfaz7Jd2SSKIRAt5cAKCWaPE8YMPAivF8LSTlkZeb5Hns7QCgnMLB
-B+JiVGUNVf+k3/Ad4rMrYiw=
-=Hw29
+iD8DBQFHyZ5Tfaz7Jd2SSKIRAromAJ9dMeCEUjhAwZGhUrN2qb07PEAqBQCeKViy
+/3dH8aheIrqHBfWSaD5VZiI=
+=1pIb
 -----END PGP SIGNATURE-----
diff --git a/media-libs/openjpeg/files/openjpeg-1.3-codec-Makefile b/media-libs/openjpeg/files/openjpeg-1.3-codec-Makefile
new file mode 100644
index 000000000000..8a07423fd9a3
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-1.3-codec-Makefile
@@ -0,0 +1,21 @@
+# Makefile for the main OpenJPEG codecs: j2k_to_image and image_to_j2k
+
+CFLAGS += -lstdc++ # -g -p -pg
+
+PREFIX = /usr
+INSTALL_BINDIR = $(PREFIX)/bin
+
+all: j2k_to_image image_to_j2k
+
+j2k_to_image: j2k_to_image.c ../libopenjpeg.a
+	$(CC) $(CFLAGS) $(LDFLAGS) compat/getopt.c index.c convert.c j2k_to_image.c -o j2k_to_image -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
+
+image_to_j2k: image_to_j2k.c ../libopenjpeg.a
+	$(CC) $(CFLAGS) $(LDFLAGS) compat/getopt.c index.c convert.c image_to_j2k.c -o image_to_j2k -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
+
+clean:
+	rm -f 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/files/openjpeg-1.3-codec-Makefile.patch b/media-libs/openjpeg/files/openjpeg-1.3-codec-Makefile.patch
deleted file mode 100644
index f1a3206def40..000000000000
--- a/media-libs/openjpeg/files/openjpeg-1.3-codec-Makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- codec/Makefile	2007-11-27 13:38:52.000000000 +0100
-+++ codec/Makefile.new	2008-02-28 11:18:08.000000000 +0100
-@@ -2,6 +2,9 @@
- 
- CFLAGS = -O3 -lstdc++ # -g -p -pg
- 
-+PREFIX = /usr
-+INSTALL_BINDIR = $(PREFIX)/bin
-+
- all: j2k_to_image image_to_j2k
- 
- j2k_to_image: j2k_to_image.c ../libopenjpeg.a
-@@ -12,3 +15,7 @@
- 
- clean:
- 	rm -f 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.ebuild b/media-libs/openjpeg/openjpeg-1.3.ebuild
index b17ad3fe6f62..0b9eb57c7688 100644
--- a/media-libs/openjpeg/openjpeg-1.3.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.3.ebuild,v 1.1 2008/03/01 11:39:48 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.3.ebuild,v 1.2 2008/03/01 18:19:58 drizzt Exp $
 
-inherit flag-o-matic toolchain-funcs multilib
+inherit eutils toolchain-funcs multilib
 
 DESCRIPTION="An open-source JPEG 2000 codec written in C"
 HOMEPAGE="http://www.openjpeg.org/"
@@ -11,7 +11,8 @@ SRC_URI="http://www.openjpeg.org/openjpeg_v${PV//./_}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
+IUSE="tools"
+DEPEND="tools? ( >=media-libs/tiff-3.8.2 )"
 
 S="${WORKDIR}/OpenJPEG_v1_3"
 
@@ -19,16 +20,20 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-1.2-Makefile.patch
-	epatch "${FILESDIR}"/${P}-codec-Makefile.patch
+	cp "${FILESDIR}"/${P}-codec-Makefile "${S}"/codec/Makefile
 }
 
 src_compile() {
-	append-flags -fPIC
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)" COMPILERFLAGS="${CFLAGS}" || die "emake failed"
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)" COMPILERFLAGS="${CFLAGS} -std=c99 -fPIC" || die "emake failed"
+	if use tools; then
+		emake -C codec CC="$(tc-getCC)" || die "emake failed"
+	fi
 }
 
 src_install() {
 	emake DESTDIR="${D}" INSTALL_LIBDIR="/usr/$(get_libdir)" install || die "install failed"
-	emake -C codec DESTDIR="${D}" INSTALL_BINDIR="/usr/bin" install || die "install failed"
+	if use tools; then
+		emake -C codec DESTDIR="${D}" INSTALL_BINDIR="/usr/bin" install || die "install failed"
+	fi
 	dodoc ChangeLog
 }