[csw-devel] SF.net SVN: gar:[5843] csw/mgar/pkg/flac/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Aug 4 14:19:23 CEST 2009
Revision: 5843
http://gar.svn.sourceforge.net/gar/?rev=5843&view=rev
Author: dmichelsen
Date: 2009-08-04 12:19:23 +0000 (Tue, 04 Aug 2009)
Log Message:
-----------
flac: Add patches for x86 assembly
Modified Paths:
--------------
csw/mgar/pkg/flac/trunk/Makefile
csw/mgar/pkg/flac/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/flac/trunk/files/strip-nasm-1.0.4.patch
csw/mgar/pkg/flac/trunk/files/strip-nasm-1.1.2.patch
csw/mgar/pkg/flac/trunk/files/strip-nasm-1.2.1.patch
Modified: csw/mgar/pkg/flac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/flac/trunk/Makefile 2009-08-04 09:38:48 UTC (rev 5842)
+++ csw/mgar/pkg/flac/trunk/Makefile 2009-08-04 12:19:23 UTC (rev 5843)
@@ -34,15 +34,18 @@
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
-PATCHFILES_isa-i386-garversion-1.1.2 = libtool-64bit.patch
+PATCHFILES_isa-i386-garversion-1.0.4 = strip-nasm-1.0.4.patch
+PATCHFILES_isa-i386-garversion-1.1.2 = strip-nasm-1.1.2.patch libtool-64bit.patch
PATCHFILES_isa-amd64-garversion-1.1.2 = libtool-64bit.patch
-PATCHFILES_isa-i386-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch
+PATCHFILES_isa-i386-garversion-1.2.1 = strip-nasm-1.2.1.patch libtool-64bit.patch no-stdint.patch
PATCHFILES_isa-amd64-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch
PACKAGES = CSWflac CSWxmmsflac
CATALOGNAME_CSWflac = libflac
CATALOGNAME_CSWxmmsflac = xmms_flac
+PREREQUISITE_PKGS = CSWbash CSWnasm
+
REQUIRED_PKGS_CSWflac = CSWiconv CSWlibogg
REQUIRED_PKGS_CSWxmmsflac = CSWglib CSWgtk CSWxmms CSWflac CSWiconv CSWlibogg
Modified: csw/mgar/pkg/flac/trunk/checksums
===================================================================
--- csw/mgar/pkg/flac/trunk/checksums 2009-08-04 09:38:48 UTC (rev 5842)
+++ csw/mgar/pkg/flac/trunk/checksums 2009-08-04 12:19:23 UTC (rev 5843)
@@ -3,3 +3,6 @@
153c8b15a54da428d1f0fadc756c22c7 download/flac-1.2.1.tar.gz
c9e9052e1d1238a21ac6c4ab263d2b7f download/libtool-64bit.patch
e3144fad8810ceaca718adb6f09dc8fa download/no-stdint.patch
+03e0502642d568b5b004f69328485720 download/strip-nasm-1.0.4.patch
+394225d96661019d32cc0ebfdad3d377 download/strip-nasm-1.1.2.patch
+64e7f447c2ca09ec041e6740a209291d download/strip-nasm-1.2.1.patch
Added: csw/mgar/pkg/flac/trunk/files/strip-nasm-1.0.4.patch
===================================================================
--- csw/mgar/pkg/flac/trunk/files/strip-nasm-1.0.4.patch (rev 0)
+++ csw/mgar/pkg/flac/trunk/files/strip-nasm-1.0.4.patch 2009-08-04 12:19:23 UTC (rev 5843)
@@ -0,0 +1,32 @@
+diff -Naur flac-1.0.4.orig/src/libFLAC/ia32/Makefile.in flac-1.0.4.patched/src/libFLAC/ia32/Makefile.in
+--- flac-1.0.4.orig/src/libFLAC/ia32/Makefile.in 2002-09-25 06:53:37.000000000 +0200
++++ flac-1.0.4.patched/src/libFLAC/ia32/Makefile.in 2009-08-03 11:12:29.197650544 +0200
+@@ -134,7 +134,7 @@
+
+ SUFFIXES = .nasm .lo
+
+-STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh
++STRIP_FPIC = /opt/csw/bin/bash $(top_srcdir)/strip_fPIC.sh
+
+ noinst_LTLIBRARIES = libFLAC-asm.la
+ libFLAC_asm_la_SOURCES = \
+diff -Naur flac-1.0.4.orig/strip_fPIC.sh flac-1.0.4.patched/strip_fPIC.sh
+--- flac-1.0.4.orig/strip_fPIC.sh 2002-08-26 21:21:52.000000000 +0200
++++ flac-1.0.4.patched/strip_fPIC.sh 2009-08-03 11:12:00.031237509 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/opt/csw/bin/bash
+ #
+ # libtool assumes that the compiler can handle the -fPIC flag
+ # This isn't always true (for example, nasm can't handle it)
+@@ -6,8 +6,10 @@
+ while [ $1 ]; do
+ if [ "$1" != "-fPIC" ]; then
+ if [ "$1" != "-DPIC" ]; then
++ if [ "$1" != "-KPIC" ]; then
+ command="$command $1"
+ fi
++ fi
+ fi
+ shift
+ done
Added: csw/mgar/pkg/flac/trunk/files/strip-nasm-1.1.2.patch
===================================================================
--- csw/mgar/pkg/flac/trunk/files/strip-nasm-1.1.2.patch (rev 0)
+++ csw/mgar/pkg/flac/trunk/files/strip-nasm-1.1.2.patch 2009-08-04 12:19:23 UTC (rev 5843)
@@ -0,0 +1,34 @@
+diff -Naur flac-1.1.2.orig/src/libFLAC/ia32/Makefile.in flac-1.1.2.patched/src/libFLAC/ia32/Makefile.in
+--- flac-1.1.2.orig/src/libFLAC/ia32/Makefile.in 2005-02-05 03:23:38.000000000 +0100
++++ flac-1.1.2.patched/src/libFLAC/ia32/Makefile.in 2009-08-04 09:37:40.159783125 +0200
+@@ -253,7 +253,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUFFIXES = .nasm .lo
+-STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh
++STRIP_NON_ASM = /opt/csw/bin/bash $(top_srcdir)/strip_non_asm_libtool_args.sh
+ noinst_LTLIBRARIES = libFLAC-asm.la
+ libFLAC_asm_la_SOURCES = \
+ cpu_asm.nasm \
+diff -Naur flac-1.1.2.orig/strip_non_asm_libtool_args.sh flac-1.1.2.patched/strip_non_asm_libtool_args.sh
+--- flac-1.1.2.orig/strip_non_asm_libtool_args.sh 2004-07-29 08:52:52.000000000 +0200
++++ flac-1.1.2.patched/strip_non_asm_libtool_args.sh 2009-08-04 09:38:06.129792997 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/opt/csw/bin/bash
+ #
+ # libtool assumes that the compiler can handle the -fPIC flag.
+ # This isn't always true (for example, nasm can't handle it).
+@@ -8,10 +8,12 @@
+ while [ $1 ]; do
+ if [ "$1" != "-fPIC" ]; then
+ if [ "$1" != "-DPIC" ]; then
++ if [ "$1" != "-KPIC" ]; then
+ if [ "$1" != "-fno-common" ]; then
+ command="$command $1"
+ fi
+ fi
++ fi
+ fi
+ shift
+ done
Added: csw/mgar/pkg/flac/trunk/files/strip-nasm-1.2.1.patch
===================================================================
--- csw/mgar/pkg/flac/trunk/files/strip-nasm-1.2.1.patch (rev 0)
+++ csw/mgar/pkg/flac/trunk/files/strip-nasm-1.2.1.patch 2009-08-04 12:19:23 UTC (rev 5843)
@@ -0,0 +1,34 @@
+diff -Naur flac-1.2.1.orig/src/libFLAC/ia32/Makefile.in flac-1.2.1.patched/src/libFLAC/ia32/Makefile.in
+--- flac-1.2.1.orig/src/libFLAC/ia32/Makefile.in 2007-09-16 22:05:12.000000000 +0200
++++ flac-1.2.1.patched/src/libFLAC/ia32/Makefile.in 2009-08-04 13:31:07.693331268 +0200
+@@ -234,7 +234,7 @@
+
+ SUFFIXES = .nasm .lo
+
+-STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh
++STRIP_NON_ASM = /opt/csw/bin/bash $(top_srcdir)/strip_non_asm_libtool_args.sh
+
+ noinst_LTLIBRARIES = libFLAC-asm.la
+ libFLAC_asm_la_SOURCES = \
+diff -Naur flac-1.2.1.orig/strip_non_asm_libtool_args.sh flac-1.2.1.patched/strip_non_asm_libtool_args.sh
+--- flac-1.2.1.orig/strip_non_asm_libtool_args.sh 2004-07-29 08:43:23.000000000 +0200
++++ flac-1.2.1.patched/strip_non_asm_libtool_args.sh 2009-08-04 13:30:46.782902121 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/opt/csw/bin/bash
+ #
+ # libtool assumes that the compiler can handle the -fPIC flag.
+ # This isn't always true (for example, nasm can't handle it).
+@@ -8,10 +8,12 @@
+ while [ $1 ]; do
+ if [ "$1" != "-fPIC" ]; then
+ if [ "$1" != "-DPIC" ]; then
++ if [ "$1" != "-KPIC" ]; then
+ if [ "$1" != "-fno-common" ]; then
+ command="$command $1"
+ fi
+ fi
++ fi
+ fi
+ shift
+ done
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