Fix wrt bug #211999.

Thanks to Jakub Moc for reporting.
(Portage version: 2.1.4.4)

4 files changed, 40 insertions, 28 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/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
 }