* [PATCH][oe-core 01/22] qt4-x11-free: bring back pkg-config fixups
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 02/22] libatomics-ops: force ARM mode Martin Jansa
` (21 subsequent siblings)
22 siblings, 0 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
From: Simon Busch <morphis@gravedo.de>
* With b40b9c024be5e1ec81a31961158b3e6b529acfe0 some pkg-config fixups where removed from
qt4.inc which breaks the pkg-config files for qt4-embedded. Without that the pkg-config
files for qt4-x11-free are broken. So this patch puts the fixes into the qt4-x11-free.inc
file to be used by qt4-x11-free and not qt4-embedded.
* Resending because nobody replied on
http://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg10609.html
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-qt/qt4/qt4-x11-free.inc | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index f391028..04b7885 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
SECTION = "x11/libs"
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r32"
+INC_PR = "r33"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"
@@ -16,3 +16,17 @@ QT_BASE_LIB ?= "libqt"
inherit qt4x11
+do_install_append() {
+ # fix pkgconfig, libtool and prl files
+ sed -i -e 's#I/usr/include#Iincludedir}#g' \
+ -e 's#Iin#I${in#g' \
+ ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc
+
+ # QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so
+ # manually fix it up here:
+ for pc in ${D}${libdir}/pkgconfig/*.pc ; do
+ sed -i -e "s:prefix}include/${QT_BASE_NAME}/$(basename $pc .pc):prefix}/include:" \
+ -e "s,Cflags: ,Cflags: -IP{includedir}/${QT_BASE_NAME}/$(basename $pc .pc) ," \
+ -e 's:IP{:I${:g' $pc
+ done
+}
--
1.7.8.rc1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH][oe-core 02/22] libatomics-ops: force ARM mode
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 01/22] qt4-x11-free: bring back pkg-config fixups Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 03/22] pulseaudio-0.9.23: " Martin Jansa
` (20 subsequent siblings)
22 siblings, 0 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
* otherwise ie spitz (armv5te) build fails with:
| make[3]: Entering directory `/OE/shr-core/tmp/work/armv5te-oe-linux-gnueabi/libatomics-ops-1.2-r5/libatomic_ops-1.2/src'
| arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mthumb-interwork -mtune=xscale --sysroot=/OE/shr-core/tmp/sysroots/spitz -DHAVE_CONFIG_H -I. -fPIC -O
2 -pipe -g -feliminate-unused-debug-types -DNDEBUG -c atomic_ops.c
| arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mthumb-interwork -mtune=xscale --sysroot=/OE/shr-core/tmp/sysroots/spitz -DHAVE_CONFIG_H -I. -fPIC -O
2 -pipe -g -feliminate-unused-debug-types -DNDEBUG -c atomic_ops_stack.c
| arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mthumb-interwork -mtune=xscale --sysroot=/OE/shr-core/tmp/sysroots/spitz -DHAVE_CONFIG_H -I. -fPIC -O
2 -pipe -g -feliminate-unused-debug-types -DNDEBUG -c atomic_ops_malloc.c
| atomic_ops_malloc.c: In function 'msb':
| atomic_ops_malloc.c:223:2: warning: right shift count >= width of type [enabled by default]
| rm -f libatomic_ops_gpl.a
| ar cru libatomic_ops_gpl.a atomic_ops_stack.o atomic_ops_malloc.o
| arm-oe-linux-gnueabi-ranlib libatomic_ops_gpl.a
| {standard input}: Assembler messages:
| {standard input}:286: Error: selected processor does not support Thumb mode `swp r1,r2,[r3]'
| {standard input}:329: Error: selected processor does not support Thumb mode `swp r0,r1,[r3]'
* this is just work around, proper fix proposed by Henning Heinold
hm we should think of reworking this recipe now. Because since gcc 4.5
pulseaudio for arm can use the gcc internal atomicstuff and in oe-core
and meta-oe we have 4.5 or 4.6 only. The lib is
only needed for mips and it is still the old release, on cvs
is a much better version, which supports thumb too, if
remember correctly.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../pulseaudio/libatomics-ops_1.2.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb b/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
index ab7ccbe..c84917a 100644
--- a/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
+++ b/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2 & MIT"
LIC_FILES_CHKSUM = "file://doc/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://doc/LICENSING.txt;md5=607073e04548eac7d1f763e480477bab \
"
-PR = "r6"
+PR = "r7"
SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-${PV}.tar.gz \
file://fedora/libatomic_ops-1.2-ppclwzfix.patch \
@@ -20,6 +20,8 @@ S = "${WORKDIR}/libatomic_ops-${PV}"
ALLOW_EMPTY_${PN} = "1"
+ARM_INSTRUCTION_SET = "arm"
+
inherit autotools pkgconfig
do_install_append() {
--
1.7.8.rc1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH][oe-core 03/22] pulseaudio-0.9.23: force ARM mode
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 01/22] qt4-x11-free: bring back pkg-config fixups Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 02/22] libatomics-ops: force ARM mode Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 04/22] aspell: " Martin Jansa
` (19 subsequent siblings)
22 siblings, 0 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
* this is just work around, should be tested again after upgrade to
pulseaudio-1.1
* otherwise build for armv4t (om-gta02) fails with this:
| /bin/sh ../arm-oe-linux-gnueabi-libtool --tag=CC --mode=compile
arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb -mthumb-interwork
-mtune=arm920t --sysroot=/OE/shr-core/tmp/sysroots/om-gta02 -std=gnu99
-DHAVE_CONFIG_H -I. -I.. -I../src -I../src -I../src/modules
-I../src/modules -I../src/modules/rtp -I../src/modules/rtp
-I../src/modules/gconf -I../src/modules/gconf -I../src/modules/bluetooth
-I../src/modules/bluetooth -I../src/modules/oss -I../src/modules/oss
-I../src/modules/alsa -I../src/modules/alsa -I../src/modules/raop
-I../src/modules/raop -I../src/modules/x11 -I../src/modules/x11
-I../src/modules/jack -I../src/modules/jack -I../src/modules/echo-cancel
-I../src/modules/echo-cancel -pthread -D_POSIX_PTHREAD_SEMANTICS
-DPA_BUILDDIR=\"/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/pulseaudio-0.9.23-r6/pulseaudio-0.9.23/src\"
-DPA_DLSEARCHPATH=\"/usr/lib/pulse-0.9.23/modules\"
-DPA_DEFAULT_CONFIG_DIR=\"/etc/pulse\"
-DPA_BINARY=\"/usr/bin/pulseaudio\"
-DPA_SYSTEM_RUNTIME_PATH=\"/var/run/pulse\"
-DPA_SYSTEM_CONFIG_PATH=\"/var/lib/pulse\"
-DPA_SYSTEM_STATE_PATH=\"/var/lib/pulse\" -DAO_REQUIRE_CAS
-DPULSE_LOCALEDIR=\"/usr/share/locale\"
-DPA_MACHINE_ID=\"/var/lib/dbus/machine-id\"
-DPA_ALSA_PATHS_DIR=\"/usr/share/pulseaudio/alsa-mixer/paths\"
-DPA_ALSA_PROFILE_SETS_DIR=\"/usr/share/pulseaudio/alsa-mixer/profile-sets\"
-O2 -pipe -g -feliminate-unused-debug-types -Wall -W -Wextra -pipe
-Wno-long-long -Winline -Wvla -Wno-overlength-strings
-Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op
-Wsign-compare -Wformat-security -Wmissing-include-dirs
-Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self
-Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes
-Wstrict-prototypes -Wredundant-decls -Wmissing-declarations
-Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align
-Wstrict-aliasing=2 -Wwrite-strings -Wno-unused-parameter -ffast-math
-Wp,-D_FORTIFY_SOURCE=2 -fno-common -fdiagnostics-show-option -c -o
libbluetooth_sbc_la-sbc.lo `test -f 'modules/bluetooth/sbc.c' || echo
'./'`modules/bluetooth/sbc.ci
| arm-oe-linux-gnueabi-libtool: compile: arm-oe-linux-gnueabi-gcc
-march=armv4t -mthumb -mthumb-interwork -mtune=arm920t
--sysroot=/OE/shr-core/tmp/sysroots/om-gta02 -std=gnu99 -DHAVE_CONFIG_H
-I. -I.. -I../src -I../src -I../src/modules -I../src/modules
-I../src/modules/rtp -I../src/modules/rtp -I../src/modules/gconf
-I../src/modules/gconf -I../src/modules/bluetooth
-I../src/modules/bluetooth -I../src/modules/oss -I../src/modules/oss
-I../src/modules/alsa -I../src/modules/alsa -I../src/modules/raop
-I../src/modules/raop -I../src/modules/x11 -I../src/modules/x11
-I../src/modules/jack -I../src/modules/jack -I../src/modules/echo-cancel
-I../src/modules/echo-cancel -pthread -D_POSIX_PTHREAD_SEMANTICS
-DPA_BUILDDIR=\"/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/pulseaudio-0.9.23-r6/pulseaudio-0.9.23/src\"
-DPA_DLSEARCHPATH=\"/usr/lib/pulse-0.9.23/modules\"
-DPA_DEFAULT_CONFIG_DIR=\"/etc/pulse\"
-DPA_BINARY=\"/usr/bin/pulseaudio\"
-DPA_SYSTEM_RUNTIME_PATH=\"/var/run/pulse\"
-DPA_SYSTEM_CONFIG_PATH=\"/var/lib/pulse\"
-DPA_SYSTEM_STATE_PATH=\"/var/lib/pulse\" -DAO_REQUIRE_CAS
-DPULSE_LOCALEDIR=\"/usr/share/locale\"
-DPA_MACHINE_ID=\"/var/lib/dbus/machine-id\"
-DPA_ALSA_PATHS_DIR=\"/usr/share/pulseaudio/alsa-mixer/paths\"
-DPA_ALSA_PROFILE_SETS_DIR=\"/usr/share/pulseaudio/alsa-mixer/profile-sets\"
-O2 -pipe -g -feliminate-unused-debug-types -Wall -W -Wextra -pipe
-Wno-long-long -Winline -Wvla -Wno-overlength-strings
-Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op
-Wsign-compare -Wformat-security -Wmissing-include-dirs
-Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self
-Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes
-Wstrict-prototypes -Wredundant-decls -Wmissing-declarations
-Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align
-Wstrict-aliasing=2 -Wwrite-strings -Wno-unused-parameter -ffast-math
-Wp,-D_FORTIFY_SOURCE=2 -fno-common -fdiagnostics-show-option -c
modules/bluetooth/sbc.c -fPIC -DPIC -o .libs/libbluetooth_sbc_la-sbc.oi
| modules/bluetooth/sbc.c: In function 'sbc_synthesize_four':
| modules/bluetooth/sbc.c:553:18: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:553:18: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:553:18: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:553:18: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:553:18: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:553:18: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:553:18: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:553:18: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:565:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c: In function 'sbc_synthesize_eight':
| modules/bluetooth/sbc.c:595:29: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:595:29: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: shadowed declaration is here [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: declaration of 'tmp' shadows a previous local [-Wshadow]
| modules/bluetooth/sbc.c:611:40: warning: shadowed declaration is here [-Wshadow]
| {standard input}: Assembler messages:
| {standard input}:6997: Error: selected processor does not support Thumb mode `mla r3,r0,ip,r3'
| {standard input}:7012: Error: selected processor does not support Thumb mode `mla r3,r1,ip,r3'
| {standard input}:7026: Error: selected processor does not support Thumb mode `mla r3,ip,r0,r3'
| {standard input}:7215: Error: selected processor does not support Thumb mode `mla r3,r7,r0,r3'
| {standard input}:7230: Error: selected processor does not support Thumb mode `mla r3,r7,r0,r3'
| {standard input}:7241: Error: selected processor does not support Thumb mode `mla r3,r0,r7,r3'
| {standard input}:7256: Error: selected processor does not support Thumb mode `mla r3,r0,r7,r3'
| {standard input}:7267: Error: selected processor does not support Thumb mode `mla r3,r7,r0,r3'
| {standard input}:7287: Error: selected processor does not support Thumb mode `mla r3,r7,r6,r3'
| {standard input}:7301: Error: selected processor does not support Thumb mode `mla r3,r6,r5,r3'
| {standard input}:7319: Error: selected processor does not support Thumb mode `mla r3,r0,r5,r3'
| {standard input}:7327: Error: selected processor does not support Thumb mode `mla r3,r1,r0,r3'
| {standard input}:7594: Error: selected processor does not support Thumb mode `mla r3,r5,r6,r3'
| {standard input}:7604: Error: selected processor does not support Thumb mode `mla r3,r5,r6,r3'
| {standard input}:7614: Error: selected processor does not support Thumb mode `mla r3,r5,r6,r3'
| {standard input}:7624: Error: selected processor does not support Thumb mode `mla r3,r5,r6,r3'
| {standard input}:7634: Error: selected processor does not support Thumb mode `mla r3,r5,r6,r3'
| {standard input}:7647: Error: selected processor does not support Thumb mode `mla r3,r2,r5,r3'
| {standard input}:7657: Error: selected processor does not support Thumb mode `mla r3,r2,r5,r3'
| {standard input}:7815: Error: selected processor does not support Thumb mode `mla r3,r9,r7,r3'
| {standard input}:7837: Error: selected processor does not support Thumb mode `mla r3,r9,r0,r3'
| {standard input}:7853: Error: selected processor does not support Thumb mode `mla r3,r9,r0,r3'
| {standard input}:7875: Error: selected processor does not support Thumb mode `mla r3,r9,r7,r3'
| {standard input}:7891: Error: selected processor does not support Thumb mode `mla r3,r9,r7,r3'
| {standard input}:7908: Error: selected processor does not support Thumb mode `mla r3,r0,r6,r3'
| {standard input}:7931: Error: selected processor does not support Thumb mode `mla r3,r6,r5,r3'
| {standard input}:7952: Error: selected processor does not support Thumb mode `mla r3,r0,r5,r3'
| {standard input}:7960: Error: selected processor does not support Thumb mode `mla r3,r2,r0,r3'
| make[4]: *** [libbluetooth_sbc_la-sbc.lo] Error 1
| make[4]: Leaving directory `/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/pulseaudio-0.9.23-r6/pulseaudio-0.9.23/src'
| make[3]: *** [all-recursive] Error 1
| make[3]: Leaving directory `/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/pulseaudio-0.9.23-r6/pulseaudio-0.9.23/src'
| make[2]: *** [all] Error 2
| make[2]: Leaving directory `/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/pulseaudio-0.9.23-r6/pulseaudio-0.9.23/src'
| make[1]: *** [all-recursive] Error 1
| make[1]: Leaving directory `/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/pulseaudio-0.9.23-r6/pulseaudio-0.9.23'
| make: *** [all] Error 2
| + die 'oe_runmake failed'
| + bbfatal 'oe_runmake failed'
| + echo 'ERROR: oe_runmake failed'
| ERROR: oe_runmake failed
| + exit 1
| ERROR: Function 'do_compile' failed (see /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/pulseaudio-0.9.23-r6/temp/log.do_compile.3404 for further information)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../pulseaudio/pulseaudio_0.9.23.bb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
index 9521ab0..62832d9 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
@@ -1,6 +1,6 @@
require pulseaudio.inc
-PR = "r6"
+PR = "r7"
DEPENDS += "gdbm speex libxml-parser-perl-native"
@@ -23,3 +23,4 @@ do_compile_prepend() {
cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl
}
+ARM_INSTRUCTION_SET = "arm"
--
1.7.8.rc1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH][oe-core 04/22] aspell: force ARM mode
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
` (2 preceding siblings ...)
2011-11-11 16:28 ` [PATCH][oe-core 03/22] pulseaudio-0.9.23: " Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 05/22] webkit-gtk: force arm mode to work around binutils segfault Martin Jansa
` (18 subsequent siblings)
22 siblings, 0 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
* this is just work around for ICE, better fix would be to fix gcc
| ./common/fstream.hpp:23:9: note: the mangling of 'va_list' has changed in GCC 4.4
| modules/speller/default/typo_editdist.cpp: In function 'short int aspeller::typo_edit_distance(acommon::ParmString, acommon::ParmString, const aspeller::TypoEditDistanceInfo&)':
| modules/speller/default/typo_editdist.cpp:77:3: internal compiler error: in gen_thumb_movhi_clobber, at config/arm/arm.md:5937
| Please submit a full bug report,
| with preprocessed source if appropriate.
| See <http://gcc.gnu.org/bugs.html> for instructions.
| make[1]: *** [modules/speller/default/typo_editdist.lo] Error 1
| make[1]: *** Waiting for unfinished jobs....
| make[1]: Leaving directory `/OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/aspell-0.60.6.1-r0/aspell-0.60.6.1'
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-support/aspell/aspell_0.60.6.1.bb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/aspell/aspell_0.60.6.1.bb b/meta/recipes-support/aspell/aspell_0.60.6.1.bb
index d773ee3..64611cb 100644
--- a/meta/recipes-support/aspell/aspell_0.60.6.1.bb
+++ b/meta/recipes-support/aspell/aspell_0.60.6.1.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "GNU Aspell spell-checker"
SECTION = "console/utils"
LICENSE="LGPLv2 | LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
-PR = "r0"
+PR = "r1"
PACKAGES += "libaspell libpspell libpspell-dev aspell-utils"
FILES_${PN}-dbg += "${libdir}/aspell-0.60/.debu*"
@@ -16,4 +16,5 @@ FILES_${PN} = "${bindir}/aspell"
FILES_libpspell = "${libdir}/libpspell.so.*"
FILES_libpspell-dev = "${libdir}/libpspell* ${bindir}/pspell-config ${includedir}/pspell"
+ARM_INSTRUCTION_SET = "arm"
inherit autotools gettext
--
1.7.8.rc1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH][oe-core 05/22] webkit-gtk: force arm mode to work around binutils segfault
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
` (3 preceding siblings ...)
2011-11-11 16:28 ` [PATCH][oe-core 04/22] aspell: " Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 06/22] subversion: add 1.7.0 with native support and negative D_P for now Martin Jansa
` (17 subsequent siblings)
22 siblings, 0 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
* this is just work around, would be better to fix in toolchain
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-sato/webkit/webkit-gtk_svn.bb | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index 2862ad4..92b2df1 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
@@ -14,7 +14,7 @@ SRCREV_FORMAT = "source"
SRCREV = "90727"
PV = "1.5.1+svnr${SRCPV}"
-PR = "r0"
+PR = "r1"
SRC_URI = "\
svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \
@@ -45,6 +45,23 @@ EXTRA_OECONF = "\
EXTRA_AUTORECONF = " -I Source/autotools "
+
+#| ./Source/JavaScriptCore/heap/HandleTypes.h: In static member function 'static T* JSC::HandleTypes<T>::getFromSlot(JSC::HandleSlot) [with T = JSC::Structure, JSC::HandleTypes<T>::ExternalType = JSC::Structure*, JSC::HandleSlot = JSC::JSValue*]':
+#| ./Source/JavaScriptCore/heap/Handle.h:141:79: instantiated from 'JSC::Handle<T>::ExternalType JSC::Handle<T>::get() const [with T = JSC::Structure, JSC::Handle<T>::ExternalType = JSC::Structure*]'
+#| ./Source/JavaScriptCore/runtime/ScopeChain.h:39:75: instantiated from here
+#| ./Source/JavaScriptCore/heap/HandleTypes.h:38:130: warning: cast from 'JSC::JSCell*' to 'JSC::HandleTypes<JSC::Structure>::ExternalType {aka JSC::Structure*}' increases required alignment of target type [-Wcast-align]
+#| {standard input}: Assembler messages:
+#| {standard input}:28873: Error: invalid immediate: 983040 is out of range
+#| {standard input}:28873: Error: value of 983040 too large for field of 2 bytes at 15110
+#| /OE/shr-core/tmp/sysroots/x86_64-linux/usr/libexec/armv4t-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.6.2/as: BFD (GNU Binutils) 2.21.1 assertion fail /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/binutils-cross-2.21.1a-r0/binutils-2.21.1/bfd/elf.c:2819
+#| arm-oe-linux-gnueabi-g++: internal compiler error: Segmentation fault (program as)
+#| Please submit a full bug report,
+#| with preprocessed source if appropriate.
+#| See <http://gcc.gnu.org/bugs.html> for instructions.
+#| make[1]: *** [Source/JavaScriptCore/jit/libjavascriptcoregtk_1_0_la-JIT.lo] Error 1
+#| make[1]: Leaving directory `/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-gtk-1.5.1+svnr90727-r0'
+ARM_INSTRUCTION_SET = "arm"
+
CONFIGUREOPT_DEPTRACK = ""
do_configure_append() {
--
1.7.8.rc1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH][oe-core 06/22] subversion: add 1.7.0 with native support and negative D_P for now
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
` (4 preceding siblings ...)
2011-11-11 16:28 ` [PATCH][oe-core 05/22] webkit-gtk: force arm mode to work around binutils segfault Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 07/22] base.bbclass: add subversion-native to DEPENDS if there is svn:// in SRC_URI Martin Jansa
` (16 subsequent siblings)
22 siblings, 0 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
* intentionaly with negative D_P, bitbake fetcher should be improved to
detect old checkout with newer subversion available or vice versa and
do svn upgrade automaticaly or show better error, but subversion as
client for target or -native for distributions which explicitly say
they want 1.7 (with PREFERRED_VERSION) can be available already from
oe-core.
* be aware that checkouts from 1.7.0 are not compatible with older
subversion clients (ie when builder populating distro PREMIRROR is
using 1.7.0 all builders need to have also 1.7.0)
* and also 1.7.0 client needs to call svn upgrade in checkout first in
order to use it (so if PREMIRROR has tarball from 1.6.x it won't work
on client using 1.7.0 unless fetcher2 is improved to detect this and
call svn upgrade)
* tested on SHR distribution
http://wiki.shr-project.org/trac/wiki/Building%20SHR#subversion1.7inshr-chroot
* only missing part is to add subversion-native dependency, so that
native subversion is built, before building ie elementary (because EFL
are using svnversion from configure.ac to detect source revision and
.svn dir needs to be from compatible version).
* read http://subversion.apache.org/docs/release-notes/1.7.html
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../subversion/subversion-1.7.0/libtool2.patch | 15 ++++++++
.../subversion/subversion_1.7.0.bb | 37 ++++++++++++++++++++
2 files changed, 52 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
create mode 100644 meta/recipes-devtools/subversion/subversion_1.7.0.bb
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
new file mode 100644
index 0000000..5cd572b
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
@@ -0,0 +1,15 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+--- a/configure.ac 2011-10-20 21:56:02.230663987 +0200
++++ b/configure.ac 2011-08-17 15:01:30.000000000 +0200
+@@ -227,8 +227,8 @@
+ LIBTOOL="$sh_libtool"
+ SVN_LIBTOOL="$sh_libtool"
+ else
+- sh_libtool="$abs_builddir/libtool"
+- SVN_LIBTOOL="\$(SHELL) $sh_libtool"
++ sh_libtool="$abs_builddir/$host_alias-libtool"
++ SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool"
+ fi
+ AC_SUBST(SVN_LIBTOOL)
+
diff --git a/meta/recipes-devtools/subversion/subversion_1.7.0.bb b/meta/recipes-devtools/subversion/subversion_1.7.0.bb
new file mode 100644
index 0000000..396b35b
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion_1.7.0.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "The Subversion (svn) client"
+SECTION = "console/network"
+DEPENDS = "apr-util neon"
+RDEPENDS_${PN} = "neon"
+LICENSE = "Apache-2"
+HOMEPAGE = "http://subversion.tigris.org"
+
+BBCLASSEXTEND = "native"
+
+# negative, because of new checkout format in 1.7.0
+# and distro PREMIRRORs need to be in sync with users
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
+ file://libtool2.patch \
+"
+SRC_URI[md5sum] = "930e6644a1b6094efd268fde6a318f04"
+SRC_URI[sha256sum] = "64fd5f263a80e609717a3ca42f1f2625606a5c4a40a85716f82c866033780978"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4a14fd2da3134e40a087eb4326a4ecd4"
+
+EXTRA_OECONF = " \
+ --without-berkeley-db --without-apxs --without-apache \
+ --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
+ --with-apr-util=${STAGING_BINDIR_CROSS}"
+
+inherit autotools
+
+export LDFLAGS += " -L${STAGING_LIBDIR} "
+
+acpaths = "-I build/ -I build/ac-macros/"
+
+do_configure_prepend () {
+ rm -f ${S}/libtool
+ rm -f ${S}/build/libtool.m4
+ sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4
+}
--
1.7.8.rc1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH][oe-core 07/22] base.bbclass: add subversion-native to DEPENDS if there is svn:// in SRC_URI
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
` (5 preceding siblings ...)
2011-11-11 16:28 ` [PATCH][oe-core 06/22] subversion: add 1.7.0 with native support and negative D_P for now Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 08/22] mesa: package gl/egl/osmesa to separate packages Martin Jansa
` (15 subsequent siblings)
22 siblings, 0 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
* in some cases this could cause circual dependency (ie if we decide to
apr_svn.bb or something like that before subversion-native in dependency
tree), Saul said he had such case, but I wasn't able to reproduce it
here (here it builds subversion-native-1.7.0 fine).
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/classes/base.bbclass | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index f3f798f..ba1f230 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -401,8 +401,14 @@ python () {
bb.note("SKIPPING %s because it's %s" % (pn, this_license))
raise bb.parse.SkipPackage("incompatible with license %s" % this_license)
- # Git packages should DEPEND on git-native
srcuri = d.getVar('SRC_URI', 1)
+ # Svn packages should DEPEND on subversion-native
+ if "svn://" in srcuri:
+ depends = d.getVarFlag('do_fetch', 'depends') or ""
+ depends = depends + " subversion-native:do_populate_sysroot"
+ d.setVarFlag('do_fetch', 'depends', depends)
+
+ # Git packages should DEPEND on git-native
if "git://" in srcuri:
depends = d.getVarFlag('do_fetch', 'depends') or ""
depends = depends + " git-native:do_populate_sysroot"
--
1.7.8.rc1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH][oe-core 08/22] mesa: package gl/egl/osmesa to separate packages
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
` (6 preceding siblings ...)
2011-11-11 16:28 ` [PATCH][oe-core 07/22] base.bbclass: add subversion-native to DEPENDS if there is svn:// in SRC_URI Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-14 4:25 ` Saul Wold
2011-11-11 16:28 ` [PATCH][oe-core 09/22] mesa-common: install internal GL headers to libgl-dev Martin Jansa
` (14 subsequent siblings)
22 siblings, 1 reply; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa-common.inc | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 06ebb75..b8f2289 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -38,7 +38,16 @@ EXTRA_OECONF = "--enable-glu \
# Multiple virtual/gl providers being built breaks staging
EXCLUDE_FROM_WORLD = "1"
-PACKAGES =+ "libglu libglu-dev"
-
+PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
+FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
+FILES_libgl = "${libdir}/libGL.so.*"
FILES_libglu = "${libdir}/libGLU.so.*"
+FILES_libosmesa = "${libdir}/libOSMesa.so.*"
+
+FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
+FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
+FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+FILES_libegl-dbg += "${libdir}/egl/.debug/*"
--
1.7.8.rc1
^ permalink raw reply related [flat|nested] 32+ messages in thread* Re: [PATCH][oe-core 08/22] mesa: package gl/egl/osmesa to separate packages
2011-11-11 16:28 ` [PATCH][oe-core 08/22] mesa: package gl/egl/osmesa to separate packages Martin Jansa
@ 2011-11-14 4:25 ` Saul Wold
0 siblings, 0 replies; 32+ messages in thread
From: Saul Wold @ 2011-11-14 4:25 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
On 11/11/2011 08:28 AM, Martin Jansa wrote:
> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> ---
> meta/recipes-graphics/mesa/mesa-common.inc | 13 +++++++++++--
> 1 files changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
> index 06ebb75..b8f2289 100644
> --- a/meta/recipes-graphics/mesa/mesa-common.inc
> +++ b/meta/recipes-graphics/mesa/mesa-common.inc
> @@ -38,7 +38,16 @@ EXTRA_OECONF = "--enable-glu \
> # Multiple virtual/gl providers being built breaks staging
> EXCLUDE_FROM_WORLD = "1"
>
> -PACKAGES =+ "libglu libglu-dev"
> -
> +PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
> +FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
> +FILES_libgl = "${libdir}/libGL.so.*"
> FILES_libglu = "${libdir}/libGLU.so.*"
> +FILES_libosmesa = "${libdir}/libOSMesa.so.*"
> +
> +FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
> +FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
> FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
> +FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
> +
> +FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
> +FILES_libegl-dbg += "${libdir}/egl/.debug/*"
Martin,
One of the mesa changes seems to have caused a problem building the sdk
images:
| error: Failed dependencies:
| mesa-dri = 2:7.11-r12.0 is needed by mesa-dri-dev-7.11-r12.0.x86_64
Sau!
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH][oe-core 09/22] mesa-common: install internal GL headers to libgl-dev
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
` (7 preceding siblings ...)
2011-11-11 16:28 ` [PATCH][oe-core 08/22] mesa: package gl/egl/osmesa to separate packages Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 10/22] alsa-lib: add nativesdk BBCLASSEXTEND Martin Jansa
` (13 subsequent siblings)
22 siblings, 0 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
* this is just work around
* better fix would be as RP suggested:
Ideally we should write a patch fixing the Makefile so dri-swrast
installs the pieces the xserver needs to build. Does it need both
sarea.h and dri_interface.h or just the latter?
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa-common.inc | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index b8f2289..ca2d931 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -51,3 +51,8 @@ FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
FILES_libegl-dbg += "${libdir}/egl/.debug/*"
+
+do_install_append () {
+ install -d ${D}/${includedir}/GL
+ cp -pPr ${S}/include/GL/internal* ${D}/${includedir}/GL
+}
--
1.7.8.rc1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH][oe-core 10/22] alsa-lib: add nativesdk BBCLASSEXTEND
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
` (8 preceding siblings ...)
2011-11-11 16:28 ` [PATCH][oe-core 09/22] mesa-common: install internal GL headers to libgl-dev Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-12 1:26 ` Saul Wold
2011-11-11 16:28 ` [PATCH][oe-core 11/22] libsdl: drop unused files Martin Jansa
` (12 subsequent siblings)
22 siblings, 1 reply; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
* needed for libsdl-nativesdk when DISTRO_FEATURES have alsa
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb
index b787c54..d701031 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1 & GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
file://src/socket.c;beginline=1;endline=26;md5=11ff89a8a7a4a690a5c78effe8159545"
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
# configure.in sets -D__arm__ on the command line for any arm system
# (not just those with the ARM instruction set), this should be removed,
--
1.7.8.rc1
^ permalink raw reply related [flat|nested] 32+ messages in thread* Re: [PATCH][oe-core 10/22] alsa-lib: add nativesdk BBCLASSEXTEND
2011-11-11 16:28 ` [PATCH][oe-core 10/22] alsa-lib: add nativesdk BBCLASSEXTEND Martin Jansa
@ 2011-11-12 1:26 ` Saul Wold
0 siblings, 0 replies; 32+ messages in thread
From: Saul Wold @ 2011-11-12 1:26 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
On 11/11/2011 08:28 AM, Martin Jansa wrote:
> * needed for libsdl-nativesdk when DISTRO_FEATURES have alsa
>
> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> ---
> meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb
> index b787c54..d701031 100644
> --- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb
> +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.0.24.1.bb
> @@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1& GPLv2+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
> file://src/socket.c;beginline=1;endline=26;md5=11ff89a8a7a4a690a5c78effe8159545"
>
> -BBCLASSEXTEND = "native"
> +BBCLASSEXTEND = "native nativesdk"
>
> # configure.in sets -D__arm__ on the command line for any arm system
> # (not just those with the ARM instruction set), this should be removed,
This seems to have added some multiple provider issues:
NOTE: Resolving any missing task queue dependencies
NOTE: multiple providers are available for runtime libasound (alsa-lib,
alsa-lib-nativesdk)
NOTE: consider defining a PREFERRED_PROVIDER entry to match libasound
NOTE: multiple providers are available for runtime alsa-conf-base
(alsa-lib, alsa-lib-nativesdk)
NOTE: consider defining a PREFERRED_PROVIDER entry to match alsa-conf-base
Sau!
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH][oe-core 11/22] libsdl: drop unused files
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
` (9 preceding siblings ...)
2011-11-11 16:28 ` [PATCH][oe-core 10/22] alsa-lib: add nativesdk BBCLASSEXTEND Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 12/22] libsdl: rename files dir to libsdl-1.2.14 for faster lookup Martin Jansa
` (11 subsequent siblings)
22 siblings, 0 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../libsdl/files/directfb_obsolete_calls.patch | 35 ------------
| 55 --------------------
2 files changed, 0 insertions(+), 90 deletions(-)
delete mode 100644 meta/recipes-graphics/libsdl/files/directfb_obsolete_calls.patch
delete mode 100644 meta/recipes-graphics/libsdl/files/extra-keys.patch
diff --git a/meta/recipes-graphics/libsdl/files/directfb_obsolete_calls.patch b/meta/recipes-graphics/libsdl/files/directfb_obsolete_calls.patch
deleted file mode 100644
index 3c526a6..0000000
--- a/meta/recipes-graphics/libsdl/files/directfb_obsolete_calls.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Upstream-Status: Pending
-
---- tmp/work/armv5te-angstrom-linux-gnueabi/libsdl-directfb-1.2.9-r1/SDL-1.2.9/src/video/directfb/SDL_DirectFB_video.c 2007-02-18 11:40:38.000000000 -0500
-+++ SDL/src/video/directfb/SDL_DirectFB_video.c 2007-02-18 11:00:07.000000000 -0500
-@@ -376,7 +376,7 @@
- {
- int i;
- DFBResult ret;
-- DFBCardCapabilities caps;
-+ DFBGraphicsDeviceDescription caps;
- DFBDisplayLayerConfig dlc;
- struct DirectFBEnumRect *rect;
- IDirectFB *dfb = NULL;
-@@ -448,7 +448,7 @@
-
-
- /* Query card capabilities to get the video memory size */
-- dfb->GetCardCapabilities (dfb, &caps);
-+ dfb->GetDeviceDescription (dfb, &caps);
-
- this->info.wm_available = 1;
- this->info.hw_available = 1;
-diff -u'rNF^function' tmp/work/armv5te-angstrom-linux-gnueabi/libsdl-directfb-1.2.9-r1/SDL-1.2.9/src/video/directfb/SDL_Direct
-/SDL_DirectFB_events.c
---- tmp/work/armv5te-angstrom-linux-gnueabi/libsdl-directfb-1.2.9-r1/SDL-1.2.9/src/video/directfb/SDL_DirectFB_events.c 2004-0
-+++ SDL/src/video/directfb/SDL_DirectFB_events.c 2007-02-18 11:00:07.000000000 -0500
-@@ -161,7 +161,7 @@
- keymap[DIKI_SHIFT_L - DIKI_UNKNOWN] = SDLK_LSHIFT;
- keymap[DIKI_SHIFT_R - DIKI_UNKNOWN] = SDLK_RSHIFT;
- keymap[DIKI_ALT_L - DIKI_UNKNOWN] = SDLK_LALT;
-- keymap[DIKI_ALTGR - DIKI_UNKNOWN] = SDLK_RALT;
-+ keymap[DIKI_ALT_R - DIKI_UNKNOWN] = SDLK_RALT;
- keymap[DIKI_TAB - DIKI_UNKNOWN] = SDLK_TAB;
- keymap[DIKI_ENTER - DIKI_UNKNOWN] = SDLK_RETURN;
- keymap[DIKI_SPACE - DIKI_UNKNOWN] = SDLK_SPACE;
diff --git a/meta/recipes-graphics/libsdl/files/extra-keys.patch b/meta/recipes-graphics/libsdl/files/extra-keys.patch
deleted file mode 100644
index 745b04e..0000000
--- a/meta/recipes-graphics/libsdl/files/extra-keys.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Upstream-Status: Pending
-
-diff -upr --exclude=configure --exclude=Makefile --exclude=Makefile.in libsdl1.2-1.2.4/include/SDL_keysym.h libsdl1.2-1.2.4-arm/include/SDL_keysym.h
---- libsdl1.2-1.2.4/include/SDL_keysym.h 2002-03-06 11:23:01.000000000 +0000
-+++ libsdl1.2-1.2.4-arm/include/SDL_keysym.h 2002-11-08 20:43:09.000000000 +0000
-@@ -286,6 +286,12 @@ typedef enum {
- SDLK_EURO = 321, /* Some european keyboards */
- SDLK_UNDO = 322, /* Atari keyboard has Undo */
-
-+ SDLK_RECORD = 322,
-+ SDLK_CALENDAR = 323,
-+ SDLK_TELEPHONE = 324,
-+ SDLK_MAIL = 325,
-+ SDLK_START = 326,
-+
- /* Add any other keys here */
-
- SDLK_LAST
-diff -upr --exclude=configure --exclude=Makefile --exclude=Makefile.in libsdl1.2-1.2.4/src/video/x11/SDL_x11events.c libsdl1.2-1.2.4-arm/src/video/x11/SDL_x11events.c
---- libsdl1.2-1.2.4/src/video/x11/SDL_x11events.c 2002-03-06 11:23:08.000000000 +0000
-+++ libsdl1.2-1.2.4-arm/src/video/x11/SDL_x11events.c 2002-11-08 21:01:41.000000000 +0000
-@@ -34,6 +34,7 @@ static char rcsid =
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/keysym.h>
-+#include <X11/XF86keysym.h>
- #ifdef __SVR4
- #include <X11/Sunkeysym.h>
- #endif
-@@ -655,6 +656,25 @@ SDL_keysym *X11_TranslateKey(Display *di
- case 0xFF:
- keysym->sym = MISC_keymap[xsym&0xFF];
- break;
-+ case 0x1008ff:
-+ switch (xsym) {
-+ case XF86XK_AudioRecord:
-+ keysym->sym = SDLK_RECORD;
-+ break;
-+ case XF86XK_PowerDown:
-+ keysym->sym = SDLK_POWER;
-+ break;
-+ case XF86XK_Calendar:
-+ keysym->sym = SDLK_CALENDAR;
-+ break;
-+ case XF86XK_Mail:
-+ keysym->sym = SDLK_MAIL;
-+ break;
-+ case XF86XK_Start:
-+ keysym->sym = SDLK_START;
-+ break;
-+ }
-+ break;
- default:
- fprintf(stderr,
- "X11: Unknown xsym, sym = 0x%04x\n",
--
1.7.8.rc1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH][oe-core 12/22] libsdl: rename files dir to libsdl-1.2.14 for faster lookup
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
` (10 preceding siblings ...)
2011-11-11 16:28 ` [PATCH][oe-core 11/22] libsdl: drop unused files Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 13/22] libsdl: enable cdrom, alsa and tslib, disable rpath and add few fixes from meta-oe Martin Jansa
` (10 subsequent siblings)
22 siblings, 0 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../{files => libsdl-1.2.14}/configure_tweak.patch | 0
1 files changed, 0 insertions(+), 0 deletions(-)
rename meta/recipes-graphics/libsdl/{files => libsdl-1.2.14}/configure_tweak.patch (100%)
diff --git a/meta/recipes-graphics/libsdl/files/configure_tweak.patch b/meta/recipes-graphics/libsdl/libsdl-1.2.14/configure_tweak.patch
similarity index 100%
rename from meta/recipes-graphics/libsdl/files/configure_tweak.patch
rename to meta/recipes-graphics/libsdl/libsdl-1.2.14/configure_tweak.patch
--
1.7.8.rc1
^ permalink raw reply [flat|nested] 32+ messages in thread* [PATCH][oe-core 13/22] libsdl: enable cdrom, alsa and tslib, disable rpath and add few fixes from meta-oe
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
` (11 preceding siblings ...)
2011-11-11 16:28 ` [PATCH][oe-core 12/22] libsdl: rename files dir to libsdl-1.2.14 for faster lookup Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 14/22] libsdl: enable alsa/opengl based on PACKAGECONFIG and respect DISTRO_FEATURES Martin Jansa
` (9 subsequent siblings)
22 siblings, 0 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
* virtual/libsdl is used in sdl.bbclass but nothing was providing it
* rpath disabled because otherwise libtool and ld try to link against
${libdir}/libdl.so.2 on the host
(see OE-classic commit af1a2e0e7626e372f22afbcabf08d9ae6b0d7b01)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
index 6b23344..17a3103 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
@@ -10,10 +10,12 @@ SECTION = "libs"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
-DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender"
+PROVIDES = "virtual/libsdl"
+
+DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender alsa-lib tslib"
DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
file://configure_tweak.patch \
@@ -26,25 +28,29 @@ SRC_URI[sha256sum] = "5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642
inherit autotools binconfig pkgconfig
-EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
- --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \
+EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
+ --enable-file --disable-oss --enable-alsa --disable-esd --disable-arts \
--disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
--disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
--disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \
--disable-video-xbios --disable-video-gem --disable-video-dummy \
- --enable-input-events --enable-pthreads \
+ --enable-input-events --enable-input-tslib --enable-pthreads \
${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
--disable-video-svga \
- --disable-video-picogui --disable-video-qtopia --enable-dlopen"
+ --disable-video-picogui --disable-video-qtopia --enable-dlopen \
+ --disable-rpath"
PARALLEL_MAKE = ""
+EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"
+
do_configure_prepend() {
# Remove old libtool macros.
MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
for i in ${MACROS}; do
rm -f acinclude/$i
done
+ export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
}
BBCLASSEXTEND = "nativesdk"
--
1.7.8.rc1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH][oe-core 14/22] libsdl: enable alsa/opengl based on PACKAGECONFIG and respect DISTRO_FEATURES
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
` (12 preceding siblings ...)
2011-11-11 16:28 ` [PATCH][oe-core 13/22] libsdl: enable cdrom, alsa and tslib, disable rpath and add few fixes from meta-oe Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-15 23:43 ` [PATCHv2] libsdl: enable alsa " Martin Jansa
2011-11-15 23:45 ` [PATCH][oe-core 14/22] libsdl: enable alsa/opengl " Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 15/22] libsdl: replace tabs with spaces Martin Jansa
` (8 subsequent siblings)
22 siblings, 2 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
index 17a3103..2f49f16 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
PROVIDES = "virtual/libsdl"
-DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender alsa-lib tslib"
+DEPENDS = "virtual/libx11 libxext libxrandr libxrender tslib"
DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
PR = "r1"
@@ -29,17 +29,21 @@ SRC_URI[sha256sum] = "5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642
inherit autotools binconfig pkgconfig
EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
- --enable-file --disable-oss --enable-alsa --disable-esd --disable-arts \
+ --enable-file --disable-oss --disable-esd --disable-arts \
--disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
--disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
--disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \
--disable-video-xbios --disable-video-gem --disable-video-dummy \
--enable-input-events --enable-input-tslib --enable-pthreads \
- ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
--disable-video-svga \
--disable-video-picogui --disable-video-qtopia --enable-dlopen \
--disable-rpath"
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
+PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib,"
+PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl,"
+
PARALLEL_MAKE = ""
EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"
--
1.7.8.rc1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCHv2] libsdl: enable alsa based on PACKAGECONFIG and respect DISTRO_FEATURES
2011-11-11 16:28 ` [PATCH][oe-core 14/22] libsdl: enable alsa/opengl based on PACKAGECONFIG and respect DISTRO_FEATURES Martin Jansa
@ 2011-11-15 23:43 ` Martin Jansa
2011-11-15 23:45 ` [PATCH][oe-core 14/22] libsdl: enable alsa/opengl " Martin Jansa
1 sibling, 0 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-15 23:43 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
index 17a3103..e5fdcc3 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
@@ -29,7 +29,7 @@ SRC_URI[sha256sum] = "5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642
inherit autotools binconfig pkgconfig
EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
- --enable-file --disable-oss --enable-alsa --disable-esd --disable-arts \
+ --enable-file --disable-oss --disable-esd --disable-arts \
--disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
--disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
--disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \
@@ -40,6 +40,9 @@ EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads
--disable-video-picogui --disable-video-qtopia --enable-dlopen \
--disable-rpath"
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
+PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib,"
+
PARALLEL_MAKE = ""
EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"
--
1.7.8.rc1
^ permalink raw reply related [flat|nested] 32+ messages in thread* Re: [PATCH][oe-core 14/22] libsdl: enable alsa/opengl based on PACKAGECONFIG and respect DISTRO_FEATURES
2011-11-11 16:28 ` [PATCH][oe-core 14/22] libsdl: enable alsa/opengl based on PACKAGECONFIG and respect DISTRO_FEATURES Martin Jansa
2011-11-15 23:43 ` [PATCHv2] libsdl: enable alsa " Martin Jansa
@ 2011-11-15 23:45 ` Martin Jansa
2011-11-16 10:12 ` Richard Purdie
1 sibling, 1 reply; 32+ messages in thread
From: Martin Jansa @ 2011-11-15 23:45 UTC (permalink / raw)
To: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 2964 bytes --]
On Fri, Nov 11, 2011 at 05:28:50PM +0100, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 10 +++++++---
> 1 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> index 17a3103..2f49f16 100644
> --- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
>
> PROVIDES = "virtual/libsdl"
>
> -DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender alsa-lib tslib"
> +DEPENDS = "virtual/libx11 libxext libxrandr libxrender tslib"
> DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
As Saul reported PACKAGECONFIG adds build time depends not only to
DEPENDS but they also ends in DEPENDS_virtclass-nativesdk and nothing
provides virtual/libgl-nativesdk. So I've resend this patch changing
only alsa handling to PACKAGECONFIG and keeping opengl as it was.
Cheers,
> PR = "r1"
> @@ -29,17 +29,21 @@ SRC_URI[sha256sum] = "5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642
> inherit autotools binconfig pkgconfig
>
> EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
> - --enable-file --disable-oss --enable-alsa --disable-esd --disable-arts \
> + --enable-file --disable-oss --disable-esd --disable-arts \
> --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
> --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
> --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \
> --disable-video-xbios --disable-video-gem --disable-video-dummy \
> --enable-input-events --enable-input-tslib --enable-pthreads \
> - ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
> --disable-video-svga \
> --disable-video-picogui --disable-video-qtopia --enable-dlopen \
> --disable-rpath"
>
> +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)} \
> + ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
> +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib,"
> +PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl,"
> +
> PARALLEL_MAKE = ""
>
> EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"
> --
> 1.7.8.rc1
>
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [PATCH][oe-core 14/22] libsdl: enable alsa/opengl based on PACKAGECONFIG and respect DISTRO_FEATURES
2011-11-15 23:45 ` [PATCH][oe-core 14/22] libsdl: enable alsa/opengl " Martin Jansa
@ 2011-11-16 10:12 ` Richard Purdie
2011-11-25 7:51 ` Martin Jansa
0 siblings, 1 reply; 32+ messages in thread
From: Richard Purdie @ 2011-11-16 10:12 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-11-16 at 00:45 +0100, Martin Jansa wrote:
> On Fri, Nov 11, 2011 at 05:28:50PM +0100, Martin Jansa wrote:
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> > meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 10 +++++++---
> > 1 files changed, 7 insertions(+), 3 deletions(-)
> >
> > diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> > index 17a3103..2f49f16 100644
> > --- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> > +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> > @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
> >
> > PROVIDES = "virtual/libsdl"
> >
> > -DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender alsa-lib tslib"
> > +DEPENDS = "virtual/libx11 libxext libxrandr libxrender tslib"
> > DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
>
> As Saul reported PACKAGECONFIG adds build time depends not only to
> DEPENDS but they also ends in DEPENDS_virtclass-nativesdk and nothing
> provides virtual/libgl-nativesdk. So I've resend this patch changing
> only alsa handling to PACKAGECONFIG and keeping opengl as it was.
>
> Cheers,
>
> > PR = "r1"
> > @@ -29,17 +29,21 @@ SRC_URI[sha256sum] = "5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642
> > inherit autotools binconfig pkgconfig
> >
> > EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
> > - --enable-file --disable-oss --enable-alsa --disable-esd --disable-arts \
> > + --enable-file --disable-oss --disable-esd --disable-arts \
> > --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
> > --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
> > --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \
> > --disable-video-xbios --disable-video-gem --disable-video-dummy \
> > --enable-input-events --enable-input-tslib --enable-pthreads \
> > - ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
> > --disable-video-svga \
> > --disable-video-picogui --disable-video-qtopia --enable-dlopen \
> > --disable-rpath"
> >
> > +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)} \
> > + ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
> > +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib,"
> > +PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl,"
> > +
What we could do is have a
PACKAGECONFIG_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
or something like that.
Cheers,
Richard
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [PATCH][oe-core 14/22] libsdl: enable alsa/opengl based on PACKAGECONFIG and respect DISTRO_FEATURES
2011-11-16 10:12 ` Richard Purdie
@ 2011-11-25 7:51 ` Martin Jansa
2011-11-29 5:34 ` Saul Wold
0 siblings, 1 reply; 32+ messages in thread
From: Martin Jansa @ 2011-11-25 7:51 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 3948 bytes --]
On Wed, Nov 16, 2011 at 10:12:15AM +0000, Richard Purdie wrote:
> On Wed, 2011-11-16 at 00:45 +0100, Martin Jansa wrote:
> > On Fri, Nov 11, 2011 at 05:28:50PM +0100, Martin Jansa wrote:
> > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > > ---
> > > meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 10 +++++++---
> > > 1 files changed, 7 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> > > index 17a3103..2f49f16 100644
> > > --- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> > > +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> > > @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
> > >
> > > PROVIDES = "virtual/libsdl"
> > >
> > > -DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender alsa-lib tslib"
> > > +DEPENDS = "virtual/libx11 libxext libxrandr libxrender tslib"
> > > DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
> >
> > As Saul reported PACKAGECONFIG adds build time depends not only to
> > DEPENDS but they also ends in DEPENDS_virtclass-nativesdk and nothing
> > provides virtual/libgl-nativesdk. So I've resend this patch changing
> > only alsa handling to PACKAGECONFIG and keeping opengl as it was.
> >
> > Cheers,
> >
> > > PR = "r1"
> > > @@ -29,17 +29,21 @@ SRC_URI[sha256sum] = "5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642
> > > inherit autotools binconfig pkgconfig
> > >
> > > EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
> > > - --enable-file --disable-oss --enable-alsa --disable-esd --disable-arts \
> > > + --enable-file --disable-oss --disable-esd --disable-arts \
> > > --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
> > > --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
> > > --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \
> > > --disable-video-xbios --disable-video-gem --disable-video-dummy \
> > > --enable-input-events --enable-input-tslib --enable-pthreads \
> > > - ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
> > > --disable-video-svga \
> > > --disable-video-picogui --disable-video-qtopia --enable-dlopen \
> > > --disable-rpath"
> > >
> > > +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)} \
> > > + ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
> > > +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib,"
> > > +PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl,"
> > > +
>
> What we could do is have a
> PACKAGECONFIG_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
> or something like that.
We've discussed this on IRC and just to be sure, do you want me to add
this first or can this patch go in now when builder is greener? The
jansa/pull branch has the version using PACKAGECONFIG only for alsa and
keeping opengl mangling as it was.
http://git.openembedded.org/openembedded-core-contrib/commit/?h=jansa/pull&id=aafe9d871bcbdf6995432e2c8404a6c49ba942b5
Regards,
>
> Cheers,
>
> Richard
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [PATCH][oe-core 14/22] libsdl: enable alsa/opengl based on PACKAGECONFIG and respect DISTRO_FEATURES
2011-11-25 7:51 ` Martin Jansa
@ 2011-11-29 5:34 ` Saul Wold
2011-11-29 6:52 ` Martin Jansa
0 siblings, 1 reply; 32+ messages in thread
From: Saul Wold @ 2011-11-29 5:34 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
On 11/24/2011 11:51 PM, Martin Jansa wrote:
> On Wed, Nov 16, 2011 at 10:12:15AM +0000, Richard Purdie wrote:
>> On Wed, 2011-11-16 at 00:45 +0100, Martin Jansa wrote:
>>> On Fri, Nov 11, 2011 at 05:28:50PM +0100, Martin Jansa wrote:
>>>> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
>>>> ---
>>>> meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 10 +++++++---
>>>> 1 files changed, 7 insertions(+), 3 deletions(-)
>>>>
>>>> diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
>>>> index 17a3103..2f49f16 100644
>>>> --- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
>>>> +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
>>>> @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
>>>>
>>>> PROVIDES = "virtual/libsdl"
>>>>
>>>> -DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender alsa-lib tslib"
>>>> +DEPENDS = "virtual/libx11 libxext libxrandr libxrender tslib"
>>>> DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
>>>
>>> As Saul reported PACKAGECONFIG adds build time depends not only to
>>> DEPENDS but they also ends in DEPENDS_virtclass-nativesdk and nothing
>>> provides virtual/libgl-nativesdk. So I've resend this patch changing
>>> only alsa handling to PACKAGECONFIG and keeping opengl as it was.
>>>
>>> Cheers,
>>>
>>>> PR = "r1"
>>>> @@ -29,17 +29,21 @@ SRC_URI[sha256sum] = "5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642
>>>> inherit autotools binconfig pkgconfig
>>>>
>>>> EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
>>>> - --enable-file --disable-oss --enable-alsa --disable-esd --disable-arts \
>>>> + --enable-file --disable-oss --disable-esd --disable-arts \
>>>> --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
>>>> --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
>>>> --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \
>>>> --disable-video-xbios --disable-video-gem --disable-video-dummy \
>>>> --enable-input-events --enable-input-tslib --enable-pthreads \
>>>> - ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
>>>> --disable-video-svga \
>>>> --disable-video-picogui --disable-video-qtopia --enable-dlopen \
>>>> --disable-rpath"
>>>>
>>>> +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)} \
>>>> + ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
>>>> +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib,"
>>>> +PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl,"
>>>> +
>>
>> What we could do is have a
>> PACKAGECONFIG_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
>> or something like that.
>
> We've discussed this on IRC and just to be sure, do you want me to add
> this first or can this patch go in now when builder is greener? The
> jansa/pull branch has the version using PACKAGECONFIG only for alsa and
> keeping opengl mangling as it was.
>
> http://git.openembedded.org/openembedded-core-contrib/commit/?h=jansa/pull&id=aafe9d871bcbdf6995432e2c8404a6c49ba942b5
>
Martin,
Where are we with this one? I was a way for a bit at LinuxCon Brazil,
do you have a respun and tested patch set (tested against building the
SDK and meta-toolchian...)?
Thanks
Sau!
> Regards,
>
>>
>> Cheers,
>>
>> Richard
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [PATCH][oe-core 14/22] libsdl: enable alsa/opengl based on PACKAGECONFIG and respect DISTRO_FEATURES
2011-11-29 5:34 ` Saul Wold
@ 2011-11-29 6:52 ` Martin Jansa
0 siblings, 0 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-29 6:52 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 4856 bytes --]
On Mon, Nov 28, 2011 at 09:34:56PM -0800, Saul Wold wrote:
> On 11/24/2011 11:51 PM, Martin Jansa wrote:
> > On Wed, Nov 16, 2011 at 10:12:15AM +0000, Richard Purdie wrote:
> >> On Wed, 2011-11-16 at 00:45 +0100, Martin Jansa wrote:
> >>> On Fri, Nov 11, 2011 at 05:28:50PM +0100, Martin Jansa wrote:
> >>>> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> >>>> ---
> >>>> meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 10 +++++++---
> >>>> 1 files changed, 7 insertions(+), 3 deletions(-)
> >>>>
> >>>> diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> >>>> index 17a3103..2f49f16 100644
> >>>> --- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> >>>> +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> >>>> @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
> >>>>
> >>>> PROVIDES = "virtual/libsdl"
> >>>>
> >>>> -DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender alsa-lib tslib"
> >>>> +DEPENDS = "virtual/libx11 libxext libxrandr libxrender tslib"
> >>>> DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
> >>>
> >>> As Saul reported PACKAGECONFIG adds build time depends not only to
> >>> DEPENDS but they also ends in DEPENDS_virtclass-nativesdk and nothing
> >>> provides virtual/libgl-nativesdk. So I've resend this patch changing
> >>> only alsa handling to PACKAGECONFIG and keeping opengl as it was.
> >>>
> >>> Cheers,
> >>>
> >>>> PR = "r1"
> >>>> @@ -29,17 +29,21 @@ SRC_URI[sha256sum] = "5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642
> >>>> inherit autotools binconfig pkgconfig
> >>>>
> >>>> EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
> >>>> - --enable-file --disable-oss --enable-alsa --disable-esd --disable-arts \
> >>>> + --enable-file --disable-oss --disable-esd --disable-arts \
> >>>> --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
> >>>> --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
> >>>> --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \
> >>>> --disable-video-xbios --disable-video-gem --disable-video-dummy \
> >>>> --enable-input-events --enable-input-tslib --enable-pthreads \
> >>>> - ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
> >>>> --disable-video-svga \
> >>>> --disable-video-picogui --disable-video-qtopia --enable-dlopen \
> >>>> --disable-rpath"
> >>>>
> >>>> +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)} \
> >>>> + ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
> >>>> +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib,"
> >>>> +PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl,"
> >>>> +
> >>
> >> What we could do is have a
> >> PACKAGECONFIG_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
> >> or something like that.
> >
> > We've discussed this on IRC and just to be sure, do you want me to add
> > this first or can this patch go in now when builder is greener? The
> > jansa/pull branch has the version using PACKAGECONFIG only for alsa and
> > keeping opengl mangling as it was.
> >
> > http://git.openembedded.org/openembedded-core-contrib/commit/?h=jansa/pull&id=aafe9d871bcbdf6995432e2c8404a6c49ba942b5
> >
> Martin,
>
> Where are we with this one? I was a way for a bit at LinuxCon Brazil,
> do you have a respun and tested patch set (tested against building the
> SDK and meta-toolchian...)?
Yes the version with PACKAGECONFIG used only for alsa (not for opengl)
is tested and works
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-November/012691.html
jansa/pull branch was also updated
>
> Thanks
> Sau!
>
> > Regards,
> >
> >>
> >> Cheers,
> >>
> >> Richard
> >>
> >>
> >> _______________________________________________
> >> Openembedded-core mailing list
> >> Openembedded-core@lists.openembedded.org
> >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> >
> >
> >
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH][oe-core 15/22] libsdl: replace tabs with spaces
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
` (13 preceding siblings ...)
2011-11-11 16:28 ` [PATCH][oe-core 14/22] libsdl: enable alsa/opengl based on PACKAGECONFIG and respect DISTRO_FEATURES Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 16/22] time: rename files dir to time-1.7 for faster lookup Martin Jansa
` (7 subsequent siblings)
22 siblings, 0 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
index 2f49f16..b1b2137 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
@@ -18,7 +18,7 @@ DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-n
PR = "r1"
SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
- file://configure_tweak.patch \
+ file://configure_tweak.patch \
"
S = "${WORKDIR}/SDL-${PV}"
@@ -35,7 +35,7 @@ EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads
--disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \
--disable-video-xbios --disable-video-gem --disable-video-dummy \
--enable-input-events --enable-input-tslib --enable-pthreads \
- --disable-video-svga \
+ --disable-video-svga \
--disable-video-picogui --disable-video-qtopia --enable-dlopen \
--disable-rpath"
--
1.7.8.rc1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH][oe-core 16/22] time: rename files dir to time-1.7 for faster lookup
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
` (14 preceding siblings ...)
2011-11-11 16:28 ` [PATCH][oe-core 15/22] libsdl: replace tabs with spaces Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 17/22] time: drop default S and 2 useless comments Martin Jansa
` (6 subsequent siblings)
22 siblings, 0 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../time/{files => time-1.7}/debian.patch | 0
1 files changed, 0 insertions(+), 0 deletions(-)
rename meta/recipes-extended/time/{files => time-1.7}/debian.patch (100%)
diff --git a/meta/recipes-extended/time/files/debian.patch b/meta/recipes-extended/time/time-1.7/debian.patch
similarity index 100%
rename from meta/recipes-extended/time/files/debian.patch
rename to meta/recipes-extended/time/time-1.7/debian.patch
--
1.7.8.rc1
^ permalink raw reply [flat|nested] 32+ messages in thread* [PATCH][oe-core 17/22] time: drop default S and 2 useless comments
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
` (15 preceding siblings ...)
2011-11-11 16:28 ` [PATCH][oe-core 16/22] time: rename files dir to time-1.7 for faster lookup Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 18/22] time: use u-a for time, conflicts with busybox Martin Jansa
` (5 subsequent siblings)
22 siblings, 0 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-extended/time/time_1.7.bb | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/time/time_1.7.bb b/meta/recipes-extended/time/time_1.7.bb
index 9f9a9e5..35afb1e 100644
--- a/meta/recipes-extended/time/time_1.7.bb
+++ b/meta/recipes-extended/time/time_1.7.bb
@@ -5,8 +5,5 @@ SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz \
SRC_URI[md5sum] = "e38d2b8b34b1ca259cf7b053caac32b3"
SRC_URI[sha256sum] = "e37ea79a253bf85a85ada2f7c632c14e481a5fd262a362f6f4fd58e68601496d"
-# file://autofoo.patch
-# file://compile.patch
-S = "${WORKDIR}/time-${PV}"
inherit autotools
--
1.7.8.rc1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH][oe-core 18/22] time: use u-a for time, conflicts with busybox
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
` (16 preceding siblings ...)
2011-11-11 16:28 ` [PATCH][oe-core 17/22] time: drop default S and 2 useless comments Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 19/22] util-linux: use u-a for flock and blockdev, " Martin Jansa
` (4 subsequent siblings)
22 siblings, 0 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
* it was reported here:
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/009409.html
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-extended/time/time.inc | 10 ++++++++++
meta/recipes-extended/time/time_1.7.bb | 2 ++
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-extended/time/time.inc b/meta/recipes-extended/time/time.inc
index 2d9dab8..401288b 100644
--- a/meta/recipes-extended/time/time.inc
+++ b/meta/recipes-extended/time/time.inc
@@ -6,3 +6,13 @@ SECTION = "utils"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+inherit update-alternatives
+
+do_install_append () {
+ mv ${D}${bindir}/time ${D}${bindir}/time.${PN}
+}
+
+ALTERNATIVE_NAME = "time"
+ALTERNATIVE_LINK = "${bindir}/time"
+ALTERNATIVE_PATH = "${bindir}/time.${PN}"
+ALTERNATIVE_PRIORITY = "100"
diff --git a/meta/recipes-extended/time/time_1.7.bb b/meta/recipes-extended/time/time_1.7.bb
index 35afb1e..c38608f 100644
--- a/meta/recipes-extended/time/time_1.7.bb
+++ b/meta/recipes-extended/time/time_1.7.bb
@@ -1,5 +1,7 @@
require time.inc
+PR = "r1"
+
SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz \
file://debian.patch"
--
1.7.8.rc1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH][oe-core 19/22] util-linux: use u-a for flock and blockdev, conflicts with busybox
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
` (17 preceding siblings ...)
2011-11-11 16:28 ` [PATCH][oe-core 18/22] time: use u-a for time, conflicts with busybox Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 20/22] util-linux: add missing u-a calls for setsid chrt Martin Jansa
` (3 subsequent siblings)
22 siblings, 0 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
* nobody replied on
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/009409.html
* be aware that all those renames to foo.${PN} are also applied for
native variants so now we have utils like
tmp-eglibc/sysroots/x86_64-linux/usr/bin/flock.util-linux-native
which are not used ie in
package_ipk.bbclass: package_update_index_ipk
because it calls just flock
so if that's problem then we should apply those renames only for
target version (and live with possible overwrites in -native sysroot)
or teach u-a postinst/prerm to happen also for sysroot population
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-core/util-linux/util-linux.inc | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index dcf0ed9..3b80736 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -116,9 +116,9 @@ do_install () {
mkdir -p ${D}${base_bindir}
- sbinprogs="agetty blockdev ctrlaltdel cfdisk vipw vigr"
- sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk readprofile fsck blkid sln"
- usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall setsid chrt"
+ sbinprogs="agetty ctrlaltdel cfdisk vipw vigr"
+ sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk readprofile fsck blkid sln blockdev"
+ usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall setsid chrt flock"
binprogs_a="dmesg kill more umount mount login reset"
if [ "${base_sbindir}" != "${sbindir}" ]; then
@@ -180,6 +180,7 @@ pkg_postinst_${PN} () {
update-alternatives --install ${base_bindir}/kill kill kill.${PN} 100
update-alternatives --install ${base_bindir}/more more more.${PN} 100
update-alternatives --install ${base_sbindir}/mkswap mkswap mkswap.${PN} 100
+ update-alternatives --install ${base_sbindir}/blockdev blockdev blockdev.${PN} 100
test -x ${base_sbindir}/pivot_root.${PN} && \
update-alternatives --install ${base_sbindir}/pivot_root pivot_root pivot_root.${PN} 100
# update-alternatives --install ${base_sbindir}/sln sln sln.${PN} 100
@@ -190,6 +191,7 @@ pkg_postinst_${PN} () {
update-alternatives --install ${bindir}/mesg mesg mesg.${PN} 100
update-alternatives --install ${bindir}/renice renice renice.${PN} 100
update-alternatives --install ${bindir}/wall wall wall.${PN} 100
+ update-alternatives --install ${bindir}/flock flock flock.${PN} 100
# There seems to be problem, atleast on nslu2, with these, untill they are
# fixed the busybox ones have higher priority
@@ -208,6 +210,7 @@ pkg_prerm_${PN} () {
update-alternatives --remove halt halt.${PN}
update-alternatives --remove hwclock hwclock.${PN}
update-alternatives --remove mkswap mkswap.${PN}
+ update-alternatives --remove blockdev blockdev.${PN}
update-alternatives --remove reboot reboot.${PN}
update-alternatives --remove shutdown shutdown.${PN}
# update-alternatives --remove sln sln.${PN}
@@ -218,6 +221,7 @@ pkg_prerm_${PN} () {
update-alternatives --remove mesg mesg.${PN}
update-alternatives --remove renice renice.${PN}
update-alternatives --remove wall wall.${PN}
+ update-alternatives --remove flock flock.${PN}
}
pkg_postinst_util-linux-fdisk () {
--
1.7.8.rc1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH][oe-core 20/22] util-linux: add missing u-a calls for setsid chrt
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
` (18 preceding siblings ...)
2011-11-11 16:28 ` [PATCH][oe-core 19/22] util-linux: use u-a for flock and blockdev, " Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 21/22] util-linux: bump PR after u-a changes Martin Jansa
` (2 subsequent siblings)
22 siblings, 0 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
* someone added them to usrbinprogs_a, but without u-a calls added
* similar problem is with chfn chsh newgrp, but those are not built in
current version
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-core/util-linux/util-linux.inc | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 3b80736..855a545 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -191,6 +191,8 @@ pkg_postinst_${PN} () {
update-alternatives --install ${bindir}/mesg mesg mesg.${PN} 100
update-alternatives --install ${bindir}/renice renice renice.${PN} 100
update-alternatives --install ${bindir}/wall wall wall.${PN} 100
+ update-alternatives --install ${bindir}/setsid setsid setsid.${PN} 100
+ update-alternatives --install ${bindir}/chrt chrt chrt.${PN} 100
update-alternatives --install ${bindir}/flock flock flock.${PN} 100
# There seems to be problem, atleast on nslu2, with these, untill they are
@@ -221,6 +223,8 @@ pkg_prerm_${PN} () {
update-alternatives --remove mesg mesg.${PN}
update-alternatives --remove renice renice.${PN}
update-alternatives --remove wall wall.${PN}
+ update-alternatives --remove setsid setsid.${PN}
+ update-alternatives --remove chrt chrt.${PN}
update-alternatives --remove flock flock.${PN}
}
--
1.7.8.rc1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH][oe-core 21/22] util-linux: bump PR after u-a changes
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
` (19 preceding siblings ...)
2011-11-11 16:28 ` [PATCH][oe-core 20/22] util-linux: add missing u-a calls for setsid chrt Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-11 16:28 ` [PATCH][oe-core 22/22] kbd: use u-a for chvt, deallocvt, fgconssole, openvt, conflicts with busybox Martin Jansa
2011-11-15 12:29 ` [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Richard Purdie
22 siblings, 0 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
* it's in separate commit because original PR change was eaten by later commit
util-linux: split mcookie into a package
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-core/util-linux/util-linux_2.19.1.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux_2.19.1.bb b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
index e2fb727..b65e761 100644
--- a/meta/recipes-core/util-linux/util-linux_2.19.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
@@ -1,5 +1,5 @@
MAJOR_VERSION = "2.19"
-PR = "r10"
+PR = "r11"
require util-linux.inc
# note that `lscpu' is under GPLv3+
--
1.7.8.rc1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH][oe-core 22/22] kbd: use u-a for chvt, deallocvt, fgconssole, openvt, conflicts with busybox
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
` (20 preceding siblings ...)
2011-11-11 16:28 ` [PATCH][oe-core 21/22] util-linux: bump PR after u-a changes Martin Jansa
@ 2011-11-11 16:28 ` Martin Jansa
2011-11-15 12:29 ` [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Richard Purdie
22 siblings, 0 replies; 32+ messages in thread
From: Martin Jansa @ 2011-11-11 16:28 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-core/kbd/kbd_1.15.2.bb | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/kbd/kbd_1.15.2.bb b/meta/recipes-core/kbd/kbd_1.15.2.bb
index 2e0406b..eea04a0 100644
--- a/meta/recipes-core/kbd/kbd_1.15.2.bb
+++ b/meta/recipes-core/kbd/kbd_1.15.2.bb
@@ -10,7 +10,7 @@ RREPLACES_${PN} = "console-tools"
RPROVIDES_${PN} = "console-tools"
RCONFLICTS_${PN} = "console-tools"
-PR = "r1"
+PR = "r2"
SRC_URI="${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2"
SRC_URI[md5sum] = "e850eb91e4d3b94b194efe8e953204c5"
@@ -22,3 +22,30 @@ FILES_${PN}-consolefonts = "${datadir}/consolefonts"
FILES_${PN}-consoletrans = "${datadir}/consoletrans"
FILES_${PN}-keymaps = "${datadir}/keymaps"
FILES_${PN}-unimaps = "${datadir}/unimaps"
+
+ALTERNATIVE_NAMES_USRBIN = "chvt deallocvt fgconsole openvt"
+
+do_install_append() {
+ usrbinprogs_a="${ALTERNATIVE_NAMES_USRBIN}"
+ for p in $usrbinprogs_a; do
+ if [ -f "${D}${bindir}/$p" ]; then
+ mv "${D}${bindir}/$p" "${D}${bindir}/$p.${PN}"
+ fi
+ done
+}
+
+pkg_postinst_${PN} () {
+ usrbinprogs_a="${ALTERNATIVE_NAMES_USRBIN}"
+ for p in $usrbinprogs_a; do
+ if [ -f "$D${bindir}/$p" ]; then
+ update-alternatives --install ${bindir}/$p $p $p.${PN} 100
+ fi
+ done
+}
+
+pkg_postrm_${PN} () {
+ usrbinprogs_a="${ALTERNATIVE_NAMES_USRBIN}"
+ for p in $usrbinprogs_a; do
+ update-alternatives --remove $p $p.${PN}
+ done
+}
--
1.7.8.rc1
^ permalink raw reply related [flat|nested] 32+ messages in thread* Re: [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes
2011-11-11 16:28 [PATCH][oe-core 00/22] QT4, thumb, subversion, mesa, libsdl, time, util-linux, kbd changes Martin Jansa
` (21 preceding siblings ...)
2011-11-11 16:28 ` [PATCH][oe-core 22/22] kbd: use u-a for chvt, deallocvt, fgconssole, openvt, conflicts with busybox Martin Jansa
@ 2011-11-15 12:29 ` Richard Purdie
22 siblings, 0 replies; 32+ messages in thread
From: Richard Purdie @ 2011-11-15 12:29 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-11-11 at 17:28 +0100, Martin Jansa wrote:
> Martin Jansa:
> libatomics-ops: force ARM mode
> pulseaudio-0.9.23: force ARM mode
> aspell: force ARM mode
> webkit-gtk: force arm mode to work around binutils segfault
> subversion: add 1.7.0 with native support and negative D_P for now
> alsa-lib: add nativesdk BBCLASSEXTEND
> time: rename files dir to time-1.7 for faster lookup
> time: drop default S and 2 useless comments
> time: use u-a for time, conflicts with busybox
> util-linux: use u-a for flock and blockdev, conflicts with busybox
> util-linux: add missing u-a calls for setsid chrt
> util-linux: bump PR after u-a changes
> kbd: use u-a for chvt, deallocvt, fgconssole, openvt, conflicts with
> busybox
>
> Simon Busch (1):
> qt4-x11-free: bring back pkg-config fixups
The above have all merged.
> base.bbclass: add subversion-native to DEPENDS if there is svn:// in
> SRC_URI
I've taken this but I've also fixed the default ASSUME_PROVIDED to
include subversion-native instead of svn-native in bitbake.conf. This
may need some further thought but at least the system is more correct
now.
> mesa: package gl/egl/osmesa to separate packages
This one I really want to take but there are some PR bumps missing or
some renaming missing somewhere as its causing build issues :/. I'm
holding off until these are tracked down.
> mesa-common: install internal GL headers to libgl-dev
This one is a WIP.
> libsdl: drop unused files
> libsdl: rename files dir to libsdl-1.2.14 for faster lookup
> libsdl: enable cdrom, alsa and tslib, disable rpath and add few fixes
> from meta-oe
> libsdl: enable alsa/opengl based on PACKAGECONFIG and respect
> DISTRO_FEATURES
> libsdl: replace tabs with spaces
There were some issues Saul was seeing around libsdl so I've left these
for now as we're having a few too many build issues atm :/.
Cheers,
Richard
^ permalink raw reply [flat|nested] 32+ messages in thread