mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 03:30:05 +02:00
jbigkit, bump version, remove old bep files (#2376)
* jbigkit, bump version, remove old bep files * jbigkit, put the correct libs in place, cleanup
This commit is contained in:
Schrijvers Luc
committed by
Scott McCreary
Scott McCreary
parent
0bc07ccabb
commit
075cee8ff2
@@ -1,18 +0,0 @@
|
||||
DESCRIPTION="JBIG-KIT"
|
||||
HOMEPAGE="http://www.cl.cam.ac.uk/~mgk25/jbigkit/"
|
||||
SOURCE_URI="http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-1.6.tar.gz"
|
||||
CHECKSUM_MD5="ce196e45f293d40ba76af3dc981ccfd7"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
BUILD()
|
||||
{
|
||||
cd jbigkit
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
cd jbigkit
|
||||
make test
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
DESCRIPTION="JBIG-KIT lossless image compression library"
|
||||
HOMEPAGE="http://www.cl.cam.ac.uk/~mgk25/jbigkit/"
|
||||
SOURCE_URI="http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-2.0.tar.gz"
|
||||
CHECKSUM_MD5="3dd87f605abb1a97a22dc79d8b3e8f6c"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
BUILD()
|
||||
{
|
||||
cd jbigkit
|
||||
make
|
||||
cd libjbig
|
||||
make -f Makefile-libjbig_so
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
cd jbigkit
|
||||
make test
|
||||
cd libjbig
|
||||
cp jbig.h /boot/common/include
|
||||
cp jbig_ar.h /boot/common/include
|
||||
cp jbig_85.h /boot/common/include
|
||||
cp jbig_ar.h /boot/common/include
|
||||
cp libjbig.so /boot/common/lib
|
||||
cp libjbig.so.2 /boot/common/lib
|
||||
cp libjbig.so.2.0 /boot/common/lib
|
||||
}
|
||||
101
media-libs/jbigkit/jbigkit-2.1.recipe
Normal file
101
media-libs/jbigkit/jbigkit-2.1.recipe
Normal file
@@ -0,0 +1,101 @@
|
||||
SUMMARY="A lossless image compression library"
|
||||
DESCRIPTION="JBIG-KIT is a software implementation of the JBIG1 data \
|
||||
compression standard (ITU-T T.82), which was designed for bi-level image \
|
||||
data, such as scanned documents. This library is available in portable C \
|
||||
code. It is widely used in fax products, printer firmware, printer drivers, \
|
||||
document management systems and imaging software."
|
||||
HOMEPAGE="https://www.cl.cam.ac.uk/~mgk25/jbigkit/"
|
||||
COPYRIGHT="1995-2014 Markus Kuhn
|
||||
1989, 1991 Jef Poskanzer"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://www.cl.cam.ac.uk/~mgk25/download/jbigkit-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="de7106b6bfaf495d6865c7dd7ac6ca1381bd12e0d81405ea81e7f2167263d932"
|
||||
PATCHES="jbigkit-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
|
||||
|
||||
libVersion=$portVersion
|
||||
libVersionCompat="$libVersion compat >= 2"
|
||||
|
||||
PROVIDES="
|
||||
jbigkit$secondaryArchSuffix = $portVersion
|
||||
lib:libjbig$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libjbig85$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
if [ -z "$secondaryArchSuffix" ]; then
|
||||
PROVIDES="$PROVIDES
|
||||
cmd:jbgtopbm = $portVersion
|
||||
cmd:jbgtopbm85 = $portVersion
|
||||
cmd:pbmtojbg = $portVersion
|
||||
cmd:pbmtojbg85 = $portVersion
|
||||
"
|
||||
fi
|
||||
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
jbigkit${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libjbig$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libjbig85$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES_devel="
|
||||
jbigkit$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:make
|
||||
#required for test
|
||||
cmd:cmp
|
||||
"
|
||||
|
||||
defineDebugInfoPackage jbigkit$secondaryArchSuffix \
|
||||
"$libDir"/libjbig.so.$libVersion \
|
||||
"$libDir"/libjbig85.so.$libVersion
|
||||
|
||||
BUILD()
|
||||
{
|
||||
make all $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
if [ -z "$secondaryArchSuffix" ]; then
|
||||
cd pbmtools
|
||||
install -m 0755 -d "$binDir" "$manDir"/man5
|
||||
# install the tools
|
||||
install -m 0755 -t "$binDir" jbgtopbm{,85} pbmtojbg{,85}
|
||||
# install man pages
|
||||
install -m 0644 -t "$manDir"/man5 pbm.5 pgm.5
|
||||
cd ..
|
||||
fi
|
||||
|
||||
# install headers and libs
|
||||
cd libjbig
|
||||
install -m 0755 -d "$developLibDir" "$libDir" "$includeDir"
|
||||
install -m 0644 -t "$includeDir" *.h
|
||||
install -m 0644 -t "$libDir" libjbig{,85}.so.2.1
|
||||
install -m 0644 -t "$developLibDir" libjbig{,85}.a
|
||||
cd "$libDir"
|
||||
ln -fs libjbig.so.2.1 libjbig.so.2
|
||||
ln -fs libjbig.so.2.1 libjbig.so
|
||||
ln -fs libjbig85.so.2.1 libjbig85.so.2
|
||||
ln -fs libjbig85.so.2.1 libjbig85.so
|
||||
|
||||
prepareInstalledDevelLibs libjbig libjbig85
|
||||
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make test
|
||||
}
|
||||
@@ -1,41 +0,0 @@
|
||||
diff -Naur jbigkit-2.0/libjbig/Makefile-libjbig_so jbigkit-2.0-haiku/libjbig/Makefile-libjbig_so
|
||||
--- jbigkit-2.0/libjbig/Makefile-libjbig_so 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ jbigkit-2.0-haiku/libjbig/Makefile-libjbig_so 2009-11-03 16:06:37.000000000 +0000
|
||||
@@ -0,0 +1,37 @@
|
||||
+
|
||||
+# This Makefile builds a shared version of the library,
|
||||
+# libjbig.so.2.0, with soname libjbig.so.2,
|
||||
+# Please see the README file for some important info
|
||||
+# about building the library like this.
|
||||
+# ------------------------------------------------------------------
|
||||
+# Please read the WARNING, DISCLAIMER and PATENTS sections in the
|
||||
+# README file.
|
||||
+#
|
||||
+# This program is released under the terms of the license contained
|
||||
+# in the file LICENSE.
|
||||
+# ------------------------------------------------------------------
|
||||
+
|
||||
+
|
||||
+SHELL=/bin/sh
|
||||
+CC=gcc
|
||||
+CFLAGS=-fPIC -g -c -Wall
|
||||
+
|
||||
+OBJS= jbig.o \
|
||||
+ jbig_ar.o \
|
||||
+ jbig85.o
|
||||
+
|
||||
+all: $(OBJS)
|
||||
+ $(CC) -shared -Wl,-soname,libjbig.so -o libjbig.so.2.0 $(OBJS)
|
||||
+ rm -f libjbig.so
|
||||
+ ln -s libjbig.so.2.0 libjbig.so.2
|
||||
+ ln -s libjbig.so.2.0 libjbig.so
|
||||
+
|
||||
+clean:
|
||||
+ rm -f $(OBJS) jbig.o libjbig.so.2.0 libjbig.so
|
||||
+
|
||||
+jbig85.o: jbig85.c
|
||||
+ $(CC) $(CFLAGS) -c jbig85.c
|
||||
+jbig.o: jbig.c
|
||||
+ $(CC) $(CFLAGS) -c jbig.c
|
||||
+jbig_ar.o: jbig_ar.c
|
||||
+ $(CC) $(CFLAGS) -c jbig_ar.c
|
||||
59
media-libs/jbigkit/patches/jbigkit-2.1.patchset
Normal file
59
media-libs/jbigkit/patches/jbigkit-2.1.patchset
Normal file
@@ -0,0 +1,59 @@
|
||||
From 04f33e01e3a9626fa7ec431bdcf90bba7cf51aa7 Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Sun, 8 Apr 2018 08:45:05 +0200
|
||||
Subject: add shared objects, remove -Wno-unused-result
|
||||
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 9f7e3ba..248dbf6 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -4,8 +4,8 @@
|
||||
CC = gcc
|
||||
|
||||
# Options for the compiler: A high optimization level is suggested
|
||||
-CFLAGS = -O2 -W -Wno-unused-result
|
||||
-# CFLAGS = -O -g -W -Wall -Wno-unused-result -ansi -pedantic # -DDEBUG
|
||||
+# CFLAGS = -O2 -W -Wno-unused-result
|
||||
+CFLAGS = -O -g -W -Wall -ansi -pedantic # -DDEBUG
|
||||
|
||||
export CC CFLAGS
|
||||
|
||||
diff --git a/libjbig/Makefile b/libjbig/Makefile
|
||||
index f2898f5..20a362a 100644
|
||||
--- a/libjbig/Makefile
|
||||
+++ b/libjbig/Makefile
|
||||
@@ -6,7 +6,21 @@ CC = gcc
|
||||
# Options for the compiler: A high optimization level is suggested
|
||||
CFLAGS = -g -O -W -Wall -ansi -pedantic # --coverage
|
||||
|
||||
-all: libjbig.a libjbig85.a tstcodec tstcodec85
|
||||
+OBJS= jbig.o \
|
||||
+ jbig_ar.o \
|
||||
+ jbig85.o
|
||||
+
|
||||
+all: libjbig.a libjbig85.a tstcodec tstcodec85 shared
|
||||
+
|
||||
+shared: $(OBJS)
|
||||
+ $(CC) -shared -Wl,-soname,libjbig.so -o libjbig.so.2.1 $(OBJS)
|
||||
+ rm -f libjbig.so
|
||||
+ ln -fs libjbig.so.2.1 libjbig.so.2
|
||||
+ ln -fs libjbig.so.2.1 libjbig.so
|
||||
+ $(CC) -shared -Wl,-soname,libjbig85.so -o libjbig85.so.2.1 $(OBJS)
|
||||
+ rm -f libjbig85.so
|
||||
+ ln -fs libjbig85.so.2.1 libjbig85.so.2
|
||||
+ ln -fs libjbig85.so.2.1 libjbig85.so
|
||||
|
||||
tstcodec: tstcodec.o jbig.o jbig_ar.o
|
||||
$(CC) $(CFLAGS) -o tstcodec tstcodec.o jbig.o jbig_ar.o
|
||||
@@ -50,6 +64,7 @@ t82test.pbm: tstcodec
|
||||
./tstcodec $@
|
||||
|
||||
clean:
|
||||
+ rm -f $(OBJS) jbig.o libjbig.so.2.* libjbig.* libjbig85.so.2.* libjbig85.*
|
||||
rm -f *.o *.gcda *.gcno *.gcov *.plist *~ core gmon.out dbg_d\=??.pbm
|
||||
rm -f t82test.pbm
|
||||
rm -f tstcodec tstcodec85
|
||||
--
|
||||
2.16.2
|
||||
|
||||
Reference in New Issue
Block a user