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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Apr 9 15:40:35 CEST 2009


Revision: 4253
          http://gar.svn.sourceforge.net/gar/?rev=4253&view=rev
Author:   dmichelsen
Date:     2009-04-09 13:40:35 +0000 (Thu, 09 Apr 2009)

Log Message:
-----------
flac: UModulate over 1.1.4 and 1.2.1

Modified Paths:
--------------
    csw/mgar/pkg/flac/trunk/Makefile
    csw/mgar/pkg/flac/trunk/checksums
    csw/mgar/pkg/flac/trunk/files/libtool-64bit.patch

Added Paths:
-----------
    csw/mgar/pkg/flac/trunk/bin/
    csw/mgar/pkg/flac/trunk/bin/CC
    csw/mgar/pkg/flac/trunk/bin/cc

Modified: csw/mgar/pkg/flac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/flac/trunk/Makefile	2009-04-09 13:13:26 UTC (rev 4252)
+++ csw/mgar/pkg/flac/trunk/Makefile	2009-04-09 13:40:35 UTC (rev 4253)
@@ -1,7 +1,17 @@
-GARNAME = flac
+GARNAME = libflac
 GARVERSION = 1.2.1
 CATEGORIES = lib
 
+EXTRA_MODULATORS = GARVERSION
+MODULATIONS_GARVERSION = 1.1.4 1.2.1
+
+MODULATIONS = isa-sparcv8-garversion-1.1.4
+# There was no 64 bit legacy version. Do not provide it as new binaries should
+# link against the new version.
+#MODULATIONS += isa-sparcv9-garversion-1.1.4
+MODULATIONS += isa-sparcv8-garversion-1.2.1
+MODULATIONS += isa-sparcv9-garversion-1.2.1
+
 DESCRIPTION = Free lossless audio codec
 define BLURB
   FLAC stands for Free Lossless Audio Codec, an audio format similar
@@ -15,13 +25,24 @@
 
 SF_PROJ = flac
 MASTER_SITES = $(SF_MIRRORS)
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+DISTNAME = $(SF_PROJ)-$(GARVERSION)
+DISTFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(SF_PROJ)-$(VERSION).tar.gz)
 
-PATCHFILES = no-stdint.patch
-PATCHFILES += libtool-64bit.patch
+PATCHFILES_isa-sparcv8-garversion-1.1.4 = libtool-64bit.patch
+PATCHFILES_isa-sparcv9-garversion-1.1.4 = libtool-64bit.patch
+PATCHFILES_isa-sparcv8-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch
+PATCHFILES_isa-sparcv9-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch
 
+PACKAGES = CSWflac CSWxmmsflac
 CATALOGNAME = libflac
+CATALOGNAME = xmms_flac
 
+REQUIRED_PKGS_CSWflac = CSWiconv CSWlibogg
+REQUIRED_PKGS_CSWxmmsflac = CSWglib CSWgtk CSWxmms CSWflac
+
+SPKG_DESC_CSWflac = Free lossless audio codec
+SPKG_DESC_CSWxmmsflac = FLAC plugin for XMMS
+
 LICENSE = $(foreach lic,FDL GPL LGPL Xiph,COPYING.$(lic))
 
 # We define upstream file regex so we can be notifed of new upstream software release
@@ -29,14 +50,43 @@
 UPSTREAM_USE_SF = 1
 UFILES_REGEX = flac-(\d+(?:\.\d+)*)-src
 
-REQUIRED_PKGS = CSWiconv CSWlibogg
-
 BUILD64 = 1
 
+NODIRPATHS = --includedir
+CPPFLAGS =
+
+# Must be defined and empty or -I$(includedir) is added too early
+EXTRA_CFLAGS = -D__inline=
+EXTRA_BUILD_EXPORTS = AM_CFLAGS
+
+EXTRA_CONFIGURE_ARGS_mm-64 = --disable-xmms-plugin
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_mm-$(MEMORYMODEL))
 
 TEST_TARGET = check
 
+MERGE_SCRIPTS_isa-i386-garversion-1.1.4 = copy-only
+MERGE_DIRS_isa-i386-garversion-1.1.4 = $(libdir)
+MERGE_SCRIPTS_isa-amd64-garversion-1.1.4 = copy-relocated-only
+MERGE_DIRS_isa-amd64-garversion-1.1.4 = $(libdir)
+
+MERGE_SCRIPTS_isa-i386-garversion-1.2.1 = copy-all
+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.1.4 = copy-only
+MERGE_DIRS_isa-sparcv8-garversion-1.1.4 = $(libdir)
+MERGE_SCRIPTS_isa-sparcv9-garversion-1.1.4 = copy-relocated-only
+MERGE_DIRS_isa-sparcv9-garversion-1.1.4 = $(libdir)
+
+MERGE_SCRIPTS_isa-sparcv8-garversion-1.2.1 = copy-all
+MERGE_SCRIPTS_isa-sparcv9-garversion-1.2.1 = copy-relocated-only
+MERGE_DIRS_isa-sparcv9-garversion-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+
+PKGFILES_CSWxmmsflac = $(libdir)/xmms/.*
+
 include gar/category.mk
 
-PATH := $(PATH):/usr/ccs/bin
+CC := $(abspath ./bin/cc)
+CXX := $(abspath ./bin/CC)
+PATH := ./bin:$(PATH):/usr/ccs/bin

Added: csw/mgar/pkg/flac/trunk/bin/CC
===================================================================
--- csw/mgar/pkg/flac/trunk/bin/CC	                        (rev 0)
+++ csw/mgar/pkg/flac/trunk/bin/CC	2009-04-09 13:40:35 UTC (rev 4253)
@@ -0,0 +1 @@
+link cc
\ No newline at end of file


Property changes on: csw/mgar/pkg/flac/trunk/bin/CC
___________________________________________________________________
Added: svn:special
   + *

Added: csw/mgar/pkg/flac/trunk/bin/cc
===================================================================
--- csw/mgar/pkg/flac/trunk/bin/cc	                        (rev 0)
+++ csw/mgar/pkg/flac/trunk/bin/cc	2009-04-09 13:40:35 UTC (rev 4253)
@@ -0,0 +1,22 @@
+#!/opt/csw/bin/perl -w
+
+use strict;
+
+my @oargs;
+
+my @includes = grep { /^-I/ } @ARGV;
+ at includes = ((grep { /^-I[^\/]/ } @includes),(grep { /^-I[\/]/ } @includes));
+my @argswoincludes = grep { !/^-I/ } @ARGV;
+
+foreach (@ARGV) {
+  if( /^-I/ ) {
+    push @oargs, @includes, @argswoincludes;
+    last;
+  }
+  push @oargs, shift @argswoincludes;
+}
+
+my $cc = "/opt/studio/SOS11/SUNWspro/bin/" . ($0 =~ /cc/ ? "cc" : "CC");
+
+print "$cc ", join( " ", @oargs ), "\n";
+exec( $cc, @oargs );


Property changes on: csw/mgar/pkg/flac/trunk/bin/cc
___________________________________________________________________
Added: svn:executable
   + *

Modified: csw/mgar/pkg/flac/trunk/checksums
===================================================================
--- csw/mgar/pkg/flac/trunk/checksums	2009-04-09 13:13:26 UTC (rev 4252)
+++ csw/mgar/pkg/flac/trunk/checksums	2009-04-09 13:40:35 UTC (rev 4253)
@@ -1,3 +1,4 @@
+3958cbd5b6ed8c14966792538e44223b  download/flac-1.1.4.tar.gz
 153c8b15a54da428d1f0fadc756c22c7  download/flac-1.2.1.tar.gz
+c9e9052e1d1238a21ac6c4ab263d2b7f  download/libtool-64bit.patch
 e3144fad8810ceaca718adb6f09dc8fa  download/no-stdint.patch
-099621e0dad419188acd42c588242131  download/libtool-64bit.patch

Modified: csw/mgar/pkg/flac/trunk/files/libtool-64bit.patch
===================================================================
--- csw/mgar/pkg/flac/trunk/files/libtool-64bit.patch	2009-04-09 13:13:26 UTC (rev 4252)
+++ csw/mgar/pkg/flac/trunk/files/libtool-64bit.patch	2009-04-09 13:40:35 UTC (rev 4253)
@@ -1,7 +1,7 @@
-diff -Naur db-4.4.20.orig/dist/ltmain.sh db-4.4.20/dist/ltmain.sh
---- dist/ltmain.sh	2005-10-17 16:35:53.000000000 +0200
-+++ dist/ltmain.sh	2008-05-14 08:30:26.766534000 +0200
-@@ -1552,9 +1552,7 @@
+diff -Naur flac-1.1.4.orig/ltmain.sh flac-1.1.4.patched/ltmain.sh
+--- flac-1.1.4.orig/ltmain.sh	2005-04-26 20:23:39.000000000 +0200
++++ flac-1.1.4.patched/ltmain.sh	2009-04-09 13:59:57.521039544 +0200
+@@ -1545,9 +1545,7 @@
  	esac
          compile_command="$compile_command $arg"
          finalize_command="$finalize_command $arg"


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



More information about the devel mailing list