[csw-devel] SF.net SVN: gar:[21544] csw/mgar/pkg/tiff/trunk

[lblume at users.sourceforge.net]

Revision: 21544
          http://gar.svn.sourceforge.net/gar/?rev=21544&view=rev
Author:   lblume
Date:     2013-07-23 15:05:47 +0000 (Tue, 23 Jul 2013)
Log Message:
-----------
tiff/trunk: Bump version to 4.0.3; switch compiler to GCC4; clean up deps

Modified Paths:
--------------
    csw/mgar/pkg/tiff/trunk/Makefile
    csw/mgar/pkg/tiff/trunk/checksums

Modified: csw/mgar/pkg/tiff/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tiff/trunk/Makefile	2013-07-23 14:39:49 UTC (rev 21543)
+++ csw/mgar/pkg/tiff/trunk/Makefile	2013-07-23 15:05:47 UTC (rev 21544)
@@ -1,5 +1,5 @@
-NAME = tiff
-VERSION = 3.9.5
+NAME    = tiff
+VERSION = 4.0.3
 GARTYPE = v2
 
 DESCRIPTION = Lib and tools for Tag Image File Format
@@ -15,49 +15,42 @@
 
 LICENSE = COPYRIGHT
 
+GARCOMPILER = GCC4
+
 PACKAGES = CSWtiff
 SPKG_DESC_CSWtiff += Tools for Tag Image File Format manipulation
 PKGFILES_CSWtiff += $(bindir)/.*
 PKGFILES_CSWtiff += $(mandir)/man1/.*
-RUNTIME_DEP_PKGS_CSWtiff += CSWlibtiff3
-RUNTIME_DEP_PKGS_CSWtiff += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWtiff += CSWjbigkit
+RUNTIME_DEP_PKGS_CSWtiff += CSWlibtiff5
 RUNTIME_DEP_PKGS_CSWtiff += CSWfreeglut
 RUNTIME_DEP_PKGS_CSWtiff += CSWmesa
-RUNTIME_DEP_PKGS_CSWtiff += CSWlibz1
 
-# There are legacy packages dependencing on CSWtiff who have not a SONAME binding and
-# require libtiff.so to be available
-RUNTIME_DEP_PKGS_CSWtiff += CSWlibtiff-dev
-CHECKPKG_OVERRIDES_CSWtiff += surplus-dependency|CSWlibtiff-dev
+PACKAGES += CSWlibtiff5
+SPKG_DESC_CSWlibtiff5 = Tag Image File Format library for C, libtiff.so.5
+PKGFILES_CSWlibtiff5 += $(call pkgfiles_lib,libtiff.so.5)
+RUNTIME_DEP_PKGS_CSWlibtiff5 += CSWlibjbig2
+RUNTIME_DEP_PKGS_CSWlibtiff5 += CSWliblzma5
+RUNTIME_DEP_PKGS_CSWlibtiff5 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibtiff5 += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWlibtiff5 += CSWlibz1
 
-PACKAGES += CSWlibtiff3
-SPKG_DESC_CSWlibtiff3 = Tag Image File Format library for C, libtiff.so.3
-PKGFILES_CSWlibtiff3 += $(call pkgfiles_lib,libtiff.so.3)
-RUNTIME_DEP_PKGS_CSWlibtiff3 += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWlibtiff3 += CSWjbigkit
-RUNTIME_DEP_PKGS_CSWlibtiff3 += CSWlibz1
+PACKAGES += CSWlibtiffxx5
+SPKG_DESC_CSWlibtiffxx5 = Tag Image File Format library for C++, libtiffcxx.so.5
+PKGFILES_CSWlibtiffxx5 += $(call pkgfiles_lib,libtiffxx.so.5)
+RUNTIME_DEP_PKGS_CSWlibtiffxx5 += CSWlibtiff5
+RUNTIME_DEP_PKGS_CSWlibtiffxx5 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibtiffxx5 += CSWlibstdc++6
 
-PACKAGES += CSWlibtiffxx3
-SPKG_DESC_CSWlibtiffxx3 = Tag Image File Format library for C++, libtiffcxx.so.3
-PKGFILES_CSWlibtiffxx3 += $(call pkgfiles_lib,libtiffxx.so.3)
-RUNTIME_DEP_PKGS_CSWlibtiffxx3 += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWlibtiffxx3 += CSWjbigkit
-RUNTIME_DEP_PKGS_CSWlibtiffxx3 += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibtiffxx3 += CSWlibtiff3
-
 PACKAGES += CSWlibtiff-dev
-SPKG_DESC_CSWlibtiff-dev += Development files for libtiff.so.3 and libtiffxx.so.3
+SPKG_DESC_CSWlibtiff-dev += Development files for libtiff.so.5 and libtiffxx.so.5
 # PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWlibtiff-dev += CSWlibtiff3
-RUNTIME_DEP_PKGS_CSWlibtiff-dev += CSWlibtiffxx3
+RUNTIME_DEP_PKGS_CSWlibtiff-dev += CSWlibtiff5
+RUNTIME_DEP_PKGS_CSWlibtiff-dev += CSWlibtiffxx5
 
-# There are docs only
-CHECKPKG_OVERRIDES_CSWlibtiff-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/tiff/ChangeLog
-CHECKPKG_OVERRIDES_CSWlibtiff-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/tiff/html/build.html
+# Ensure linking against the currently built lib and not the existing one
+# (for libtiffxx)
+EXTRA_LD_OPTIONS += -L$(abspath $(WORKSRC))/libtiff/.libs
 
-EXTRA_LINKER_FLAGS += -norunpath
-
 BUILD64 = 1
 ISAEXEC = 1
 
@@ -65,11 +58,6 @@
 CONFIGURE_ARGS += --with-docdir=$(docdir)/tiff
 CONFIGURE_ARGS += --disable-static
 CONFIGURE_ARGS += --enable-cxx
-CONFIGURE_ARGS += --with-zlib-include-dir=$(includedir)
-CONFIGURE_ARGS += --with-zlib-lib-dir=$(libdir)
-CONFIGURE_ARGS += --with-jpeg-include-dir=$(includedir)
-CONFIGURE_ARGS += --with-jpeg-lib-dir=$(libdir)
-CONFIGURE_ARGS += --with-jbig-include-dir=$(includedir)
-CONFIGURE_ARGS += --with-jbig-lib-dir=$(libdir)
+CONFIGURE_ARGS += --enable-maintainer-mode
 
 include gar/category.mk

Modified: csw/mgar/pkg/tiff/trunk/checksums
===================================================================
--- csw/mgar/pkg/tiff/trunk/checksums	2013-07-23 14:39:49 UTC (rev 21543)
+++ csw/mgar/pkg/tiff/trunk/checksums	2013-07-23 15:05:47 UTC (rev 21544)
@@ -1 +1 @@
-8fc7ce3b4e1d0cc8a319336967815084  tiff-3.9.5.tar.gz
+051c1068e6a0627f461948c365290410  tiff-4.0.3.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.