[oe-commits] org.oe.dev merge of '3bc048bb553b64eaf0567c44a7b375930a42b5af'
mickeyl commit
openembedded-commits at lists.openembedded.org
Tue Aug 7 11:04:33 UTC 2007
merge of '3bc048bb553b64eaf0567c44a7b375930a42b5af'
and '64cb3a9bf1c0275166bc2bd9550ea0eec67a60b6'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 526e95d4cdf1cd30f201f0f6f8abbd0f7afbceab
ViewMTN: http://monotone.openembedded.org/revision.psp?id=526e95d4cdf1cd30f201f0f6f8abbd0f7afbceab
Files:
1
packages/maemo3/osso-ic-oss
packages/glibc/eglibc-initial_svn.bb
packages/glibc/eglibc-intermediate_svn.bb
packages/maemo3/osso-ic-oss/dbus-api-update.patch
packages/maemo3/osso-ic-oss_1.0.4.bb
conf/distro/angstrom-2007.1.conf
conf/distro/include/angstrom-eglibc.inc
packages/dbus/dbus-c++
packages/dbus/dbus-c++/fix-linking.patch
packages/dbus/dbus-c++-native_svn.bb
packages/dbus/dbus-c++_svn.bb
packages/gstreamer/gst-plugins-bad/vorbisdec.h
packages/gstreamer/gst-plugins-bad/vorbisenc.h
packages/gstreamer/gst-plugins-bad_0.10.5.bb
packages/gstreamer/gst-plugins-base_0.10.14.bb
packages/gstreamer/gst-plugins-good_0.10.6.bb
packages/gstreamer/gst-plugins-ugly_0.10.6.bb
packages/gstreamer/gstreamer_0.10.14.bb
packages/psplash/files/openmoko/psplash-bar-img.h
packages/psplash/psplash_svn.bb
Diffs:
#
# mt diff -r3bc048bb553b64eaf0567c44a7b375930a42b5af -r526e95d4cdf1cd30f201f0f6f8abbd0f7afbceab
#
#
#
# add_dir "packages/maemo3/osso-ic-oss"
#
# add_file "packages/glibc/eglibc-initial_svn.bb"
# content [ace0a4db6c3ffdaa2eeec3e7c3fcb17db6dcbfe6]
#
# add_file "packages/glibc/eglibc-intermediate_svn.bb"
# content [519b2d7a8e2971ddd964fb98f2cb9a44d7237d87]
#
# add_file "packages/maemo3/osso-ic-oss/dbus-api-update.patch"
# content [e6a233004639de0f9f4a045bd2129b3c2edf1e22]
#
# add_file "packages/maemo3/osso-ic-oss_1.0.4.bb"
# content [dead034f542e3a2def64bfbccd112417c8ed2e7b]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [130e9306ef9ffabf334b2c8549419be52677db82]
# to [81a4b9e96eb00492f039bc10f99adc1a4946a3bd]
#
# patch "conf/distro/include/angstrom-eglibc.inc"
# from [e85fb0131715f927c8d9216b622a1b12d83f4ec2]
# to [4e302c110a6fbfde708303672e19e149984c7108]
#
============================================================
--- packages/glibc/eglibc-initial_svn.bb ace0a4db6c3ffdaa2eeec3e7c3fcb17db6dcbfe6
+++ packages/glibc/eglibc-initial_svn.bb ace0a4db6c3ffdaa2eeec3e7c3fcb17db6dcbfe6
@@ -0,0 +1,46 @@
+require eglibc_${PV}.bb
+
+DEPENDS = "linux-libc-headers"
+PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+PACKAGES = ""
+
+do_configure () {
+ sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
+ chmod +x ${S}/configure
+ unset CFLAGS
+ CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
+ --without-cvs --disable-sanity-checks \
+ --with-headers=${CROSS_DIR}/${TARGET_SYS}/include \
+ --enable-hacker-mode
+ if grep -q GLIBC_2.3 ${S}/ChangeLog; then
+ # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
+ # Fortunately, we don't need errlist-compat.c, since we just need .h files,
+ # so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
+ # Another workaround might be to tell configure to not use any cross options to $(CC).
+ # The real fix would be to get install-headers to not generate errlist-compat.c.
+ make sysdeps/gnu/errlist.c
+ mkdir -p stdio-common
+ touch stdio-common/errlist-compat.c
+ fi
+}
+
+do_compile () {
+ :
+}
+
+do_stage () {
+ oe_runmake cross-compiling=yes install_root=${CROSS_DIR}/${TARGET_SYS} prefix="" install-headers
+
+ # Two headers -- stubs.h and features.h -- aren't installed by install-headers,
+ # so do them by hand. We can tolerate an empty stubs.h for the moment.
+ # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
+ mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include/gnu
+ touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h
+ cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h
+}
+
+do_install () {
+ :
+}
============================================================
--- packages/glibc/eglibc-intermediate_svn.bb 519b2d7a8e2971ddd964fb98f2cb9a44d7237d87
+++ packages/glibc/eglibc-intermediate_svn.bb 519b2d7a8e2971ddd964fb98f2cb9a44d7237d87
@@ -0,0 +1,19 @@
+require eglibc_${PV}.bb
+
+do_install () {
+ :
+}
+
+# gcc uses -Werror which break on a "you have no thumb interwork" _warning_
+do_configure_prepend() {
+ sed -i s:-Werror:: ${S}/configure
+}
+
+
+
+PACKAGES = ""
+PACKAGES_DYNAMIC = ""
+PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc"
+DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
+GLIBC_ADDONS = "nptl,ports"
+GLIBC_EXTRA_OECONF = ""
============================================================
--- packages/maemo3/osso-ic-oss/dbus-api-update.patch e6a233004639de0f9f4a045bd2129b3c2edf1e22
+++ packages/maemo3/osso-ic-oss/dbus-api-update.patch e6a233004639de0f9f4a045bd2129b3c2edf1e22
@@ -0,0 +1,33 @@
+--- /tmp/osso-iap-connect.c 2007-08-07 12:06:51.000000000 +0200
++++ osso-ic-oss-1.0.4/examples/osso-iap-connect.c 2007-08-07 12:07:32.698400000 +0200
+@@ -276,7 +276,7 @@
+ g_main_loop_run(ctxt.loop);
+
+ /* Clean up */
+- dbus_connection_disconnect(conn);
++ dbus_connection_close(conn);
+ dbus_connection_unref(conn);
+
+ g_main_loop_unref(ctxt.loop);
+--- /tmp/ic-compat-preload.c 2007-08-07 12:06:57.000000000 +0200
++++ osso-ic-oss-1.0.4/src/ic-compat-preload.c 2007-08-07 12:07:40.268400000 +0200
+@@ -140,7 +140,7 @@
+ return NULL;
+
+ if (!dbus_bus_register(connection, NULL)) {
+- dbus_connection_disconnect(connection);
++ dbus_connection_close(connection);
+ dbus_connection_unref(connection);
+ connection = NULL;
+ return NULL;
+--- /tmp/ic-api.c 2007-08-07 12:06:57.000000000 +0200
++++ osso-ic-oss-1.0.4/src/ic-api.c 2007-08-07 12:07:55.628400000 +0200
+@@ -145,7 +145,7 @@
+ if (dbus_connection_register_object_path(
+ connection, ICD_DBUS_PATH,
+ &icd_vtable, arg) == FALSE) {
+- dbus_connection_disconnect(connection);
++ dbus_connection_close(connection);
+ dbus_connection_unref(connection);
+ connection = NULL;
+ return NULL;
============================================================
--- packages/maemo3/osso-ic-oss_1.0.4.bb dead034f542e3a2def64bfbccd112417c8ed2e7b
+++ packages/maemo3/osso-ic-oss_1.0.4.bb dead034f542e3a2def64bfbccd112417c8ed2e7b
@@ -0,0 +1,25 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia osso-ic library"
+
+DEPENDS = "dbus-glib glib-2.0 outo libosso"
+
+PR = "r0"
+
+SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}.tar.gz \
+ file://dbus-api-update.patch;patch=1 "
+
+inherit autotools pkgconfig lib_package
+
+
+do_configure_prepend() {
+ # remove Werror from OSSO_CFLAGS
+ sed -i s:-Werror::g configure.ac
+}
+
+PARALLEL_MAKE = ""
+
+do_stage() {
+ autotools_stage_all
+}
+
+
============================================================
--- conf/distro/angstrom-2007.1.conf 130e9306ef9ffabf334b2c8549419be52677db82
+++ conf/distro/angstrom-2007.1.conf 81a4b9e96eb00492f039bc10f99adc1a4946a3bd
@@ -12,10 +12,6 @@ require conf/distro/include/sane-srcdate
require conf/distro/include/sane-srcdates.inc
-#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
-ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
-require conf/distro/include/angstrom${ARM_ABI}.inc
-
#Images built can have to modes:
# 'debug': empty rootpassword, strace and gdb included
# 'release' no root password, no strace and gdb by default
@@ -298,21 +294,10 @@ PREFERRED_PROVIDER_task-bootstrap = "tas
#Silence a warning during parsing
PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
+ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
+require conf/distro/include/angstrom${ARM_ABI}.inc
-
-#Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff
-# c7x0, akita, spitz, nokia770, h2200, h6300, hx4700, simpad
-
-
-# add altboot to compatible models, will be replaced with angstrom-bootmanager
-#PREFERRED_VERSION_altboot = "1.0.8+1.0.9_pre1"
-#EXTRA_STUFF_append_c7x0 += "altboot"
-#EXTRA_STUFF_append_akita += "altboot"
-#EXTRA_STUFF_append_poodle += "altboot"
-#EXTRA_STUFF_append_tosa += "altboot"
-#EXTRA_STUFF_append_spitz += "altboot"
-
-
# do some task-base stuff here
# We want to ship extra debug utils in the rootfs when doing a debug build
============================================================
--- conf/distro/include/angstrom-eglibc.inc e85fb0131715f927c8d9216b622a1b12d83f4ec2
+++ conf/distro/include/angstrom-eglibc.inc 4e302c110a6fbfde708303672e19e149984c7108
@@ -1,8 +1,18 @@ PREFERRED_PROVIDER_virtual/libc ?= "egli
# eglibc:
PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc"
PREFERRED_PROVIDER_virtual/libintl ?= "eglibc"
PREFERRED_PROVIDER_virtual/libc ?= "eglibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate"
+PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "eglibc-intermediate"
+PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "eglibc-intermediate"
+PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "eglibc-intermediate"
+PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "eglibc-intermediate"
+
+
+
TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
#mess with compiler flags to use -Os instead of -O2
#
# mt diff -r64cb3a9bf1c0275166bc2bd9550ea0eec67a60b6 -r526e95d4cdf1cd30f201f0f6f8abbd0f7afbceab
#
#
#
# add_dir "packages/dbus/dbus-c++"
#
# add_file "packages/dbus/dbus-c++/fix-linking.patch"
# content [e5f0399bc17b259bc61d3e586878c0e6673e4364]
#
# add_file "packages/dbus/dbus-c++-native_svn.bb"
# content [7eb2939e91cca228ceb1c6c1bf08fd50acb9a210]
#
# add_file "packages/dbus/dbus-c++_svn.bb"
# content [8b99926fdfa9bd562bdceaf341c89352f338d839]
#
# add_file "packages/gstreamer/gst-plugins-bad/vorbisdec.h"
# content [35a5d523350c80fd7fcbb6e24b8cd33ed8d54767]
#
# add_file "packages/gstreamer/gst-plugins-bad/vorbisenc.h"
# content [b5193a880ad4ca82fbae6b25eaa778dde0c47235]
#
# add_file "packages/gstreamer/gst-plugins-bad_0.10.5.bb"
# content [f7278fed1af9fcc35b052a8c231322246a53e65e]
#
# add_file "packages/gstreamer/gst-plugins-base_0.10.14.bb"
# content [42b568147310d58a2ca061df2db79c873973b472]
#
# add_file "packages/gstreamer/gst-plugins-good_0.10.6.bb"
# content [8e022b10f99f96c8cba7fe44d7252de0edc90cd9]
#
# add_file "packages/gstreamer/gst-plugins-ugly_0.10.6.bb"
# content [4abb994fb91c9f798af210780f9db761ea010eb5]
#
# add_file "packages/gstreamer/gstreamer_0.10.14.bb"
# content [5ed31adc22e5c777ea6a206f57d4e85992cd22b8]
#
# patch "packages/psplash/files/openmoko/psplash-bar-img.h"
# from [a5a1e99a9370f213300b5cbe8050a3348618fd62]
# to [8fdbab79237e9485930ba88ab8f16c382c9f753d]
#
# patch "packages/psplash/psplash_svn.bb"
# from [f1826cfd4a06731d53778cf72dab8dbdb9cf57fd]
# to [7abf9b46c0a3bb9b7fc41ebcb847334eb2cc0313]
#
============================================================
--- packages/dbus/dbus-c++/fix-linking.patch e5f0399bc17b259bc61d3e586878c0e6673e4364
+++ packages/dbus/dbus-c++/fix-linking.patch e5f0399bc17b259bc61d3e586878c0e6673e4364
@@ -0,0 +1,13 @@
+Index: dbus/tools/Makefile.am
+===================================================================
+--- dbus.orig/tools/Makefile.am
++++ dbus/tools/Makefile.am
+@@ -16,7 +16,7 @@ endif
+ bin_PROGRAMS = dbusxx-xml2cpp dbusxx-introspect
+
+ dbusxx_xml2cpp_SOURCES = xml.h xml.cpp xml2cpp.h xml2cpp.cpp
+-dbusxx_xml2cpp_LDADD = $(libdbus_cxx_la)
++dbusxx_xml2cpp_LDADD = $(libdbus_cxx_la) -lexpat
+
+ dbusxx_introspect_SOURCES = introspect.h introspect.cpp
+ dbusxx_introspect_LDADD = $(libdbus_cxx_la)
============================================================
--- packages/dbus/dbus-c++-native_svn.bb 7eb2939e91cca228ceb1c6c1bf08fd50acb9a210
+++ packages/dbus/dbus-c++-native_svn.bb 7eb2939e91cca228ceb1c6c1bf08fd50acb9a210
@@ -0,0 +1,6 @@
+require dbus-c++_${PV}.bb
+inherit native
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-c++"
+# actually dbus-native and expat-native, but even the bearest build machine should have that nowadays...
+DEPENDS = ""
============================================================
--- packages/dbus/dbus-c++_svn.bb 8b99926fdfa9bd562bdceaf341c89352f338d839
+++ packages/dbus/dbus-c++_svn.bb 8b99926fdfa9bd562bdceaf341c89352f338d839
@@ -0,0 +1,23 @@
+DESCRIPTION = "C++ bindings for dbus"
+LICENSE = "LGPL"
+SECTION = "libs"
+DEPENDS = "dbus dbus-c++-native expat"
+
+SRC_URI = "svn://dev.openwengo.org/svn/openwengo/wengophone-ng/branches/wengophone-dbus-api/libs;module=dbus;proto=http \
+ file://fix-linking.patch;patch=1"
+S = "${WORKDIR}/dbus"
+
+inherit autotools pkgconfig
+
+do_compile_prepend() {
+ find . -name "Makefile.am" |xargs sed -i -e 's,$(top_builddir)/tools/dbusxx-xml2cpp,dbusxx-xml2cpp,'
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
+FILES_${PN}-dbg += "${bindir}/dbusxx-xml2cpp ${bindir}/dbusxx-introspect"
+FILES_${PN}-dev += "${bindir}/.dev"
+FILES_${PN} = "${libdir}/*.so.*"
+
============================================================
--- packages/gstreamer/gst-plugins-bad/vorbisdec.h 35a5d523350c80fd7fcbb6e24b8cd33ed8d54767
+++ packages/gstreamer/gst-plugins-bad/vorbisdec.h 35a5d523350c80fd7fcbb6e24b8cd33ed8d54767
@@ -0,0 +1,87 @@
+/* -*- c-basic-offset: 2 -*-
+ * GStreamer
+ * Copyright (C) <1999> Erik Walthinsen <omega at cse.ogi.edu>
+ *
+ * Tremor modifications <2006>:
+ * Chris Lord, OpenedHand Ltd. <chris at openedhand.com>, http://www.o-hand.com/
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+
+#ifndef __GST_IVORBIS_DEC_H__
+#define __GST_IVORBIS_DEC_H__
+
+
+#include <gst/gst.h>
+#include <tremor/ivorbiscodec.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_IVORBIS_DEC \
+ (gst_ivorbis_dec_get_type())
+#define GST_IVORBIS_DEC(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_IVORBIS_DEC,GstIVorbisDec))
+#define GST_IVORBIS_DEC_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_IVORBIS_DEC,GstIVorbisDecClass))
+#define GST_IS_IVORBIS_DEC(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_IVORBIS_DEC))
+#define GST_IS_IVORBIS_DEC_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_IVORBIS_DEC))
+
+typedef struct _GstIVorbisDec GstIVorbisDec;
+typedef struct _GstIVorbisDecClass GstIVorbisDecClass;
+
+/**
+ * GstIVorbisDec:
+ *
+ * Opaque data structure.
+ */
+struct _GstIVorbisDec {
+ GstElement element;
+
+ GstPad * sinkpad;
+ GstPad * srcpad;
+
+ vorbis_dsp_state vd;
+ vorbis_info vi;
+ vorbis_comment vc;
+ vorbis_block vb;
+ guint64 granulepos;
+
+ gboolean initialized;
+
+ GList *queued;
+
+ GstSegment segment;
+ gboolean discont;
+
+ GstClockTime cur_timestamp; /* only used with non-ogg container formats */
+ GstClockTime prev_timestamp; /* only used with non-ogg container formats */
+
+ GList *pendingevents;
+ GstTagList *taglist;
+};
+
+struct _GstIVorbisDecClass {
+ GstElementClass parent_class;
+};
+
+GType gst_ivorbis_dec_get_type(void);
+
+G_END_DECLS
+
+#endif /* __GST_IVORBIS_DEC_H__ */
============================================================
--- packages/gstreamer/gst-plugins-bad/vorbisenc.h b5193a880ad4ca82fbae6b25eaa778dde0c47235
+++ packages/gstreamer/gst-plugins-bad/vorbisenc.h b5193a880ad4ca82fbae6b25eaa778dde0c47235
@@ -0,0 +1,101 @@
+/* GStreamer
+ * Copyright (C) <1999> Erik Walthinsen <omega at cse.ogi.edu>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+
+#ifndef __VORBISENC_H__
+#define __VORBISENC_H__
+
+
+#include <config.h>
+#include <gst/gst.h>
+
+#include <tremor/codec.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#define GST_TYPE_VORBISENC \
+ (vorbisenc_get_type())
+#define GST_VORBISENC(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VORBISENC,VorbisEnc))
+#define GST_VORBISENC_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VORBISENC,VorbisEncClass))
+#define GST_IS_VORBISENC(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VORBISENC))
+#define GST_IS_VORBISENC_CLASS(obj) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VORBISENC))
+
+typedef struct _VorbisEnc VorbisEnc;
+typedef struct _VorbisEncClass VorbisEncClass;
+
+struct _VorbisEnc {
+ GstElement element;
+
+ GstPad *sinkpad,
+ *srcpad;
+
+ ogg_stream_state os; /* take physical pages, weld into a logical
+ stream of packets */
+ ogg_page og; /* one Ogg bitstream page. Vorbis packets are inside */
+ ogg_packet op; /* one raw packet of data for decode */
+
+ vorbis_info vi; /* struct that stores all the static vorbis bitstream
+ settings */
+ vorbis_comment vc; /* struct that stores all the user comments */
+
+ vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
+ vorbis_block vb; /* local working space for packet->PCM decode */
+
+ gboolean eos;
+
+ gboolean managed;
+ gint bitrate;
+ gint min_bitrate;
+ gint max_bitrate;
+ gfloat quality;
+ gboolean quality_set;
+ gint serial;
+
+ gint channels;
+ gint frequency;
+
+ guint64 samples_in;
+ guint64 bytes_out;
+
+ GstCaps *metadata;
+
+ gboolean setup;
+ gboolean flush_header;
+ gchar *last_message;
+};
+
+struct _VorbisEncClass {
+ GstElementClass parent_class;
+};
+
+GType vorbisenc_get_type(void);
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+#endif /* __VORBISENC_H__ */
============================================================
--- packages/gstreamer/gst-plugins-bad_0.10.5.bb f7278fed1af9fcc35b052a8c231322246a53e65e
+++ packages/gstreamer/gst-plugins-bad_0.10.5.bb f7278fed1af9fcc35b052a8c231322246a53e65e
@@ -0,0 +1,11 @@
+require gst-plugins.inc
+
+SRC_URI += "file://vorbisenc.h file://vorbisdec.h"
+DEPENDS += "gst-plugins-base"
+
+do_compile_prepend() {
+ # work around missing files in upstream tarball (upstream bug #454078)
+ install -m 0644 ${WORKDIR}/vorbis*.h ${S}/ext/ivorbis/
+}
+
+PR = "r0"
============================================================
--- packages/gstreamer/gst-plugins-base_0.10.14.bb 42b568147310d58a2ca061df2db79c873973b472
+++ packages/gstreamer/gst-plugins-base_0.10.14.bb 42b568147310d58a2ca061df2db79c873973b472
@@ -0,0 +1,12 @@
+require gst-plugins.inc
+
+PROVIDES += "gst-plugins"
+
+# gst-plugins-base only builds the alsa plugin
+# if alsa has been built and is present. You will
+# not get an error if this is not present, just
+# a missing alsa plugin
+DEPENDS += "alsa-lib"
+
+PR = "r2"
+
============================================================
--- packages/gstreamer/gst-plugins-good_0.10.6.bb 8e022b10f99f96c8cba7fe44d7252de0edc90cd9
+++ packages/gstreamer/gst-plugins-good_0.10.6.bb 8e022b10f99f96c8cba7fe44d7252de0edc90cd9
@@ -0,0 +1,5 @@
+require gst-plugins.inc
+
+EXTRA_OECONF += "--with-check=no"
+DEPENDS += "gst-plugins-base"
+PR = "r3"
============================================================
--- packages/gstreamer/gst-plugins-ugly_0.10.6.bb 4abb994fb91c9f798af210780f9db761ea010eb5
+++ packages/gstreamer/gst-plugins-ugly_0.10.6.bb 4abb994fb91c9f798af210780f9db761ea010eb5
@@ -0,0 +1,6 @@
+require gst-plugins.inc
+
+DEPENDS += "gst-plugins-base"
+SRC_URI += "file://cross-compile.patch;patch=1"
+
+PR = "r0"
============================================================
--- packages/gstreamer/gstreamer_0.10.14.bb 5ed31adc22e5c777ea6a206f57d4e85992cd22b8
+++ packages/gstreamer/gstreamer_0.10.14.bb 5ed31adc22e5c777ea6a206f57d4e85992cd22b8
@@ -0,0 +1,3 @@
+require gstreamer.inc
+
+PR = "r0"
============================================================
--- packages/psplash/files/openmoko/psplash-bar-img.h a5a1e99a9370f213300b5cbe8050a3348618fd62
+++ packages/psplash/files/openmoko/psplash-bar-img.h 8fdbab79237e9485930ba88ab8f16c382c9f753d
@@ -5,31 +5,55 @@
#define BAR_IMG_HEIGHT (28)
#define BAR_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */
#define BAR_IMG_RLE_PIXEL_DATA ((uint8*) \
- "\203\0\0\0\377\3\320\324\310\377\230\234\230\377\200\200\200\377\377h" \
- "lp\377\333hlp\377\3\200\200\200\377\230\234\230\377\320\324\310\377\205" \
- "\0\0\0\377\1\260\260\250\377\377hlp\377\341hlp\377\1\260\260\250\377" \
- "\203\0\0\0\377\1\260\260\250\377\377hlp\377\343hlp\377\4\260\260\250" \
- "\377\0\0\0\377\345\345\337\377ppp\377\377hlp\377\343hlp\377\3ppp\377" \
- "\220\220\212\377\240\244\240\377\203hlp\377\377\0\0\0\377\337\0\0\0\377" \
- "\203hlp\377\2\240\244\240\377\210\210\210\377\203hlp\377\377\0\0\0\377" \
- "\337\0\0\0\377\203hlp\377\2\210\210\210\377ppp\377\203hlp\377\377\0\0" \
- "\0\377\337\0\0\0\377\203hlp\377\1ppp\377\204hlp\377\377\0\0\0\377\337" \
- "\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0" \
- "\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377" \
- "\377\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210" \
- "hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0" \
- "\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377" \
+ "\7\17\20\17\377!#\40\377EGC\377z}x\377\200\204\201\377vz{\377knr\377\377" \
+ "hlp\377\331hlp\377\16knr\377x|}\377\210\214\211\377\206\212\205\377=" \
+ "\77<\377\27\27\26\377\7\7\7\377\"#!\377464\377bda\377mpn\377sww\377n" \
+ "qt\377ilp\377\377hlp\377\331hlp\377\20ilp\377nqt\377swy\377ors\377nn" \
+ "k\377+,*\377\24\24\24\377HIG\377ded\377egf\377ill\377fik\377beh\377_" \
+ "cf\377aei\377fjn\377\377hlp\377\323hlp\377\2hlo\377dhl\377\203bfj\377" \
+ "\22dgk\377gkn\377knp\377fij\377jkf\377342\377\201\203\201\377prr\377" \
+ "jlm\377_bd\377TWY\377JNP\377ILO\377MQS\377WZ]\377_cf\377dhk\377gko\377" \
+ "\377hlp\377\317hlp\377\30cgj\377\\_b\377QTW\377LNQ\377LOQ\377LOR\377" \
+ "NRT\377VZ]\377`cf\377jmo\377lnn\377ttr\377\211\213\212\377wy{\377hjl" \
+ "\377TWY\37779;\377&)*\377\36\40!\377\30\30\32\377\17\17\20\377\7\7\10" \
+ "\377\6\6\7\377\1\1\1\377\377\0\0\0\377\317\0\0\0\377\24\4\4\4\377\12" \
+ "\12\13\377\24\26\27\377\32\34\35\377\34\35\37\377\35\36\37\377\40\"#" \
+ "\377/12\377VY]\377gjm\377rtv\377\210\212\210\377{}\177\377psv\377cfi" \
+ "\377KNP\377&()\377\16\17\17\377\5\5\5\377\2\2\2\377\377\0\0\0\377\325" \
+ "\0\0\0\377\2\1\1\1\377\4\5\5\377\202\6\6\6\377\14\13\14\14\377\40\"#" \
+ "\377NRT\377dgj\377ort\377\200\201\202\377pqs\377jmq\377aeh\377KNQ\377" \
+ "\33\34\35\377\5\5\5\377\377\0\0\0\377\332\0\0\0\377\7\1\1\1\377\6\6\6" \
+ "\377\35\36\37\377MPR\377bfj\377jnq\377pqs\377\202hlp\377\4gko\377SWY" \
+ "\377\23\23\25\377\1\1\1\377\377\0\0\0\377\333\0\0\0\377\4\4\4\4\377\31" \
+ "\32\33\377PSV\377fjm\377\205hlp\377\2^be\377\11\11\12\377\377\0\0\0\377" \
+ "\334\0\0\0\377\3\1\1\1\377\17\20\21\377Y\\_\377\206hlp\377\2cgj\377\6" \
+ "\6\7\377\377\0\0\0\377\336\0\0\0\377\207hlp\377\2fjm\377\4\4\5\377\377" \
+ "\0\0\0\377\336\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210h" \
+ "lp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0" \
+ "\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377" \
"\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377\377" \
- "\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210h" \
- "lp\377\377\0\0\0\377\337\0\0\0\377\204hlp\377\1ppp\377\203hlp\377\377" \
- "\0\0\0\377\337\0\0\0\377\203hlp\377\2ppp\377\210\210\210\377\203hlp\377" \
- "\377\0\0\0\377\337\0\0\0\377\203hlp\377\2\210\210\210\377\240\244\240" \
- "\377\203hlp\377\377\0\0\0\377\337\0\0\0\377\203hlp\377\3\240\244\240" \
- "\377\220\220\212\377ppp\377\377hlp\377\343hlp\377\4ppp\377\220\220\212" \
- "\377\0\0\0\377\260\260\250\377\377hlp\377\343hlp\377\1\260\260\250\377" \
- "\203\0\0\0\377\1\260\260\250\377\377hlp\377\341hlp\377\1\260\260\250" \
- "\377\205\0\0\0\377\3\320\324\310\377\230\234\230\377\200\200\200\377" \
- "\377hlp\377\333hlp\377\3\200\200\200\377\230\234\230\377\320\324\310" \
- "\377\203\0\0\0\377")
+ "\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377\336\0\0\0\377\2\2\2" \
+ "\3\377eim\377\206hlp\377\2cgk\377\3\3\3\377\377\0\0\0\377\334\0\0\0\377" \
+ "\4\3\3\3\377\26\27\31\377TWZ\377gko\377\204hlp\377\3gko\377Z]a\377\13" \
+ "\14\14\377\377\0\0\%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list