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: 20-Sep-2002 18:06:02
Branch: HEAD Handle: 2002092017060200
Modified files:
openpkg-src/xv xv.spec
Log:
Add native TIFF support, with corresponding patches.
Summary:
Revision Changes Path
1.5 +14 -8 openpkg-src/xv/xv.spec
____________________________________________________________________________
Index: openpkg-src/xv/xv.spec
============================================================
$ cvs diff -u -r1.4 -r1.5 xv.spec
--- openpkg-src/xv/xv.spec 20 Sep 2002 15:28:28 -0000 1.4
+++ openpkg-src/xv/xv.spec 20 Sep 2002 16:06:02 -0000 1.5
@@ -37,16 +37,17 @@
# list of sources
Source0: ftp://ftp.cis.upenn.edu/pub/xv/xv-%{version}.tar.gz
-Source1: ftp://ftp.trilon.com/pub/xv/xv-3.10a-png-1.2d.tar.gz
+Source1: ftp://ftp.trilon.com/pub/xv/xv-%{version}-png-1.2d.tar.gz
Patch0: ftp://ftp.cis.upenn.edu/pub/xv/xv-%{version}.JPEG-patch
-Patch1: ftp://ftp.trilon.com/pub/xv/patches/xvpng-1.2d-fix3.patch
-Patch2: xv.patch
+Patch1: ftp://ftp.cis.upenn.edu/pub/xv/xv-%{version}.TIFF-patch
+Patch2: ftp://ftp.trilon.com/pub/xv/patches/xvpng-1.2d-fix3.patch
+Patch3: xv.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, X11, jpeg, png, patch
-PreReq: OpenPKG, openpkg >= 20020206, X11, jpeg, png, gzip
+BuildPreReq: OpenPKG, openpkg >= 20020206, X11, jpeg, png, tiff, patch
+PreReq: OpenPKG, openpkg >= 20020206, X11, jpeg, png, tiff, gzip
AutoReq: no
AutoReqProv: no
@@ -59,15 +60,17 @@
installed on your machine, it can also display them.
This OpenPKG copy of xv is patched for use with version 6 of the
- Independent JPEG Group's JPEG library, and to feature additional
- PNG file viewing.
+ Independent JPEG Group's JPEG library. It is also patched for use
+ with version 3.5.7 of Sam Leffler's TIFF library. It is also patched
+ to additionally allow for PNG file viewing.
%prep
%setup0 -q
%setup1 -q -T -D -a 1
%patch0 -p0
%patch1 -p0
- %patch2 -p1
+ %patch2 -p0
+ %patch3 -p1
patch -p1 < xvpng.diff
# use our own gunzip command
@@ -77,12 +80,15 @@
# use our own JPEG, PNG, and z libraries
%{l_shtool} subst -e 's;\(\tcd $(JPEGDIR)\).*;;' \
+ -e 's;\(\t( cd $(TIFFDIR) \;\).*;;' \
-e 's;\(JPEGINC = -I\)$(JPEGDIR);\1%{l_prefix}/include;' \
-e 's;\(JPEGLIB =
\)$(JPEGDIR)\(/libjpeg.a\);\1%{l_prefix}/lib\2;' \
-e 's;\(PNGINC = -I\)$(PNGDIR);\1%{l_prefix}/include;' \
-e 's;\(PNGLIB = -L\)$(PNGDIR)\(.*\);\1%{l_prefix}/lib\2;' \
-e 's;\(ZLIBINC = -I\)$(ZLIBDIR);\1%{l_prefix}/include;' \
-e 's;\(ZLIBLIB = -L\)$(ZLIBDIR)\(.*\);\1%{l_prefix}/lib\2;' \
+ -e 's;\(TIFFINC = -I\)$(TIFFDIR);\1%{l_prefix}/include/tiff;'
\
+ -e 's;\(TIFFLIB =
\)$(TIFFDIR)\(/libtiff.a\);\1%{l_prefix}/lib\2;' \
Makefile
%build
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
