96 lines
3 KiB
Text
96 lines
3 KiB
Text
$NetBSD: patch-ah,v 1.1 2001/04/05 13:57:15 wiz Exp $
|
|
|
|
This patch is based on
|
|
http://www.mit.edu/afs/athena/contrib/graphics/src/xv/patches/png/xvpng.diff
|
|
It was edited to fit into the NetBSD Packages Collection! - HF
|
|
|
|
---------------------------------------------------------------------------
|
|
|
|
|
|
--- Imakefile.orig Sun Jun 13 04:15:05 1999
|
|
+++ Imakefile Sun Jun 13 04:31:20 1999
|
|
@@ -23,6 +23,9 @@
|
|
#define HavePDS
|
|
|
|
|
|
+#define UseInstalledPng
|
|
+#define UseInstalledZlib
|
|
+
|
|
/*
|
|
* if you are running on a SysV-based machine, such as HP, Silicon Graphics,
|
|
* etc, uncomment one of the following lines to get you *most* of the way
|
|
@@ -149,6 +152,35 @@
|
|
PDS = -DDOPDS
|
|
#endif
|
|
|
|
+/*
|
|
+###
|
|
+### if, for whatever reason, you're unable to get the PNG library to compile
|
|
+### on your machine, *COMMENT OUT* the following lines
|
|
+###
|
|
+*/
|
|
+#ifdef UseInstalledPng
|
|
+PNG = -DDOPNG
|
|
+PNGDIR = ${LOCALBASE}
|
|
+PNGINC = -I$(PNGDIR)/include
|
|
+PNGLIB = -L$(PNGDIR)/lib -lpng -lz
|
|
+LIBPNG = ${PNGLIB}
|
|
+PNGINCLUDE = ${PNGINC}
|
|
+#endif
|
|
+
|
|
+/*
|
|
+###
|
|
+### if, for whatever reason, you're unable to get the PNG library to compile
|
|
+### on your machine, *COMMENT OUT* the following lines
|
|
+###
|
|
+*/
|
|
+#ifdef UseInstalledZlib
|
|
+ZLIBDIR = $(LOCALBASE)
|
|
+ZLIBINC = -I$(ZLIBDIR)/include
|
|
+ZLIBLIB = -L$(ZLIBDIR)/lib -lz
|
|
+LIBZLIB = ${ZLIB}
|
|
+ZLIBINCLUDE = ${ZLIBINC}
|
|
+#endif
|
|
+
|
|
#if defined(SCOArchitecture)
|
|
SCO= -Dsco -DPOSIX -DNO_RANDOM
|
|
SYS_LIBRARIES= -lm -lc -lx
|
|
@@ -157,14 +189,14 @@
|
|
#endif
|
|
|
|
|
|
-DEPLIBS = $(DEPLIBJPEG) $(DEPLIBTIFF)
|
|
-LOCAL_LIBRARIES = $(XLIB) $(LIBJPEG) $(LIBTIFF)
|
|
+DEPLIBS = $(DEPLIBJPEG) $(DEPLIBTIFF) $(DEPLIBPNG) $(DEPLIBZLIB)
|
|
+LOCAL_LIBRARIES = $(XLIB) $(LIBJPEG) $(LIBTIFF) $(LIBPNG) $(LIBZLIB)
|
|
|
|
DEFINES= $(SCO) $(UNIX) $(NODIRENT) $(VPRINTF) $(TIMERS) \
|
|
- $(HPUX7) $(JPEG) $(TIFF) $(PDS) $(DXWM) $(RAND) \
|
|
+ $(HPUX7) $(JPEG) $(TIFF) $(PNG) $(PDS) $(DXWM) $(RAND) \
|
|
$(BACKING_STORE) $(BSDTYPES) $(SGI)
|
|
|
|
-INCLUDES = $(JPEGINCLUDE) $(TIFFINCLUDE)
|
|
+INCLUDES = $(JPEGINCLUDE) $(TIFFINCLUDE) $(PNGINCLUDE) $(ZLIBINCLUDE)
|
|
|
|
SRCS1 = xv.c xvevent.c xvroot.c xvmisc.c xvimage.c xvcolor.c xvsmooth.c \
|
|
xv24to8.c xvgif.c xvpm.c xvinfo.c xvctrl.c xvscrl.c xvalg.c \
|
|
@@ -172,7 +204,8 @@
|
|
xvdial.c xvgraf.c xvsunras.c xvjpeg.c xvps.c xvpopup.c xvdflt.c \
|
|
xvtiff.c xvtiffwr.c xvpds.c xvrle.c xviris.c xvgrab.c vprintf.c \
|
|
xvbrowse.c xvtext.c xvpcx.c xviff.c xvtarga.c xvxpm.c xvcut.c \
|
|
- xvxwd.c xvfits.c xvmag.c xvmaki.c xvpic.c xvpi.c xvpic2.c xvpcd.c
|
|
+ xvxwd.c xvfits.c xvmag.c xvmaki.c xvpic.c xvpi.c xvpic2.c xvpcd.c \
|
|
+ xvpng.c
|
|
|
|
OBJS1 = xv.o xvevent.o xvroot.o xvmisc.o xvimage.o xvcolor.o xvsmooth.o \
|
|
xv24to8.o xvgif.o xvpm.o xvinfo.o xvctrl.o xvscrl.o xvalg.o \
|
|
@@ -180,7 +213,8 @@
|
|
xvdial.o xvgraf.o xvsunras.o xvjpeg.o xvps.o xvpopup.o xvdflt.o \
|
|
xvtiff.o xvtiffwr.o xvpds.o xvrle.o xviris.o xvgrab.o vprintf.o \
|
|
xvbrowse.o xvtext.o xvpcx.o xviff.o xvtarga.o xvxpm.o xvcut.o \
|
|
- xvxwd.o xvfits.o xvmag.o xvmaki.o xvpic.o xvpi.o xvpic2.o xvpcd.o
|
|
+ xvxwd.o xvfits.o xvmag.o xvmaki.o xvpic.o xvpi.o xvpic2.o xvpcd.o \
|
|
+ xvpng.o
|
|
|
|
SRCS2= bggen.c
|
|
OBJS2= bggen.o
|