[csw-devel] SF.net SVN: gar:[13565] csw/mgar/pkg
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri Mar 4 23:28:02 CET 2011
Revision: 13565
http://gar.svn.sourceforge.net/gar/?rev=13565&view=rev
Author: dmichelsen
Date: 2011-03-04 22:28:02 +0000 (Fri, 04 Mar 2011)
Log Message:
-----------
libflac4: Initial creation
Modified Paths:
--------------
csw/mgar/pkg/libflac4/trunk/Makefile
csw/mgar/pkg/libflac4/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/libflac4/
Removed Paths:
-------------
csw/mgar/pkg/libflac4/trunk/files/libtool-64bit.patch
csw/mgar/pkg/libflac4/trunk/files/no-stdint.patch
csw/mgar/pkg/libflac4/trunk/files/strip-nasm-1.1.2.patch
csw/mgar/pkg/libflac4/trunk/files/strip-nasm-1.2.1.patch
Modified: csw/mgar/pkg/libflac4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/flac/trunk/Makefile 2011-03-03 03:02:29 UTC (rev 13545)
+++ csw/mgar/pkg/libflac4/trunk/Makefile 2011-03-04 22:28:02 UTC (rev 13565)
@@ -1,18 +1,7 @@
NAME = libflac
-VERSION = 1.2.1
+VERSION = 1.0.4
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,112 +16,45 @@
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 = strip-nasm-1.0.4.patch
+BUILD_DEP_PKGS += CSWbash
-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
+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
-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
+# 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
-PACKAGES = CSWflac CSWxmmsflac
-CATALOGNAME_CSWflac = libflac
-CATALOGNAME_CSWxmmsflac = xmms_flac
+VENDOR_URL = http://flac.sourceforge.net/
-BUILD_DEP_PKGS = CSWbash CSWnasm
-
-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=
-# 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))
-# XXX: Assembler optimization just doesn't work. Disable for now.
-CONFIGURE_ARGS += --disable-asm-optimizations
+# This is a legacy library, built XMMS plugin against newest one
+CONFIGURE_ARGS += --with-xmms-prefix=/notthere
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:
+post-patch-modulated:
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/libflac4/trunk/checksums
===================================================================
--- csw/mgar/pkg/flac/trunk/checksums 2011-03-03 03:02:29 UTC (rev 13545)
+++ csw/mgar/pkg/libflac4/trunk/checksums 2011-03-04 22:28:02 UTC (rev 13565)
@@ -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
+b1523e6ad8ef85d1df5b18f20a8cfad6 flac-1.0.4.tar.gz
Deleted: csw/mgar/pkg/libflac4/trunk/files/libtool-64bit.patch
===================================================================
--- csw/mgar/pkg/flac/trunk/files/libtool-64bit.patch 2011-03-03 03:02:29 UTC (rev 13545)
+++ csw/mgar/pkg/libflac4/trunk/files/libtool-64bit.patch 2011-03-04 22:28:02 UTC (rev 13565)
@@ -1,13 +0,0 @@
-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/libflac4/trunk/files/no-stdint.patch
===================================================================
--- csw/mgar/pkg/flac/trunk/files/no-stdint.patch 2011-03-03 03:02:29 UTC (rev 13545)
+++ csw/mgar/pkg/libflac4/trunk/files/no-stdint.patch 2011-03-04 22:28:02 UTC (rev 13565)
@@ -1,12 +0,0 @@
-diff -Naur flac-1.2.1.orig/include/share/alloc.h flac-1.2.1.patch/include/share/alloc.h
---- flac-1.2.1.orig/include/share/alloc.h 2007-09-12 07:32:21.000000000 +0200
-+++ flac-1.2.1.patch/include/share/alloc.h 2009-02-24 16:19:58.442033162 +0100
-@@ -29,7 +29,7 @@
-
- #include <limits.h> /* for SIZE_MAX */
- #if !defined _MSC_VER && !defined __MINGW32__ && !defined __EMX__
--#include <stdint.h> /* for SIZE_MAX in case limits.h didn't get it */
-+/* #include <stdint.h> /* for SIZE_MAX in case limits.h didn't get it */
- #endif
- #include <stdlib.h> /* for size_t, malloc(), etc */
-
Deleted: csw/mgar/pkg/libflac4/trunk/files/strip-nasm-1.1.2.patch
===================================================================
--- csw/mgar/pkg/flac/trunk/files/strip-nasm-1.1.2.patch 2011-03-03 03:02:29 UTC (rev 13545)
+++ csw/mgar/pkg/libflac4/trunk/files/strip-nasm-1.1.2.patch 2011-03-04 22:28:02 UTC (rev 13565)
@@ -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
Deleted: csw/mgar/pkg/libflac4/trunk/files/strip-nasm-1.2.1.patch
===================================================================
--- csw/mgar/pkg/flac/trunk/files/strip-nasm-1.2.1.patch 2011-03-03 03:02:29 UTC (rev 13545)
+++ csw/mgar/pkg/libflac4/trunk/files/strip-nasm-1.2.1.patch 2011-03-04 22:28:02 UTC (rev 13565)
@@ -1,34 +0,0 @@
-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