Fix library naming wrt bug #258373

Thanks to Peter Alfredsen for reporting and thanks to Diego Pettenò for bug #258360
(Portage version: 2.2_rc23/cvs/Linux x86_64)

3 files changed, 90 insertions, 1 deletions

diff --git a/media-libs/openjpeg/ChangeLog b/media-libs/openjpeg/ChangeLog
index 78f6da60ac66..3f5f8891330b 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.19 2009/02/03 15:34:37 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.20 2009/02/10 11:05:21 drizzt Exp $
+
+*openjpeg-1.3-r2 (10 Feb 2009)
+
+  10 Feb 2009; Timothy Redaelli <drizzt@gentoo.org>
+  +files/openjpeg-1.3-Makefile.patch, +openjpeg-1.3-r2.ebuild:
+  Fix library naming wrt bug #258373 Thanks to Peter Alfredsen for reporting
+  and thanks to Diego Pettenò for bug #258360
 
 *openjpeg-1.3-r1 (03 Feb 2009)
 
diff --git a/media-libs/openjpeg/files/openjpeg-1.3-Makefile.patch b/media-libs/openjpeg/files/openjpeg-1.3-Makefile.patch
new file mode 100644
index 000000000000..5dfd6a91e72f
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-1.3-Makefile.patch
@@ -0,0 +1,42 @@
+diff -NrU5 OpenJPEG_v1_3.orig/Makefile OpenJPEG_v1_3/Makefile
+--- OpenJPEG_v1_3.orig/Makefile	2009-02-09 21:25:42.000000000 +0100
++++ OpenJPEG_v1_3/Makefile	2009-02-09 21:34:35.000000000 +0100
+@@ -24,11 +24,11 @@
+ MODULES = $(SRCS:.c=.o)
+ CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
+ 
+ TARGET  = openjpeg
+ STATICLIB = lib$(TARGET).a
+-SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so
++SHAREDLIB = lib$(TARGET).so.$(VER_MAJOR).$(VER_MINOR)
+ LIBNAME = lib$(TARGET).so.$(VER_MAJOR)
+ 
+ 
+ 
+ default: all
+@@ -52,20 +52,20 @@
+ 
+ $(STATICLIB): $(MODULES)
+ 	$(AR) r $@ $(MODULES)
+ 
+ $(SHAREDLIB): $(MODULES)
+-	$(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
++	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
+ 
+ install: OpenJPEG
+ 	install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'
+-	install -m 644 -o root -g root $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
++	install -m 644 $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
+ 	ranlib '$(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)'
+-	install -m 755 -o root -g root $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
++	install -m 755 $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
+ 	ln -sf $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)'
+-	install -m 644 -o root -g root libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)'
+-	-ldconfig
++	ln -sf $(LIBNAME) '$(DESTDIR)$(INSTALL_LIBDIR)/lib$(TARGET).so'
++	install -m 644 libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)'
+ 
+ clean:
+ 	rm -rf core dist/ u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
+ 
+ osx:
diff --git a/media-libs/openjpeg/openjpeg-1.3-r2.ebuild b/media-libs/openjpeg/openjpeg-1.3-r2.ebuild
new file mode 100644
index 000000000000..44b0218b4161
--- /dev/null
+++ b/media-libs/openjpeg/openjpeg-1.3-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.3-r2.ebuild,v 1.1 2009/02/10 11:05:21 drizzt Exp $
+
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="An open-source JPEG 2000 codec written in C"
+HOMEPAGE="http://www.openjpeg.org/"
+SRC_URI="http://www.openjpeg.org/openjpeg_v${PV//./_}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="tools"
+DEPEND="tools? ( >=media-libs/tiff-3.8.2 )"
+RDEPEND=${DEPEND}
+
+S="${WORKDIR}/OpenJPEG_v1_3"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-Makefile.patch #258373
+	cp "${FILESDIR}"/${P}-codec-Makefile "${S}"/codec/Makefile
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)" LIBRARIES="-lm" 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"
+	if use tools; then
+		emake -C codec DESTDIR="${D}" INSTALL_BINDIR="/usr/bin" install || die "install failed"
+	fi
+	dodoc ChangeLog
+}