SF.net SVN: gar:[23621] csw/mgar/pkg/libfpx/trunk

[lblume at users.sourceforge.net]

Revision: 23621
          http://sourceforge.net/p/gar/code/23621
Author:   lblume
Date:     2014-05-16 08:11:55 +0000 (Fri, 16 May 2014)
Log Message:
-----------
libfpx/trunk: Bump to 1.3.1-4; switch to GCC4; try to remove patches to check them

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

Modified: csw/mgar/pkg/libfpx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libfpx/trunk/Makefile	2014-05-15 21:45:25 UTC (rev 23620)
+++ csw/mgar/pkg/libfpx/trunk/Makefile	2014-05-16 08:11:55 UTC (rev 23621)
@@ -1,21 +1,25 @@
-NAME = libfpx
-VERSION = 1.3.1
-GARTYPE = v2
+NAME      = libfpx
+VERSION   = 1.3.1
+GARSUBREV = 4
+GARTYPE   = v2
 
 DESCRIPTION = FlashPIX library
 define BLURB
 endef
 
 MASTER_SITES = ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/
-DISTFILES  = $(DISTNAME).tar.xz
+DISTNAME     = libfpx-$(VERSION)-$(GARSUBREV)
+DISTFILES    = $(DISTNAME).tar.xz
 
-PATCHFILES += olecomm.h.patch
+GARCOMPILER = GCC4
+
+###PATCHFILES += olecomm.h.patch
 # PATCHFILES += tchar.patch
 
 # PATCHFILES += 0001-Force-one-signature-for-CExposedDocFile-RenameElemen.patch
 
-PATCHFILES += 0002-Fix-unresolved-symbols-part-1.patch
-PATCHFILES += 0003-Fix-unresolved-symbols-part-2.patch
+###PATCHFILES += 0002-Fix-unresolved-symbols-part-1.patch
+###PATCHFILES += 0003-Fix-unresolved-symbols-part-2.patch
 
 VENDOR_URL = http://www.imagemagick.org
 LICENSE = flashpix.h
@@ -38,15 +42,15 @@
 DOCFILES += README
 
 # Fix for problem introduced between 12101[7-8]-17 and 12101[7-8]-20
-EXTRA_CPPFLAGS += -D_RWSTD_NO_WSTR=1
+###EXTRA_CPPFLAGS += -D_RWSTD_NO_WSTR=1
+###
+###COMPILERLIBS-sparc-32 = /opt/SUNWspro/lib
+###COMPILERLIBS-sparc-64 = /opt/SUNWspro/lib/v9
+###COMPILERLIBS-i386-32 = /opt/SUNWspro/lib
+###COMPILERLIBS-i386-64 = /opt/SUNWspro/lib/amd64
 
-COMPILERLIBS-sparc-32 = /opt/SUNWspro/lib
-COMPILERLIBS-sparc-64 = /opt/SUNWspro/lib/v9
-COMPILERLIBS-i386-32 = /opt/SUNWspro/lib
-COMPILERLIBS-i386-64 = /opt/SUNWspro/lib/amd64
-
 # Make sure to include path or we link against libCrun.a
-EXTRA_LINKER_FLAGS += -L$(COMPILERLIBS-$(GARCH)-$(MEMORYMODEL)) -lCrun -lCstd
+###EXTRA_LINKER_FLAGS += -L$(COMPILERLIBS-$(GARCH)-$(MEMORYMODEL)) -lCrun -lCstd
 
 # For sqrt, atan2, pow
 EXTRA_LINKER_FLAGS += -lm

Modified: csw/mgar/pkg/libfpx/trunk/checksums
===================================================================
--- csw/mgar/pkg/libfpx/trunk/checksums	2014-05-15 21:45:25 UTC (rev 23620)
+++ csw/mgar/pkg/libfpx/trunk/checksums	2014-05-16 08:11:55 UTC (rev 23621)
@@ -1 +1 @@
-c66ab2b3e43edfe0ab2ca11ee67c98f3  libfpx-1.3.1.tar.xz
+65e2cf8dcf230ad0b90aead35553bbda  libfpx-1.3.1-4.tar.xz

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