[oe-commits] org.oe.dev merge of '014e04809d6848b8f7c4ce43e57a9e89857ed8c9'
mickeyl commit
oe at amethyst.openembedded.net
Fri Jul 25 11:36:24 UTC 2008
merge of '014e04809d6848b8f7c4ce43e57a9e89857ed8c9'
and '312397dbc5a5ae102fde8714c41666b07b74ee8a'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 66901d5eabd98c5f7c2f9cdf809e9fe7f182f1ef
ViewMTN: http://monotone.openembedded.org/revision/info/66901d5eabd98c5f7c2f9cdf809e9fe7f182f1ef
Files:
1
packages/uclibc/uclibc-cvs/uclibc-arm-ftruncate64.patch
packages/uclibc/files/uclibc-arm-ftruncate64.patch
packages/gpe-su/gpe-su_0.20.bb
packages/libgpewidget/libgpewidget_0.117.bb
conf/distro/include/angstrom-uclibc.inc
packages/tasks/task-gpe-base.bb
packages/uclibc/uclibc-initial_svn.bb
packages/uclibc/uclibc_svn.bb
packages/speex/speex_1.0.4.bb
packages/speex/speex_1.1.12.bb
packages/speex/speex_1.1.7.bb
packages/speex/speex_1.2-beta3.bb
packages/speex/speex_1.2.bb
conf/distro/include/preferred-om-2008-versions.inc
Diffs:
#
# mt diff -r014e04809d6848b8f7c4ce43e57a9e89857ed8c9 -r66901d5eabd98c5f7c2f9cdf809e9fe7f182f1ef
#
#
#
# rename "packages/uclibc/uclibc-cvs/uclibc-arm-ftruncate64.patch"
# to "packages/uclibc/files/uclibc-arm-ftruncate64.patch"
#
# add_file "packages/gpe-su/gpe-su_0.20.bb"
# content [ee9d5997abef9b50de5f430cd2e882c211906c10]
#
# add_file "packages/libgpewidget/libgpewidget_0.117.bb"
# content [b0c070d4f2cfa704c9379750ab366355e92563a2]
#
# patch "conf/distro/include/angstrom-uclibc.inc"
# from [811d455e8ee857e124f2089a5c52c29d5b1124be]
# to [ca2fe974b58e8678de2abda68a7ace8c061523a2]
#
# patch "packages/tasks/task-gpe-base.bb"
# from [ab132c0f7f2cb6b6cfb49188855c0c5345502b81]
# to [acf55f8f5d7e22a3767bfe2c1a8be178c8644d5c]
#
# patch "packages/uclibc/uclibc-initial_svn.bb"
# from [766c264be7d787f2285f02b13a392f43cb2a87d2]
# to [f93c2db24556094e01b1100d0abfb605627c9169]
#
# patch "packages/uclibc/uclibc_svn.bb"
# from [837ea53cd611b44f1987f917d2e4554a1ea7c756]
# to [88b7021e9c8e55186b7a8a8fe49a21da5aa94bac]
#
============================================================
--- packages/gpe-su/gpe-su_0.20.bb ee9d5997abef9b50de5f430cd2e882c211906c10
+++ packages/gpe-su/gpe-su_0.20.bb ee9d5997abef9b50de5f430cd2e882c211906c10
@@ -0,0 +1,3 @@
+require gpe-su.inc
+
+PR = "r0"
============================================================
--- packages/libgpewidget/libgpewidget_0.117.bb b0c070d4f2cfa704c9379750ab366355e92563a2
+++ packages/libgpewidget/libgpewidget_0.117.bb b0c070d4f2cfa704c9379750ab366355e92563a2
@@ -0,0 +1,22 @@
+LICENSE = "LGPL"
+DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+DEPENDS = "gtk+ cairo libxrender gtk-doc"
+PR = "r0"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpe pkgconfig autotools
+
+SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0"
+
+PACKAGES =+ "libgpewidget-bin"
+FILES_libgpewidget-bin = "${bindir}/*"
+
+EXTRA_OECONF = "--enable-cairo"
+
+LDFLAGS += " -L${STAGING_LIBDIR}"
+
+do_stage () {
+ autotools_stage_all
+}
============================================================
--- conf/distro/include/angstrom-uclibc.inc 811d455e8ee857e124f2089a5c52c29d5b1124be
+++ conf/distro/include/angstrom-uclibc.inc ca2fe974b58e8678de2abda68a7ace8c061523a2
@@ -14,7 +14,7 @@ TARGET_OS_UC = "linux${@['-uclibc','-ucl
USE_NLS_glib-2.0 = "yes"
TARGET_OS_UC = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
-TARGET_OS ?= "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d) in ['bfin']]}"
+TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d) in ['bfin']]}"
#mess with compiler flags to use -Os instead of -O2
#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
============================================================
--- packages/tasks/task-gpe-base.bb ab132c0f7f2cb6b6cfb49188855c0c5345502b81
+++ packages/tasks/task-gpe-base.bb acf55f8f5d7e22a3767bfe2c1a8be178c8644d5c
@@ -1,11 +1,10 @@ DESCRIPTION = "Base task package for GPE
DESCRIPTION = "Base task package for GPE Palmtop Environment"
-PR = "r8"
+PR = "r9"
LICENSE = "MIT"
inherit task
RDEPENDS_${PN} = "\
- gpe-bootsplash \
bluez-utils-dbus \
matchbox \
xcursor-transparent-theme \
============================================================
--- packages/uclibc/uclibc-initial_svn.bb 766c264be7d787f2285f02b13a392f43cb2a87d2
+++ packages/uclibc/uclibc-initial_svn.bb f93c2db24556094e01b1100d0abfb605627c9169
@@ -1,8 +1,6 @@ require uclibc_svn.bb
SECTION = "base"
require uclibc_svn.bb
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-cvs', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
PACKAGES = ""
============================================================
--- packages/uclibc/uclibc_svn.bb 837ea53cd611b44f1987f917d2e4554a1ea7c756
+++ packages/uclibc/uclibc_svn.bb 88b7021e9c8e55186b7a8a8fe49a21da5aa94bac
@@ -8,7 +8,7 @@ PV = "${UCLIBC_BASE}+svnr${SRCREV}"
#
UCLIBC_BASE ?= "0.9.29"
PV = "${UCLIBC_BASE}+svnr${SRCREV}"
-PR = "r11"
+PR = "r12"
#DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
# precedence.
@@ -28,8 +28,6 @@ SRC_URI += "svn://uclibc.org/trunk;modul
file://uClibc.machine \
file://uClibc.distro \
file://uclibc-arm-ftruncate64.patch;patch=1 \
- file://errno_values.h.patch;patch=1 \
- file://build_wcs_upper_buffer.patch;patch=1 \
file://arm_fix_alignment.patch;patch=1 \
file://unistd_arm.patch;patch=1 \
"
#
# mt diff -r312397dbc5a5ae102fde8714c41666b07b74ee8a -r66901d5eabd98c5f7c2f9cdf809e9fe7f182f1ef
#
#
#
# delete "packages/speex/speex_1.0.4.bb"
#
# delete "packages/speex/speex_1.1.12.bb"
#
# delete "packages/speex/speex_1.1.7.bb"
#
# delete "packages/speex/speex_1.2-beta3.bb"
#
# add_file "packages/speex/speex_1.2.bb"
# content [62d80f520ab6363d5a91f147d1a750a91550a252]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [398b1c782a663466e0069988b2abf9e09f37a1ad]
# to [1b5cac00d46388ab063fd9310c8e3b9aac2ac9c4]
#
============================================================
--- packages/speex/speex_1.2.bb 62d80f520ab6363d5a91f147d1a750a91550a252
+++ packages/speex/speex_1.2.bb 62d80f520ab6363d5a91f147d1a750a91550a252
@@ -0,0 +1,49 @@
+DESCRIPTION = "Speex is an Open Source/Free Software patent-free audio compression format designed for speech."
+SECTION = "libs/multimedia"
+LICENSE = "BSD"
+HOMEPAGE = "http://www.speex.org"
+DEPENDS = "libogg"
+BETA = "1.2rc1"
+PV = "1.1+${BETA}"
+PR = "r0"
+
+SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-${BETA}.tar.gz"
+S = "${WORKDIR}/speex-${BETA}"
+
+PARALLEL_MAKE = ""
+
+inherit autotools pkgconfig
+
+LEAD_SONAME = "libspeex.so"
+
+# Some interesting options are:
+#
+# --enable-arm4-asm
+# --enable-arm5e-asm
+# --enable-blackfin-asm
+# --enable-fixed-point
+# --disable-float-api --disable-vbr (must disable-vbr if disable-float-api)
+#
+
+EXTRA_OECONF_append_openmn = " --enable-arm5e-asm --enable-fixed-point --disable-float-api --disable-vbr "
+EXTRA_OECONF_append_amsdelta = " --enable-arm4-asm --enable-fixed-point --disable-float-api --disable-vbr "
+EXTRA_OECONF_append_bfin = " --enable-blackfin-asm --enable-fixed-point --disable-float-api --disable-vbr "
+EXTRA_OECONF_append_arm = " --enable-fixed-point --disable-float-api --disable-vbr "
+EXTRA_OECONF_append_dht-walnut = " --enable-fixed-point --disable-float-api --disable-vbr "
+
+
+
+do_configure_append() {
+ sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile
+ sed -i s/"^OGG_LIBS.*$"/"OGG_LIBS = -logg"/g Makefile */Makefile */*/Makefile
+ find . -name "Makefile" -exec sed -i s,-I/usr/include,, {} \;
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
+PACKAGES =+ "${PN}-utils ${PN}-dsp"
+FILES_${PN}-utils = "${bindir}/speex*"
+FILES_${PN}-dsp = "${libdir}/libspeexdsp.so.*"
+FILES_${PN} = "${libdir}/libspeex.so.*"
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc 398b1c782a663466e0069988b2abf9e09f37a1ad
+++ conf/distro/include/preferred-om-2008-versions.inc 1b5cac00d46388ab063fd9310c8e3b9aac2ac9c4
@@ -1555,8 +1555,8 @@ PREFERRED_VERSION_python-pyreverse ?= "0
PREFERRED_VERSION_python-pyrad ?= "0.8"
PREFERRED_VERSION_python-pyraf ?= "1.4"
PREFERRED_VERSION_python-pyreverse ?= "0.5.2"
-PREFERRED_VERSION_python-pyrex ?= "0.9.8"
-PREFERRED_VERSION_python-pyrex-native ?= "0.9.8"
+PREFERRED_VERSION_python-pyrex ?= "0.9.8.4"
+PREFERRED_VERSION_python-pyrex-native ?= "0.9.8.4"
PREFERRED_VERSION_python-pyro ?= "3.7"
PREFERRED_VERSION_python-pyserial ?= "2.2"
PREFERRED_VERSION_python-pytester ?= "0.6.0"
@@ -1764,7 +1764,7 @@ PREFERRED_VERSION_spectrum-fw ?= "1.0"
PREFERRED_VERSION_spandsp ?= "0.0.3"
PREFERRED_VERSION_spca5xx ?= "20060501"
PREFERRED_VERSION_spectrum-fw ?= "1.0"
-PREFERRED_VERSION_speex ?= "1.1.12"
+PREFERRED_VERSION_speex ?= "1.1+1.2rc1"
PREFERRED_VERSION_sphinxbase ?= "0.1"
PREFERRED_VERSION_squashfs-lzma-tools ?= "3.1r2"
PREFERRED_VERSION_squashfs-lzma-tools-native ?= "3.1r2"
More information about the Openembedded-commits
mailing list