OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 20-Sep-2002 17:28:28
Branch: HEAD Handle: 2002092016282701
Modified files:
openpkg-src/xv xv.spec
openpkg-web news.txt
Log:
Fixed native library logic, and added PNG support.
Summary:
Revision Changes Path
1.4 +28 -11 openpkg-src/xv/xv.spec
1.1590 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/xv/xv.spec
============================================================
$ cvs diff -u -r1.3 -r1.4 xv.spec
--- openpkg-src/xv/xv.spec 13 Aug 2002 12:50:31 -0000 1.3
+++ openpkg-src/xv/xv.spec 20 Sep 2002 15:28:28 -0000 1.4
@@ -33,18 +33,20 @@
Group: XWindow
License: XV
Version: 3.10a
-Release: 20020812
+Release: 20020920
# 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
Patch0: ftp://ftp.cis.upenn.edu/pub/xv/xv-%{version}.JPEG-patch
-Patch1: xv.patch
+Patch1: ftp://ftp.trilon.com/pub/xv/patches/xvpng-1.2d-fix3.patch
+Patch2: xv.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, X11, jpeg
-PreReq: OpenPKG, openpkg >= 20020206, X11, gzip, jpeg
+BuildPreReq: OpenPKG, openpkg >= 20020206, X11, jpeg, png, patch
+PreReq: OpenPKG, openpkg >= 20020206, X11, jpeg, png, gzip
AutoReq: no
AutoReqProv: no
@@ -57,14 +59,31 @@
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.
+ Independent JPEG Group's JPEG library, and to feature additional
+ PNG file viewing.
%prep
%setup0 -q
+ %setup1 -q -T -D -a 1
%patch0 -p0
- %patch1 -p1
+ %patch1 -p0
+ %patch2 -p1
+ patch -p1 < xvpng.diff
+
+ # use our own gunzip command
%{l_shtool} subst -e 's;#undef USE_GUNZIP;#define USE_GUNZIP;' \
- -e 's;# define GUNZIP "/usr/local/bin/gunzip -q";#define
GUNZIP "%{l_prefix}/bin/gunzip -q";' config.h
+ -e 's;# define GUNZIP "/usr/local/bin/gunzip -q";#define
GUNZIP "%{l_prefix}/bin/gunzip -q";' \
+ config.h
+
+ # use our own JPEG, PNG, and z libraries
+ %{l_shtool} subst -e 's;\(\tcd $(JPEGDIR)\).*;;' \
+ -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;' \
+ Makefile
%build
# fix braindead FreeBSD
@@ -74,10 +93,8 @@
esac
# build XV
- %{l_make} %{l_mflags} \
- JPEGINC=-I%{l_prefix}/include \
- JPEGLIB=%{l_prefix}/lib/libjpeg.a \
- CCOPTS="$CCHACK"
+ JPEGLIB=%{l_prefix}/lib/libjpeg.a
+ %{l_make} %{l_mflags} CCOPTS="$CCHACK"
%install
rm -rf $RPM_BUILD_ROOT
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1589 -r1.1590 news.txt
--- openpkg-web/news.txt 20 Sep 2002 15:27:23 -0000 1.1589
+++ openpkg-web/news.txt 20 Sep 2002 15:28:27 -0000 1.1590
@@ -1,3 +1,4 @@
+20-Sep-2002: Upgraded package: P<xv-3.10a-20020920>
20-Sep-2002: Upgraded package: P<perl-time-20020919-20020919>
20-Sep-2002: Upgraded package: P<pkgconfig-0.13.0-20020919>
20-Sep-2002: Upgraded package: P<perl-parse-20020919-20020919>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
