Christian Weisgerber <na...@mips.inka.de> writes: > There is a major new release in the "super stable" release series > (which is the only one with tarballs) that would take us from 10.35 > to 10.47. While a lot newer than 10.35, it is still years out of > date. In particular, it still hasn't caught up with libpng >1.4. > After manually redoing the 900-line patch-converter_other_pngtopnm_c, > I figured that spending this much effort on code that is already way > obsolete doesn't make sense. > > We need to bite the bullet. The diff below brings us up to 10.74 > from the "advanced" release series, i.e., the very latest releases. > Unfortunately, releases there are only marked in Subversion, so we > have to create our own distfiles when we update the port. I have > included a convenience target in Makefile for this purpose. > > The new code now also comes with a regression test suite. I started > patching out the GNU-isms but eventually decided it wasn't worth > the effort and added the dependencies. > > Finally, the port now uses srand_deterministic(). There are a lot > of tools that take seed values on the command line, which was broken. > > Comments? OK?
Looks fine to me, thanks for working on this. The header location change means that a few fixes are needed in the ports tree. Those declare a lib-depends on netpbm. Index: converters/ppmtoTbmp/Makefile =================================================================== RCS file: /cvs/ports/converters/ppmtoTbmp/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- converters/ppmtoTbmp/Makefile 28 Oct 2014 08:18:30 -0000 1.13 +++ converters/ppmtoTbmp/Makefile 26 Apr 2016 13:57:56 -0000 @@ -3,7 +3,7 @@ COMMENT= PPM to Pilot bitmap converter DISTNAME= ppmtoTbmp-1.1 -REVISION= 2 +REVISION= 3 CATEGORIES= converters graphics HOMEPAGE= http://www.isaac.cs.berkeley.edu/pilot/ @@ -15,7 +15,7 @@ WANTLIB= c m netpbm MASTER_SITES= ${HOMEPAGE} -MAKE_FLAGS= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ +MAKE_FLAGS= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/netpbm" \ LDLIBS="-L${LOCALBASE}/lib -lnetpbm -lm" LIB_DEPENDS= graphics/netpbm Index: graphics/vid/Makefile =================================================================== RCS file: /cvs/ports/graphics/vid/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- graphics/vid/Makefile 10 Oct 2013 02:08:23 -0000 1.17 +++ graphics/vid/Makefile 26 Apr 2016 13:52:36 -0000 @@ -3,7 +3,7 @@ COMMENT= get images from USB cameras using the OV511(+) chipsets DISTNAME= vid-1.0.1 -REVISION= 5 +REVISION= 6 CATEGORIES= graphics HOMEPAGE= http://ovtvid-bsd.sourceforge.net/ Index: graphics/vid/patches/patch-README =================================================================== RCS file: /cvs/ports/graphics/vid/patches/patch-README,v retrieving revision 1.1 diff -u -p -r1.1 patch-README --- graphics/vid/patches/patch-README 20 Jan 2003 18:54:14 -0000 1.1 +++ graphics/vid/patches/patch-README 26 Apr 2016 13:50:10 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-README,v 1.1 2003/01/20 18:54:14 sturm Exp $ ---- README.orig Sun May 7 22:59:03 2000 -+++ README Sun Jan 19 11:41:56 2003 +--- README.orig Mon May 8 06:59:03 2000 ++++ README Tue Apr 26 15:49:36 2016 @@ -1,4 +1,5 @@ -NetBSD/FreeBSD Simple OV511 video capture program, version 1.0 (2000-04-26) +FreeBSD/NetBSD/OpenBSD Simple OV511 video capture program @@ -8,7 +8,7 @@ $OpenBSD: patch-README,v 1.1 2003/01/20 This is a simple image capture program for USB webcams based on the OmniVision Technologies OV511 bridge chip attached to an OV7610 CCD -@@ -61,3 +62,5 @@ http://members.home.com/housel/ for upda +@@ -61,3 +62,5 @@ http://members.home.com/housel/ for updates. -Peter S. Housel- Index: graphics/vid/patches/patch-vid_c =================================================================== RCS file: /cvs/ports/graphics/vid/patches/patch-vid_c,v retrieving revision 1.3 diff -u -p -r1.3 patch-vid_c --- graphics/vid/patches/patch-vid_c 20 Jan 2003 18:54:14 -0000 1.3 +++ graphics/vid/patches/patch-vid_c 26 Apr 2016 13:50:10 -0000 @@ -1,6 +1,15 @@ $OpenBSD: patch-vid_c,v 1.3 2003/01/20 18:54:14 sturm Exp $ --- vid.c.orig Mon May 8 06:59:03 2000 -+++ vid.c Mon Jan 20 17:56:47 2003 ++++ vid.c Tue Apr 26 15:50:06 2016 +@@ -37,7 +37,7 @@ + + #include <dev/usb/usb.h> + +-#include <pnm.h> ++#include <netpbm/pnm.h> + + #include "vid.h" + @@ -48,15 +48,15 @@ ov511_reg_read(int fd, int reg) { struct usb_ctl_request ur; unsigned char data[1024]; @@ -25,7 +34,7 @@ $OpenBSD: patch-vid_c,v 1.3 2003/01/20 1 if(ioctl(fd, USB_DO_REQUEST, &ur) < 0) { return -1; -@@ -72,15 +72,15 @@ ov511_reg_write(int fd, int reg, int val +@@ -72,15 +72,15 @@ ov511_reg_write(int fd, int reg, int val) { data[0] = val; @@ -63,8 +72,8 @@ $OpenBSD: patch-vid_c,v 1.3 2003/01/20 1 + int isplus; /* bridge is OV511+ if true, else OV511 */ + int is20; /* sensor is OV7620 if true, else OV7610 */ + int bufsize; /* size of packet buffer */ -+ ++ /* pnm_init(&argc, argv); */ /* required for PNM programs? */ while(++argv, --argc) { @@ -135,7 +144,7 @@ $OpenBSD: patch-vid_c,v 1.3 2003/01/20 1 /* reset the OV511 */ if(ov511_reg_write(fd, OV511_REG_RST, 0x7f) < 0) -@@ -398,23 +412,56 @@ main(int argc, char *argv[]) { +@@ -398,24 +412,57 @@ main(int argc, char *argv[]) { if(ov511_reg_write(fd, OV511_REG_CE_EN, 0x0) < 0) exit(1); @@ -158,7 +167,8 @@ $OpenBSD: patch-vid_c,v 1.3 2003/01/20 1 + if((is20 = ov511_i2c_read(fd, OV7610_REG_COMI)) < 0) + exit(1); + is20 = !is20; -+ + +- ov511_i2c_write(fd, OV7610_REG_GAM, 0x04); + /* set up the OV7610/OV7620 */ + if(is20) { + ov511_i2c_write(fd, OV7610_REG_EC, 0xff); @@ -200,14 +210,14 @@ $OpenBSD: patch-vid_c,v 1.3 2003/01/20 1 + ov511_i2c_write(fd, OV7610_REG_COMJ, 0x93); + ov511_i2c_write(fd, OV7610_REG_BADJ, 0x48); + ov511_i2c_write(fd, OV7610_REG_COMK, 0x81); -+ + + ov511_i2c_write(fd, OV7610_REG_GAM, 0x04); + } - -- ov511_i2c_write(fd, OV7610_REG_GAM, 0x04); - ++ ++ if(small) { vs.width = 320; + vs.height = 240; @@ -442,14 +489,14 @@ main(int argc, char *argv[]) { ov511_reg_write(fd, OV511_REG_LNDV, 0x00); Index: multimedia/subtitleripper/Makefile =================================================================== RCS file: /cvs/ports/multimedia/subtitleripper/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- multimedia/subtitleripper/Makefile 11 Mar 2013 11:35:44 -0000 1.6 +++ multimedia/subtitleripper/Makefile 26 Apr 2016 13:54:27 -0000 @@ -4,7 +4,7 @@ COMMENT= subtitle ripper, used with tran DISTNAME= subtitleripper-0.3-4 PKGNAME= subtitleripper-0.3.4 -REVISION= 1 +REVISION= 2 EXTRACT_SUFX= .tgz CATEGORIES= multimedia Index: multimedia/subtitleripper/patches/patch-Makefile =================================================================== RCS file: /cvs/ports/multimedia/subtitleripper/patches/patch-Makefile,v retrieving revision 1.3 diff -u -p -r1.3 patch-Makefile --- multimedia/subtitleripper/patches/patch-Makefile 4 Jun 2013 15:41:25 -0000 1.3 +++ multimedia/subtitleripper/patches/patch-Makefile 26 Apr 2016 13:54:14 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-Makefile,v 1.3 2013/06/04 15:41:25 naddy Exp $ ---- Makefile.orig Mon Dec 8 09:28:02 2003 -+++ Makefile Fri Mar 16 23:46:57 2012 +--- Makefile.orig Mon Dec 8 10:28:02 2003 ++++ Makefile Tue Apr 26 15:54:05 2016 @@ -3,13 +3,13 @@ # @@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile,v 1.3 2013/06/0 -INCLUDES := +DEFINES := -DHAVE_GETLINE +LIBS := -lm -L!!LOCALBASE!!/lib -+INCLUDES := -I!!LOCALBASE!!/include ++INCLUDES := -I!!LOCALBASE!!/include -I!!LOCALBASE!!/include/netpbm ### enable ppm support ### DEFINES += -D_HAVE_LIB_PPM_ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
