From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 30 Sep 2005 02:16:07 +0000 (+0000)
Subject: Build a shared library since imagemagick tries to link against libjbig #107542.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=24e2fc5c5b634d000795b0ecc301e9f3ef7941a6;p=gentoo.git

Build a shared library since imagemagick tries to link against libjbig #107542.
Package-Manager: portage-2.0.52-r1 http://www.bash.org/?136501
---

diff --git a/media-libs/jbigkit/ChangeLog b/media-libs/jbigkit/ChangeLog
index fdcb1f4f4753..ad16e79725eb 100644
--- a/media-libs/jbigkit/ChangeLog
+++ b/media-libs/jbigkit/ChangeLog
@@ -1,6 +1,12 @@
 # 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.18 2005/09/27 00:16:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.19 2005/09/30 02:16:07 vapier Exp $
+
+*jbigkit-1.6-r1 (30 Sep 2005)
+
+  30 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/jbigkit-1.6-shared-lib.patch, +jbigkit-1.6-r1.ebuild:
+  Build a shared library since imagemagick tries to link against libjbig #107542.
 
 *jbigkit-1.6 (27 Sep 2005)
 
diff --git a/media-libs/jbigkit/Manifest b/media-libs/jbigkit/Manifest
index 35d6014b366d..28b73baf58b7 100644
--- a/media-libs/jbigkit/Manifest
+++ b/media-libs/jbigkit/Manifest
@@ -1,16 +1,19 @@
 -----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 eb34f06feaef5f6ef881b660e2fb861e ChangeLog 1676
+MD5 70f37f9e51f8292849714f159ce03727 ChangeLog 1903
 MD5 d1b93d8aefb118f3259cc9ac2a55239e files/digest-jbigkit-1.6 63
+MD5 d1b93d8aefb118f3259cc9ac2a55239e files/digest-jbigkit-1.6-r1 63
 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)
 
-iD8DBQFDOI+kgIKl8Uu19MoRAs7NAJ4twnFuleVpsoxKLV5cPmmP1ReMZACggP3M
-zoO/1RbzhtYm6lNMcPWmI9k=
-=STwS
+iD8DBQFDPKArgIKl8Uu19MoRAjQkAJ0fxOs1S2v+9LwJZfGcOt8uqr1sGgCdFZrX
+B6GdOktHe0hcyKaDv3XaUDA=
+=sa+q
 -----END PGP SIGNATURE-----
diff --git a/media-libs/jbigkit/files/digest-jbigkit-1.6-r1 b/media-libs/jbigkit/files/digest-jbigkit-1.6-r1
new file mode 100644
index 000000000000..95e57285e490
--- /dev/null
+++ b/media-libs/jbigkit/files/digest-jbigkit-1.6-r1
@@ -0,0 +1 @@
+MD5 ce196e45f293d40ba76af3dc981ccfd7 jbigkit-1.6.tar.gz 405712
diff --git a/media-libs/jbigkit/files/jbigkit-1.6-shared-lib.patch b/media-libs/jbigkit/files/jbigkit-1.6-shared-lib.patch
new file mode 100644
index 000000000000..98895ecc276f
--- /dev/null
+++ b/media-libs/jbigkit/files/jbigkit-1.6-shared-lib.patch
@@ -0,0 +1,32 @@
+--- libjbig/Makefile
++++ libjbig/Makefile
+@@ -7,7 +7,10 @@
+ # Options for the compiler: A high optimization level is suggested
+ CFLAGS = -O -Wall -ansi -pedantic
+ 
++AR = ar
++RANLIB = ranlib
++
+-all: libjbig.a tstcodec
++all: libjbig.a libjbig.so 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 @@
+ 
+ libjbig.a: jbig.o jbig_tab.o
+ 	rm -f libjbig.a
+-	ar rc libjbig.a jbig.o jbig_tab.o
+-	-ranlib libjbig.a
++	$(AR) rc libjbig.a jbig.o jbig_tab.o
++	$(RANLIB) libjbig.a
++
++SOBJS = jbig.lo jbig_tab.lo
++libjbig.so: $(SOBJS)
++	$(CC) -shared $(LDFLAGS) -o $@ -Wl,-soname -Wl,$@ $(SOBJS)
++
++%.lo: %.c jbig.h
++	$(CC) $(CFLAGS) -fPIC -c $< -o $@
+ 
+ jbig.o: jbig.c jbig.h
+ 
diff --git a/media-libs/jbigkit/jbigkit-1.6-r1.ebuild b/media-libs/jbigkit/jbigkit-1.6-r1.ebuild
new file mode 100644
index 000000000000..1caa36b0e0d2
--- /dev/null
+++ b/media-libs/jbigkit/jbigkit-1.6-r1.ebuild
@@ -0,0 +1,37 @@
+# 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 $
+
+inherit eutils
+
+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/"
+SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=sys-apps/sed-4"
+RDEPEND=""
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-shared-lib.patch
+}
+
+src_install() {
+	dobin pbmtools/jbgtopbm pbmtools/pbmtojbg || die "dobin"
+	doman pbmtools/jbgtopbm.1 pbmtools/pbmtojbg.1
+
+	insinto /usr/include
+	newins libjbig/jbig.h jbig.h || die "doins include"
+	dolib libjbig/libjbig.{a,so} || die "dolib"
+
+	dodoc ANNOUNCE CHANGES INSTALL TODO
+}