[oe-commits] org.oe.dev merge of '93974111864d318a6e96f9646847c5a9647aa819'
pH5 commit
openembedded-commits at lists.openembedded.org
Mon Aug 20 18:02:15 UTC 2007
merge of '93974111864d318a6e96f9646847c5a9647aa819'
and 'f7fb409ce8abfb0a3e4ef36fe058a6fbb429a7b6'
Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: 9f877480867cc9cabebff8145a336b76f7a0f58d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9f877480867cc9cabebff8145a336b76f7a0f58d
Files:
1
packages/efl1/ecore/configure.patch
packages/efl1/ecore.inc
packages/efl1/evas/fix-configure.patch
packages/efl1/evas.inc
packages/gsm/files/fix-mlbuf.patch
packages/gsm/libgsmd_svn.bb
Diffs:
#
# mt diff -r93974111864d318a6e96f9646847c5a9647aa819 -r9f877480867cc9cabebff8145a336b76f7a0f58d
#
#
#
# patch "packages/efl1/ecore/configure.patch"
# from [f8d751202a5cfede1100f0216eba1146e5980a43]
# to [2071aa5308ada0b0d149faee2e9cea2a3dc6064f]
#
# patch "packages/efl1/ecore.inc"
# from [77e800a680cc16d7b45d6800e92bbb3e3f2e02da]
# to [a118a5964c5363f81cd965a8487f715eb588a60b]
#
# patch "packages/efl1/evas/fix-configure.patch"
# from [038b5c06de3db84675386207352adefc073bc947]
# to [8c89e36034808e87ae9ad89bd075b3dc4786af3a]
#
# patch "packages/efl1/evas.inc"
# from [a0a8221d4e2bce64eaf06314987a4f4267e7fe52]
# to [1174ba86379ac3fe19ba6930fa2f25cf794caba9]
#
============================================================
--- packages/efl1/ecore/configure.patch f8d751202a5cfede1100f0216eba1146e5980a43
+++ packages/efl1/ecore/configure.patch 2071aa5308ada0b0d149faee2e9cea2a3dc6064f
@@ -1,5 +1,7 @@
---- ecore-0.9.9.036/configure.in.bak 2006-11-13 14:01:10.000000000 -0800
-+++ ecore-0.9.9.036/configure.in 2006-11-13 14:02:15.000000000 -0800
+Index: ecore/configure.in
+===================================================================
+--- ecore.orig/configure.in 2007-08-20 17:21:13.000000000 +0000
++++ ecore/configure.in 2007-08-20 17:23:31.000000000 +0000
@@ -16,7 +16,6 @@
AC_CHECK_SIZEOF(long, 4)
AM_ENABLE_SHARED
@@ -8,14 +10,14 @@
if test "x${bindir}" = 'xNONE'; then
if test "x${prefix}" = "xNONE"; then
+@@ -238,9 +237,7 @@
+ AC_CHECK_HEADER(X11/X.h,
+ [
+ have_x="yes"
+- x_dir=${x_dir:-/usr/X11R6}
+- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
++ x_libs="${x_libs} -lX11 -lXext"
+ ]
+ )
+
-@@ -200,9 +199,7 @@
- AM_CONDITIONAL(BUILD_ECORE_X, true)
- AC_DEFINE(BUILD_ECORE_X, 1, [Build Ecore_X Module])
- have_ecore_x="yes"
-- x_dir=${x_dir:-/usr/X11R6}
-- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
-- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
-+ x_libs="-lX11 -lXext"
- ecore_x_libs="-lecore_x $x_libs";
- ],[
- AM_CONDITIONAL(BUILD_ECORE_X, false)
============================================================
--- packages/efl1/ecore.inc 77e800a680cc16d7b45d6800e92bbb3e3f2e02da
+++ packages/efl1/ecore.inc a118a5964c5363f81cd965a8487f715eb588a60b
@@ -9,10 +9,9 @@ inherit efl_library
inherit efl_library
-SRC_URI += "\
+SRC_URI += "file://configure.patch;patch=1 \
file://fix-tslib-configure.patch;patch=1 \
- file://fix-directfb-include.patch;patch=1 \
-"
+ file://fix-directfb-include.patch;patch=1"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore"
============================================================
--- packages/efl1/evas/fix-configure.patch 038b5c06de3db84675386207352adefc073bc947
+++ packages/efl1/evas/fix-configure.patch 8c89e36034808e87ae9ad89bd075b3dc4786af3a
@@ -1,36 +1,71 @@
-diff -Nur evas-0.9.9.037~/configure.in evas-0.9.9.037/configure.in
---- evas-0.9.9.037~/configure.in 2007-01-14 20:09:57.000000000 -0800
-+++ evas-0.9.9.037/configure.in 2007-01-14 20:11:09.000000000 -0800
-@@ -161,9 +161,7 @@
+Index: evas/configure.in
+===================================================================
+--- evas.orig/configure.in 2007-08-20 16:44:22.000000000 +0000
++++ evas/configure.in 2007-08-20 16:49:08.000000000 +0000
+@@ -260,9 +260,7 @@
AC_CHECK_HEADER(X11/X.h,
[
AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend])
- x_dir=${x_dir:-/usr/X11R6}
- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
-+ x_libs="-lX11 -lXext"
++ x_libs="${x_libs} -lX11 -lXext"
],
[
AC_MSG_RESULT(disabling software X11 engine)
-@@ -407,10 +405,10 @@
- AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend])
- AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true)
- AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support])
-- x_dir=${x_dir:-/usr/X11R6};
-+ x_dir=${x_dir:-};
- x_cflags=${x_cflags:--I$x_dir/include}
- x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}"
-- gl_cflags="-I/usr/include"
-+ gl_cflags=""
- gl_libs="-lGL -lGLU -lpthread"
- gl_dir=""
- ], [
-@@ -471,7 +469,7 @@
+@@ -303,9 +301,7 @@
+ AC_CHECK_HEADER(X11/X.h,
+ [
+ AC_DEFINE(BUILD_ENGINE_SOFTWARE_16_X11, 1, [Software 16bit X11 Rendering Backend])
+- x_dir=${x_dir:-/usr/X11R6}
+- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
++ x_libs="${x_libs} -lX11 -lXext"
+ ],
+ [
+ AC_MSG_RESULT(disabling software 16bit X11 engine)
+@@ -599,10 +595,7 @@
+ [
+ AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend])
+ AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support])
+- x_dir=${x_dir:-/usr/X11R6};
+- x_cflags=${x_cflags:--I$x_dir/include}
+- x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}"
+- gl_cflags="-I/usr/include"
++ x_libs="${x_libs} -lX11 -lXext"
+ gl_libs="-lGL -lGLU -lpthread"
+ gl_dir=""
+ ],
+@@ -694,9 +687,7 @@
AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend])
AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true)
AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support])
- x_dir="/usr/X11R6";
-+ x_dir="";
- x_cflags="-I"$x_dir"/include"
- x_libs="-L"$x_dir"/lib -lX11 -lXext"
+- x_cflags="-I"$x_dir"/include"
+- x_libs="-L"$x_dir"/lib -lX11 -lXext"
++ x_libs="${x_libs} -lX11 -lXext"
], [
+ AM_CONDITIONAL(BUILD_ENGINE_CAIRO_X11, false)
+ AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, false)
+@@ -738,9 +729,7 @@
+ AC_CHECK_HEADER(X11/extensions/Xrender.h,
+ [
+ AC_DEFINE(BUILD_ENGINE_XRENDER_X11, 1, [XRender X11 Rendering Backend])
+- x_dir=${x_dir:-/usr/X11R6}
+- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender"
++ x_libs="${x_libs} -lX11 -lXext -lXrender"
+ ],
+ [
+ AC_MSG_RESULT(disabling xrender X11 engine)
+@@ -826,9 +815,7 @@
+ [
+ PKG_CHECK_MODULES(GLITZ, glitz glitz-glx,
+ [
+- x_dir=${x_dir:-/usr/X11R6}
+- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
++ x_libs="${x_libs} -lX11 -lXext"
+ AC_DEFINE(BUILD_ENGINE_GLITZ_X11, 1, [Glitz X11 Rendering Backend])
+ ],
+ [
============================================================
--- packages/efl1/evas.inc a0a8221d4e2bce64eaf06314987a4f4267e7fe52
+++ packages/efl1/evas.inc 1174ba86379ac3fe19ba6930fa2f25cf794caba9
@@ -9,7 +9,7 @@ inherit efl_library
inherit efl_library
-export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
+SRC_URI += "file://fix-configure.patch;patch=1"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
#
# mt diff -rf7fb409ce8abfb0a3e4ef36fe058a6fbb429a7b6 -r9f877480867cc9cabebff8145a336b76f7a0f58d
#
#
#
# add_file "packages/gsm/files/fix-mlbuf.patch"
# content [557dce80239fff8ac79176198ecf6c19a3aaa4e0]
#
# patch "packages/gsm/libgsmd_svn.bb"
# from [6387ca7f099a514f35eed5b601884e71694739b2]
# to [ba98d351988038ba9049d25dc6f82ae76c983ee7]
#
============================================================
--- packages/gsm/files/fix-mlbuf.patch 557dce80239fff8ac79176198ecf6c19a3aaa4e0
+++ packages/gsm/files/fix-mlbuf.patch 557dce80239fff8ac79176198ecf6c19a3aaa4e0
@@ -0,0 +1,50 @@
+Index: gsm/src/gsmd/atcmd.c
+===================================================================
+--- gsm/src/gsmd/atcmd.c (revision 2745)
++++ gsm/src/gsmd/atcmd.c (working copy)
+@@ -370,8 +370,8 @@
+ if (g->mlbuf_len)
+ g->mlbuf[g->mlbuf_len ++] = '\n';
+ DEBUGP("Appending buf to mlbuf\n");
+- if (len > sizeof(g->mlbuf) - g->mlbuf_len)
+- len = sizeof(g->mlbuf) - g->mlbuf_len;
++ if (len > MLPARSE_BUF_SIZE - g->mlbuf_len)
++ len = MLPARSE_BUF_SIZE - g->mlbuf_len;
+ memcpy(g->mlbuf + g->mlbuf_len, buf, len);
+ g->mlbuf_len += len;
+
+@@ -470,7 +470,7 @@
+ if (cr)
+ len = cr - pos->cur;
+ else
+- len = pos->buflen;
++ len = pos->buflen - 1; /* assuming zero-terminated strings */
+ rc = write(fd, pos->cur, len);
+ if (rc == 0) {
+ gsmd_log(GSMD_ERROR, "write returns 0, aborting\n");
+@@ -480,8 +480,8 @@
+ fd, rc);
+ return rc;
+ }
+- if (cr && rc == len)
+- rc ++; /* Skip the \n */
++ if (!cr || rc == len)
++ rc ++; /* Skip the \n or \0 */
+ pos->buflen -= rc;
+ pos->cur += rc;
+ write(fd, "\r", 1);
+Index: gsm/src/gsmd/gsmd.c
+===================================================================
+--- gsm/src/gsmd/gsmd.c (revision 2745)
++++ gsm/src/gsmd/gsmd.c (working copy)
+@@ -301,6 +301,10 @@
+ {
+ INIT_LLIST_HEAD(&g->users);
+
++ g->mlbuf = talloc_array(gsmd_tallocs, unsigned char, MLPARSE_BUF_SIZE);
++ if (!g->mlbuf)
++ return -ENOMEM;
++
+ return 0;
+ }
+
============================================================
--- packages/gsm/libgsmd_svn.bb 6387ca7f099a514f35eed5b601884e71694739b2
+++ packages/gsm/libgsmd_svn.bb ba98d351988038ba9049d25dc6f82ae76c983ee7
@@ -9,6 +9,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/
SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
+ file://fix-mlbuf.patch;patch=1 \
file://gsmd \
file://default"
S = "${WORKDIR}/gsm"
@@ -27,8 +28,17 @@ do_install_append() {
install -m 0755 ${WORKDIR}/gsmd ${D}/${sysconfdir}/init.d/
install -d ${D}/${sysconfdir}/default
install ${WORKDIR}/default ${D}/${sysconfdir}/default/gsmd
+ # band-aid:
+ install -d ${D}${includedir}/common
+ install -m 0644 ${S}/include/common/linux_list.h ${D}${includedir}/common
}
+# band-aid:
+do_stage_append () {
+ install -d ${STAGING_INCDIR}/common
+ install ${S}/include/common/linux_list.h ${STAGING_INCDIR}/common
+}
+
PACKAGES =+ "${PN}-tools gsmd gsmd-plugins \
gsmd-plugin-machine-generic gsmd-plugin-machine-tihtc \
gsmd-plugin-vendor-qc gsmd-plugin-vendor-ti \
More information about the Openembedded-commits
mailing list