summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/alsa/alsa-lib/fix_libmath.patch17
-rw-r--r--packages/alsa/alsa-lib_1.0.15.bb14
-rw-r--r--packages/alsa/alsa-versym.inc21
-rw-r--r--packages/ffmpeg/ffmpeg_git.bb4
-rw-r--r--packages/ffmpeg/omapfbplay_git.bb4
-rw-r--r--packages/freesmartphone/frameworkd/magician/.mtn2git_empty0
-rw-r--r--packages/freesmartphone/frameworkd/magician/frameworkd.conf17
-rw-r--r--packages/linux/linux-neuros_git.bb4
-rw-r--r--packages/opkg-utils/.mtn2git_empty0
-rw-r--r--packages/opkg-utils/opkg-utils-native_svn.bb10
-rw-r--r--packages/opkg-utils/opkg-utils_svn.bb18
-rw-r--r--packages/pulseaudio/pulseaudio-0.9.10/libiconv.patch22
-rw-r--r--packages/pulseaudio/pulseaudio_0.9.10.bb3
-rw-r--r--packages/speech-dispatcher/files/configure_fix.patch30
-rw-r--r--packages/speech-dispatcher/speech-dispatcher_0.6.6.bb2
15 files changed, 145 insertions, 21 deletions
diff --git a/packages/alsa/alsa-lib/fix_libmath.patch b/packages/alsa/alsa-lib/fix_libmath.patch
new file mode 100644
index 0000000000..23309ce381
--- /dev/null
+++ b/packages/alsa/alsa-lib/fix_libmath.patch
@@ -0,0 +1,17 @@
+Index: alsa-lib-1.0.15/configure.in
+===================================================================
+--- alsa-lib-1.0.15.orig/configure.in 2007-10-15 10:45:26.000000000 +0200
++++ alsa-lib-1.0.15/configure.in 2008-07-19 15:51:34.177119589 +0200
+@@ -191,9 +191,9 @@
+ AC_MSG_RESULT(no)
+ fi
+
+-ALSA_DEPLIBS=""
+-if test "$softfloat" != "yes"; then
+- ALSA_DEPLIBS="-lm"
++ALSA_DEPLIBS="-lm"
++if test "$softfloat" = "yes"; then
++ AC_CHECK_LIB([m], [floor], , [ALSA_DEPLIBS=""])
+ fi
+
+ dnl Check for libdl
diff --git a/packages/alsa/alsa-lib_1.0.15.bb b/packages/alsa/alsa-lib_1.0.15.bb
index 60b44dbc8e..399352f299 100644
--- a/packages/alsa/alsa-lib_1.0.15.bb
+++ b/packages/alsa/alsa-lib_1.0.15.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Alsa sound library"
HOMEPAGE = "http://www.alsa-project.org"
SECTION = "libs/multimedia"
LICENSE = "GPL"
+PR = "1"
# 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,
@@ -10,14 +11,23 @@ LICENSE = "GPL"
ARM_INSTRUCTION_SET = "arm"
SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
- file://fix-tstamp-declaration.patch;patch=1"
+ file://fix-tstamp-declaration.patch;patch=1 \
+ file://fix_libmath.patch;patch=1 \
+ "
inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python"
+
+
require alsa-fpu.inc
EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} "
-EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python"
+
+require alsa-versym.inc
+EXTRA_OECONF += "${@get_alsa_versym_setting(bb, d)} "
+
do_stage () {
oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/
diff --git a/packages/alsa/alsa-versym.inc b/packages/alsa/alsa-versym.inc
new file mode 100644
index 0000000000..6d585ecf4a
--- /dev/null
+++ b/packages/alsa/alsa-versym.inc
@@ -0,0 +1,21 @@
+
+def get_alsa_versym_setting(bb, d):
+ # Versioned symbols don't work propery with uClibc
+ if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0:
+ return "--with-versioned=no"
+ return ""
+
+
+def get_alsa_versym_setting(bb, d):
+ # Versioned symbols don't work propery with uClibc
+ if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0:
+ return "--with-versioned=no"
+ return ""
+
+
+def get_alsa_versym_setting(bb, d):
+ # Versioned symbols don't work propery with uClibc
+ if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0:
+ return "--with-versioned=no"
+ return ""
+
diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb
index 979da0362e..b0c57288a1 100644
--- a/packages/ffmpeg/ffmpeg_git.bb
+++ b/packages/ffmpeg/ffmpeg_git.bb
@@ -3,7 +3,7 @@ require ffmpeg.inc
DEPENDS += "libgsm"
PV = "0.4.9+${PR}+gitr${SRCREV}"
-PR = "r15"
+PR = "r16"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_armv7a = "1"
@@ -12,7 +12,7 @@ FFBRANCH_arm = "arm-neon"
FFBRANCH ?= "master"
SRCREV = "dee1c2d60a67dc6411ed3fcbe26db5113cb1a371"
-SRCREV_arm = "7137e7907e706300183c120703d4c9b46db93029"
+SRCREV_arm = "699f491ee2d3c3216ef16ea30ec3956f4cb583db"
SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
"
diff --git a/packages/ffmpeg/omapfbplay_git.bb b/packages/ffmpeg/omapfbplay_git.bb
index 9494e57d33..dd89b8eae8 100644
--- a/packages/ffmpeg/omapfbplay_git.bb
+++ b/packages/ffmpeg/omapfbplay_git.bb
@@ -2,13 +2,13 @@ DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays"
DEPENDS = "bzip2 lame ffmpeg virtual/kernel"
LICENSE = "MIT"
-PR = "r5"
+PR = "r6"
inherit module-base
PV = "0.0+${PR}+gitr${SRCREV}"
-SRCREV = "5d0a1fd4c9733ef8c57823c368e21688344bbeb4"
+SRCREV = "0e4b69dbdc807da9b51e97fcffd8e26427b57162"
SRC_URI = "git://git.mansr.com/${PN};protocol=git \
file://fbplay-static.diff;patch=1 "
diff --git a/packages/freesmartphone/frameworkd/magician/.mtn2git_empty b/packages/freesmartphone/frameworkd/magician/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/freesmartphone/frameworkd/magician/.mtn2git_empty
diff --git a/packages/freesmartphone/frameworkd/magician/frameworkd.conf b/packages/freesmartphone/frameworkd/magician/frameworkd.conf
new file mode 100644
index 0000000000..cbafb1925f
--- /dev/null
+++ b/packages/freesmartphone/frameworkd/magician/frameworkd.conf
@@ -0,0 +1,17 @@
+[idlenotifier]
+
+[input]
+# magician doesn't have AUX, use the CAMERA key for now
+# (it's in about the same place as AUX on gta01/02)
+report1 = AUX,key,212,1
+report2 = POWER,key,116,1
+# magician doesn't use KEY_POWER2 for the charger, need to fix
+report3 = CHARGER,key,356,0
+report4 = HEADSET,switch,2,0
+
+[ophoned]
+# Magician has TI Calypso
+modemtype = ti_calypso
+
+[opreferencesd]
+rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
diff --git a/packages/linux/linux-neuros_git.bb b/packages/linux/linux-neuros_git.bb
index 1a5bd607fa..2fe367cd49 100644
--- a/packages/linux/linux-neuros_git.bb
+++ b/packages/linux/linux-neuros_git.bb
@@ -2,10 +2,10 @@ require linux.inc
DESCRIPTION = "Linux kernel for Neuros OSD devices"
-SRCREV = "a4701816600fbfc6d3144fa169a27a57d05d2682"
+SRCREV = "e014243410af1c7c214e6974f5fc2f23c0a1c1ee"
PV = "2.6.23-${PR}+git${SRCREV}"
-PR = "r6"
+PR = "r7"
COMPATIBLE_MACHINE = "(neuros-osd|neuros-osd2)"
diff --git a/packages/opkg-utils/.mtn2git_empty b/packages/opkg-utils/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opkg-utils/.mtn2git_empty
diff --git a/packages/opkg-utils/opkg-utils-native_svn.bb b/packages/opkg-utils/opkg-utils-native_svn.bb
new file mode 100644
index 0000000000..0495b1eda3
--- /dev/null
+++ b/packages/opkg-utils/opkg-utils-native_svn.bb
@@ -0,0 +1,10 @@
+require opkg-utils_svn.bb
+
+RDEPENDS = ""
+
+inherit native
+
+# Avoid circular dependencies from package_ipk.bbclass
+PACKAGES = ""
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/opkg-utils"
+
diff --git a/packages/opkg-utils/opkg-utils_svn.bb b/packages/opkg-utils/opkg-utils_svn.bb
new file mode 100644
index 0000000000..4c3c0905ea
--- /dev/null
+++ b/packages/opkg-utils/opkg-utils_svn.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "OPKG Package Manager Utilities"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+RDEPENDS = "python"
+PR = "r2"
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http"
+
+S = "${WORKDIR}/opkg-utils"
+
+inherit autotools
+
+S = "${WORKDIR}/opkg-utils"
+
+do_stage () {
+ autotools_stage_all
+}
diff --git a/packages/pulseaudio/pulseaudio-0.9.10/libiconv.patch b/packages/pulseaudio/pulseaudio-0.9.10/libiconv.patch
new file mode 100644
index 0000000000..273b446d78
--- /dev/null
+++ b/packages/pulseaudio/pulseaudio-0.9.10/libiconv.patch
@@ -0,0 +1,22 @@
+Index: pulseaudio-0.9.10/src/Makefile.am
+===================================================================
+--- pulseaudio-0.9.10.orig/src/Makefile.am 2008-07-20 13:16:51.548858829 +0200
++++ pulseaudio-0.9.10/src/Makefile.am 2008-07-20 13:43:39.842031837 +0200
+@@ -551,7 +551,7 @@
+
+ libpulse_la_CFLAGS = $(AM_CFLAGS)
+ libpulse_la_LDFLAGS = -version-info $(LIBPULSE_VERSION_INFO) -Wl,-version-script=$(srcdir)/map-file
+-libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LIBICONV)
++libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV)
+
+ if HAVE_X11
+ libpulse_la_CFLAGS += $(X_CFLAGS)
+@@ -771,7 +771,7 @@
+
+ libpulsecore_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBOIL_CFLAGS)
+ libpulsecore_la_LDFLAGS = -version-info $(LIBPULSECORE_VERSION_INFO)
+-libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LIBICONV) libspeex-resampler-fixed.la libspeex-resampler-float.la libffmpeg-resampler.la
++libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LTLIBICONV) libspeex-resampler-fixed.la libspeex-resampler-float.la libffmpeg-resampler.la
+
+ ###################################
+ # Plug-in support libraries #
diff --git a/packages/pulseaudio/pulseaudio_0.9.10.bb b/packages/pulseaudio/pulseaudio_0.9.10.bb
index 8c858f9015..8da4a1c7da 100644
--- a/packages/pulseaudio/pulseaudio_0.9.10.bb
+++ b/packages/pulseaudio/pulseaudio_0.9.10.bb
@@ -1,7 +1,7 @@
require pulseaudio.inc
DEPENDS += "dbus"
-PR = "r3"
+PR = "r4"
SRC_URI += "\
file://disable-using-glibc-tls.patch;patch=1 \
@@ -10,6 +10,7 @@ SRC_URI += "\
# file://libtool2.patch;patch=1 \
file://2113.diff;patch=1;pnum=0 \
file://2114.diff;patch=1;pnum=0 \
+ file://libiconv.patch;patch=1 \
"
do_compile_prepend() {
diff --git a/packages/speech-dispatcher/files/configure_fix.patch b/packages/speech-dispatcher/files/configure_fix.patch
index 19feabf379..d593d4e0ab 100644
--- a/packages/speech-dispatcher/files/configure_fix.patch
+++ b/packages/speech-dispatcher/files/configure_fix.patch
@@ -1,8 +1,16 @@
-Index: speech-dispatcher-0.6.5/configure.in
+Index: speech-dispatcher-0.6.6/configure.in
===================================================================
---- speech-dispatcher-0.6.5.orig/configure.in 2008-03-10 23:11:42.000000000 +0000
-+++ speech-dispatcher-0.6.5/configure.in 2008-03-10 23:14:02.000000000 +0000
-@@ -134,12 +134,15 @@
+--- speech-dispatcher-0.6.6.orig/configure.in 2008-07-20 13:10:44.208894676 +0200
++++ speech-dispatcher-0.6.6/configure.in 2008-07-20 13:11:16.946093820 +0200
+@@ -5,6 +5,7 @@
+
+ dnl progs
+ AC_PROG_CC
++AC_PROG_CXX
+
+ dnl info
+ AM_INIT_AUTOMAKE("speech-dispatcher", "`cat version.sh|grep '^VERSION'|awk -F= '{print $2}'`")
+@@ -134,12 +135,15 @@
AC_SUBST(ibmtts_include)
dnl check for espeak support
@@ -18,10 +26,10 @@ Index: speech-dispatcher-0.6.5/configure.in
AC_ARG_WITH(espeak, AS_HELP_STRING(--with-espeak, Compile with espeak support),
if test $withval = "no"; then
echo "Forced compilation without espeak support.";
-Index: speech-dispatcher-0.6.5/src/modules/Makefile.am
+Index: speech-dispatcher-0.6.6/src/modules/Makefile.am
===================================================================
---- speech-dispatcher-0.6.5.orig/src/modules/Makefile.am 2008-03-10 23:18:50.000000000 +0000
-+++ speech-dispatcher-0.6.5/src/modules/Makefile.am 2008-03-10 23:25:39.000000000 +0000
+--- speech-dispatcher-0.6.6.orig/src/modules/Makefile.am 2008-07-20 13:10:51.768895801 +0200
++++ speech-dispatcher-0.6.6/src/modules/Makefile.am 2008-07-20 13:10:57.665559805 +0200
@@ -8,6 +8,7 @@
EXTRA_DIST = module_main.c module_utils_addvoice.c festival_client.c festival_client.h
@@ -32,15 +40,15 @@ Index: speech-dispatcher-0.6.5/src/modules/Makefile.am
if ibmtts_support
@@ -45,6 +46,6 @@
sd_cicero_SOURCES = cicero.c module_utils.c module_utils.h
- sd_cicero_LDADD = -lm -lpthread -ldotconf @glib_libs@
+ sd_cicero_LDADD = -lpthread -ldotconf @glib_libs@ @gthread_libs@
-sd_espeak_SOURCES = espeak.c module_utils.c module_utils.h
+sd_espeak_SOURCES = espeak.c module_utils.c module_utils.h dummy.cpp
sd_espeak_LDFLAGS = -rpath '$(spdlibdir)'
- sd_espeak_LDADD = -lsdaudio -lm -lespeak -lpthread -ldotconf @SNDFILE_LIBS@ @gthread_libs@
-Index: speech-dispatcher-0.6.5/src/modules/dummy.cpp
+ sd_espeak_LDADD = -lsdaudio -lespeak -lpthread -ldotconf @glib_libs@ @SNDFILE_LIBS@ @gthread_libs@
+Index: speech-dispatcher-0.6.6/src/modules/dummy.cpp
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ speech-dispatcher-0.6.5/src/modules/dummy.cpp 2008-03-10 23:26:50.000000000 +0000
++++ speech-dispatcher-0.6.6/src/modules/dummy.cpp 2008-07-20 13:10:57.668895216 +0200
@@ -0,0 +1 @@
+
diff --git a/packages/speech-dispatcher/speech-dispatcher_0.6.6.bb b/packages/speech-dispatcher/speech-dispatcher_0.6.6.bb
index 302f642d67..105c32312f 100644
--- a/packages/speech-dispatcher/speech-dispatcher_0.6.6.bb
+++ b/packages/speech-dispatcher/speech-dispatcher_0.6.6.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
DEPENDS = "espeak flite pulseaudio libdotconf glib-2.0"
RPROVIDES_${PN} += "speechd"
-PR = "r0"
+PR = "r1"
inherit autotools update-rc.d