summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2007-08-20 17:55:36 +0000
committerPhilipp Zabel <philipp.zabel@gmail.com>2007-08-20 17:55:36 +0000
commitde542fe9877144b7e0bd5226e0a3841887ce6c89 (patch)
treeafe1514f88cbd3e8f5fa4f5a7432658cbfa14465 /packages
parent4f73b29c2b66b6d55caf55eccd59caa766086fa4 (diff)
parent79acea313ac47165c6b3c55224484c4420e06720 (diff)
merge of '93974111864d318a6e96f9646847c5a9647aa819'
and 'f7fb409ce8abfb0a3e4ef36fe058a6fbb429a7b6'
Diffstat (limited to 'packages')
-rw-r--r--packages/efl1/ecore.inc5
-rw-r--r--packages/efl1/ecore/configure.patch28
-rw-r--r--packages/efl1/evas.inc2
-rw-r--r--packages/efl1/evas/fix-configure.patch79
4 files changed, 75 insertions, 39 deletions
diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc
index 9e1bc18f5c..42b4ccb7a2 100644
--- a/packages/efl1/ecore.inc
+++ b/packages/efl1/ecore.inc
@@ -9,10 +9,9 @@ PV = "0.9.9+cvs${SRCDATE}"
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"
diff --git a/packages/efl1/ecore/configure.patch b/packages/efl1/ecore/configure.patch
index 23d8193b44..9939bd9d34 100644
--- a/packages/efl1/ecore/configure.patch
+++ b/packages/efl1/ecore/configure.patch
@@ -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
-@@ -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)
+@@ -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"
+ ]
+ )
+
diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc
index 28c883d895..e83dd11c4e 100644
--- a/packages/efl1/evas.inc
+++ b/packages/efl1/evas.inc
@@ -9,7 +9,7 @@ PV = "0.9.9+cvs${SRCDATE}"
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"
diff --git a/packages/efl1/evas/fix-configure.patch b/packages/efl1/evas/fix-configure.patch
index abf9b94bdf..1a5bf78e46 100644
--- a/packages/efl1/evas/fix-configure.patch
+++ b/packages/efl1/evas/fix-configure.patch
@@ -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])
+ ],
+ [