summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/flac
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2014-02-12 18:42:32 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-14 12:30:20 +0000
commitcb0fe9bf151b1c6dc49b4f3b099316323b8685d7 (patch)
tree4bae6871553a3e31aad016b9ef1a94fa33d8b9dc /meta/recipes-multimedia/flac
parentda0a4c7f8de57624f70ef4c8fabacd089241d91a (diff)
downloadpoky-cb0fe9bf151b1c6dc49b4f3b099316323b8685d7.tar.gz
flac: upgrade to 1.3.0
- Updated description, bugtracker and source; - Switched to ${BP} variable; - 0001-No-AltiVec-on-SPE.patch, flac-gcc43-fixes.patch, asm-pic.patch, obsolete_automake_macros.patch patches removed, included in upstream; - Licenses checksums changed due to added copyright owners and street adresses changed; - Backported 1.3.0 specific fix; - Removed obsolete PPC fix; - Added support for SSE optimizations; - Removed default ${S} definition; - Removed xmms unneeded prefixes. Build on all qemu arch; Tested on qemux86-64 and qemuppc. (From OE-Core rev: 85ac4d82c77e3cab6a5867e4ec110ba07023838b) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/flac')
-rw-r--r--meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch78
-rw-r--r--meta/recipes-multimedia/flac/flac-1.2.1/asm-pic.patch99
-rw-r--r--meta/recipes-multimedia/flac/flac-1.2.1/disable-xmms-plugin.patch25
-rw-r--r--meta/recipes-multimedia/flac/flac-1.2.1/flac-gcc43-fixes.patch15
-rw-r--r--meta/recipes-multimedia/flac/flac-1.2.1/obsolete_automake_macros.patch14
-rw-r--r--meta/recipes-multimedia/flac/flac-1.2.1/xmms.m4149
-rw-r--r--meta/recipes-multimedia/flac/flac-1.3.0/0001-Fix-Makefile.am-altivec-logic.patch35
-rw-r--r--meta/recipes-multimedia/flac/flac_1.2.1.bb59
-rw-r--r--meta/recipes-multimedia/flac/flac_1.3.0.bb43
9 files changed, 78 insertions, 439 deletions
diff --git a/meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch b/meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch
deleted file mode 100644
index 5ca8b35142..0000000000
--- a/meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch
+++ /dev/null
@@ -1,78 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3From f9b017c2c958d968cc5dfd36dc68fc8e5fb89a58 Mon Sep 17 00:00:00 2001
4From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
5Date: Fri, 11 Jun 2010 09:48:58 +0200
6Subject: [PATCH] No AltiVec on SPE
7
8Consider *gnuspe which matches powerpc-unknown-linux-gnuspe where
9AltiVec is not available at all. This triplet uses SPE which is
10incompatible with AltiVec shares the same opcode range and can't be used
11at all.
12
13Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
14---
15 configure.in | 8 ++++++++
16 src/libFLAC/Makefile.am | 10 +++++++++-
17 2 files changed, 17 insertions(+), 1 deletions(-)
18
19diff --git a/configure.in b/configure.in
20index bfa6d8e..17b7c73 100644
21--- a/configure.in
22+++ b/configure.in
23@@ -82,6 +82,14 @@ case "$host" in
24 *) OBJ_FORMAT=elf ;;
25 esac
26 AC_SUBST(OBJ_FORMAT)
27+case "$host" in
28+ *-gnuspe)
29+ abi_spe=true
30+ AC_DEFINE(FLAC__CPU_PPC_SPE)
31+ AH_TEMPLATE(FLAC__CPU_PPC_SPE, [define if building for PowerPC with SPE ABI])
32+ ;;
33+esac
34+AM_CONDITIONAL(FLaC__CPU_PPC_SPE, test "x$abi_spe" = xtrue)
35
36 # only needed because of ntohl() usage, can get rid of after that's gone:
37 case "$host" in
38diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
39index cbfb0ac..5785372 100644
40--- a/src/libFLAC/Makefile.am
41+++ b/src/libFLAC/Makefile.am
42@@ -40,8 +40,15 @@ if FLaC__SYS_DARWIN
43 CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
44 else
45 # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
46+CPUCFLAGS =
47+if FLaC__CPU_PPC_SPE
48+else
49+if FLaC__USE_ALTIVEC
50+CPUCFLAGS += -maltivec -mabi=altivec
51+endif
52+endif
53 #@@@ PPC optimizations temporarily disabled
54-CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
55+CPUCFLAGS += -DFLAC__NO_ASM
56 endif
57 endif
58
59@@ -58,6 +63,8 @@ endif
60 if FLaC__CPU_PPC
61 ARCH_SUBDIRS = ppc
62 if FLaC__HAS_AS__TEMPORARILY_DISABLED
63+if FLaC__CPU_PPC_SPE
64+else
65 LOCAL_EXTRA_LIBADD = ppc/as/libFLAC-asm.la
66 LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
67 else
68@@ -68,6 +75,7 @@ endif
69 endif
70 endif
71 endif
72+endif
73
74 libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@
75
76--
771.5.6.5
78
diff --git a/meta/recipes-multimedia/flac/flac-1.2.1/asm-pic.patch b/meta/recipes-multimedia/flac/flac-1.2.1/asm-pic.patch
deleted file mode 100644
index 43f29cf1ee..0000000000
--- a/meta/recipes-multimedia/flac/flac-1.2.1/asm-pic.patch
+++ /dev/null
@@ -1,99 +0,0 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 12022d90dd3adc9f37dc2b16358cbecfe3c5be1c Mon Sep 17 00:00:00 2001
5From: Samuli Suominen <drac@gentoo.org>
6Date: Sun, 15 Jul 2012 15:45:10 +1000
7Subject: [PATCH] Fix assembler code to make it PIC so the dynamic linker does
8 not have to do text relocations on-the-fly. Patch from Gentoo
9 via Jaren Stangret <sirjaren@gmail.com>
10
11Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
12---
13 src/libFLAC/ia32/bitreader_asm.nasm | 27 +++++++++++++++++++++++++++
14 1 files changed, 27 insertions(+), 0 deletions(-)
15
16diff --git a/src/libFLAC/ia32/bitreader_asm.nasm b/src/libFLAC/ia32/bitreader_asm.nasm
17index c6bb8c2..4cd0ea2 100644
18--- a/src/libFLAC/ia32/bitreader_asm.nasm
19+++ b/src/libFLAC/ia32/bitreader_asm.nasm
20@@ -140,8 +140,13 @@ cident FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap
21 %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE
22 mov edi, _FLAC__crc16_table
23 %else
24+%ifdef OBJ_FORMAT_elf
25+ mov edi, [esp + 16] ; saved ebx (GOT base)
26+ lea edi, [edi + FLAC__crc16_table wrt ..gotoff]
27+%else
28 mov edi, FLAC__crc16_table
29 %endif
30+%endif
31 ;; eax (ax) crc a.k.a. br->read_crc
32 ;; ebx (bl) intermediate result index into FLAC__crc16_table[]
33 ;; ecx br->crc16_align
34@@ -216,8 +221,13 @@ cident FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap
35 %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE
36 mov edi, _FLAC__crc16_table
37 %else
38+%ifdef OBJ_FORMAT_elf
39+ mov edi, [esp + 16] ; saved ebx (GOT base)
40+ lea edi, [edi + FLAC__crc16_table wrt ..gotoff]
41+%else
42 mov edi, FLAC__crc16_table
43 %endif
44+%endif
45 ;; eax (ax) crc a.k.a. br->read_crc
46 ;; ebx (bl) intermediate result index into FLAC__crc16_table[]
47 ;; ecx br->crc16_align
48@@ -316,8 +326,13 @@ cident FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap
49 %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE
50 call _bitreader_read_from_client_
51 %else
52+%ifdef OBJ_FORMAT_elf
53+ mov ebx, [esp + 20] ; saved ebx (GOT base)
54+ call bitreader_read_from_client_ wrt ..plt
55+%else
56 call bitreader_read_from_client_
57 %endif
58+%endif
59 pop edx ; /* discard, unused */
60 pop ecx ; /* restore */
61 mov esi, [ebp + 16] ; cwords = br->consumed_words;
62@@ -363,13 +378,20 @@ cident FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap
63 mov [ebp + 16], esi ; br->consumed_words = cwords;
64 mov [ebp + 20], ecx ; br->consumed_bits = cbits;
65 push ecx ; /* save */
66+ push ebx ; /* save */
67 push ebp ; /* push br argument */
68 %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE
69 call _bitreader_read_from_client_
70 %else
71+%ifdef OBJ_FORMAT_elf
72+ mov ebx, [esp + 24] ; saved ebx (GOT base)
73+ call bitreader_read_from_client_ wrt ..plt
74+%else
75 call bitreader_read_from_client_
76 %endif
77+%endif
78 pop edx ; /* discard, unused */
79+ pop ebx ; /* restore */
80 pop ecx ; /* restore */
81 mov esi, [ebp + 16] ; cwords = br->consumed_words;
82 ; ucbits = (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits;
83@@ -438,8 +460,13 @@ cident FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap
84 %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE
85 mov edi, _FLAC__crc16_table
86 %else
87+%ifdef OBJ_FORMAT_elf
88+ mov edi, [esp + 24] ; saved ebx (GOT base)
89+ lea edi, [edi + FLAC__crc16_table wrt ..gotoff]
90+%else
91 mov edi, FLAC__crc16_table
92 %endif
93+%endif
94 ;; eax (ax) crc a.k.a. br->read_crc
95 ;; ebx (bl) intermediate result index into FLAC__crc16_table[]
96 ;; ecx br->crc16_align
97--
981.7.2.5
99
diff --git a/meta/recipes-multimedia/flac/flac-1.2.1/disable-xmms-plugin.patch b/meta/recipes-multimedia/flac/flac-1.2.1/disable-xmms-plugin.patch
deleted file mode 100644
index 80769a87c5..0000000000
--- a/meta/recipes-multimedia/flac/flac-1.2.1/disable-xmms-plugin.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1# Acquired from OpenEmbedded
2Upstream-Status: Inappropriate [disable feature]
3
4diff -ruN flac-1.2.1-orig/src/Makefile.am flac-1.2.1-new/src/Makefile.am
5--- flac-1.2.1-orig/src/Makefile.am 2010-06-23 15:06:29.167865355 +0800
6+++ flac-1.2.1-new/src/Makefile.am 2010-06-25 16:23:05.555202728 +0800
7@@ -15,10 +15,6 @@
8 # restrictive of those mentioned above. See the file COPYING.Xiph in this
9 # distribution.
10
11-if FLaC__HAS_XMMS
12-XMMS_DIRS = plugin_common plugin_xmms
13-endif
14-
15 if FLaC__WITH_CPPLIBS
16 CPPLIBS_DIRS = libFLAC++ test_libFLAC++
17 endif
18@@ -29,7 +25,6 @@
19 flac \
20 metaflac \
21 monkeys_audio_utilities \
22- $(XMMS_DIRS) \
23 plugin_winamp2 \
24 test_grabbag \
25 test_libs_common \
diff --git a/meta/recipes-multimedia/flac/flac-1.2.1/flac-gcc43-fixes.patch b/meta/recipes-multimedia/flac/flac-1.2.1/flac-gcc43-fixes.patch
deleted file mode 100644
index 6b6659994f..0000000000
--- a/meta/recipes-multimedia/flac/flac-1.2.1/flac-gcc43-fixes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1# Acquired from OpenEmbedded
2# Fix no declaration of memcmp()
3Upstream-Status: Submitted
4
5diff -urN flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp
6--- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp 2010-06-23 15:06:29.159481339 +0800
7+++ flac-1.2.1/examples/cpp/encode/file/main.cpp 2010-06-23 15:06:46.233384883 +0800
8@@ -30,6 +30,7 @@
9
10 #include <stdio.h>
11 #include <stdlib.h>
12+#include <string.h>
13 #include "FLAC++/metadata.h"
14 #include "FLAC++/encoder.h"
15
diff --git a/meta/recipes-multimedia/flac/flac-1.2.1/obsolete_automake_macros.patch b/meta/recipes-multimedia/flac/flac-1.2.1/obsolete_automake_macros.patch
deleted file mode 100644
index aa060a465f..0000000000
--- a/meta/recipes-multimedia/flac/flac-1.2.1/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Upstream-Status: Backport [https://sourceforge.net/p/flac/support-requests/146/]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd flac-1.2.1/configure.in flac-1.2.1/configure.in
5--- flac-1.2.1/configure.in 2007-09-13 18:48:42.000000000 +0300
6+++ flac-1.2.1/configure.in 2013-01-03 08:20:07.454704587 +0200
7@@ -44,7 +44,7 @@
8 AC_CHECK_SIZEOF(void*,0)
9
10 #@@@ new name is AC_CONFIG_HEADERS
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13
14 AC_C_BIGENDIAN
diff --git a/meta/recipes-multimedia/flac/flac-1.2.1/xmms.m4 b/meta/recipes-multimedia/flac/flac-1.2.1/xmms.m4
deleted file mode 100644
index 5e250cdd38..0000000000
--- a/meta/recipes-multimedia/flac/flac-1.2.1/xmms.m4
+++ /dev/null
@@ -1,149 +0,0 @@
1# CFLAGS and library paths for XMMS
2# written 15 December 1999 by Ben Gertzfield <che@debian.org>
3# Acquired from OpenEmbedded
4
5dnl Usage:
6dnl AM_PATH_XMMS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
7dnl
8dnl Example:
9dnl AM_PATH_XMMS(0.9.5.1, , AC_MSG_ERROR([*** XMMS >= 0.9.5.1 not installed - please install first ***]))
10dnl
11dnl Defines XMMS_CFLAGS, XMMS_LIBS, XMMS_DATA_DIR, XMMS_PLUGIN_DIR,
12dnl XMMS_VISUALIZATION_PLUGIN_DIR, XMMS_INPUT_PLUGIN_DIR,
13dnl XMMS_OUTPUT_PLUGIN_DIR, XMMS_GENERAL_PLUGIN_DIR, XMMS_EFFECT_PLUGIN_DIR,
14dnl and XMMS_VERSION for your plugin pleasure.
15dnl
16
17dnl XMMS_TEST_VERSION(AVAILABLE-VERSION, NEEDED-VERSION [, ACTION-IF-OKAY [, ACTION-IF-NOT-OKAY]])
18AC_DEFUN(XMMS_TEST_VERSION, [
19
20# Determine which version number is greater. Prints 2 to stdout if
21# the second number is greater, 1 if the first number is greater,
22# 0 if the numbers are equal.
23
24# Written 15 December 1999 by Ben Gertzfield <che@debian.org>
25# Revised 15 December 1999 by Jim Monty <monty@primenet.com>
26
27 AC_PROG_AWK
28 xmms_got_version=[` $AWK ' \
29BEGIN { \
30 print vercmp(ARGV[1], ARGV[2]); \
31} \
32 \
33function vercmp(ver1, ver2, ver1arr, ver2arr, \
34 ver1len, ver2len, \
35 ver1int, ver2int, len, i, p) { \
36 \
37 ver1len = split(ver1, ver1arr, /\./); \
38 ver2len = split(ver2, ver2arr, /\./); \
39 \
40 len = ver1len > ver2len ? ver1len : ver2len; \
41 \
42 for (i = 1; i <= len; i++) { \
43 p = 1000 ^ (len - i); \
44 ver1int += ver1arr[i] * p; \
45 ver2int += ver2arr[i] * p; \
46 } \
47 \
48 if (ver1int < ver2int) \
49 return 2; \
50 else if (ver1int > ver2int) \
51 return 1; \
52 else \
53 return 0; \
54}' $1 $2`]
55
56 if test $xmms_got_version -eq 2; then # failure
57 ifelse([$4], , :, $4)
58 else # success!
59 ifelse([$3], , :, $3)
60 fi
61])
62
63AC_DEFUN(AM_PATH_XMMS,
64[
65AC_ARG_WITH(xmms-prefix,[ --with-xmms-prefix=PFX Prefix where XMMS is installed (optional)],
66 xmms_config_prefix="$withval", xmms_config_prefix="")
67AC_ARG_WITH(xmms-exec-prefix,[ --with-xmms-exec-prefix=PFX Exec prefix where XMMS is installed (optional)],
68 xmms_config_exec_prefix="$withval", xmms_config_exec_prefix="")
69
70if test x$xmms_config_exec_prefix != x; then
71 xmms_config_args="$xmms_config_args --exec-prefix=$xmms_config_exec_prefix"
72 if test x${XMMS_CONFIG+set} != xset; then
73 XMMS_CONFIG=$xmms_config_exec_prefix/bin/xmms-config
74 fi
75fi
76
77if test x$xmms_config_prefix != x; then
78 xmms_config_args="$xmms_config_args --prefix=$xmms_config_prefix"
79 if test x${XMMS_CONFIG+set} != xset; then
80 XMMS_CONFIG=$xmms_config_prefix/bin/xmms-config
81 fi
82fi
83
84AC_PATH_PROG(XMMS_CONFIG, xmms-config, no)
85min_xmms_version=ifelse([$1], ,0.9.5.1, $1)
86
87if test "$XMMS_CONFIG" = "no"; then
88 no_xmms=yes
89else
90 XMMS_CFLAGS=`$XMMS_CONFIG $xmms_config_args --cflags`
91 XMMS_LIBS=`$XMMS_CONFIG $xmms_config_args --libs`
92 XMMS_VERSION=`$XMMS_CONFIG $xmms_config_args --version`
93 XMMS_DATA_DIR=`$XMMS_CONFIG $xmms_config_args --data-dir`
94 XMMS_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --plugin-dir`
95 XMMS_VISUALIZATION_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args \
96 --visualization-plugin-dir`
97 XMMS_INPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --input-plugin-dir`
98 XMMS_OUTPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --output-plugin-dir`
99 XMMS_EFFECT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --effect-plugin-dir`
100 XMMS_GENERAL_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --general-plugin-dir`
101
102 XMMS_TEST_VERSION($XMMS_VERSION, $min_xmms_version, ,no_xmms=version)
103fi
104
105AC_MSG_CHECKING(for XMMS - version >= $min_xmms_version)
106
107if test "x$no_xmms" = x; then
108 AC_MSG_RESULT(yes)
109 ifelse([$2], , :, [$2])
110else
111 AC_MSG_RESULT(no)
112
113 if test "$XMMS_CONFIG" = "no" ; then
114 echo "*** The xmms-config script installed by XMMS could not be found."
115 echo "*** If XMMS was installed in PREFIX, make sure PREFIX/bin is in"
116 echo "*** your path, or set the XMMS_CONFIG environment variable to the"
117 echo "*** full path to xmms-config."
118 else
119 if test "$no_xmms" = "version"; then
120 echo "*** An old version of XMMS, $XMMS_VERSION, was found."
121 echo "*** You need a version of XMMS newer than $min_xmms_version."
122 echo "*** The latest version of XMMS is always available from"
123 echo "*** http://www.xmms.org/"
124 echo "***"
125
126 echo "*** If you have already installed a sufficiently new version, this error"
127 echo "*** probably means that the wrong copy of the xmms-config shell script is"
128 echo "*** being found. The easiest way to fix this is to remove the old version"
129 echo "*** of XMMS, but you can also set the XMMS_CONFIG environment to point to the"
130 echo "*** correct copy of xmms-config. (In this case, you will have to"
131 echo "*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf"
132 echo "*** so that the correct libraries are found at run-time)"
133 fi
134 fi
135 XMMS_CFLAGS=""
136 XMMS_LIBS=""
137 ifelse([$3], , :, [$3])
138fi
139AC_SUBST(XMMS_CFLAGS)
140AC_SUBST(XMMS_LIBS)
141AC_SUBST(XMMS_VERSION)
142AC_SUBST(XMMS_DATA_DIR)
143AC_SUBST(XMMS_PLUGIN_DIR)
144AC_SUBST(XMMS_VISUALIZATION_PLUGIN_DIR)
145AC_SUBST(XMMS_INPUT_PLUGIN_DIR)
146AC_SUBST(XMMS_OUTPUT_PLUGIN_DIR)
147AC_SUBST(XMMS_GENERAL_PLUGIN_DIR)
148AC_SUBST(XMMS_EFFECT_PLUGIN_DIR)
149])
diff --git a/meta/recipes-multimedia/flac/flac-1.3.0/0001-Fix-Makefile.am-altivec-logic.patch b/meta/recipes-multimedia/flac/flac-1.3.0/0001-Fix-Makefile.am-altivec-logic.patch
new file mode 100644
index 0000000000..d086cc910f
--- /dev/null
+++ b/meta/recipes-multimedia/flac/flac-1.3.0/0001-Fix-Makefile.am-altivec-logic.patch
@@ -0,0 +1,35 @@
1From 1b3597cdc7b5e604ea37db29b2a65aab91e263e6 Mon Sep 17 00:00:00 2001
2From: Gustavo Zacarias <gustavo@zacarias.com.ar>
3Date: Wed, 4 Dec 2013 13:31:28 -0300
4Subject: [PATCH] Fix Makefile.am altivec logic
5
6Upstream-Status: Backport
7
8Besides SPE (FSL e500v? cores) there are other powerpc processors
9that don't support altivec instructions so only enable them when it's
10100% sure that the target has it.
11
12Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
13Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
14Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
15---
16 src/libFLAC/Makefile.am | 3 +--
17 1 file changed, 1 insertion(+), 2 deletions(-)
18
19diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
20index 247e33c..258de40 100644
21--- a/src/libFLAC/Makefile.am
22+++ b/src/libFLAC/Makefile.am
23@@ -47,8 +47,7 @@ CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
24 else
25 # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
26 CPUCFLAGS =
27-if FLaC__CPU_PPC_SPE
28-else
29+if FLaC__USE_ALTIVEC
30 CPUCFLAGS += -maltivec -mabi=altivec
31 endif
32 #@@@ PPC optimizations temporarily disabled
33--
341.8.3.2
35
diff --git a/meta/recipes-multimedia/flac/flac_1.2.1.bb b/meta/recipes-multimedia/flac/flac_1.2.1.bb
deleted file mode 100644
index 37c7a97834..0000000000
--- a/meta/recipes-multimedia/flac/flac_1.2.1.bb
+++ /dev/null
@@ -1,59 +0,0 @@
1SUMMARY = "Free Lossless Audio Codec"
2DESCRIPTION = "FLAC stands for Free Lossless Audio Codec, an audio format similar to MP3, but lossless."
3HOMEPAGE = "http://flac.sourceforge.net/"
4BUGTRACKER = "http://sourceforge.net/tracker/?group_id=13478&atid=113478"
5SECTION = "libs"
6LICENSE = "GFDL-1.2 & GPLv2+ & LGPLv2.1+ & BSD"
7LIC_FILES_CHKSUM = "file://COPYING.FDL;md5=ad1419ecc56e060eccf8184a87c4285f \
8 file://src/Makefile.am;beginline=1;endline=16;md5=8dee151a56a3122f064a9dce771db37d \
9 file://COPYING.GPL;md5=079b27cd65c86dbc1b6997ffde902735 \
10 file://src/flac/main.c;beginline=1;endline=17;md5=756c4234516e4266ea45ee7bbbd798cf \
11 file://COPYING.LGPL;md5=fbc093901857fcd118f065f900982c24 \
12 file://src/plugin_common/all.h;beginline=1;endline=17;md5=b2e7960da6b43e4eccabf999bcf7f3a9 \
13 file://COPYING.Xiph;md5=df8975c0225f83ed7b567587ed953b83 \
14 file://include/FLAC/all.h;beginline=64;endline=69;md5=64474f2b22e9e77b28d8b8b25c983a48"
15DEPENDS = "libogg"
16
17PR = "r4"
18
19SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \
20 file://disable-xmms-plugin.patch \
21 file://flac-gcc43-fixes.patch \
22 file://xmms.m4 \
23 file://0001-No-AltiVec-on-SPE.patch \
24 file://asm-pic.patch \
25 file://obsolete_automake_macros.patch \
26"
27
28SRC_URI[md5sum] = "153c8b15a54da428d1f0fadc756c22c7"
29SRC_URI[sha256sum] = "9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf"
30
31S = "${WORKDIR}/flac-${PV}"
32
33inherit autotools gettext
34
35EXTRA_OECONF = "--disable-oggtest \
36 --with-ogg-libraries=${STAGING_LIBDIR} \
37 --with-ogg-includes=${STAGING_INCDIR} \
38 --without-xmms-prefix \
39 --without-xmms-exec-prefix \
40 --without-libiconv-prefix \
41 "
42
43EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "altivec", " --enable-altivec", " --disable-altivec", d)}"
44
45PACKAGES += "libflac libflac++ liboggflac liboggflac++"
46FILES_${PN} = "${bindir}/*"
47FILES_libflac = "${libdir}/libFLAC.so.*"
48FILES_libflac++ = "${libdir}/libFLAC++.so.*"
49FILES_liboggflac = "${libdir}/libOggFLAC.so.*"
50FILES_liboggflac++ = "${libdir}/libOggFLAC++.so.*"
51
52do_configure () {
53 install -d ${S}/m4
54 install -m 0644 ${WORKDIR}/xmms.m4 ${S}/m4/
55 autotools_do_configure
56 # removes '-read-only-relocs' which is enabled for PowerPC builds.
57 # It makes the build fail, other archs are not affected. Fixes #1775.
58 sed -i 's/-Wl,-read_only_relocs,warning//g' src/libFLAC/Makefile
59}
diff --git a/meta/recipes-multimedia/flac/flac_1.3.0.bb b/meta/recipes-multimedia/flac/flac_1.3.0.bb
new file mode 100644
index 0000000000..aa04caccc5
--- /dev/null
+++ b/meta/recipes-multimedia/flac/flac_1.3.0.bb
@@ -0,0 +1,43 @@
1SUMMARY = "Free Lossless Audio Codec"
2DESCRIPTION = "FLAC stands for Free Lossless Audio Codec, a lossless audio compression format."
3HOMEPAGE = "https://xiph.org/flac/"
4BUGTRACKER = "http://sourceforge.net/p/flac/bugs/"
5SECTION = "libs"
6LICENSE = "GFDL-1.2 & GPLv2+ & LGPLv2.1+ & BSD"
7LIC_FILES_CHKSUM = "file://COPYING.FDL;md5=ad1419ecc56e060eccf8184a87c4285f \
8 file://src/Makefile.am;beginline=1;endline=17;md5=59575c1aa8f5f70d9361b776c2e2bdb5 \
9 file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://src/flac/main.c;beginline=1;endline=18;md5=d36a16abc38d5ffd346ac4ba1be1932b \
11 file://COPYING.LGPL;md5=fbc093901857fcd118f065f900982c24 \
12 file://src/plugin_common/all.h;beginline=1;endline=18;md5=e33e281151e7f40db2d3d170d9b0c1bb \
13 file://COPYING.Xiph;md5=755582d124a03e3001afea59fc02b61b \
14 file://include/FLAC/all.h;beginline=65;endline=70;md5=64474f2b22e9e77b28d8b8b25c983a48"
15DEPENDS = "libogg"
16
17SRC_URI = "http://downloads.xiph.org/releases/flac/${BP}.tar.xz \
18 file://0001-Fix-Makefile.am-altivec-logic.patch \
19 "
20
21SRC_URI[md5sum] = "13b5c214cee8373464d3d65dee362cdd"
22SRC_URI[sha256sum] = "fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc"
23
24inherit autotools gettext
25
26EXTRA_OECONF = "--disable-oggtest \
27 --with-ogg-libraries=${STAGING_LIBDIR} \
28 --with-ogg-includes=${STAGING_INCDIR} \
29 --disable-xmms-plugin \
30 --without-libiconv-prefix \
31 "
32
33EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "altivec", " --enable-altivec", " --disable-altivec", d)}"
34EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "core2", " --enable-sse", "", d)}"
35EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "corei7", " --enable-sse", "", d)}"
36
37PACKAGES += "libflac libflac++ liboggflac liboggflac++"
38FILES_${PN} = "${bindir}/*"
39FILES_libflac = "${libdir}/libFLAC.so.*"
40FILES_libflac++ = "${libdir}/libFLAC++.so.*"
41FILES_liboggflac = "${libdir}/libOggFLAC.so.*"
42FILES_liboggflac++ = "${libdir}/libOggFLAC++.so.*"
43
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-08 21:07:01 +0000