[pkgsrc/trunk]: pkgsrc/graphics/radiance Never ever touch the included libtif...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/graphics/radiance Never ever touch the included libtif...
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:24:20 +0000

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b7181c7e8c5f
branches:  trunk
changeset: 512003:b7181c7e8c5f
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Apr 28 16:55:10 2006 +0000

description:
Never ever touch the included libtiff. Bump revision.

diffstat:

 graphics/radiance/Makefile         |   4 +-
 graphics/radiance/distinfo         |   6 +-
 graphics/radiance/patches/patch-ak |  65 ++++++++++++++++++++++++++++++-------
 graphics/radiance/patches/patch-aq |   6 +-
 4 files changed, 61 insertions(+), 20 deletions(-)

diffs (147 lines):

diff -r 3e8f682a0087 -r b7181c7e8c5f graphics/radiance/Makefile
--- a/graphics/radiance/Makefile        Fri Apr 28 16:54:08 2006 +0000
+++ b/graphics/radiance/Makefile        Fri Apr 28 16:55:10 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2006/02/26 21:26:32 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/28 16:55:10 joerg Exp $
 #
 
 DISTNAME=      rad3R6P1
 PKGNAME=       radiance-3.6.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    graphics
 MASTER_SITES=  http://www.radiance-online.org/software/non-cvs/        \
                http://www.radiance-online.org/software/
diff -r 3e8f682a0087 -r b7181c7e8c5f graphics/radiance/distinfo
--- a/graphics/radiance/distinfo        Fri Apr 28 16:54:08 2006 +0000
+++ b/graphics/radiance/distinfo        Fri Apr 28 16:55:10 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2006/02/26 21:26:32 joerg Exp $
+$NetBSD: distinfo,v 1.8 2006/04/28 16:55:10 joerg Exp $
 
 SHA1 (rad3R6P1.tar.gz) = 71f46abd1c30be282a93237fa0c162d3bf0b1f99
 RMD160 (rad3R6P1.tar.gz) = 3bcf40518a57cdb5455264c83a3e206b67b3d1fa
@@ -16,13 +16,13 @@
 SHA1 (patch-ah) = be320a6b9b8b6b2153a31ea9218eb7d41aa43b0e
 SHA1 (patch-ai) = 02c6c3109c8e425d394980e1d223169dd6a3e7ae
 SHA1 (patch-aj) = 5242f18c523bbebcfdd886fa20501434f07b74c0
-SHA1 (patch-ak) = 438bd7e9ad397663ddac09543ac484610b13086b
+SHA1 (patch-ak) = 6cc99ea8f5c06e2234cdc4905631d56982404835
 SHA1 (patch-al) = c215a209fccd3d1d2e64d09018bce87291efc880
 SHA1 (patch-am) = 705a3f62c5688f593fd5c5a1a71b22e4652b1c77
 SHA1 (patch-an) = d0c388a5aaea622b220e3ef4c0f52956ecca5470
 SHA1 (patch-ao) = 22e3e8f3b593bca0423390f696324f42e8b52098
 SHA1 (patch-ap) = 42bb1691b2c1d76bf5d19872d70ca50332d31987
-SHA1 (patch-aq) = 338ca0df287e797fbc784158e7d622f70ddcd35e
+SHA1 (patch-aq) = 3ce1e089c7a26c176cd725eab2e7ceae8c51e557
 SHA1 (patch-ar) = e2afaad398d61f152ce9a7f3ddf451547c359e13
 SHA1 (patch-as) = 9b7c6bef44a4f9640b7a30253522ffab425ffbac
 SHA1 (patch-at) = 34bf252c122727308ebaa47177afabbc888a4f6a
diff -r 3e8f682a0087 -r b7181c7e8c5f graphics/radiance/patches/patch-ak
--- a/graphics/radiance/patches/patch-ak        Fri Apr 28 16:54:08 2006 +0000
+++ b/graphics/radiance/patches/patch-ak        Fri Apr 28 16:55:10 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1.1.1 2005/02/16 22:17:34 jschauma Exp $
+$NetBSD: patch-ak,v 1.2 2006/04/28 16:55:10 joerg Exp $
 
---- ./src/px/Rmakefile.orig    2005-02-15 14:42:54.000000000 -0500
-+++ ./src/px/Rmakefile 2005-02-15 14:43:53.000000000 -0500
-@@ -7,13 +7,12 @@
+--- src/px/Rmakefile.orig      2004-10-27 23:23:47.000000000 +0000
++++ src/px/Rmakefile
+@@ -7,13 +7,12 @@ ARCH = sun
  OPT = -O
  MACH = -DBSD
  SPECIAL = aed
@@ -19,21 +19,62 @@
  
  PIXAR_INCLUDE=        -I/usr/pixar/include
  PIXAR_LIB=    -L/usr/pixar/host/lib -lpirl -lpicio -lchad -lpixar $(MLIB)
-@@ -55,7 +54,7 @@
+@@ -55,7 +54,6 @@ pdfblur.csh pmblur.csh xyzimage.csh pgbl
  clean:
        set nonomatch; rm -f x10image aedimage glimage \
  $(PROGS) $(SPECIAL) *.o core
 -      -cd tiff; make distclean
-+      -cd tiff; @MAKE@ distclean
  
  pfilt:        pfilt.o pf2.o pf3.o
        $(CC) $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o -lrt $(MLIB)
-@@ -199,7 +198,7 @@
- ../lib/libtiff.a:     tiff/config.local
-       cd tiff ; sh configure -quiet -noninteractive -with-CC=$(CC) \
-               "-with-ENVOPTS=$(OPT)" ; \
+@@ -186,21 +184,12 @@ pinterp: pinterp.o
+ ra_xyze:      ra_xyze.o
+       $(CC) $(CFLAGS) -o ra_xyze ra_xyze.o -lrt $(MLIB)
+ 
+-ra_tiff:      ra_tiff.o ../lib/libtiff.a
++ra_tiff:      ra_tiff.o
+       $(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrt -ltiff $(MLIB)
+ 
+-../common/tiff.h ../common/tiffio.h:  ../lib/libtiff.a
+-      @chmod u+w ../common/tiff.h ../common/tiffio.h
+-      @touch ../common/tiff.h ../common/tiffio.h
+-
+-normtiff:     normtiff.o ../lib/libtiff.a
++normtiff:     normtiff.o
+       $(CC) $(CFLAGS) -o normtiff normtiff.o -lrt -ltiff $(MLIB)
+ 
+-../lib/libtiff.a:     tiff/config.local
+-      cd tiff ; sh configure -quiet -noninteractive -with-CC=$(CC) \
+-              "-with-ENVOPTS=$(OPT)" ; \
 -      cd libtiff ; make install
-+      cd libtiff ; @MAKE@ install
- 
+-
  ra_pixar:     ra_pixar.o ra_pixar.c
        $(CC) $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o -lrt \
+ $(PIXAR_LIB)
+@@ -244,7 +233,7 @@ neuclrtab.o pvalue.o protate.o biq.o ciq
+ xshowtrace.o clrtab.o pcomb.o pfilt.o pf3.o image.o:  ../common/standard.h \
+ ../common/rtmisc.h ../common/rtio.h \
+ ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+-../common/rterror.h ../common/tifftypes.h
++../common/rterror.h
+ 
+ ximage.o xraster.o:   xraster.h
+ 
+@@ -254,8 +243,6 @@ x11image.o:        ../common/tonemap.h ../commo
+ 
+ ra_t8.o:      ../common/targa.h
+ 
+-ra_tiff.o normtiff.o: ../common/tiff.h ../common/tiffio.h
+-
+ aedimage.o ximage.o ra_t8.o ra_pr.o:  pic.h
+ 
+ ciq.o cut.o closest.o biq.o:  pic.h ciq.h
+@@ -277,7 +264,7 @@ psign.o:   ../common/font.h
+ pcond.o pcond2.o pcond3.o pcond4.o:   pcond.h ../common/standard.h \
+ ../common/rtmisc.h ../common/rtio.h \
+ ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+-../common/rterror.h ../common/tifftypes.h \
++../common/rterror.h \
+ ../common/color.h ../common/view.h ../common/resolu.h
+ 
+ normtiff.o:   ../common/color.h ../common/tonemap.h ../common/resolu.h
diff -r 3e8f682a0087 -r b7181c7e8c5f graphics/radiance/patches/patch-aq
--- a/graphics/radiance/patches/patch-aq        Fri Apr 28 16:54:08 2006 +0000
+++ b/graphics/radiance/patches/patch-aq        Fri Apr 28 16:55:10 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.1.1.1 2005/02/16 22:17:34 jschauma Exp $
+$NetBSD: patch-aq,v 1.2 2006/04/28 16:55:10 joerg Exp $
 
 --- ./src/px/tiff/contrib/addtiffo/Makefile.orig       2005-02-15 15:19:59.000000000 -0500
 +++ ./src/px/tiff/contrib/addtiffo/Makefile    2005-02-15 15:22:05.000000000 -0500
@@ -9,8 +9,8 @@
 -CC    =       gcc
 -CFLAGS        =       -O -I$(LIBTIFF_DIR)
 -LIBS  =       $(LIBTIFF_DIR)/libtiff.a -lm
-+CFLAGS        +=      -O -I$(LIBTIFF_DIR)
-+LIBS  =       $(LIBTIFF_DIR)/libtiff.a -lm ${LDFLAGS}
++CFLAGS        +=      -O -I$(PREFIX)/include
++LIBS  =       -ltiff -lm ${LDFLAGS}
  
  addtiffo:     addtiffo.o tif_overview.o tif_ovrcache.o
        $(CXX) $(CFLAGS) addtiffo.o tif_overview.o tif_ovrcache.o \

Prev by Date: [pkgsrc/trunk]: pkgsrc/games/xarchon Fix C++ for GCC 3.4+. Always link with p...
Next by Date: [pkgsrc/trunk]: pkgsrc/ham/gmfsk When trying to link fftw libs, also link wit...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/games/xarchon Fix C++ for GCC 3.4+. Always link with p...
Next by Thread: [pkgsrc/trunk]: pkgsrc/ham/gmfsk When trying to link fftw libs, also link wit...
Indexes:

Home | Main Index | Thread Index | Old Index