[oe-commits] org.oe.dev merge of '6951a4bf0c57a677b8f2cdf1144402fe1358e3e1'
mickeyl commit
openembedded-commits at lists.openembedded.org
Mon Aug 20 17:50:55 UTC 2007
merge of '6951a4bf0c57a677b8f2cdf1144402fe1358e3e1'
and 'a76f71ae5f89679c6f4ec02e1b1b05e22a7c5905'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: b091298f5a7429063b7fc43393d70a224e4a5d99
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b091298f5a7429063b7fc43393d70a224e4a5d99
Files:
1
packages/efl1/ecore/configure.patch
packages/efl1/ecore.inc
packages/efl1/evas/fix-configure.patch
packages/efl1/evas.inc
packages/gammu/gammu_1.12.94.bb
packages/gammu/gammu_1.10.0.bb
packages/gammu/gammu_1.13.0.bb
conf/distro/include/angstrom-glibc.inc
packages/python/python-gammu_0.21.bb
packages/tasks/task-python-everything.bb
Diffs:
#
# mt diff -r6951a4bf0c57a677b8f2cdf1144402fe1358e3e1 -rb091298f5a7429063b7fc43393d70a224e4a5d99
#
#
#
# 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 -ra76f71ae5f89679c6f4ec02e1b1b05e22a7c5905 -rb091298f5a7429063b7fc43393d70a224e4a5d99
#
#
#
# delete "packages/gammu/gammu_1.12.94.bb"
#
# rename "packages/gammu/gammu_1.10.0.bb"
# to "packages/gammu/gammu_1.13.0.bb"
#
# patch "conf/distro/include/angstrom-glibc.inc"
# from [c70c421338b418901a172a9210ea87a82ab763c0]
# to [ec0e25a8758fde2b684a43cc8fb0b55d7c3a27cc]
#
# patch "packages/gammu/gammu_1.13.0.bb"
# from [1cb34c46e873f0aa5efd810dcecdb5ff8a9ebefb]
# to [dbbfbd2cf47cb31eb603a90b621a074f7786c9f0]
#
# patch "packages/python/python-gammu_0.21.bb"
# from [b985997bf86465ce82869a460e1336305461798f]
# to [41ae201e5a819b7fe87d6622edcf2404f1475add]
#
# patch "packages/tasks/task-python-everything.bb"
# from [254f7dc42630e435f56b4ca93927f802d3bb00d4]
# to [7c5d8562b7e55c346c3e9537d5021584b770f3dc]
#
============================================================
--- conf/distro/include/angstrom-glibc.inc c70c421338b418901a172a9210ea87a82ab763c0
+++ conf/distro/include/angstrom-glibc.inc ec0e25a8758fde2b684a43cc8fb0b55d7c3a27cc
@@ -1,7 +1,8 @@ PREFERRED_PROVIDER_virtual/libc ?= "glib
# glibc:
PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
PREFERRED_PROVIDER_virtual/libc ?= "glibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "glibc-initial"
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']]}"
============================================================
--- packages/gammu/gammu_1.10.0.bb 1cb34c46e873f0aa5efd810dcecdb5ff8a9ebefb
+++ packages/gammu/gammu_1.13.0.bb dbbfbd2cf47cb31eb603a90b621a074f7786c9f0
@@ -1,78 +1,33 @@ SECTION = "console/network"
DESCRIPTION = "GNU All Mobile Managment Utilities"
SECTION = "console/network"
-DEPENDS = "bluez-libs"
+DEPENDS = "bluez-libs cmake-native"
LICENSE = "GPL"
HOMEPAGE = "http://www.gammu.org/"
-PR = "r1"
-SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 \
- file://ldflags-again.patch;patch=1"
+SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 "
-EXTRA_OECONF = "--disable-mysql --with-bluedir=${STAGING_DIR}"
+inherit pkgconfig
-EXTRA_LDFLAGS = "-lbluetooth2"
+do_configure() {
+ cd ${S} && CMAKE_C_COMPILER=${TARGET_OS}-gcc ./configure --prefix=${prefix} --enable-shared --enable-backup
+}
-inherit autotools pkgconfig
-
do_compile () {
- oe_runmake shared LDFLAGS='-L${STAGING_LIBDIR} -lbluetooth'
+ oe_runmake
}
-do_stage() {
- install -d ${STAGING_INCDIR}/gammu/misc ${STAGING_INCDIR}/gammu/misc/coding \
- ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \
- ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \
- ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4s40 \
- ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \
- ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \
- ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \
- ${STAGING_INCDIR}/gammu/device/irda ${STAGING_INCDIR}/gammu/device/bluetoth \
- ${STAGING_INCDIR}/gammu/device/serial ${STAGING_INCDIR}/gammu/protocol \
- ${STAGING_INCDIR}/gammu/protocol/at ${STAGING_INCDIR}/gammu/protocol/obex \
- ${STAGING_INCDIR}/gammu/protocol/nokia ${STAGING_INCDIR}/gammu/protocol/symbian \
- ${STAGING_INCDIR}/gammu/protocol/alcatel
-
- oe_libinstall -so -C common libGammu ${STAGING_LIBDIR}
-
- install -m 0644 common/*.h ${STAGING_INCDIR}/gammu/
- install -m 0644 common/misc/*.h ${STAGING_INCDIR}/gammu/misc
- install -m 0644 common/misc/coding/*.h ${STAGING_INCDIR}/gammu/misc/coding
- install -m 0644 common/phone/*.h ${STAGING_INCDIR}/gammu/phone
- install -m 0644 common/phone/at/*.h ${STAGING_INCDIR}/gammu/phone/at
- install -m 0644 common/phone/obex/*.h ${STAGING_INCDIR}/gammu/phone/obex
- install -m 0644 common/phone/nokia/*.h ${STAGING_INCDIR}/gammu/phone/nokia
- install -m 0644 common/phone/nokia/dct3/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct3
- install -m 0644 common/phone/nokia/dct4s40/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct4s40
- install -m 0644 common/phone/symbian/*.h ${STAGING_INCDIR}/gammu/phone/symbian
- install -m 0644 common/phone/alcatel/*.h ${STAGING_INCDIR}/gammu/phone/alcatel
- install -m 0644 common/service/*.h ${STAGING_INCDIR}/gammu/service
- install -m 0644 common/service/sms/*.h ${STAGING_INCDIR}/gammu/service/sms
- install -m 0644 common/service/backup/*.h ${STAGING_INCDIR}/gammu/service/backup
- install -m 0644 common/device/*.h ${STAGING_INCDIR}/gammu/device
- install -m 0644 common/device/irda/*.h ${STAGING_INCDIR}/gammu/device/irda
- install -m 0644 common/device/bluetoth/*.h ${STAGING_INCDIR}/gammu/device/bluetoth
- install -m 0644 common/device/serial/*.h ${STAGING_INCDIR}/gammu/device/serial
- install -m 0644 common/protocol/*.h ${STAGING_INCDIR}/gammu/protocol
- install -m 0644 common/protocol/at/*.h ${STAGING_INCDIR}/gammu/protocol/at
- install -m 0644 common/protocol/obex/*.h ${STAGING_INCDIR}/gammu/protocol/obex
- install -m 0644 common/protocol/nokia/*.h ${STAGING_INCDIR}/gammu/protocol/nokia
- install -m 0644 common/protocol/symbian/*.h ${STAGING_INCDIR}/gammu/protocol/symbian
- install -m 0644 common/protocol/alcatel/*.h ${STAGING_INCDIR}/gammu/protocol/alcatel
+do_install () {
+ oe_runmake install DESTDIR=${D}
}
-do_install () {
- oe_runmake 'DESTDIR=${D}' installshared
+do_stage() {
+ install -d ${STAGING_INCDIR}/gammu/
+ install -m 0644 build-configure/include/*.h ${STAGING_INCDIR}/gammu/
+
+ oe_libinstall -so -C build-configure/common libGammu ${STAGING_LIBDIR}
}
PACKAGES =+ "libgammu"
FILES_${PN} = "${bindir}/gammu"
FILES_libgammu = "${libdir}/libGammu.so*"
-
-PACKAGES_DYNAMIC = "gammu-locale-*"
-
-python populate_packages_prepend () {
- help_dir = bb.data.expand('${datadir}/gammu/', d)
-
- do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu')
-}
============================================================
--- packages/python/python-gammu_0.21.bb b985997bf86465ce82869a460e1336305461798f
+++ packages/python/python-gammu_0.21.bb 41ae201e5a819b7fe87d6622edcf2404f1475add
@@ -1,6 +1,3 @@
-#TODO needs recent gammu, which in turn needs cmake which we don't have yet
-BROKEN = "1"
-
DESCRIPTION = "Python bindings for the gammu GSM phone communication library."
HOMEPAGE = "http://cihar.com/gammu/python"
SECTION = "devel/python"
@@ -11,4 +8,3 @@ inherit distutils
SRC_URI = "http://dl.cihar.com/python-gammu/latest/python-gammu-${PV}.tar.bz2"
inherit distutils
-
============================================================
--- packages/tasks/task-python-everything.bb 254f7dc42630e435f56b4ca93927f802d3bb00d4
+++ packages/tasks/task-python-everything.bb 7c5d8562b7e55c346c3e9537d5021584b770f3dc
@@ -52,7 +52,6 @@ RDEPENDS = "\
python-pyiw \
python-pylinda \
python-pylint \
- python-pyode \
python-pyraf \
python-pyreverse \
python-pyrex \
More information about the Openembedded-commits
mailing list