cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Import flac from oldpackages

Browse Source
This commit is contained in:
Ted Hess
2014-07-17 16:52:21 -04:00
parent da4616cfb6
commit 18aef4945a
5 changed files with 245 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/flac/patches/001-no-docs-and-examples.patch
+73
View File
@@ -0,0 +1,73 @@
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@
AUTOMAKE_OPTIONS = foreign 1.7
-SUBDIRS = doc include m4 man src examples test build obj
+SUBDIRS = include m4 src build obj
DISTCLEANFILES = libtool-disable-static
--- a/Makefile.in
+++ b/Makefile.in
@@ -234,7 +234,7 @@ target_alias = @target_alias@
AUTOMAKE_OPTIONS = foreign 1.7
-SUBDIRS = doc include m4 man src examples test build obj
+SUBDIRS = include m4 src build obj
DISTCLEANFILES = libtool-disable-static
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,12 +30,6 @@ SUBDIRS = \
metaflac \
monkeys_audio_utilities \
$(XMMS_DIRS) \
- plugin_winamp2 \
- test_grabbag \
- test_libs_common \
- test_libFLAC \
- test_seeking \
- test_streams \
$(CPPLIBS_DIRS)
EXTRA_DIST = \
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -221,7 +221,7 @@ target_alias = @target_alias@
@FLaC__HAS_XMMS_TRUE@XMMS_DIRS = plugin_common plugin_xmms
-@FLaC__WITH_CPPLIBS_TRUE@CPPLIBS_DIRS = libFLAC++ test_libFLAC++
+@FLaC__WITH_CPPLIBS_TRUE@CPPLIBS_DIRS = libFLAC++
SUBDIRS = \
libFLAC \
@@ -230,12 +230,6 @@ SUBDIRS = \
metaflac \
monkeys_audio_utilities \
$(XMMS_DIRS) \
- plugin_winamp2 \
- test_grabbag \
- test_libs_common \
- test_libFLAC \
- test_seeking \
- test_streams \
$(CPPLIBS_DIRS)
@@ -256,9 +250,8 @@ RECURSIVE_TARGETS = info-recursive dvi-r
check-recursive installcheck-recursive
DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
DIST_SUBDIRS = libFLAC share flac metaflac monkeys_audio_utilities \
- plugin_common plugin_xmms plugin_winamp2 test_grabbag \
- test_libs_common test_libFLAC test_seeking test_streams \
- libFLAC++ test_libFLAC++
+ plugin_common plugin_xmms plugin_winamp2 \
+ libFLAC++
all: all-recursive
.SUFFIXES:
libs/flac/patches/002-no-utility.patch
+24
View File
@@ -0,0 +1,24 @@
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,9 +26,6 @@ endif
SUBDIRS = \
libFLAC \
share \
- flac \
- metaflac \
- monkeys_audio_utilities \
$(XMMS_DIRS) \
$(CPPLIBS_DIRS)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -226,9 +226,6 @@ target_alias = @target_alias@
SUBDIRS = \
libFLAC \
share \
- flac \
- metaflac \
- monkeys_audio_utilities \
$(XMMS_DIRS) \
$(CPPLIBS_DIRS)
libs/flac/patches/010-automake-compat.patch
+11
View File
@@ -0,0 +1,11 @@
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,8 @@ SUBDIRS = include m4 src build obj
DISTCLEANFILES = libtool-disable-static
+ACLOCAL_AMFLAGS = -I m4
+
EXTRA_DIST = \
COPYING.FDL \
COPYING.GPL \
libs/flac/patches/020-libFLAC-remove-altivec-options.patch
+62
View File
@@ -0,0 +1,62 @@
--- a/src/libFLAC/Makefile.in
+++ b/src/libFLAC/Makefile.in
@@ -66,6 +66,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
+@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@@FLaC__USE_ALTIVEC_TRUE@am__append_1 = -maltivec -mabi=altivec
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
AMDEP_FALSE = @AMDEP_FALSE@
@@ -234,13 +235,21 @@ target_alias = @target_alias@
lib_LTLIBRARIES = libFLAC.la
@DEBUG_TRUE@DEBUGCFLAGS = -DFLAC__OVERFLOW_DETECT
+# Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
+#@@@ PPC optimizations temporarily disabled
+@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@CPUCFLAGS = \
+@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@ $(am__append_1) \
+@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@ -DFLAC__NO_ASM
+
+# FIXME: The following logic should be part of configure, not of Makefile.am
+
# The -force_cpusubtype_ALL is needed to insert a ppc64 instruction
# into cpu.c with an asm().
#@@@ PPC optimizations temporarily disabled
-@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE@CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
-# Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
-#@@@ PPC optimizations temporarily disabled
-@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
+@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE@CPUCFLAGS = -faltivec \
+@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE@ -force_cpusubtype_ALL \
+@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE@ -DFLAC__NO_ASM \
+@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE@ $(am__append_1)
AM_CFLAGS = $(DEBUGCFLAGS) $(CPUCFLAGS) @OGG_CFLAGS@
@FLaC__CPU_PPC_TRUE@@FLaC__NO_ASM_FALSE@ARCH_SUBDIRS = ppc
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -32,6 +32,9 @@ lib_LTLIBRARIES = libFLAC.la
if DEBUG
DEBUGCFLAGS = -DFLAC__OVERFLOW_DETECT
endif
+
+# FIXME: The following logic should be part of configure, not of Makefile.am
+
if FLaC__CPU_PPC
# The -force_cpusubtype_ALL is needed to insert a ppc64 instruction
# into cpu.c with an asm().
@@ -40,8 +43,12 @@ if FLaC__SYS_DARWIN
CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
else
# Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
+CPUCFLAGS =
+if FLaC__USE_ALTIVEC
+CPUCFLAGS += -maltivec -mabi=altivec
+endif
#@@@ PPC optimizations temporarily disabled
-CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
+CPUCFLAGS += -DFLAC__NO_ASM
endif
endif