[csw-devel] SF.net SVN: gar:[14149] csw/mgar/pkg
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Apr 12 20:42:01 CEST 2011
Revision: 14149
http://gar.svn.sourceforge.net/gar/?rev=14149&view=rev
Author: dmichelsen
Date: 2011-04-12 18:42:00 +0000 (Tue, 12 Apr 2011)
Log Message:
-----------
libflac8: Initial commit, libtool issue on libgmodule.la
Modified Paths:
--------------
csw/mgar/pkg/libflac8/trunk/Makefile
csw/mgar/pkg/libflac8/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/libflac8/
Removed Paths:
-------------
csw/mgar/pkg/libflac8/trunk/files/strip-nasm-1.0.4.patch
csw/mgar/pkg/libflac8/trunk/files/strip-nasm-1.1.2.patch
Modified: csw/mgar/pkg/libflac8/trunk/Makefile
===================================================================
--- csw/mgar/pkg/flac/trunk/Makefile 2011-04-11 23:02:33 UTC (rev 14131)
+++ csw/mgar/pkg/libflac8/trunk/Makefile 2011-04-12 18:42:00 UTC (rev 14149)
@@ -2,17 +2,6 @@
VERSION = 1.2.1
CATEGORIES = lib
-EXTRA_MODULATORS = VERSION
-# Version 1.1.2 is the last to contain libflac.so.7 where most of the binaries depend on
-MODULATIONS_VERSION = 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.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
define BLURB
FLAC stands for Free Lossless Audio Codec, an audio format similar
@@ -27,57 +16,41 @@
SF_PROJ = flac
MASTER_SITES = $(SF_MIRRORS)
DISTNAME = $(SF_PROJ)-$(VERSION)
-SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION),$(SF_PROJ)-$(VERSION).tar.gz)
-DISTFILES = $(SOURCEFILES)
+DISTFILES = $(DISTNAME).tar.gz
-NOEXTRACT = $(filter-out $(SF_PROJ)-$(VERSION).tar.gz,$(SOURCEFILES))
+PATCHFILES += libtool-64bit.patch
+PATCHFILES += strip-nasm-1.2.1.patch
+PATCHFILES += no-stdint.patch
-PATCHFILES_isa-sparcv8-garversion-1.1.2 = libtool-64bit.patch
-PATCHFILES_isa-sparcv9-garversion-1.1.2 = 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
+BUILD_DEP_PKGS += CSWbash
-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 = strip-nasm-1.2.1.patch libtool-64bit.patch no-stdint.patch
-PATCHFILES_isa-amd64-garversion-1.2.1 = strip-nasm-1.2.1.patch libtool-64bit.patch no-stdint.patch
+PACKAGES += CSWlibflac8
+CATALOGNAME_CSWlibflac8 = libflac8
+SPKG_DESC_CSWlibflac8 = Free lossless audio codec library, libflac.so.8
+PKGFILES_CSWlibflac8 = $(call pkgfiles_lib,libFLAC.so.8)
+RUNTIME_DEP_PKGS_CSWlibflac8 += CSWiconv
-PACKAGES = CSWflac CSWxmmsflac
-CATALOGNAME_CSWflac = libflac
-CATALOGNAME_CSWxmmsflac = xmms_flac
+# Override conflicts with CSWflac as the new CSWflac is built from the latest libflac
+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
-BUILD_DEP_PKGS = CSWbash CSWnasm
+VENDOR_URL = http://flac.sourceforge.net/
-RUNTIME_DEP_PKGS_CSWflac = CSWiconv CSWlibogg
-RUNTIME_DEP_PKGS_CSWxmmsflac = CSWglib CSWgtk CSWxmms CSWflac CSWiconv CSWlibogg
-
-SPKG_DESC_CSWflac = Free lossless audio codec
-SPKG_DESC_CSWxmmsflac = FLAC plugin for XMMS
-
-SPKG_SOURCEURL = http://flac.sourceforge.net/
-
LICENSE = $(foreach lic,FDL GPL LGPL Xiph,COPYING.$(lic))
-# We define upstream file regex so we can be notifed of new upstream software release
-UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=13478
-UPSTREAM_USE_SF = 1
-UFILES_REGEX = flac-(\d+(?:\.\d+)*)-src
+# EXTRA_LINKER_FLAGS = -liconv -lm
-BUILD64 = 1
-
-# For 1.0.4
-EXTRA_LINKER_FLAGS = -liconv
-
-NODIRPATHS = --includedir
+# Must be defined and empty or -I$(includedir) is added too early
+# EXTRA_INC = ../../include
CPPFLAGS =
+EXTRA_CFLAGS = $(INCLUDE_FLAGS) -D__inline=
+# EXTRA_CFLAGS = -D__inline=
-# Must be defined and empty or -I$(includedir) is added too early
-EXTRA_CFLAGS = -D__inline=
-EXTRA_BUILD_EXPORTS = AM_CFLAGS
+STRIP_LIBTOOL = 1
-EXTRA_CONFIGURE_ARGS_mm-64 = --disable-xmms-plugin
CONFIGURE_ARGS = $(DIRPATHS)
+
+EXTRA_CONFIGURE_ARGS_mm-64 = --disable-xmms-plugin
CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_mm-$(MEMORYMODEL))
# XXX: Assembler optimization just doesn't work. Disable for now.
@@ -85,54 +58,8 @@
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)
+# There is one test failing, but as this is really a long-outdated legacy library
+# I don't care much for now.
+# SKIPTEST ?= 1
-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
-MERGE_DIRS_isa-amd64-garversion-1.1.2 = $(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.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
-MERGE_DIRS_isa-sparcv9-garversion-1.1.2 = $(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
-
-CC := $(abspath ./bin/cc)
-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/libflac8/trunk/checksums
===================================================================
--- csw/mgar/pkg/flac/trunk/checksums 2011-04-11 23:02:33 UTC (rev 14131)
+++ csw/mgar/pkg/libflac8/trunk/checksums 2011-04-12 18:42:00 UTC (rev 14149)
@@ -1,8 +1 @@
-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
-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
+153c8b15a54da428d1f0fadc756c22c7 flac-1.2.1.tar.gz
Deleted: csw/mgar/pkg/libflac8/trunk/files/strip-nasm-1.0.4.patch
===================================================================
--- csw/mgar/pkg/flac/trunk/files/strip-nasm-1.0.4.patch 2011-04-11 23:02:33 UTC (rev 14131)
+++ csw/mgar/pkg/libflac8/trunk/files/strip-nasm-1.0.4.patch 2011-04-12 18:42:00 UTC (rev 14149)
@@ -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
Deleted: csw/mgar/pkg/libflac8/trunk/files/strip-nasm-1.1.2.patch
===================================================================
--- csw/mgar/pkg/flac/trunk/files/strip-nasm-1.1.2.patch 2011-04-11 23:02:33 UTC (rev 14131)
+++ csw/mgar/pkg/libflac8/trunk/files/strip-nasm-1.1.2.patch 2011-04-12 18:42:00 UTC (rev 14149)
@@ -1,34 +0,0 @@
-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