OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Oct-2004 12:49:35
Branch: HEAD Handle: 2004102811493400
Modified files:
openpkg-src/pdflib pdflib.patch pdflib.spec
Log:
whip this misbehaving metadistro into shape by removing png, zlib, and
jpeg aggregate sources (sadly the composite tiff sources are so badly
hacked that they cannot be removed)
Summary:
Revision Changes Path
1.6 +93 -2 openpkg-src/pdflib/pdflib.patch
1.33 +8 -2 openpkg-src/pdflib/pdflib.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pdflib/pdflib.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 pdflib.patch
--- openpkg-src/pdflib/pdflib.patch 28 Oct 2004 08:51:38 -0000 1.5
+++ openpkg-src/pdflib/pdflib.patch 28 Oct 2004 10:49:34 -0000 1.6
@@ -1,4 +1,5 @@
Index: config/mkmainlib.inc
+diff -Nau config/mkmainlib.inc.orig config/mkmainlib.inc
--- config/mkmainlib.inc.orig 2004-01-26 14:30:23.000000000 +0100
+++ config/mkmainlib.inc 2004-02-12 09:08:24.000000000 +0100
@@ -28,7 +28,7 @@
@@ -11,9 +12,23 @@
$(LIBTOOL) -n --finish $(libdir);\
else\
Index: configure
+diff -Nau configure.orig configure
--- configure.orig 2004-07-07 20:29:08.000000000 +0200
+++ configure 2004-10-27 17:04:45.110483011 +0200
-@@ -8866,6 +8866,7 @@
+@@ -8853,6 +8853,7 @@
+
+
+ # zlib
++if [ ".$FLATELIBINC" = . -a ".$FLATELIBLINK" = . ]; then
+ if test -d libs/flate ; then
+ FLATELIBINC="-I\$(top_builddir)/libs/flate"
+ FLATELIBLINK="\$(top_builddir)/libs/flate/libz\$(LA)"
+@@ -8862,10 +8863,12 @@
+ FLATELIBINC=""
+ FLATELIBLINK=""
+ fi
++fi
+
# pnglib
@@ -21,7 +36,7 @@
if test -d libs/png ; then
PNGLIBINC="-I\$(top_builddir)/libs/png"
PNGLIBLINK="\$(top_builddir)/libs/png/libpng\$(LA)"
-@@ -8875,6 +8876,7 @@
+@@ -8875,10 +8878,12 @@
PNGLIBINC=""
PNGLIBLINK=""
fi
@@ -29,3 +44,79 @@
+ # tifflib
++if [ ".$TIFFLIBINC" = . -a ".$TIFFLIBLINK" = . ]; then
+ if test -d libs/tiff ; then
+ TIFFLIBINC="-I\$(top_builddir)/libs/tiff"
+ TIFFLIBLINK="\$(top_builddir)/libs/tiff/libtiff\$(LA)"
+@@ -8888,10 +8893,12 @@
+ TIFFLIBINC=""
+ TIFFLIBLINK=""
+ fi
++fi
+
+
+
+ # jpeglib
++if [ ".$JPEGLIBINC" = . -a ".$JPEGLIBLINK" = . ]; then
+ if test -d libs/jpeg ; then
+ JPEGLIBINC="-I\$(top_builddir)/libs/jpeg"
+ JPEGLIBLINK="\$(top_builddir)/libs/jpeg/libjpeg\$(LA)"
+@@ -8901,6 +8908,7 @@
+ JPEGLIBINC=""
+ JPEGLIBLINK=""
+ fi
++fi
+
+
+
+Index: libs/tiff/tif_ojpeg.c
+diff -Nau libs/tiff/tif_ojpeg.c.orig libs/tiff/tif_ojpeg.c
+--- libs/tiff/tif_ojpeg.c.orig 2004-07-07 20:29:14 +0200
++++ libs/tiff/tif_ojpeg.c 2004-10-28 12:27:57 +0200
+@@ -140,9 +140,6 @@
+ #undef JPEG_CJPEG_DJPEG
+ #undef JPEG_INTERNALS
+
+-/* Hack for files produced by Wang Imaging application on Microsoft Windows */
+-extern void jpeg_reset_huff_decode(j_decompress_ptr);
+-
+ /* On some machines, it may be worthwhile to use "_setjmp()" or "sigsetjmp()"
+ instead of "setjmp()". These macros make it easier:
+ */
+@@ -1042,17 +1039,6 @@
+ buf += bytesperline;
+ ++tif->tif_row;
+ };
+-
+- /* BEWARE OF KLUDGE: If our input file was produced by Microsoft's Wang
+- Imaging for Windows application, the DC coefficients of
+- each JPEG image component (Y,Cb,Cr) must be reset at the end of each TIFF
+- "strip", and any JPEG data bits remaining in the current Byte of the
+- decoder's input buffer must be discarded. To do so, we create an "ad hoc"
+- interface in the "jdhuff.c" module of IJG JPEG Library Version 6 (module
+- "jdshuff.c", if Ken Murchison's lossless-Huffman patch is applied), and we
+- invoke that interface here after decoding each "strip".
+- */
+- if (sp->is_WANG) jpeg_reset_huff_decode(&sp->cinfo.d);
+ return 1;
+ }
+
+@@ -1138,17 +1124,6 @@
+ buf += sp->bytesperline;
+ ++tif->tif_row;
+ };
+-
+- /* BEWARE OF KLUDGE: If our input file was produced by Microsoft's Wang
+- Imaging for Windows application, the DC coefficients of
+- each JPEG image component (Y,Cb,Cr) must be reset at the end of each TIFF
+- "strip", and any JPEG data bits remaining in the current Byte of the
+- decoder's input buffer must be discarded. To do so, we create an "ad hoc"
+- interface in the "jdhuff.c" module of IJG JPEG Library Version 6 (module
+- "jdshuff.c", if Ken Murchison's lossless-Huffman patch is applied), and we
+- invoke that interface here after decoding each "strip".
+- */
+- if (sp->is_WANG) jpeg_reset_huff_decode(&sp->cinfo.d);
+ return 1;
+ }
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pdflib/pdflib.spec
============================================================================
$ cvs diff -u -r1.32 -r1.33 pdflib.spec
--- openpkg-src/pdflib/pdflib.spec 28 Oct 2004 08:51:38 -0000 1.32
+++ openpkg-src/pdflib/pdflib.spec 28 Oct 2004 10:49:34 -0000 1.33
@@ -47,8 +47,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, png, make
-PreReq: OpenPKG, openpkg >= 20040130, png
+BuildPreReq: OpenPKG, openpkg >= 20040130, png, zlib, jpeg, make
+PreReq: OpenPKG, openpkg >= 20040130, png, zlib, jpeg
AutoReq: no
AutoReqProv: no
@@ -67,6 +67,8 @@
%prep
%setup -q -n PDFlib-Lite-%{V_long}
rm -rf libs/png
+ rm -rf libs/jpeg
+ rm -rf libs/flate
%patch -p0
%build
@@ -75,6 +77,10 @@
INSTALL="%{l_shtool} install -c" \
PNGLIBINC="-I%{l_prefix}/include/libpng" \
PNGLIBLINK="-lpng -lz" \
+ JPEGLIBINC="-I%{l_prefix}/include" \
+ JPEGLIBLINK="-ljpeg" \
+ FLATELIBINC="-I%{l_prefix}/include" \
+ FLATELIBLINK="-lz" \
./configure \
--prefix=%{l_prefix} \
--disable-shared
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
