pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/xv xv: rename patches for maintainability, an...
details: https://anonhg.NetBSD.org/pkgsrc/rev/728d7c37930f
branches: trunk
changeset: 319824:728d7c37930f
user: tsutsui <tsutsui%pkgsrc.org@localhost>
date: Thu Feb 21 14:32:32 2019 +0000
description:
xv: rename patches for maintainability, and also fix pkglint warnings.
diffstat:
graphics/xv/PLIST | 12 +-
graphics/xv/distinfo | 16 +-
graphics/xv/options.mk | 4 +-
graphics/xv/patches/patch-Imakefile | 122 ++++++++
graphics/xv/patches/patch-aa | 14 -
graphics/xv/patches/patch-ab | 46 ---
graphics/xv/patches/patch-ac | 23 -
graphics/xv/patches/patch-ad | 123 --------
graphics/xv/patches/patch-ae | 543 ------------------------------------
graphics/xv/patches/patch-af | 58 ---
graphics/xv/patches/patch-ag | 16 -
graphics/xv/patches/patch-config.h | 23 +
graphics/xv/patches/patch-vdcomp.c | 48 +++
graphics/xv/patches/patch-xv.h | 57 +++
graphics/xv/patches/patch-xvinfo.c | 15 +
graphics/xv/patches/patch-xvpcd.c | 16 +
graphics/xv/patches/patch-xvpng.c | 543 ++++++++++++++++++++++++++++++++++++
17 files changed, 840 insertions(+), 839 deletions(-)
diffs (truncated from 1768 to 300 lines):
diff -r f3d4a67e3d33 -r 728d7c37930f graphics/xv/PLIST
--- a/graphics/xv/PLIST Thu Feb 21 10:29:25 2019 +0000
+++ b/graphics/xv/PLIST Thu Feb 21 14:32:32 2019 +0000
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:59:32 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/02/21 14:32:32 tsutsui Exp $
bin/bggen
bin/vdcomp
bin/xcmap
bin/xv
bin/xvpictoppm
lib/X11/xv_mgcsfx.sample
-${IMAKE_MAN_DIR}/xv.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/bggen.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/vdcomp.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/xcmap.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/xvpictoppm.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/xv.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/bggen.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/vdcomp.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/xcmap.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/xvpictoppm.${IMAKE_MAN_SUFFIX}
share/doc/xv/README
share/doc/xv/xvdocs.ps
diff -r f3d4a67e3d33 -r 728d7c37930f graphics/xv/distinfo
--- a/graphics/xv/distinfo Thu Feb 21 10:29:25 2019 +0000
+++ b/graphics/xv/distinfo Thu Feb 21 14:32:32 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2019/02/21 01:37:14 tsutsui Exp $
+$NetBSD: distinfo,v 1.23 2019/02/21 14:32:32 tsutsui Exp $
SHA1 (xv-3.10a-enhancements.20070520-20081216.diff) = 40bfb0889b820e0f9d3bd7d771144ec3458acc66
RMD160 (xv-3.10a-enhancements.20070520-20081216.diff) = dbd4ab25b5b62fb543befcf655d928db3a77e005
@@ -12,10 +12,10 @@
RMD160 (xv-3.10a.tar.gz) = 7d545e0c0e5b0120a7d026ea549cba19a53fbc0d
SHA512 (xv-3.10a.tar.gz) = 5b8c5890503e2796638921cabae8967e458c73e332acea8561b1025ed13c771bc44c0e309b4592852e33726eeaa9784f933d1312073b0ba2e0b8c0cedabcaa3f
Size (xv-3.10a.tar.gz) = 2259124 bytes
-SHA1 (patch-aa) = bd6ef51bf962e1994e2e47ba5197c9729ec5221a
-SHA1 (patch-ab) = 5bfc8ae09b029e4661b27d94bba46540c7f320fb
-SHA1 (patch-ac) = 66430e80d9a17f772abefd14d00af0b5a0f88100
-SHA1 (patch-ad) = 9447ae45ac67f2f9ef7eead8a6a21902f0c7922e
-SHA1 (patch-ae) = 2bda08bae67fcf127c49b9ed780b7a247579c088
-SHA1 (patch-af) = 7f6e771788e04577d8db17bfe8fbcce8dca4a600
-SHA1 (patch-ag) = 120d589f728fd32ea267fd46bcc16f27d9f08116
+SHA1 (patch-Imakefile) = e27d7d2f110d4edbce9a5d236e45a556714b5be0
+SHA1 (patch-config.h) = fd0ef6bbf774a57dd0bb94676927dcc6eeef1014
+SHA1 (patch-vdcomp.c) = 4c603cdc2c01925fed283b2aa6030d1933cdaddc
+SHA1 (patch-xv.h) = 894c5a9d4e1cb5fb18a9914c75408b67f1e6e5d4
+SHA1 (patch-xvinfo.c) = 33b2392de259f1380e5be180f8e7293a9551fc52
+SHA1 (patch-xvpcd.c) = 1825015f441b9af91916f9a62e8d1dee6ddfdef9
+SHA1 (patch-xvpng.c) = 2bda08bae67fcf127c49b9ed780b7a247579c088
diff -r f3d4a67e3d33 -r 728d7c37930f graphics/xv/options.mk
--- a/graphics/xv/options.mk Thu Feb 21 10:29:25 2019 +0000
+++ b/graphics/xv/options.mk Thu Feb 21 14:32:32 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2019/02/21 06:00:22 tsutsui Exp $
+# $NetBSD: options.mk,v 1.2 2019/02/21 14:32:32 tsutsui Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.xv
PKG_SUPPORTED_OPTIONS= ghostscript
-PKG_SUGGESTED_OPTIONS=
+PKG_SUGGESTED_OPTIONS=
.include "../../mk/bsd.options.mk"
diff -r f3d4a67e3d33 -r 728d7c37930f graphics/xv/patches/patch-Imakefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/xv/patches/patch-Imakefile Thu Feb 21 14:32:32 2019 +0000
@@ -0,0 +1,122 @@
+$NetBSD: patch-Imakefile,v 1.1 2019/02/21 14:32:32 tsutsui Exp $
+
+- use jpeg, png, tiff, and zlib from pkgsrc
+- make ghostscript support optional
+
+--- Imakefile.orig 2019-02-21 14:07:37.512579350 +0000
++++ Imakefile
+@@ -6,13 +6,15 @@
+ /* 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 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 +23,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
+@@ -124,20 +130,66 @@ MGCSFX = -DMGCSFXDIR=\"$(MGCSFXDIR)\"
+ 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 +201,14 @@ SYS_LIBRARIES= -lm
+ #endif
+
+
+-DEPLIBS = $(LIBJPEG) $(LIBTIFF)
+-LOCAL_LIBRARIES = $(XLIB) $(DEPLIBS)
++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) $(GS) $(PNG) $(PDS) $(DXWM) $(RAND) \
+ $(BACKING_STORE) $(BSDTYPES) $(SGI) $(MGCSFX)
+
+-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 \
diff -r f3d4a67e3d33 -r 728d7c37930f graphics/xv/patches/patch-aa
--- a/graphics/xv/patches/patch-aa Thu Feb 21 10:29:25 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2007/07/08 10:50:24 wiz Exp $
-
---- xvpcd.c.orig 2007-05-14 01:02:13.000000000 +0000
-+++ xvpcd.c
-@@ -30,9 +30,6 @@
- #ifdef HAVE_PCD
-
- #include <memory.h>
--#ifndef alloca
--# include <alloca.h> /* "not in POSIX or SUSv3" according to Linux man page */
--#endif /* ...but required for Sun C compiler (alloca = macro) */
-
- #define TRACE 0
- #if TRACE
diff -r f3d4a67e3d33 -r 728d7c37930f graphics/xv/patches/patch-ab
--- a/graphics/xv/patches/patch-ab Thu Feb 21 10:29:25 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2007/07/27 23:42:17 joerg Exp $
-
---- vdcomp.c.orig 2007-07-27 23:20:04.000000000 +0000
-+++ vdcomp.c
-@@ -96,41 +96,6 @@
- #include <stdio.h>
- #include <stdlib.h>
-
--/* include a malloc.h of some sort (if needed...most systems use stdlib.h) */
--#ifndef VMS /* VMS hates multi-line "#if"s */
-- /*
-- * I want to use BSD macro for checking if this OS is *BSD or not,
-- * but the macro is defined in <sys/parm.h>, which I don't know all
-- * machine has or not.
-- */
--# if !defined(ibm032) && \
-- !defined(__convex__) && \
-- !(defined(vax) && !defined(ultrix)) && \
-- !defined(mips) && \
-- !defined(apollo) && \
-- !defined(pyr) && \
-- !defined(sequent) && \
-- !defined(__UMAXV__) && \
-- !defined(aux) && \
-- !defined(bsd43) && \
-- !defined(__bsd43) && \
-- !defined(__bsdi__) && \
-- !defined(__386BSD__) && \
-- !defined(__FreeBSD__) && \
-- !defined(__OpenBSD__) && \
-- !defined(__NetBSD__) && \
-- !defined(__DARWIN__)
--
--# if defined(hp300) || defined(hp800) || defined(NeXT)
--# include <sys/malloc.h> /* it's in "sys" on HPs and NeXT */
--# else
--# include <malloc.h> /* FIXME: should explicitly list systems that NEED this, not everyone that doesn't */
--# endif
--
--# endif /* !most modern systems */
--#endif /* !VMS */
--
--
- #include <X11/Xos.h>
-
- #define TRUE 1
diff -r f3d4a67e3d33 -r 728d7c37930f graphics/xv/patches/patch-ac
--- a/graphics/xv/patches/patch-ac Thu Feb 21 10:29:25 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.11 2019/02/21 01:37:14 tsutsui Exp $
-
-- make ghostscript support optional
-- use pkgsrc ${PREFIX} for ghostscript files
-
---- config.h.orig 2019-02-17 16:07:37.145241693 +0000
-+++ config.h
-@@ -112,10 +112,12 @@
- * should not need to be changed
- */
-
-+#ifdef DOGS
- /* #define GS_PATH "/usr/local/bin/gs" */
--#define GS_PATH "gs"
--/* #define GS_LIB "." */
--/* #define GS_DEV "ppmraw" */
-+#define GS_PATH "@PREFIX@/bin/gs"
-+#define GS_LIB "@PREFIX@/share/ghostscript"
-+#define GS_DEV "ppmraw"
-+#endif
-
-
- /***************************************************************************
diff -r f3d4a67e3d33 -r 728d7c37930f graphics/xv/patches/patch-ad
--- a/graphics/xv/patches/patch-ad Thu Feb 21 10:29:25 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-$NetBSD: patch-ad,v 1.12 2019/02/21 01:37:14 tsutsui Exp $
-
-- use jpeg, png, tiff, and zlib from pkgsrc
-- make ghostscript support optional
-
-diff -u Imakefile Imakefile
---- Imakefile.orig 2019-02-17 16:07:37.119347259 +0000
-+++ Imakefile
-@@ -6,13 +6,15 @@
- /* if, for whatever reason, you're unable to get the JPEG library to compile
Home |
Main Index |
Thread Index |
Old Index