[csw-devel] SF.net SVN: gar:[14017] csw/mgar/pkg
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Wed Mar 30 15:42:37 CEST 2011
Revision: 14017
http://gar.svn.sourceforge.net/gar/?rev=14017&view=rev
Author: dmichelsen
Date: 2011-03-30 13:42:37 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
libflac7: Initial commit
Modified Paths:
--------------
csw/mgar/pkg/libflac7/trunk/Makefile
csw/mgar/pkg/libflac7/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/libflac7/
csw/mgar/pkg/libflac7/trunk/files/libtool-64bit.patch
csw/mgar/pkg/libflac7/trunk/files/strip-nasm-1.1.2.patch
Removed Paths:
-------------
csw/mgar/pkg/libflac7/trunk/bin/
csw/mgar/pkg/libflac7/trunk/files/strip-nasm-1.0.4.patch
Modified: csw/mgar/pkg/libflac7/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libflac4/trunk/Makefile 2011-03-30 03:20:37 UTC (rev 14014)
+++ csw/mgar/pkg/libflac7/trunk/Makefile 2011-03-30 13:42:37 UTC (rev 14017)
@@ -1,5 +1,5 @@
NAME = libflac
-VERSION = 1.0.4
+VERSION = 1.1.2
CATEGORIES = lib
DESCRIPTION = Free lossless audio codec
@@ -18,18 +18,20 @@
DISTNAME = $(SF_PROJ)-$(VERSION)
DISTFILES = $(DISTNAME).tar.gz
-PATCHFILES = strip-nasm-1.0.4.patch
+PATCHFILES += libtool-64bit.patch
+PATCHFILES += strip-nasm-1.1.2.patch
+
BUILD_DEP_PKGS += CSWbash
-PACKAGES += CSWlibflac4
-CATALOGNAME_CSWlibflac4 = libflac4
-SPKG_DESC_CSWlibflac4 = Free lossless audio codec library, libflac.so.4
-PKGFILES_CSWlibflac4 = $(call baseisadirs,$(libdir),libFLAC\.so\.4(\.\d+)*)
-RUNTIME_DEP_PKGS_CSWlibflac4 += CSWiconv
+PACKAGES += CSWlibflac7
+CATALOGNAME_CSWlibflac7 = libflac7
+SPKG_DESC_CSWlibflac7 = Free lossless audio codec library, libflac.so.7
+PKGFILES_CSWlibflac7 = $(call pkgfiles_lib,libFLAC.so.7)
+RUNTIME_DEP_PKGS_CSWlibflac7 += CSWiconv
# Override conflicts with CSWflac as the new CSWflac is built from the latest libflac
-CHECKPKG_OVERRIDES_CSWlibflac4 += file-collision|/opt/csw/lib/libFLAC.so.4.0.1|CSWflac|CSWlibflac4
-CHECKPKG_OVERRIDES_CSWlibflac4 += file-collision|/opt/csw/lib/libFLAC.so.4|CSWflac|CSWlibflac4
+CHECKPKG_OVERRIDES_CSWlibflac7 += file-collision|/opt/csw/lib/libFLAC.so.7.0.0|CSWflac|CSWlibflac7
+CHECKPKG_OVERRIDES_CSWlibflac7 += file-collision|/opt/csw/lib/libFLAC.so.7|CSWflac|CSWlibflac7
VENDOR_URL = http://flac.sourceforge.net/
@@ -38,9 +40,10 @@
EXTRA_LINKER_FLAGS = -liconv -lm
# Must be defined and empty or -I$(includedir) is added too early
-# EXTRA_INC = ../../include
-CPPFLAGS =
-EXTRA_CFLAGS = $(INCLUDE_FLAGS) -D__inline=
+EXTRA_INC = ../../include
+#CPPFLAGS =
+#EXTRA_CFLAGS = $(INCLUDE_FLAGS) -D__inline=
+EXTRA_CFLAGS = -D__inline=
CONFIGURE_ARGS = $(DIRPATHS)
@@ -56,5 +59,5 @@
include gar/category.mk
post-patch-modulated:
- perl -pi -e "s/-O3 //g" $(WORKSRC)/configure
+ perl -pi -e "s/-O2 //g" $(WORKSRC)/configure
$(MAKECOOKIE)
Modified: csw/mgar/pkg/libflac7/trunk/checksums
===================================================================
--- csw/mgar/pkg/libflac4/trunk/checksums 2011-03-30 03:20:37 UTC (rev 14014)
+++ csw/mgar/pkg/libflac7/trunk/checksums 2011-03-30 13:42:37 UTC (rev 14017)
@@ -1 +1 @@
-b1523e6ad8ef85d1df5b18f20a8cfad6 flac-1.0.4.tar.gz
+2bfc127cdda02834d0491ab531a20960 flac-1.1.2.tar.gz
Copied: csw/mgar/pkg/libflac7/trunk/files/libtool-64bit.patch (from rev 14014, csw/mgar/pkg/flac/trunk/files/libtool-64bit.patch)
===================================================================
--- csw/mgar/pkg/libflac7/trunk/files/libtool-64bit.patch (rev 0)
+++ csw/mgar/pkg/libflac7/trunk/files/libtool-64bit.patch 2011-03-30 13:42:37 UTC (rev 14017)
@@ -0,0 +1,13 @@
+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"
+- if test "$with_gcc" = "yes" ; then
+ compiler_flags="$compiler_flags $arg"
+- fi
+ continue
+ ;;
+
Deleted: csw/mgar/pkg/libflac7/trunk/files/strip-nasm-1.0.4.patch
===================================================================
--- csw/mgar/pkg/libflac4/trunk/files/strip-nasm-1.0.4.patch 2011-03-30 03:20:37 UTC (rev 14014)
+++ csw/mgar/pkg/libflac7/trunk/files/strip-nasm-1.0.4.patch 2011-03-30 13:42:37 UTC (rev 14017)
@@ -1,32 +0,0 @@
-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
Copied: csw/mgar/pkg/libflac7/trunk/files/strip-nasm-1.1.2.patch (from rev 14014, csw/mgar/pkg/flac/trunk/files/strip-nasm-1.1.2.patch)
===================================================================
--- csw/mgar/pkg/libflac7/trunk/files/strip-nasm-1.1.2.patch (rev 0)
+++ csw/mgar/pkg/libflac7/trunk/files/strip-nasm-1.1.2.patch 2011-03-30 13:42:37 UTC (rev 14017)
@@ -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
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