From 1b6243b62d911d49254da4555501a2c4aa3e36b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 8 Sep 2016 22:48:05 +0200
Subject: [PATCH] jbigkit: autotools + libtool for shared library

Created a "fork" of jbigkit-2.1 at github which uses autotools
and libtool to create both, shared and static libraries.

Parallel building fails because test programs which depend on the
libraries are built before these (not yet installed) libs,
thus the disable_parallel_build=yes
---
 common/shlibs            |  2 ++
 srcpkgs/jbigkit-libs     |  1 +
 srcpkgs/jbigkit/template | 47 ++++++++++++++++++++++------------------
 3 files changed, 29 insertions(+), 21 deletions(-)
 create mode 120000 srcpkgs/jbigkit-libs

diff --git a/common/shlibs b/common/shlibs
index 6d263f9b329..2b267e843de 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2617,3 +2617,5 @@ libcourier-unicode.so.3 courier-unicode-1.4_1
 libzstd.so.1 zstd-1.0.0_1
 libudis86.so.0 udis86-devel-1.7.2_3
 libsass.so.0 libsass-3.3.6_1
+libjbig.so.0 jbigkit-libs-2.1_2
+libjbig85.so.0 jbigkit-libs-2.1_2
diff --git a/srcpkgs/jbigkit-libs b/srcpkgs/jbigkit-libs
new file mode 120000
index 00000000000..831c51a7154
--- /dev/null
+++ b/srcpkgs/jbigkit-libs
@@ -0,0 +1 @@
+jbigkit
\ No newline at end of file
diff --git a/srcpkgs/jbigkit/template b/srcpkgs/jbigkit/template
index e1bb0cb7525..f59ed939fbf 100644
--- a/srcpkgs/jbigkit/template
+++ b/srcpkgs/jbigkit/template
@@ -1,37 +1,42 @@
 # Template file for 'jbigkit'
 pkgname=jbigkit
 version=2.1
-revision=1
-build_style=gnu-makefile
+revision=2
+wrksrc="${pkgname}-shared-${version}"
+build_style=gnu-configure
+hostmakedepends="automake libtool"
 short_desc="Data compression library/utilities for bi-level high-resolution images"
 maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
 license="GPL-3"
 homepage="http://www.cl.cam.ac.uk/~mgk25/jbigkit"
-distfiles="http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-$version.tar.gz"
-checksum=de7106b6bfaf495d6865c7dd7ac6ca1381bd12e0d81405ea81e7f2167263d932
+distfiles="https://github.com/voidlinux/jbigkit-shared/archive/v${version}.tar.gz"
+checksum=bce256a39735145ecfc10d3e446e0b55fed1f7c80cffb6e2601a9090faae92e6
+disable_parallel_build=yes
 
-do_build() {
-	make CC=$CC CFLAGS="${CFLAGS} -I${wrksrc}/libjbig ${LDFLAGS}" ${makejobs}
+pre_configure() {
+	./bootstrap.sh
 }
-do_install() {
-	# Install pbm tools
-	for tool in $(find pbmtools/ -executable -type f); do
-		vbin $tool
-	done
-	# Install man pages
-	for manp in pbmtools/*.{1,5}; do
-		vman $manp
-	done
+
+post_install() {
+	vinstall jbigkit.pc 644 usr/lib/pkgconfig
+	vinstall jbigkit85.pc 644 usr/lib/pkgconfig
+	rm -vf ${DESTDIR}/usr/lib/*.la
+}
+
+jbigkit-libs_package() {
+	short_desc+=" - shared libraries"
+	pkg_install() {
+		vmove usr/lib/*.so.*
+	}
 }
 
 jbigkit-devel_package() {
 	short_desc+=" - development files"
+	depends="${sourcepkg}-libs>=${version}_${revision}"
 	pkg_install() {
-		for lib in libjbig/*.a; do
-			vinstall $lib 644 usr/lib
-		done
-		for header in libjbig/*.h; do
-			vinstall $header 644 usr/include
-		done
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/*.so
+		vmove usr/lib/*.a
 	}
 }