Skip to contentSkip to conversation

PUs and telepathy-mission-control fix

PATCH Superseded Cristian Iorga 2 participants 6 messages Feb 12, 2014

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover PUs and telepathy-mission-control fix

The following changes since commit 92cad721d764ec28c3570dfe4a80847c3df19453:

curl: fix https certificate problems (2014-02-11 17:15:55 +0000)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib ciorga/PUs
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ciorga/PUs

Cristian Iorga (3):
telepathy-mission-control: typo in connectivity switch
harfbuzz: upgrade to 0.9.26
flac: upgrade to 1.3.0

 .../telepathy/telepathy-mission-control_5.16.0.bb  |   2 +-
 .../{harfbuzz_0.9.25.bb => harfbuzz_0.9.26.bb}     |   6 +-
 .../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}          |  46 +++----
 10 files changed, 56 insertions(+), 413 deletions(-)
 rename meta/recipes-graphics/harfbuzz/{harfbuzz_0.9.25.bb => harfbuzz_0.9.26.bb} (86%)
 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} (46%)
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/3 telepathy-mission-control: typo in connectivity switch

telepathy-mission-control connectivity switch was
mistyped, defeating its purpose.

---
 meta/recipes-connectivity/telepathy/telepathy-mission-control_5.16.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/telepathy/telepathy-mission-control_5.16.0.bb +1 -1
index b28b9ce..fbd8ba2 100644
@@ -18,7 +18,7 @@ PACKAGECONFIG ??= ""
 PACKAGECONFIG[upower] = "--enable-upower,--disable-upower,upower"
 
 # to select connman or nm you need to use "connectivity" and "connman" or "nm", default is to disable both
-PACKAGECONFIG[connectvity] = ",--with-connectivity=no"
+PACKAGECONFIG[connectivity] = ",--with-connectivity=no"
 PACKAGECONFIG[connman] = "--with-connectivity=connman,,connman"
 PACKAGECONFIG[nm] = "--with-connectivity=nm,,networkmanager"
 
Signature · 1 line
1.8.3.2
#2 lore raw

PATCH 2/3 harfbuzz: upgrade to 0.9.26

In reply to Cristian Iorga

switched to ${BP} variable.

---
 .../harfbuzz/{harfbuzz_0.9.25.bb => harfbuzz_0.9.26.bb}             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/harfbuzz/{harfbuzz_0.9.25.bb => harfbuzz_0.9.26.bb} (86%)
meta/recipes-graphics/harfbuzz/harfbuzz_0.9.26.bb renamed from meta/recipes-graphics/harfbuzz/harfbuzz_0.9.25.bb +3 -3
similarity index 86%
rename from meta/recipes-graphics/harfbuzz/harfbuzz_0.9.25.bb
rename to meta/recipes-graphics/harfbuzz/harfbuzz_0.9.26.bb
index ba637bc..61d54c6 100644
@@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \
 
 SECTION = "libs"
 
-SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${PV}.tar.bz2 \
+SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2 \
 "
 
-SRC_URI[md5sum] = "491b631239f51dcd4f7934775306c4e7"
-SRC_URI[sha256sum] = "dc6e5997a569526cd28147a80a0f65466e87ae617753b38704a60184bc6d6bee"
+SRC_URI[md5sum] = "a2b6cbd437f22dd5dc93d377696c9204"
+SRC_URI[sha256sum] = "5ded7dc3d15fb5c9230d7a224b9256b67b35fde30193b4c3a4c3f6b13110e257"
 
 inherit autotools pkgconfig lib_package
 
Signature · 1 line
1.8.3.2
#3 lore raw

PATCH 3/3 flac: upgrade to 1.3.0

In reply to Cristian Iorga

- 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.

Build on all qemu arch;
Tested on qemux86-64 and qemuppc.

---
 .../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}          |  46 +++----
 8 files changed, 52 insertions(+), 409 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} (46%)
meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch deleted +0 -78
deleted file mode 100644
index 5ca8b35..0000000
@@ -1,78 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-From f9b017c2c958d968cc5dfd36dc68fc8e5fb89a58 Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <[email protected]>
-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 <[email protected]>
----
- 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
-
meta/recipes-multimedia/flac/flac-1.2.1/asm-pic.patch deleted +0 -99

99 lines not on this page · raw message

meta/recipes-multimedia/flac/flac-1.2.1/disable-xmms-plugin.patch deleted +0 -25
deleted file mode 100644
index 80769a8..0000000
@@ -1,25 +0,0 @@
-# Acquired from OpenEmbedded
-Upstream-Status: Inappropriate [disable feature]
-
-diff -ruN flac-1.2.1-orig/src/Makefile.am flac-1.2.1-new/src/Makefile.am
---- flac-1.2.1-orig/src/Makefile.am	2010-06-23 15:06:29.167865355 +0800
-+++ flac-1.2.1-new/src/Makefile.am	2010-06-25 16:23:05.555202728 +0800
-@@ -15,10 +15,6 @@
- #  restrictive of those mentioned above.  See the file COPYING.Xiph in this
- #  distribution.
- 
--if FLaC__HAS_XMMS
--XMMS_DIRS = plugin_common plugin_xmms
--endif
--
- if FLaC__WITH_CPPLIBS
- CPPLIBS_DIRS = libFLAC++ test_libFLAC++
- endif
-@@ -29,7 +25,6 @@
- 	flac \
- 	metaflac \
- 	monkeys_audio_utilities \
--	$(XMMS_DIRS) \
- 	plugin_winamp2 \
- 	test_grabbag \
- 	test_libs_common \
meta/recipes-multimedia/flac/flac-1.2.1/flac-gcc43-fixes.patch deleted +0 -15
deleted file mode 100644
index 6b66599..0000000
@@ -1,15 +0,0 @@
-# Acquired from OpenEmbedded
-# Fix no declaration of memcmp()
-Upstream-Status: Submitted
-
-diff -urN flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp
---- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp	2010-06-23 15:06:29.159481339 +0800
-+++ flac-1.2.1/examples/cpp/encode/file/main.cpp	2010-06-23 15:06:46.233384883 +0800
-@@ -30,6 +30,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include "FLAC++/metadata.h"
- #include "FLAC++/encoder.h"
- 
meta/recipes-multimedia/flac/flac-1.2.1/obsolete_automake_macros.patch deleted +0 -14
deleted file mode 100644
index aa060a4..0000000
@@ -1,14 +0,0 @@
-Upstream-Status: Backport [https://sourceforge.net/p/flac/support-requests/146/]
-
-Signed-off-by: Marko Lindqvist <[email protected]>
-diff -Nurd flac-1.2.1/configure.in flac-1.2.1/configure.in
---- flac-1.2.1/configure.in	2007-09-13 18:48:42.000000000 +0300
-+++ flac-1.2.1/configure.in	2013-01-03 08:20:07.454704587 +0200
-@@ -44,7 +44,7 @@
- AC_CHECK_SIZEOF(void*,0)
-
- #@@@ new name is AC_CONFIG_HEADERS
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- AC_C_BIGENDIAN
meta/recipes-multimedia/flac/flac-1.2.1/xmms.m4 deleted +0 -149

149 lines not on this page · raw message

meta/recipes-multimedia/flac/flac-1.3.0/0001-Fix-Makefile.am-altivec-logic.patch new file +35 -0
new file mode 100644
index 0000000..d086cc9
@@ -0,0 +1,35 @@
+From 1b3597cdc7b5e604ea37db29b2a65aab91e263e6 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <[email protected]>
+Date: Wed, 4 Dec 2013 13:31:28 -0300
+Subject: [PATCH] Fix Makefile.am altivec logic
+
+Upstream-Status: Backport
+
+Besides SPE (FSL e500v? cores) there are other powerpc processors
+that don't support altivec instructions so only enable them when it's
+100% sure that the target has it.
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+Signed-off-by: Erik de Castro Lopo <[email protected]>
+Signed-off-by: Cristian Iorga <[email protected]>
+---
+ src/libFLAC/Makefile.am | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
+index 247e33c..258de40 100644
+--- a/src/libFLAC/Makefile.am
++++ b/src/libFLAC/Makefile.am
+@@ -47,8 +47,7 @@ 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
+ #@@@ PPC optimizations temporarily disabled
+-- 
+1.8.3.2
+
meta/recipes-multimedia/flac/flac_1.3.0.bb renamed from meta/recipes-multimedia/flac/flac_1.2.1.bb +17 -29

72 lines not on this page · raw message

Signature · 1 line
1.8.3.2
#4 lore raw

Re: [PATCH 3/3] flac: upgrade to 1.3.0

Quoted 11 lines · Cristian Iorga

- 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.

Got to love a patch that is 90% removals!

Quoted 1 line

+DESCRIPTION = "FLAC stands for Free Lossless Audio Codec, a losless audio compression format."

"losless" is a typo.

Quoted 1 line

S = "${WORKDIR}/flac-${PV}"

This is the default so you can remove this.

Quoted 3 lines
+                --disable-xmms-plugin \
                 --without-xmms-prefix \
                 --without-xmms-exec-prefix \

Does the addition of --disable mean you can remove the two --without arguments?

Ross

#5 lore raw

Re: [PATCH 3/3] flac: upgrade to 1.3.0

Hello Ross, all,

Thanks for the review.
Will correct the typo.

Quoted 2 lines
                 --without-xmms-prefix \
                 --without-xmms-exec-prefix \

To me it seems that this are still necessary, as it prevents from looking for an existent xmms player. So I left those in.
I will try and if no adverse effect is seen, I will remove those also.

Regards,
Cristian Iorga
YP
Intel Corporation

-----Original Message-----
From: Burton, Ross [mailto:[email protected]]
Sent: Wednesday, February 12, 2014 12:32 PM
To: Iorga, Cristian
Cc: OE-core
Subject: Re: [OE-core] [PATCH 3/3] flac: upgrade to 1.3.0

Quoted 10 lines · Cristian Iorga

- 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.

Got to love a patch that is 90% removals!

Quoted 1 line

+DESCRIPTION = "FLAC stands for Free Lossless Audio Codec, a losless audio compression format."

"losless" is a typo.

Quoted 1 line

S = "${WORKDIR}/flac-${PV}"

This is the default so you can remove this.

Quoted 3 lines
+                --disable-xmms-plugin \
                 --without-xmms-prefix \
                 --without-xmms-exec-prefix \

Does the addition of --disable mean you can remove the two --without arguments?

Ross