[oe-commits] org.oe.dev merge of '66901d5eabd98c5f7c2f9cdf809e9fe7f182f1ef'
oe commit
oe at amethyst.openembedded.net
Fri Jul 25 11:53:30 UTC 2008
merge of '66901d5eabd98c5f7c2f9cdf809e9fe7f182f1ef'
and '8a68b62f9b7e2ae09097a8b9390d75dbcfc1ca82'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 11190e741ffccdf2d209ad44d788d7a645b62eef
ViewMTN: http://monotone.openembedded.org/revision/info/11190e741ffccdf2d209ad44d788d7a645b62eef
Files:
1
packages/tslib/tslib/bd-neon/tslib.sh
conf/machine/netvista.conf
packages/linux/linux-2.6.23/netvista/defconfig
packages/tslib/tslib/bd-neon/ts.conf
packages/tslib/tslib_1.0.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 -r66901d5eabd98c5f7c2f9cdf809e9fe7f182f1ef -r11190e741ffccdf2d209ad44d788d7a645b62eef
#
#
#
# delete "packages/tslib/tslib/bd-neon/tslib.sh"
#
# patch "conf/machine/netvista.conf"
# from [1e8916b0ef719e2519ead2446fbf85bb7d5a455a]
# to [f9365efa8c856367a0d936ad6ce959be4df0b48f]
#
# patch "packages/linux/linux-2.6.23/netvista/defconfig"
# from [194cad167a3bd92c06baf952080953e93a7c0691]
# to [ecd7e14dbf92b73c96dbeca99f62b244e5f993d1]
#
# patch "packages/tslib/tslib/bd-neon/ts.conf"
# from [4b9e32da7b1b5a703348cc9d4fc2800494e9fb98]
# to [a3fae8541d77a6d7f5aed7eb5b73fbf41c483c91]
#
# patch "packages/tslib/tslib_1.0.bb"
# from [d5ac4e962d47cee8d9cdd1b1c0e62a83088f730f]
# to [11f9ac2e626e92402422989031894d52cd8285e2]
#
============================================================
--- conf/machine/netvista.conf 1e8916b0ef719e2519ead2446fbf85bb7d5a455a
+++ conf/machine/netvista.conf f9365efa8c856367a0d936ad6ce959be4df0b48f
@@ -7,7 +7,7 @@ PREFERRED_VERSION_linux = "2.6.23"
PREFERRED_PROVIDER_virtual/kernel = "linux"
PREFERRED_VERSION_linux = "2.6.23"
-XSERVER = "xserver-kdrive-vesa"
+XSERVER = "xserver-kdrive-fbdev"
KERNEL_IMAGETYPE = "bzImage"
@@ -23,3 +23,5 @@ GLIBC_EXTRA_OECONF = "--with-tls"
OLDEST_KERNEL = "2.6.17"
GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
+
+require conf/machine/include/tune-x86.inc
============================================================
--- packages/linux/linux-2.6.23/netvista/defconfig 194cad167a3bd92c06baf952080953e93a7c0691
+++ packages/linux/linux-2.6.23/netvista/defconfig ecd7e14dbf92b73c96dbeca99f62b244e5f993d1
@@ -780,10 +780,10 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=600
CONFIG_INPUT_MOUSEDEV_SCREEN_X=800
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=600
# CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_TSDEV=m
+CONFIG_INPUT_TSDEV=y
CONFIG_INPUT_TSDEV_SCREEN_X=800
CONFIG_INPUT_TSDEV_SCREEN_Y=600
-CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_EVBUG is not set
#
============================================================
--- packages/tslib/tslib/bd-neon/ts.conf 4b9e32da7b1b5a703348cc9d4fc2800494e9fb98
+++ packages/tslib/tslib/bd-neon/ts.conf a3fae8541d77a6d7f5aed7eb5b73fbf41c483c91
@@ -1,4 +1,4 @@
-module_raw ucb1x00
+module_raw input
module pthres pmin=1
module variance delta=500
module dejitter delta=10000
============================================================
--- packages/tslib/tslib_1.0.bb d5ac4e962d47cee8d9cdd1b1c0e62a83088f730f
+++ packages/tslib/tslib_1.0.bb 11f9ac2e626e92402422989031894d52cd8285e2
@@ -4,7 +4,7 @@ LICENSE = "LGPL"
SECTION = "base"
LICENSE = "LGPL"
-PR = "r18"
+PR = "r19"
SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
file://tslib-input_raw-grab_events.patch;patch=1 \
#
# mt diff -r8a68b62f9b7e2ae09097a8b9390d75dbcfc1ca82 -r11190e741ffccdf2d209ad44d788d7a645b62eef
#
#
#
# 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