Enhancing spanky's shared lib patch to get it compiling again on OSX using dylibs.

(Portage version: 2.0.51.22-r2)

4 files changed, 37 insertions, 25 deletions

diff --git a/media-libs/jbigkit/ChangeLog b/media-libs/jbigkit/ChangeLog
index ad16e79725eb..88f1abe71279 100644
--- a/media-libs/jbigkit/ChangeLog
+++ b/media-libs/jbigkit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/jbigkit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.19 2005/09/30 02:16:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.20 2005/10/01 14:48:07 grobian Exp $
+
+  01 Oct 2005; Fabian Groffen <grobian@gentoo.org>
+  files/jbigkit-1.6-shared-lib.patch, jbigkit-1.6-r1.ebuild:
+  Enhancing spanky's shared lib patch to get it compiling again on OSX using
+  dylibs.
 
 *jbigkit-1.6-r1 (30 Sep 2005)
 
diff --git a/media-libs/jbigkit/Manifest b/media-libs/jbigkit/Manifest
index 28b73baf58b7..2180eae9d5f1 100644
--- a/media-libs/jbigkit/Manifest
+++ b/media-libs/jbigkit/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 07d14e1eb1c7a51773b23fb5dec40a89 jbigkit-1.6-r1.ebuild 1068
 MD5 4e84e1e79ca429311ce5af75fb72c3c5 jbigkit-1.6.ebuild 1016
-MD5 f38ae5389c51dc49e9046dc00c043403 jbigkit-1.4.ebuild 1111
 MD5 70f37f9e51f8292849714f159ce03727 ChangeLog 1903
-MD5 d1b93d8aefb118f3259cc9ac2a55239e files/digest-jbigkit-1.6 63
-MD5 d1b93d8aefb118f3259cc9ac2a55239e files/digest-jbigkit-1.6-r1 63
+MD5 bfff4981825715bde07c3b15fd6bffde jbigkit-1.6-r1.ebuild 1127
+MD5 f38ae5389c51dc49e9046dc00c043403 jbigkit-1.4.ebuild 1111
 MD5 b5fa036877461225b796e1bab1fb2179 files/jbigkit-1.6-build.patch 284
 MD5 3b69012688770808e2d9ebaf7d43533e files/digest-jbigkit-1.4 63
-MD5 4374012624b3c5fba5144ac9b661d2d2 files/jbigkit-1.6-shared-lib.patch 748
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDPKArgIKl8Uu19MoRAjQkAJ0fxOs1S2v+9LwJZfGcOt8uqr1sGgCdFZrX
-B6GdOktHe0hcyKaDv3XaUDA=
-=sa+q
------END PGP SIGNATURE-----
+MD5 d1b93d8aefb118f3259cc9ac2a55239e files/digest-jbigkit-1.6 63
+MD5 d1b93d8aefb118f3259cc9ac2a55239e files/digest-jbigkit-1.6-r1 63
+MD5 0c3a01852145fadd51e5ae7268761cbc files/jbigkit-1.6-shared-lib.patch 1199
diff --git a/media-libs/jbigkit/files/jbigkit-1.6-shared-lib.patch b/media-libs/jbigkit/files/jbigkit-1.6-shared-lib.patch
index 98895ecc276f..3e94ef8c26ef 100644
--- a/media-libs/jbigkit/files/jbigkit-1.6-shared-lib.patch
+++ b/media-libs/jbigkit/files/jbigkit-1.6-shared-lib.patch
@@ -1,18 +1,32 @@
---- libjbig/Makefile
-+++ libjbig/Makefile
-@@ -7,7 +7,10 @@
+--- libjbig/Makefile.orig	2005-10-01 16:18:37.000000000 +0200
++++ libjbig/Makefile	2005-10-01 16:36:16.000000000 +0200
+@@ -1,13 +1,24 @@
+ # Unix makefile for the JBIG-KIT library
+ # $Id: jbigkit-1.6-shared-lib.patch,v 1.2 2005/10/01 14:48:07 grobian Exp $
+ 
++include ../uname.mk
++
+ # Select an ANSI/ISO C compiler here, GNU gcc is recommended
+ CC = gcc
+ 
  # Options for the compiler: A high optimization level is suggested
  CFLAGS = -O -Wall -ansi -pedantic
  
+-all: libjbig.a tstcodec
 +AR = ar
 +RANLIB = ranlib
 +
--all: libjbig.a tstcodec
-+all: libjbig.a libjbig.so tstcodec
++ifeq ($(UNAME),Darwin)
++	SONAME = dylib
++else
++	SONAME = so
++endif
++
++all: libjbig.a libjbig.$(SONAME) tstcodec
  
  tstcodec: tstcodec.c jbig.c jbig.h jbig_tab.o
  	$(CC) $(CFLAGS) -o tstcodec -DTEST_CODEC tstcodec.c jbig.c \
-@@ -15,8 +18,15 @@
+@@ -15,8 +26,17 @@
  
  libjbig.a: jbig.o jbig_tab.o
  	rm -f libjbig.a
@@ -24,6 +38,8 @@
 +SOBJS = jbig.lo jbig_tab.lo
 +libjbig.so: $(SOBJS)
 +	$(CC) -shared $(LDFLAGS) -o $@ -Wl,-soname -Wl,$@ $(SOBJS)
++libjbig.dylib: $(SOBJS)
++	$(CC) -dynamic $(LDFLAGS) -o $@ -dynamiclib -install_name $@ $(SOBJS)
 +
 +%.lo: %.c jbig.h
 +	$(CC) $(CFLAGS) -fPIC -c $< -o $@
diff --git a/media-libs/jbigkit/jbigkit-1.6-r1.ebuild b/media-libs/jbigkit/jbigkit-1.6-r1.ebuild
index 1caa36b0e0d2..914b7a186d8f 100644
--- a/media-libs/jbigkit/jbigkit-1.6-r1.ebuild
+++ b/media-libs/jbigkit/jbigkit-1.6-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-1.6-r1.ebuild,v 1.1 2005/09/30 02:16:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-1.6-r1.ebuild,v 1.2 2005/10/01 14:48:07 grobian Exp $
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="highly effective data compression algorithm for bi-level high-resolution images such as fax pages or scanned documents"
 HOMEPAGE="http://www.cl.cam.ac.uk/~mgk25/jbigkit/"
@@ -23,6 +23,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-build.patch
 	epatch "${FILESDIR}"/${P}-shared-lib.patch
+	echo "UNAME = `uname -s`" > uname.mk
 }
 
 src_install() {
@@ -31,7 +32,7 @@ src_install() {
 
 	insinto /usr/include
 	newins libjbig/jbig.h jbig.h || die "doins include"
-	dolib libjbig/libjbig.{a,so} || die "dolib"
+	dolib libjbig/libjbig{.a,$(get_libname)} || die "dolib"
 
 	dodoc ANNOUNCE CHANGES INSTALL TODO
 }