12:19 p.m.
Author: thl
Update of /cvs/free/rpms/jbigkit/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9601
Modified Files:
.cvsignore sources
Added Files:
jbigkit-1.6-shlib.patch jbigkit.spec
Log Message:
import jbigkit
jbigkit-1.6-shlib.patch:
--- NEW FILE jbigkit-1.6-shlib.patch ---
--- jbigkit/pbmtools/Makefile.shlib 2003-06-11 18:27:22.000000000 +0100
+++ jbigkit/pbmtools/Makefile 2006-09-12 14:06:14.000000000 +0100
@@ -9,19 +9,19 @@ CFLAGS = -g -Wall -ansi -pedantic -I../l
.SUFFIXES: .1 .5 .txt $(SUFFIXES)
-all: pbmtojbg jbgtopbm pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
+all: pbmtojbg jbgtopbm # pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
-pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a
+pbmtojbg: pbmtojbg.o ../libjbig/libjbig.so.$(VERSION)
$(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig
-jbgtopbm: jbgtopbm.o ../libjbig/libjbig.a
+jbgtopbm: jbgtopbm.o ../libjbig/libjbig.so.$(VERSION)
$(CC) $(CFLAGS) -o jbgtopbm jbgtopbm.o -L../libjbig -ljbig
jbgtopbm.o: jbgtopbm.c ../libjbig/jbig.h
pbmtojbg.o: pbmtojbg.c ../libjbig/jbig.h
-../libjbig/libjbig.a: ../libjbig/jbig.c ../libjbig/jbig.h
- cd ../libjbig ; make libjbig.a
+../libjbig/libjbig.so.$(VERSION): ../libjbig/jbig.c ../libjbig/jbig.h
+ cd ../libjbig ; make libjbig.so.$(VERSION)
test: pbmtojbg jbgtopbm
make IMG=ccitt1 OPTIONSJ= OPTIONSP= dotest1
--- jbigkit/libjbig/Makefile.shlib 2004-06-08 15:40:06.000000000 +0100
+++ jbigkit/libjbig/Makefile 2006-09-12 14:07:26.000000000 +0100
@@ -6,19 +6,24 @@
# Options for the compiler: A high optimization level is suggested
CFLAGS = -O -Wall -ansi -pedantic
+PICFLAGS := -fPIC -DPIC
-all: libjbig.a tstcodec
+all: libjbig.so.$(VERSION) tstcodec
-tstcodec: tstcodec.c jbig.c jbig.h jbig_tab.o
- $(CC) $(CFLAGS) -o tstcodec -DTEST_CODEC tstcodec.c jbig.c \
- jbig_tab.o
-
-libjbig.a: jbig.o jbig_tab.o
- rm -f libjbig.a
- ar rc libjbig.a jbig.o jbig_tab.o
- -ranlib libjbig.a
+tstcodec: tstcodec.c jbig.c jbig_tab.c
+ $(CC) $(CFLAGS) -DTEST_CODEC -o $@ $^
+
+libjbig.so.$(VERSION): jbig.o jbig_tab.o jbig.h libjbig.so
+ $(CC) -shared -Wl,-soname,$@ -o $@ jbig.o jbig_tab.o
+
+libjbig.so:
+ ln -sf $@.$(VERSION) $@
jbig.o: jbig.c jbig.h
+ $(CC) $(CFLAGS) $(PICFLAGS) -c -o $@ $<
+
+jbig_tab.o: jbig_tab.c
+ $(CC) $(CFLAGS) $(PICFLAGS) -c -o $@ $<
test: tstcodec
./tstcodec
@@ -27,4 +32,4 @@ t82test.pbm: tstcodec
./tstcodec $@
clean:
- rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec t82test.pbm
+ rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec t82test.pbm libjbig.so*
--- jbigkit/Makefile.shlib 2004-06-11 19:05:26.000000000 +0100
+++ jbigkit/Makefile 2006-09-12 14:06:14.000000000 +0100
@@ -11,6 +11,7 @@ CCFLAGS = -O2 -W
CFLAGS = $(CCFLAGS) -I../libjbig
VERSION=1.6
+export VERSION
all: lib pbm
@echo "Enter 'make test' in order to start some automatic tests."
@@ -23,7 +24,7 @@ pbm: lib
test: lib pbm
(cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
- (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
+ (cd pbmtools; LD_LIBRARY_PATH=../libjbig make "CC=$(CC)"
"CFLAGS=$(CFLAGS)" test)
clean:
rm -f *~ core
--- NEW FILE jbigkit.spec ---
Name: jbigkit
Version: 1.6
Release: 2%{?dist}
Summary: JBIG1 lossless image compression tools
Group: Applications/Multimedia
License: GPL
URL: http://www.cl.cam.ac.uk/~mgk25/jbigkit/
Source0: http://www.cl.cam.ac.uk/~mgk25/download/%{name}-%{version}.tar.gz
Patch0: jbigkit-1.6-shlib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%package libs
Summary: JBIG1 lossless image compression library
Group: Applications/Multimedia
%package devel
Summary: JBIG1 lossless image compression library -- development files
Group: Applications/Multimedia
Requires: jbigkit-libs = %{version}-%{release}
%description libs
JBIG-KIT provides a portable library of compression and decompression
functions with a documented interface that you can include very easily
into your image or document processing software. In addition, JBIG-KIT
provides ready-to-use compression and decompression programs with a
simple command line interface (similar to the converters found in
netpbm).
JBIG-KIT implements the specification:
ISO/IEC 11544:1993 and ITU-T Recommendation T.82(1993):
Information technology — Coded representation of picture and audio
information — Progressive bi-level image compression
which is commonly referred to as the “JBIG1 standard”
%description devel
The jbigkit-devel package contains files needed for development using
the JBIG-KIT image compression library.
%description
The jbigkit package contains tools for converting between PBM and JBIG1
formats.
%prep
%setup -q -n jbigkit
%patch0 -p1 -b .shlib
%build
make %{?_smp_mflags} CCFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}
mkdir -p $RPM_BUILD_ROOT%{_includedir}
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
install -p -m0755 libjbig/libjbig.so.%{version} $RPM_BUILD_ROOT/%{_libdir}
ln -sf libjbig.so.%{version} $RPM_BUILD_ROOT/%{_libdir}/libjbig.so
install -p -m0644 libjbig/jbig.h $RPM_BUILD_ROOT%{_includedir}
install -p -m0755 pbmtools/???to??? $RPM_BUILD_ROOT%{_bindir}
install -p -m0644 pbmtools/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
%clean
rm -rf $RPM_BUILD_ROOT
%check
make test
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%{_bindir}/???to???
%{_mandir}/man1/*
%files libs
%{_libdir}/libjbig.so.%{version}
%doc COPYING ANNOUNCE TODO INSTALL CHANGES
%files devel
%{_libdir}/libjbig.so
%{_includedir}/jbig.h
%changelog
* Sun Oct 1 2006 David Woodhouse <dwmw2(a)infradead.org> 1.6-2
- Review fixes
* Tue Sep 12 2006 David Woodhouse <dwmw2(a)infradead.org> 1.6-1
- Initial version
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/jbigkit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:51:30 -0000 1.1
+++ .cvsignore 3 Aug 2008 12:19:03 -0000 1.2
@@ -0,0 +1 @@
+jbigkit-1.6.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/jbigkit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:51:30 -0000 1.1
+++ sources 3 Aug 2008 12:19:03 -0000 1.2
@@ -0,0 +1 @@
+ce196e45f293d40ba76af3dc981ccfd7 jbigkit-1.6.tar.gz