Re: [OE-core] [PATCH v2 3/3] flac: upgrade to 1.3.0
Ping.
-Original Message-
From: Burton, Ross [mailto:ross.bur...@intel.com]
Sent: Wednesday, February 12, 2014 8:25 PM
To: Iorga, Cristian
Cc: OE-core
Subject: Re: [OE-core] [PATCH v2 3/3] flac: upgrade to 1.3.0
Reviewed-by: Ross Burton ross.bur...@intel.com
On 12 February 2014 16:42, Cristian Iorga cristian.io...@intel.com wrote:
- 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.
Signed-off-by: Cristian Iorga cristian.io...@intel.com
---
.../flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch | 78 ---
.../flac/flac-1.2.1/asm-pic.patch | 99 --
.../flac/flac-1.2.1/disable-xmms-plugin.patch | 25
.../flac/flac-1.2.1/flac-gcc43-fixes.patch | 15 ---
.../flac/flac-1.2.1/obsolete_automake_macros.patch | 14 --
meta/recipes-multimedia/flac/flac-1.2.1/xmms.m4| 149
-
.../0001-Fix-Makefile.am-altivec-logic.patch | 35 +
.../flac/{flac_1.2.1.bb = flac_1.3.0.bb} | 50 +++
8 files changed, 52 insertions(+), 413 deletions(-) delete mode
100644
meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch
delete mode 100644
meta/recipes-multimedia/flac/flac-1.2.1/asm-pic.patch
delete mode 100644
meta/recipes-multimedia/flac/flac-1.2.1/disable-xmms-plugin.patch
delete mode 100644
meta/recipes-multimedia/flac/flac-1.2.1/flac-gcc43-fixes.patch
delete mode 100644
meta/recipes-multimedia/flac/flac-1.2.1/obsolete_automake_macros.patch
delete mode 100644 meta/recipes-multimedia/flac/flac-1.2.1/xmms.m4
create mode 100644
meta/recipes-multimedia/flac/flac-1.3.0/0001-Fix-Makefile.am-altivec-l
ogic.patch rename meta/recipes-multimedia/flac/{flac_1.2.1.bb =
flac_1.3.0.bb} (42%)
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 5ca8b35..000
---
a/meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-From f9b017c2c958d968cc5dfd36dc68fc8e5fb89a58 Mon Sep 17 00:00:00
2001
-From: Sebastian Andrzej Siewior bige...@linutronix.de
-Date: Fri, 11 Jun 2010 09:48:58 +0200
-Subject: [PATCH] No AltiVec on SPE
-
-Consider *gnuspe which matches powerpc-unknown-linux-gnuspe where
-AltiVec is not available at all. This triplet uses SPE which is
-incompatible with AltiVec shares the same opcode range and can't be
used -at all.
-
-Signed-off-by: Sebastian Andrzej Siewior bige...@linutronix.de
- configure.in|8
- src/libFLAC/Makefile.am | 10 +-
- 2 files changed, 17 insertions(+), 1 deletions(-)
-
-diff --git a/configure.in b/configure.in -index bfa6d8e..17b7c73
100644
a/configure.in
-+++ b/configure.in
-@@ -82,6 +82,14 @@ case $host in
- *) OBJ_FORMAT=elf ;;
- esac
- AC_SUBST(OBJ_FORMAT)
-+case $host in
-+ *-gnuspe)
-+ abi_spe=true
-+ AC_DEFINE(FLAC__CPU_PPC_SPE)
-+ AH_TEMPLATE(FLAC__CPU_PPC_SPE, [define if building for
PowerPC with SPE ABI])
-+ ;;
-+esac
-+AM_CONDITIONAL(FLaC__CPU_PPC_SPE, test x$abi_spe = xtrue)
-
- # only needed because of ntohl() usage, can get rid of after that's gone:
- case $host in
-diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am -index
cbfb0ac..5785372 100644
a/src/libFLAC/Makefile.am
-+++ b/src/libFLAC/Makefile.am
-@@ -40,8 +40,15 @@ 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__CPU_PPC_SPE
-+else
-+if FLaC__USE_ALTIVEC
-+CPUCFLAGS += -maltivec -mabi=altivec endif endif
- #@@@ PPC optimizations temporarily disabled --CPUCFLAGS = -maltivec
-mabi=altivec -DFLAC__NO_ASM
-+CPUCFLAGS += -DFLAC__NO_ASM
- endif
- endif
-
-@@ -58,6 +63,8 @@ endif
- if FLaC__CPU_PPC
- ARCH_SUBDIRS = ppc
- if FLaC__HAS_AS__TEMPORARILY_DISABLED
-+if FLaC__CPU_PPC_SPE
-+else
- LOCAL_EXTRA_LIBADD = ppc/as/libFLAC-asm.la
- LOCAL_EXTRA_LDFLAGS = -Wl,-read_only_relocs,warning
- else
-@@ -68,6 +75,7 @@ endif
- endif
- endif
- endif
-+endif
-
- libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@
-
---
-1.5.6.5
-
diff --git a/meta/recipes-multimedia/flac/flac-1.2.1/asm-pic.patch
b/meta/recipes
[OE-core] [PATCH v2 3/3] 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.
Signed-off-by: Cristian Iorga cristian.io...@intel.com
---
.../flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch | 78 ---
.../flac/flac-1.2.1/asm-pic.patch | 99 --
.../flac/flac-1.2.1/disable-xmms-plugin.patch | 25
.../flac/flac-1.2.1/flac-gcc43-fixes.patch | 15 ---
.../flac/flac-1.2.1/obsolete_automake_macros.patch | 14 --
meta/recipes-multimedia/flac/flac-1.2.1/xmms.m4| 149 -
.../0001-Fix-Makefile.am-altivec-logic.patch | 35 +
.../flac/{flac_1.2.1.bb = flac_1.3.0.bb} | 50 +++
8 files changed, 52 insertions(+), 413 deletions(-)
delete mode 100644
meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch
delete mode 100644 meta/recipes-multimedia/flac/flac-1.2.1/asm-pic.patch
delete mode 100644
meta/recipes-multimedia/flac/flac-1.2.1/disable-xmms-plugin.patch
delete mode 100644
meta/recipes-multimedia/flac/flac-1.2.1/flac-gcc43-fixes.patch
delete mode 100644
meta/recipes-multimedia/flac/flac-1.2.1/obsolete_automake_macros.patch
delete mode 100644 meta/recipes-multimedia/flac/flac-1.2.1/xmms.m4
create mode 100644
meta/recipes-multimedia/flac/flac-1.3.0/0001-Fix-Makefile.am-altivec-logic.patch
rename meta/recipes-multimedia/flac/{flac_1.2.1.bb = flac_1.3.0.bb} (42%)
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 5ca8b35..000
--- a/meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-From f9b017c2c958d968cc5dfd36dc68fc8e5fb89a58 Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior bige...@linutronix.de
-Date: Fri, 11 Jun 2010 09:48:58 +0200
-Subject: [PATCH] No AltiVec on SPE
-
-Consider *gnuspe which matches powerpc-unknown-linux-gnuspe where
-AltiVec is not available at all. This triplet uses SPE which is
-incompatible with AltiVec shares the same opcode range and can't be used
-at all.
-
-Signed-off-by: Sebastian Andrzej Siewior bige...@linutronix.de
- configure.in|8
- src/libFLAC/Makefile.am | 10 +-
- 2 files changed, 17 insertions(+), 1 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index bfa6d8e..17b7c73 100644
a/configure.in
-+++ b/configure.in
-@@ -82,6 +82,14 @@ case $host in
- *) OBJ_FORMAT=elf ;;
- esac
- AC_SUBST(OBJ_FORMAT)
-+case $host in
-+ *-gnuspe)
-+ abi_spe=true
-+ AC_DEFINE(FLAC__CPU_PPC_SPE)
-+ AH_TEMPLATE(FLAC__CPU_PPC_SPE, [define if building for PowerPC
with SPE ABI])
-+ ;;
-+esac
-+AM_CONDITIONAL(FLaC__CPU_PPC_SPE, test x$abi_spe = xtrue)
-
- # only needed because of ntohl() usage, can get rid of after that's gone:
- case $host in
-diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
-index cbfb0ac..5785372 100644
a/src/libFLAC/Makefile.am
-+++ b/src/libFLAC/Makefile.am
-@@ -40,8 +40,15 @@ 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__CPU_PPC_SPE
-+else
-+if FLaC__USE_ALTIVEC
-+CPUCFLAGS += -maltivec -mabi=altivec
-+endif
-+endif
- #@@@ PPC optimizations temporarily disabled
--CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
-+CPUCFLAGS += -DFLAC__NO_ASM
- endif
- endif
-
-@@ -58,6 +63,8 @@ endif
- if FLaC__CPU_PPC
- ARCH_SUBDIRS = ppc
- if FLaC__HAS_AS__TEMPORARILY_DISABLED
-+if FLaC__CPU_PPC_SPE
-+else
- LOCAL_EXTRA_LIBADD = ppc/as/libFLAC-asm.la
- LOCAL_EXTRA_LDFLAGS = -Wl,-read_only_relocs,warning
- else
-@@ -68,6 +75,7 @@ endif
- endif
- endif
- endif
-+endif
-
- libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@
-
---
-1.5.6.5
-
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 43f29cf..000
--- a/meta/recipes-multimedia/flac/flac-1.2.1/asm-pic.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton ross.bur...@intel.com
-
-From 12022d90dd3adc9f37dc2b16358cbecfe3c5be1c Mon Sep 17 00:00:00 2001
-From: Samuli Suominen d...@gentoo.org
-Date: Sun, 15 Jul 2012 15:45:10 +1000
-Subject: [PATCH] Fix assembler code to make it PIC so the dynamic linker does
Re: [OE-core] [PATCH v2 3/3] flac: upgrade to 1.3.0
Reviewed-by: Ross Burton ross.bur...@intel.com
On 12 February 2014 16:42, Cristian Iorga cristian.io...@intel.com wrote:
- 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.
Signed-off-by: Cristian Iorga cristian.io...@intel.com
---
.../flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch | 78 ---
.../flac/flac-1.2.1/asm-pic.patch | 99 --
.../flac/flac-1.2.1/disable-xmms-plugin.patch | 25
.../flac/flac-1.2.1/flac-gcc43-fixes.patch | 15 ---
.../flac/flac-1.2.1/obsolete_automake_macros.patch | 14 --
meta/recipes-multimedia/flac/flac-1.2.1/xmms.m4| 149
-
.../0001-Fix-Makefile.am-altivec-logic.patch | 35 +
.../flac/{flac_1.2.1.bb = flac_1.3.0.bb} | 50 +++
8 files changed, 52 insertions(+), 413 deletions(-)
delete mode 100644
meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch
delete mode 100644 meta/recipes-multimedia/flac/flac-1.2.1/asm-pic.patch
delete mode 100644
meta/recipes-multimedia/flac/flac-1.2.1/disable-xmms-plugin.patch
delete mode 100644
meta/recipes-multimedia/flac/flac-1.2.1/flac-gcc43-fixes.patch
delete mode 100644
meta/recipes-multimedia/flac/flac-1.2.1/obsolete_automake_macros.patch
delete mode 100644 meta/recipes-multimedia/flac/flac-1.2.1/xmms.m4
create mode 100644
meta/recipes-multimedia/flac/flac-1.3.0/0001-Fix-Makefile.am-altivec-logic.patch
rename meta/recipes-multimedia/flac/{flac_1.2.1.bb = flac_1.3.0.bb} (42%)
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 5ca8b35..000
--- a/meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-From f9b017c2c958d968cc5dfd36dc68fc8e5fb89a58 Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior bige...@linutronix.de
-Date: Fri, 11 Jun 2010 09:48:58 +0200
-Subject: [PATCH] No AltiVec on SPE
-
-Consider *gnuspe which matches powerpc-unknown-linux-gnuspe where
-AltiVec is not available at all. This triplet uses SPE which is
-incompatible with AltiVec shares the same opcode range and can't be used
-at all.
-
-Signed-off-by: Sebastian Andrzej Siewior bige...@linutronix.de
- configure.in|8
- src/libFLAC/Makefile.am | 10 +-
- 2 files changed, 17 insertions(+), 1 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index bfa6d8e..17b7c73 100644
a/configure.in
-+++ b/configure.in
-@@ -82,6 +82,14 @@ case $host in
- *) OBJ_FORMAT=elf ;;
- esac
- AC_SUBST(OBJ_FORMAT)
-+case $host in
-+ *-gnuspe)
-+ abi_spe=true
-+ AC_DEFINE(FLAC__CPU_PPC_SPE)
-+ AH_TEMPLATE(FLAC__CPU_PPC_SPE, [define if building for
PowerPC with SPE ABI])
-+ ;;
-+esac
-+AM_CONDITIONAL(FLaC__CPU_PPC_SPE, test x$abi_spe = xtrue)
-
- # only needed because of ntohl() usage, can get rid of after that's gone:
- case $host in
-diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
-index cbfb0ac..5785372 100644
a/src/libFLAC/Makefile.am
-+++ b/src/libFLAC/Makefile.am
-@@ -40,8 +40,15 @@ 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__CPU_PPC_SPE
-+else
-+if FLaC__USE_ALTIVEC
-+CPUCFLAGS += -maltivec -mabi=altivec
-+endif
-+endif
- #@@@ PPC optimizations temporarily disabled
--CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
-+CPUCFLAGS += -DFLAC__NO_ASM
- endif
- endif
-
-@@ -58,6 +63,8 @@ endif
- if FLaC__CPU_PPC
- ARCH_SUBDIRS = ppc
- if FLaC__HAS_AS__TEMPORARILY_DISABLED
-+if FLaC__CPU_PPC_SPE
-+else
- LOCAL_EXTRA_LIBADD = ppc/as/libFLAC-asm.la
- LOCAL_EXTRA_LDFLAGS = -Wl,-read_only_relocs,warning
- else
-@@ -68,6 +75,7 @@ endif
- endif
- endif
- endif
-+endif
-
- libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@
-
---
-1.5.6.5
-
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 43f29cf..000
--- a/meta/recipes-multimedia/flac/flac-1.2.1/asm-pic.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross
