diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-06-21 03:45:25 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-06-21 03:45:25 +0000 |
| commit | 4c87123f6bebc0029f4e4fa501c83ae7524a754a (patch) | |
| tree | d6918e7445079e3f4361c5f409bf700406ad0d14 /packages/efl1/evas | |
| parent | 9e92b09feb313bd682ebb47d801e0e6f657b9684 (diff) | |
massive E revamp. all shiny and new. no more binconfig madness, no longer
m4 patch madness, much less hackish and fragile. all hail pkgconfig
Diffstat (limited to 'packages/efl1/evas')
| -rw-r--r-- | packages/efl1/evas/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/efl1/evas/fix-configure.patch | 36 | ||||
| -rw-r--r-- | packages/efl1/evas/pagesize.patch | 13 |
3 files changed, 49 insertions, 0 deletions
diff --git a/packages/efl1/evas/.mtn2git_empty b/packages/efl1/evas/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/efl1/evas/.mtn2git_empty diff --git a/packages/efl1/evas/fix-configure.patch b/packages/efl1/evas/fix-configure.patch new file mode 100644 index 0000000000..abf9b94bdf --- /dev/null +++ b/packages/efl1/evas/fix-configure.patch @@ -0,0 +1,36 @@ +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 @@ + 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" + ], + [ + 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 @@ + 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" + ], [ diff --git a/packages/efl1/evas/pagesize.patch b/packages/efl1/evas/pagesize.patch new file mode 100644 index 0000000000..5efd16a96e --- /dev/null +++ b/packages/efl1/evas/pagesize.patch @@ -0,0 +1,13 @@ +diff --git a/src/modules/engines/fb/evas_fb_main.c b/src/modules/engines/fb/evas_fb_main.c +index e26c171..75e0743 100644 +--- a/src/modules/engines/fb/evas_fb_main.c ++++ b/src/modules/engines/fb/evas_fb_main.c +@@ -530,7 +530,7 @@ fb_postinit(FB_Mode *mode) + fb_cleanup(); + exit(1); + } +- mode->mem_offset = (unsigned)(fb_fix.smem_start) & (~PAGE_MASK); ++ mode->mem_offset = (unsigned)(fb_fix.smem_start) & (getpagesize()-1); + mode->mem = (unsigned char *)mmap(NULL, fb_fix.smem_len + mode->mem_offset, + PROT_WRITE | PROT_READ, MAP_SHARED, fb, 0); + if ((int)mode->mem == -1) |