[oe-commits] org.oe.dev merge of 'b091298f5a7429063b7fc43393d70a224e4a5d99'
oe commit
openembedded-commits at lists.openembedded.org
Mon Aug 20 17:51:08 UTC 2007
merge of 'b091298f5a7429063b7fc43393d70a224e4a5d99'
and 'b7ecd3fb6f5dac44f9fe8b851242aa671d666c3a'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: f7fb409ce8abfb0a3e4ef36fe058a6fbb429a7b6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f7fb409ce8abfb0a3e4ef36fe058a6fbb429a7b6
Files:
1
packages/linux/linux-handhelds-2.6/magician/defconfig
packages/efl1/ecore/configure.patch
packages/efl1/ecore.inc
packages/efl1/evas/fix-configure.patch
packages/efl1/evas.inc
Diffs:
#
# mt diff -rb091298f5a7429063b7fc43393d70a224e4a5d99 -rf7fb409ce8abfb0a3e4ef36fe058a6fbb429a7b6
#
#
#
# patch "packages/linux/linux-handhelds-2.6/magician/defconfig"
# from [733c78dca4659e362fbd3a43ef5287380bb72f1b]
# to [3ece7048b0db57ab0907cfe256ce71a1e13290f6]
#
============================================================
--- packages/linux/linux-handhelds-2.6/magician/defconfig 733c78dca4659e362fbd3a43ef5287380bb72f1b
+++ packages/linux/linux-handhelds-2.6/magician/defconfig 3ece7048b0db57ab0907cfe256ce71a1e13290f6
@@ -167,7 +167,6 @@ CONFIG_MAGICIAN_LCD=y
CONFIG_MAGICIAN_PM=y
CONFIG_MAGICIAN_TS=m
CONFIG_MAGICIAN_LCD=y
-CONFIG_MAGICIAN_DS1WM=m
CONFIG_MAGICIAN_PHONE=m
# CONFIG_MACH_HTCAPACHE is not set
# CONFIG_MACH_BLUEANGEL is not set
@@ -908,6 +907,7 @@ CONFIG_ADC_ADS7846_SSP=m
# CONFIG_MFD_SM501 is not set
# CONFIG_HTC_ASIC2 is not set
# CONFIG_HTC_ASIC3 is not set
+CONFIG_HTC_PASIC3=y
CONFIG_HTC_EGPIO=y
# CONFIG_HTC_ASIC3_DS1WM is not set
# CONFIG_SOC_SAMCOP is not set
@@ -929,13 +929,15 @@ CONFIG_LEDS_MAGICIAN=y
# LED drivers
#
CONFIG_LEDS_MAGICIAN=y
+CONFIG_LEDS_PASIC3=y
#
# LED Triggers
#
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y
-# CONFIG_LEDS_TRIGGER_HWTIMER is not set
+CONFIG_LEDS_TRIGGER_HWTIMER=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
CONFIG_LEDS_TRIGGER_SHARED=y
#
# mt diff -rb7ecd3fb6f5dac44f9fe8b851242aa671d666c3a -rf7fb409ce8abfb0a3e4ef36fe058a6fbb429a7b6
#
#
#
# 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"
More information about the Openembedded-commits
mailing list