Attachment #684154 for bug #766579

View | Details | Raw Unified | Return to bug 766579
Collapse All | Expand All




This patch has been mailed to upstream. No reply at this time. Status unknown.

--- a/libjbig/Makefile
+++ b/libjbig/Makefile
@@ -1,28 +1,58 @@
 # Unix makefile for the JBIG-KIT library
 

 
 jbig.o: jbig.c jbig.h jbig_ar.h
 jbig85.o: jbig85.c jbig85.h jbig_ar.h
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Unix makefile for JBIG-KIT
 

 	tar cvaf jbigkit-$(VERSION).tar.gz jbigkit-$(VERSION)
 
 release:
--- a/pbmtools/Makefile
+++ b/pbmtools/Makefile
@@ -1,11 +1,11 @@
 # Unix makefile for the JBIG-KIT PBM tools
 




# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

inherit multilib multilib-minimal toolchain-funcs

DESCRIPTION="data compression algorithm for bi-level high-resolution images"
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/${PV}" # Since we install unversioned libraries, use ${PV} subslots.
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"

DOCS="ANNOUNCE CHANGES TODO libjbig/*.txt pbmtools/*.txt"

PATCHES=(
	"${FILESDIR}"/${P}-build.patch
)

src_prepare() {
	default
	multilib_copy_sources
	tc-export AR CC RANLIB
}

		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
		$(multilib_is_native_abi || echo lib)

	use static-libs && emake -C libjbig static
		cd libjbig && emake static
	fi
}

multilib_src_test() {

		doman pbmtools/jbgtopbm.1 pbmtools/pbmtojbg.1
	fi

	doheader libjbig/*.h
	dolib.so libjbig/libjbig{,85}$(get_libname)
	use static-libs && dolib.a libjbig/libjbig{,85}.a
	use static-libs && dolib libjbig/libjbig{,85}.a
}
- 

Return to bug 766579

Lines 1-7 Link Here

(-)a/media-libs/jbigkit/files/jbigkit-2.1-build.patch (-6 / +6 lines)
1	This patch has been mailed to upstream. No reply at this time. Status unknown.	1	This patch has been mailed to upstream. No reply at this time. Status unknown.
2		2
3	--- libjbig/Makefile	3	--- a/libjbig/Makefile
4	+++ libjbig/Makefile	4	+++ b/libjbig/Makefile
5	@@ -1,28 +1,58 @@	5	@@ -1,28 +1,58 @@
6	# Unix makefile for the JBIG-KIT library	6	# Unix makefile for the JBIG-KIT library
7		7
Lines 70-77 This patch has been mailed to upstream. No reply at this time. Status unknown. Link Here
70		70
71	jbig.o: jbig.c jbig.h jbig_ar.h	71	jbig.o: jbig.c jbig.h jbig_ar.h
72	jbig85.o: jbig85.c jbig85.h jbig_ar.h	72	jbig85.o: jbig85.c jbig85.h jbig_ar.h
73	--- Makefile	73	--- a/Makefile
74	+++ Makefile	74	+++ b/Makefile
75	@@ -1,10 +1,10 @@	75	@@ -1,10 +1,10 @@
76	# Unix makefile for JBIG-KIT	76	# Unix makefile for JBIG-KIT
77		77
Lines 94-101 This patch has been mailed to upstream. No reply at this time. Status unknown. Link Here
94	tar cvaf jbigkit-$(VERSION).tar.gz jbigkit-$(VERSION)	94	tar cvaf jbigkit-$(VERSION).tar.gz jbigkit-$(VERSION)
95		95
96	release:	96	release:
97	--- pbmtools/Makefile	97	--- a/pbmtools/Makefile
98	+++ pbmtools/Makefile	98	+++ b/pbmtools/Makefile
99	@@ -1,11 +1,11 @@	99	@@ -1,11 +1,11 @@
100	# Unix makefile for the JBIG-KIT PBM tools	100	# Unix makefile for the JBIG-KIT PBM tools
101		101

Lines 1-23 Link Here

(-)a/media-libs/jbigkit/jbigkit-2.1.ebuild (-12 / +12 lines)
1	# Copyright 1999-2021 Gentoo Authors	1	# Copyright 1999-2021 Gentoo Authors
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3		3
4	EAPI=5	4	EAPI=7
5		5
6	inherit eutils multilib toolchain-funcs multilib-minimal	6	inherit multilib multilib-minimal toolchain-funcs
7		7
8	DESCRIPTION="data compression algorithm for bi-level high-resolution images"	8	DESCRIPTION="data compression algorithm for bi-level high-resolution images"
9	HOMEPAGE="http://www.cl.cam.ac.uk/~mgk25/jbigkit/"	9	HOMEPAGE="http://www.cl.cam.ac.uk/~mgk25/jbigkit/"
10	SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz"	10	SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz"
11		11
12	LICENSE="GPL-2"	12	LICENSE="GPL-2"
13	SLOT="0/2.1" # Since we install libjbig.so and libjbig85.so without version, use ${PV} like 2.1	13	SLOT="0/${PV}" # Since we install unversioned libraries, use ${PV} subslots.
14	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"	14	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
15	IUSE="static-libs"	15	IUSE="static-libs"
16		16
17	DOCS="ANNOUNCE CHANGES TODO libjbig/.txt pbmtools/.txt"	17	DOCS="ANNOUNCE CHANGES TODO libjbig/.txt pbmtools/.txt"
18		18
		19	PATCHES=(
		20	"${FILESDIR}"/${P}-build.patch
		21	)
		22
19	src_prepare() {	23	src_prepare() {
20	epatch "${FILESDIR}"/${P}-build.patch	24	default
21	multilib_copy_sources	25	multilib_copy_sources
22	tc-export AR CC RANLIB	26	tc-export AR CC RANLIB
23	}	27	}
Lines 27-35 multilib_src_compile() { Link Here
27	LIBDIR="${EPREFIX}/usr/$(get_libdir)" \	31	LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
28	$(multilib_is_native_abi \|\| echo lib)	32	$(multilib_is_native_abi \|\| echo lib)
29		33
30	if use static-libs; then	34	use static-libs && emake -C libjbig static
31	cd libjbig && emake static
32	fi
33	}	35	}
34		36
35	multilib_src_test() {	37	multilib_src_test() {
Lines 42-49 multilib_src_install() { Link Here
42	doman pbmtools/jbgtopbm.1 pbmtools/pbmtojbg.1	44	doman pbmtools/jbgtopbm.1 pbmtools/pbmtojbg.1
43	fi	45	fi
44		46
45	insinto /usr/include	47	doheader libjbig/*.h
46	doins libjbig/*.h	48	dolib.so libjbig/libjbig{,85}$(get_libname)
47	dolib libjbig/libjbig{,85}$(get_libname)	49	use static-libs && dolib.a libjbig/libjbig{,85}.a
48	use static-libs && dolib libjbig/libjbig{,85}.a
49	}	50	}
50	-