[csw-devel] SF.net SVN: gar:[5826] csw/mgar/pkg/flac/trunk

[dmichelsen at users.sourceforge.net]

Revision: 5826
          http://gar.svn.sourceforge.net/gar/?rev=5826&view=rev
Author:   dmichelsen
Date:     2009-08-03 08:36:42 +0000 (Mon, 03 Aug 2009)

Log Message:
-----------
flac: Include legacy libs libFLAC.so.4 from 1.0.4, fixing #3791

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

Modified: csw/mgar/pkg/flac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/flac/trunk/Makefile	2009-08-03 07:49:53 UTC (rev 5825)
+++ csw/mgar/pkg/flac/trunk/Makefile	2009-08-03 08:36:42 UTC (rev 5826)
@@ -4,11 +4,13 @@
 
 EXTRA_MODULATORS = GARVERSION
 # Version 1.1.2 is the last to contain libflac.so.7 where most of the binaries depend on
-MODULATIONS_GARVERSION = 1.1.2 1.2.1
+MODULATIONS_GARVERSION = 1.0.4 1.1.2 1.2.1
 
 # There was no 64 bit legacy version. Do not provide it as new binaries should
 # link against the new version.
-SKIP_MODULATIONS = isa-sparcv9-garversion-1.1.2
+SKIP_MODULATIONS = isa-sparcv9-garversion-1.0.4
+SKIP_MODULATIONS += isa-amd64-garversion-1.0.4
+SKIP_MODULATIONS += isa-sparcv9-garversion-1.1.2
 SKIP_MODULATIONS += isa-amd64-garversion-1.1.2
 
 DESCRIPTION = Free lossless audio codec
@@ -58,6 +60,9 @@
 
 BUILD64 = 1
 
+# For 1.0.4
+EXTRA_LINKER_FLAGS = -liconv
+
 NODIRPATHS = --includedir
 CPPFLAGS =
 
@@ -71,6 +76,11 @@
 
 TEST_TARGET = check
 
+MERGE_SCRIPTS_isa-i386-garversion-1.0.4 = copy-only
+MERGE_DIRS_isa-i386-garversion-1.0.4 = $(libdir)
+MERGE_SCRIPTS_isa-amd64-garversion-1.0.4 = copy-relocated-only
+MERGE_DIRS_isa-amd64-garversion-1.0.4 = $(libdir)
+
 MERGE_SCRIPTS_isa-i386-garversion-1.1.2 = copy-only
 MERGE_DIRS_isa-i386-garversion-1.1.2 = $(libdir)
 MERGE_SCRIPTS_isa-amd64-garversion-1.1.2 = copy-relocated-only
@@ -80,6 +90,11 @@
 MERGE_SCRIPTS_isa-amd64-garversion-1.2.1 = copy-relocated-only
 MERGE_DIRS_isa-amd64-garversion-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
 
+MERGE_SCRIPTS_isa-sparcv8-garversion-1.0.4 = copy-only
+MERGE_DIRS_isa-sparcv8-garversion-1.0.4 = $(libdir)
+MERGE_SCRIPTS_isa-sparcv9-garversion-1.0.4 = copy-relocated-only
+MERGE_DIRS_isa-sparcv9-garversion-1.0.4 = $(libdir)
+
 MERGE_SCRIPTS_isa-sparcv8-garversion-1.1.2 = copy-only
 MERGE_DIRS_isa-sparcv8-garversion-1.1.2 = $(libdir)
 MERGE_SCRIPTS_isa-sparcv9-garversion-1.1.2 = copy-relocated-only
@@ -97,10 +112,18 @@
 CXX := $(abspath ./bin/CC)
 PATH := ./bin:$(PATH):/usr/ccs/bin
 
+post-patch-isa-i386-garversion-1.0.4:
+	perl -pi -e "s/-O3 //g" $(WORKSRC)/configure
+	$(MAKECOOKIE)
+
 post-patch-isa-i386-garversion-1.1.2:
 	perl -pi -e "s/-O2 //g" $(WORKSRC)/configure
 	$(MAKECOOKIE)
 
+post-patch-isa-sparcv8-garversion-1.0.4:
+	perl -pi -e "s/-O3 //g" $(WORKSRC)/configure
+	$(MAKECOOKIE)
+
 post-patch-isa-sparcv8-garversion-1.1.2:
 	perl -pi -e "s/-O2 //g" $(WORKSRC)/configure
 	$(MAKECOOKIE)

Modified: csw/mgar/pkg/flac/trunk/checksums
===================================================================
--- csw/mgar/pkg/flac/trunk/checksums	2009-08-03 07:49:53 UTC (rev 5825)
+++ csw/mgar/pkg/flac/trunk/checksums	2009-08-03 08:36:42 UTC (rev 5826)
@@ -1,3 +1,4 @@
+b1523e6ad8ef85d1df5b18f20a8cfad6  download/flac-1.0.4.tar.gz
 2bfc127cdda02834d0491ab531a20960  download/flac-1.1.2.tar.gz
 153c8b15a54da428d1f0fadc756c22c7  download/flac-1.2.1.tar.gz
 c9e9052e1d1238a21ac6c4ab263d2b7f  download/libtool-64bit.patch


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