diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gsm/files/default | 4 | ||||
| -rw-r--r-- | packages/gsm/libgsmd_svn.bb | 2 | ||||
| -rw-r--r-- | packages/gstreamer/gst-plugins-bad/gst-plugins-directfb-fix.patch | 32 | ||||
| -rw-r--r-- | packages/gstreamer/gst-plugins-bad_0.10.5.bb | 6 |
4 files changed, 38 insertions, 6 deletions
diff --git a/packages/gsm/files/default b/packages/gsm/files/default index 43f4a2db0d..4b582dd5ac 100644 --- a/packages/gsm/files/default +++ b/packages/gsm/files/default @@ -3,12 +3,12 @@ . /etc/init.d/functions case `cpuinfo_id` in - "GTA01", "GTA02") + "GTA01"|"GTA02") GSMD_OPTS="-s 115200 -F" GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" GSM_DEV="/dev/ttySAC0" ;; - "HTC Apache", "HTC Blueangel") + "HTC Apache"|"HTC Blueangel") GSMD_OPTS="-s 115200 -F" GSM_DEV="/dev/ttyS0" ;; diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index b815a227b6..7eee675047 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL LGPL" SECTION = "libs/gsm" PROVIDES += "gsmd" PV = "0.1+svn${SRCDATE}" -PR = "r20" +PR = "r21" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://gsmd \ diff --git a/packages/gstreamer/gst-plugins-bad/gst-plugins-directfb-fix.patch b/packages/gstreamer/gst-plugins-bad/gst-plugins-directfb-fix.patch new file mode 100644 index 0000000000..f8f516bc44 --- /dev/null +++ b/packages/gstreamer/gst-plugins-bad/gst-plugins-directfb-fix.patch @@ -0,0 +1,32 @@ +--- gst-plugins-bad-0.10.5-r1.orig/gst-plugins-bad-0.10.5/examples/directfb/gstdfb.c 2007-08-24 08:23:23.000000000 +0100 ++++ gst-plugins-bad-0.10.5-r1/gst-plugins-bad-0.10.5/examples/directfb/gstdfb.c 2007-08-24 08:24:28.000000000 +0100 +@@ -35,7 +35,7 @@ + #include <math.h> + #include <time.h> + +-#include <directfb.h> ++#include <directfb/directfb.h> + #include <gst/gst.h> + #include <string.h> + +--- gst-plugins-bad-0.10.5-r1.orig/gst-plugins-bad-0.10.5/ext/directfb/dfb-example.c 2007-08-24 08:23:24.000000000 +0100 ++++ gst-plugins-bad-0.10.5-r1/gst-plugins-bad-0.10.5/ext/directfb/dfb-example.c 2007-08-24 08:24:41.000000000 +0100 +@@ -1,5 +1,5 @@ + +-#include <directfb.h> ++#include <directfb/directfb.h> + #include <gst/gst.h> + + static IDirectFB *dfb = NULL; + +--- gst-plugins-bad-0.10.5-r1.orig/gst-plugins-bad-0.10.5/ext/directfb/dfbvideosink.h 2007-08-24 08:23:24.000000000 +0100 ++++ gst-plugins-bad-0.10.5-r1/gst-plugins-bad-0.10.5/ext/directfb/dfbvideosink.h 2007-08-24 08:24:56.000000000 +0100 +@@ -22,7 +22,7 @@ + + #include <gst/video/gstvideosink.h> + +-#include <directfb.h> ++#include <directfb/directfb.h> + + G_BEGIN_DECLS + diff --git a/packages/gstreamer/gst-plugins-bad_0.10.5.bb b/packages/gstreamer/gst-plugins-bad_0.10.5.bb index 9c7d94117c..ce61d10010 100644 --- a/packages/gstreamer/gst-plugins-bad_0.10.5.bb +++ b/packages/gstreamer/gst-plugins-bad_0.10.5.bb @@ -1,8 +1,8 @@ require gst-plugins.inc -SRC_URI += "file://vorbisenc.h file://vorbisdec.h" -DEPENDS += "gst-plugins-base" -EXTRA_OECONF += " --disable-directfb " +SRC_URI += "file://vorbisenc.h file://vorbisdec.h \ + file://gst-plugins-directfb-fix.patch;patch=1;pnum=2" +DEPENDS += "gst-plugins-base directfb" do_compile_prepend() { # work around missing files in upstream tarball (upstream bug #454078) |