head 1.5; access; symbols pkgsrc-2026Q1:1.5.0.8 pkgsrc-2026Q1-base:1.5 pkgsrc-2025Q4:1.5.0.6 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.5.0.4 pkgsrc-2025Q3-base:1.5 pkgsrc-2025Q2:1.5.0.2 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.4.0.10 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.8 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.6 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.4 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.2 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.3.0.4 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.2 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.1.0.36 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.34 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.32 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.30 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.28 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.26 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.24 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.22 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.20 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.18 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.16 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.14 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.12 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.8 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.10 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.6 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.4 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.2 pkgsrc-2019Q1-base:1.1; locks; strict; comment @# @; 1.5 date 2025.04.19.23.14.24; author tsutsui; state Exp; branches; next 1.4; commitid Ly4QATDjc6nLvIRF; 1.4 date 2024.03.23.18.07.38; author tsutsui; state Exp; branches; next 1.3; commitid JpJvw76DhPOJpj3F; 1.3 date 2023.08.16.17.02.20; author tsutsui; state Exp; branches; next 1.2; commitid sUMxqcwsx0eM72BE; 1.2 date 2023.07.30.07.55.45; author tsutsui; state Exp; branches; next 1.1; commitid CsW345tTbS59ENyE; 1.1 date 2019.02.21.14.32.32; author tsutsui; state Exp; branches; next ; commitid zuTRmWD9QzGvUDcB; desc @@ 1.5 log @xv: apply several fixes from forked upstream. - https://gitlab.com/DavidGriffith/xv/-/commit/60a25db1 > Updated xvbmp.c to support reading the three newer versions of BMP format. - https://gitlab.com/DavidGriffith/xv/-/commit/b91710b5 > Fix off-by-one's resulting in dereferencing out-of-bound memory. - https://gitlab.com/DavidGriffith/xv/-/commit/a84406cb > Add XrandR support. - https://gitlab.com/DavidGriffith/xv/-/commit/72c80bff > Fix off-by-one in smoothing code and use better interpolation/rounding. - https://gitlab.com/DavidGriffith/xv/-/commit/f9d46bd9 > Eliminate flicker Bump PKGREVISION. @ text @$NetBSD: patch-Imakefile,v 1.4 2024/03/23 18:07:38 tsutsui Exp $ - use jpeg, png, tiff, and zlib from pkgsrc - make ghostscript support optional - add webp support from forked upstream https://gitlab.com/DavidGriffith/xv/-/commit/5682a07e and use libwebp from pkgsrc - fix build errors on NetBSD/vax - pull XRandR support from forked upstream https://gitlab.com/DavidGriffith/xv/-/commit/a84406cb --- Imakefile.orig 2025-04-19 21:39:43.875821441 +0000 +++ Imakefile @@@@ -6,13 +6,20 @@@@ /* if, for whatever reason, you're unable to get the JPEG library to compile * on your machine, *COMMENT OUT* the following line */ -#define HaveJpeg +/* #define HaveJpeg */ +#define UseInstalledJpeg +/* if, for whatever reason, you're unable to get the WEBP library to compile + * on your machine, *COMMENT OUT* the following line + */ +/* #define HaveWEBP */ +#define UseInstalledWEBP /* if, for whatever reason, you're unable to get the TIFF library to compile * on your machine, *COMMENT OUT* the following line */ -#define HaveTiff +/* #define HaveTiff */ +#define UseInstalledTiff /* if, for whatever reason, you're unable to get the PDS/VICAR support @@@@ -21,6 +28,10 @@@@ #define HavePDS +/* #define UseInstalledGhostScript */ +#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 @@@@ -79,7 +90,7 @@@@ /* if your machine doesn't have 'vprintf()' or 'vsprintf()' * see vprintf.c for more information, if needed. */ -#if defined(VaxArchitecture) && !defined(UltrixArchitecture) +#if defined(VaxArchitecture) && !defined(UltrixArchitecture) && !defined(NetBSDArchitecture) VPRINTF= -DNEED_VPRINTF -DINTSPRINTF -DLONGINT -DNOVOID #else # if defined(RtArchitecture) && !defined(AIXArchitecture) @@@@ -109,6 +120,10 @@@@ MGCSFXDIR = $(LIBDIR) /* Directory of default configuration file. */ MGCSFX = -DMGCSFXDIR=\"$(MGCSFXDIR)\" +#if BuildRandRLibrary +XRANDR = -DDOXRANDR +XRANDRLIB = -lXrandr +#endif @@@@ -116,28 +131,84 @@@@ MGCSFX = -DMGCSFXDIR=\"$(MGCSFXDIR)\" /* This marks the end of the configuration parameters */ +#ifdef HaveWEBP +WEBP = -DDOWEBP +WEBPDIR = /usr +LIBWEBP = $(WEBPDIR)/lib/libwebp.so $(WEBPDIR)/lib/libwebpdemux.so +DEPLIBWEBP = $(LIBWEBP) +WEBPINCLUDE = -I$(WEBPDIR)/include +#endif - - +#ifdef UseInstalledWEBP +WEBP = -DDOWEBP +LIBWEBP = $(LDFLAGS) -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib -lwebp -lwebpdemux +WEBPINCLUDE = -I$(PREFIX)/include +#endif #ifdef HaveJpeg JPEG = -DDOJPEG JPEGDIR = jpeg LIBJPEG = $(JPEGDIR)/libjpeg.a +DEPLIBJPEG = $(LIBJPEG) JPEGINCLUDE = -I$(JPEGDIR) #endif +#ifdef UseInstalledJpeg +JPEG = -DDOJPEG +LIBJPEG = $(LDFLAGS) -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib -ljpeg +JPEGINCLUDE = -I$(PREFIX)/include +#endif + #ifdef HaveTiff TIFF = -DDOTIFF TIFFDIR = tiff LIBTIFF = $(TIFFDIR)/libtiff.a +DEPLIBTIFF = $(LIBTIFF) TIFFINCLUDE = -I$(TIFFDIR) #endif +#ifdef UseInstalledTiff +TIFF = -DDOTIFF +LIBTIFF = -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib -ltiff -ljpeg -lz +TIFFINCLUDE = -I$(PREFIX)/include +#endif + #ifdef HavePDS PDS = -DDOPDS #endif +#ifdef UseInstalledGhostScript +GS = -DDOGS +#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 = ${PREFIX} +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 = $(PREFIX) +ZLIBINC = -I$(ZLIBDIR)/include +ZLIBLIB = -L$(ZLIBDIR)/lib -lz +LIBZLIB = ${ZLIB} +ZLIBINCLUDE = ${ZLIBINC} +#endif #if defined(SCOArchitecture) SCO= -Dsco -DPOSIX -DNO_RANDOM @@@@ -149,14 +220,16 @@@@ SYS_LIBRARIES= -lm #endif -DEPLIBS = $(LIBJPEG) $(LIBTIFF) -LOCAL_LIBRARIES = $(XLIB) $(DEPLIBS) +DEPLIBS = $(DEPLIBJPEG) $(DEPLIBTIFF) $(DEPLIBPNG) $(DEPLIBWEBP) $(DEPLIBZLIB) +LOCAL_LIBRARIES = $(XRANDRLIB) $(XLIB) $(LIBJPEG) $(LIBTIFF) $(LIBPNG) \ + $(LIBWEBP) $(LIBZLIB) -DEFINES= $(SCO) $(UNIX) $(NODIRENT) $(VPRINTF) $(TIMERS) \ - $(HPUX7) $(JPEG) $(TIFF) $(PDS) $(DXWM) $(RAND) \ +DEFINES= $(SCO) $(UNIX) $(NODIRENT) $(VPRINTF) $(TIMERS) $(XRANDR) \ + $(HPUX7) $(JPEG) $(TIFF) $(GS) $(PNG) $(WEBP) $(PDS) $(DXWM) $(RAND) \ $(BACKING_STORE) $(BSDTYPES) $(SGI) $(MGCSFX) -INCLUDES = $(JPEGINCLUDE) $(TIFFINCLUDE) +INCLUDES = $(JPEGINCLUDE) $(TIFFINCLUDE) $(PNGINCLUDE) $(WEBPINCLUDE) \ + $(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 \ @@@@ -166,7 +239,7 @@@@ SRCS1 = xv.c xvevent.c xvroot.c xvmisc.c xvbrowse.c xvtext.c xvpcx.c xviff.c xvtarga.c xvxpm.c xvcut.c \ xvxwd.c xvfits.c xvpng.c xvzx.c xvwbmp.c xvpcd.c \ xvmag.c xvpic.c xvmaki.c xvpi.c xvpic2.c xvvd.c xvmgcsfx.c \ - xvml.c + xvml.c xvwebp.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 \ @@@@ -176,7 +249,7 @@@@ OBJS1 = xv.o xvevent.o xvroot.o xvmisc.o xvbrowse.o xvtext.o xvpcx.o xviff.o xvtarga.o xvxpm.o xvcut.o \ xvxwd.o xvfits.o xvpng.o xvzx.o xvwbmp.o xvpcd.o \ xvmag.o xvpic.o xvmaki.o xvpi.o xvpic2.o xvvd.o xvmgcsfx.o \ - xvml.o + xvml.o xvwebp.o SRCS2= bggen.c OBJS2= bggen.o @ 1.4 log @xv: fix build errors on NetBSD/vax. @ text @d1 1 a1 1 $NetBSD: patch-Imakefile,v 1.3 2023/08/16 17:02:20 tsutsui Exp $ d9 2 d12 1 a12 1 --- Imakefile.orig 2024-03-23 18:02:14.701404322 +0000 d57 12 a68 1 @@@@ -116,28 +127,84 @@@@ MGCSFX = -DMGCSFXDIR=\"$(MGCSFXDIR)\" d155 1 a155 1 @@@@ -149,14 +216,15 @@@@ SYS_LIBRARIES= -lm d162 2 a163 1 +LOCAL_LIBRARIES = $(XLIB) $(LIBJPEG) $(LIBTIFF) $(LIBPNG) $(LIBWEBP) $(LIBZLIB) d165 1 a165 1 DEFINES= $(SCO) $(UNIX) $(NODIRENT) $(VPRINTF) $(TIMERS) \ d167 1 d177 1 a177 1 @@@@ -166,7 +234,7 @@@@ SRCS1 = xv.c xvevent.c xvroot.c xvmisc.c d186 1 a186 1 @@@@ -176,7 +244,7 @@@@ OBJS1 = xv.o xvevent.o xvroot.o xvmisc.o @ 1.3 log @xv: improve webp support, in a pkgsrc patch by me. - minimum support for loading animation webp (decode only the first frame) - handle RGBA images properly (libwebp APIs don't convert RGBA to RGB) https://bugs.chromium.org/p/webp/issues/detail?id=616 - plug several resouce leaks - use snprintf(3) rather than sprintf(3) Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-Imakefile,v 1.2 2023/07/30 07:55:45 tsutsui Exp $ d8 1 d10 1 a10 1 --- Imakefile.orig 2023-08-16 16:51:48.939703880 +0000 d46 9 @ 1.2 log @xv: add webp support. Taken from https://gitlab.com/DavidGriffith/xv/-/commit/5682a07e and several fixes by me (see patch comments for details). Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-Imakefile,v 1.1 2019/02/21 14:32:32 tsutsui Exp $ d9 1 a9 1 --- Imakefile.orig 2023-07-30 04:38:19.657014071 +0000 d52 1 a52 1 +LIBWEBP = $(WEBPDIR)/lib/libwebp.so d61 1 a61 1 +LIBWEBP = $(LDFLAGS) -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib -lwebp @ 1.1 log @xv: rename patches for maintainability, and also fix pkglint warnings. @ text @d1 1 a1 1 $NetBSD$ d5 3 d9 1 a9 1 --- Imakefile.orig 2019-02-21 14:07:37.512579350 +0000 d11 1 a11 1 @@@@ -6,13 +6,15 @@@@ d19 5 d34 1 a34 1 @@@@ -21,6 +23,10 @@@@ d45 21 a65 1 @@@@ -124,20 +130,66 @@@@ MGCSFX = -DMGCSFXDIR=\"$(MGCSFXDIR)\" d132 1 a132 1 @@@@ -149,14 +201,14 @@@@ SYS_LIBRARIES= -lm d138 2 a139 2 +DEPLIBS = $(DEPLIBJPEG) $(DEPLIBTIFF) $(DEPLIBPNG) $(DEPLIBZLIB) +LOCAL_LIBRARIES = $(XLIB) $(LIBJPEG) $(LIBTIFF) $(LIBPNG) $(LIBZLIB) d143 1 a143 1 + $(HPUX7) $(JPEG) $(TIFF) $(GS) $(PNG) $(PDS) $(DXWM) $(RAND) \ d147 2 a148 1 +INCLUDES = $(JPEGINCLUDE) $(TIFFINCLUDE) $(PNGINCLUDE) $(ZLIBINCLUDE) d152 18 @