From 80ec30e4ffff6d24a80b7498c86d83df3d47d948 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 20 Mar 2008 18:34:05 +0000 Subject: epsilon cvs remove patches no longer necessary (from Aloisio Almeida) --- packages/efl1/epsilon/.mtn2git_empty | 0 packages/efl1/epsilon/compile-fix.patch | 15 --------------- packages/efl1/epsilon/server-is-not-client.patch | 11 ----------- 3 files changed, 26 deletions(-) delete mode 100644 packages/efl1/epsilon/.mtn2git_empty delete mode 100644 packages/efl1/epsilon/compile-fix.patch delete mode 100644 packages/efl1/epsilon/server-is-not-client.patch (limited to 'packages/efl1') diff --git a/packages/efl1/epsilon/.mtn2git_empty b/packages/efl1/epsilon/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/efl1/epsilon/compile-fix.patch b/packages/efl1/epsilon/compile-fix.patch deleted file mode 100644 index 1c42cc59c4..0000000000 --- a/packages/efl1/epsilon/compile-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- epsilon-0.3.0.004/src/lib/exiftags/exif.c~compile-fix -+++ epsilon-0.3.0.004/src/lib/exiftags/exif.c -@@ -48,7 +48,6 @@ - #include - #include - #include --#include - #include - #include - diff --git a/packages/efl1/epsilon/server-is-not-client.patch b/packages/efl1/epsilon/server-is-not-client.patch deleted file mode 100644 index e96e528b9e..0000000000 --- a/packages/efl1/epsilon/server-is-not-client.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /tmp/epsilon_private.h 2006-12-01 12:06:30.000000000 +0100 -+++ epsilon-0.3.0.007/src/include/epsilon_private.h 2006-12-01 12:07:10.928254000 +0100 -@@ -41,7 +41,7 @@ - Epsilon_Message *epsilon_message_new(int clientid, char *path, char *dst, int status); - - int epsilon_ipc_client_send(Ecore_Con_Client *cl, Epsilon_Message *msg); --int epsilon_ipc_server_send(Ecore_Con_Client *cl, Epsilon_Message *msg); -+int epsilon_ipc_server_send(Ecore_Con_Server *srv, Epsilon_Message *msg); - - Epsilon_Message *epsilon_ipc_consume(Epsilon_Ipc_End *end); - -- cgit v1.2.3 From 143cde5e8283dd5e704ac9b14b76e1ee2ca2a2b3 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 20 Mar 2008 18:35:47 +0000 Subject: epsilon cvs add patch to fix alignment error through GNU extension syntax (by Aloisio Almeida) --- packages/efl1/epsilon/.mtn2git_empty | 0 packages/efl1/epsilon/fix_alignment_error.patch | 13 +++++++++++++ packages/efl1/epsilon_cvs.bb | 3 +++ 3 files changed, 16 insertions(+) create mode 100644 packages/efl1/epsilon/.mtn2git_empty create mode 100644 packages/efl1/epsilon/fix_alignment_error.patch (limited to 'packages/efl1') diff --git a/packages/efl1/epsilon/.mtn2git_empty b/packages/efl1/epsilon/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/efl1/epsilon/fix_alignment_error.patch b/packages/efl1/epsilon/fix_alignment_error.patch new file mode 100644 index 0000000000..7a635bcf88 --- /dev/null +++ b/packages/efl1/epsilon/fix_alignment_error.patch @@ -0,0 +1,13 @@ +Index: epsilon/src/lib/exiftags/canon.c +=================================================================== +--- epsilon.orig/src/lib/exiftags/canon.c 2007-12-03 17:45:27.000000000 -0300 ++++ epsilon/src/lib/exiftags/canon.c 2007-12-03 17:46:59.000000000 -0300 +@@ -52,7 +52,7 @@ + struct ccstm { + int32_t val; + struct descrip *table; +- const char descr[]; ++ const char *descr; + }; + + diff --git a/packages/efl1/epsilon_cvs.bb b/packages/efl1/epsilon_cvs.bb index 8c71ef3e3d..4674e1913c 100644 --- a/packages/efl1/epsilon_cvs.bb +++ b/packages/efl1/epsilon_cvs.bb @@ -4,9 +4,12 @@ LICENSE = "MIT BSD" # can also depend on xine for movie thumbnails DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native" PV = "0.3.0.012+cvs${SRCDATE}" +PR = "r1" inherit efl_library +SRC_URI += "file://fix_alignment_error.patch;patch=1" + # a gstreamer thumbnailer would be nice now that we have emotion using gstreamer as well EXTRA_OECONF = "--disable-xine" -- cgit v1.2.3 From 4c0402f7501e857505b12ed11e1b1c502cf27d3e Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 20 Mar 2008 19:08:04 +0000 Subject: edbus cvs build e_dbus_hal GUI test client and fix packaging (by Aloisio Almeida) --- packages/efl1/edbus_cvs.bb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'packages/efl1') diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb index d9c2b83b79..feb940f4ec 100644 --- a/packages/efl1/edbus_cvs.bb +++ b/packages/efl1/edbus_cvs.bb @@ -1,16 +1,19 @@ DESCRIPTION = "DBus and HAL convenience wrappers for EFL" -DEPENDS = "dbus ecore" +DEPENDS = "dbus ecore efreet ewl" LICENSE = "MIT BSD" PV = "0.1.0.042+cvs${SRCDATE}" -PR = "r2" +PR = "r3" inherit efl_library SRC_URI = "${E_CVS};module=e17/libs/e_dbus" S = "${WORKDIR}/e_dbus" -PACKAGES =+ "${PN}-enotify ${PN}-edbus ${PN}-enm ${PN}-ehal" +EXTRA_OECONF = "--enable-build-test-gui" + +PACKAGES =+ "${PN}-enotify ${PN}-edbus ${PN}-enm ${PN}-ehal ${PN}-test-gui" FILES_${PN}-enotify = "${libdir}/libenotify.so.*" FILES_${PN}-edbus = "${libdir}/libedbus.so.*" FILES_${PN}-enm = "${libdir}/libenm.so.*" FILES_${PN}-ehal = "${libdir}/libehal.so.*" +FILES_${PN}-test-gui = "${bindir}/e_dbus_hal" -- cgit v1.2.3 From 4357b3b8474897159e9331fcd27bfd949bf13a16 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 20 Mar 2008 19:09:41 +0000 Subject: evas cvs remove patches that have been sent upstream (by Aloisios Almeida) --- packages/efl1/evas/fix-configure.patch | 71 ---------------------------------- packages/efl1/evas/pagesize.patch | 13 ------- 2 files changed, 84 deletions(-) delete mode 100644 packages/efl1/evas/fix-configure.patch delete mode 100644 packages/efl1/evas/pagesize.patch (limited to 'packages/efl1') diff --git a/packages/efl1/evas/fix-configure.patch b/packages/efl1/evas/fix-configure.patch deleted file mode 100644 index 1a5bf78e46..0000000000 --- a/packages/efl1/evas/fix-configure.patch +++ /dev/null @@ -1,71 +0,0 @@ -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="${x_libs} -lX11 -lXext" - ], - [ - AC_MSG_RESULT(disabling software X11 engine) -@@ -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_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]) - ], - [ diff --git a/packages/efl1/evas/pagesize.patch b/packages/efl1/evas/pagesize.patch deleted file mode 100644 index 5efd16a96e..0000000000 --- a/packages/efl1/evas/pagesize.patch +++ /dev/null @@ -1,13 +0,0 @@ -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) -- cgit v1.2.3 From 8c618efcf50b0c2a81cf5605ace696740c8f14c7 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 20 Mar 2008 19:37:51 +0000 Subject: imlib: switch to cvs builds (by Aloisios Almeida) --- packages/efl1/imlib2_1.4.1.000.bb | 26 -------------------------- packages/efl1/imlib2_cvs.bb | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 26 deletions(-) delete mode 100644 packages/efl1/imlib2_1.4.1.000.bb create mode 100644 packages/efl1/imlib2_cvs.bb (limited to 'packages/efl1') diff --git a/packages/efl1/imlib2_1.4.1.000.bb b/packages/efl1/imlib2_1.4.1.000.bb deleted file mode 100644 index b0db13b5ce..0000000000 --- a/packages/efl1/imlib2_1.4.1.000.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipulation." -LICENSE = "BSD" -# can also depend on tiff34, ungif or gif, z, bz2, id3tag -DEPENDS = "freetype libpng jpeg virtual/libx11 libxext" -PR = "r0" - -inherit efl_library - -SRC_URI += "file://remove-local-includes.patch;patch=1" - -EXTRA_OECONF = "--with-x" - -# TODO: Use more fine granular version -#OE_LT_RPATH_ALLOW=":${libdir}/imlib2/loaders:${libdir}/imlib2/filters:" -OE_LT_RPATH_ALLOW = "any" -OE_LT_RPATH_ALLOW[export]="1" - -PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters" -FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so" -FILES_${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/" -FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}" -FILES_${PN}-bin = "${bindir}" -FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so" -FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so" -FILES_imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug" -FILES_imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug" diff --git a/packages/efl1/imlib2_cvs.bb b/packages/efl1/imlib2_cvs.bb new file mode 100644 index 0000000000..e17f3c04c1 --- /dev/null +++ b/packages/efl1/imlib2_cvs.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipulation." +LICENSE = "BSD" +# can also depend on tiff34, ungif or gif, z, bz2, id3tag +DEPENDS = "freetype libpng jpeg virtual/libx11 libxext" +PV = "1.4.1.000+cvs${SRCDATE}" +PR = "r0" + +inherit efl_library + +SRC_URI += "file://remove-local-includes.patch;patch=1" + +EXTRA_OECONF = "--with-x" + +# TODO: Use more fine granular version +#OE_LT_RPATH_ALLOW=":${libdir}/imlib2/loaders:${libdir}/imlib2/filters:" +OE_LT_RPATH_ALLOW = "any" +OE_LT_RPATH_ALLOW[export]="1" + +PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters" +FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so" +FILES_${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/" +FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}" +FILES_${PN}-bin = "${bindir}" +FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so" +FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so" +FILES_imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug" +FILES_imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug" -- cgit v1.2.3 From 232b211705c053cdbf54effd6d50674638b5cf83 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 20 Mar 2008 19:39:02 +0000 Subject: emotion cvs RRECOMMEND the gstreamer backend (it's dlopened) --- packages/efl1/emotion_cvs.bb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'packages/efl1') diff --git a/packages/efl1/emotion_cvs.bb b/packages/efl1/emotion_cvs.bb index 36a5065e7a..7ee7c384d6 100644 --- a/packages/efl1/emotion_cvs.bb +++ b/packages/efl1/emotion_cvs.bb @@ -2,14 +2,13 @@ DESCRIPTION = "The Enlightenment multimedia library" LICENSE = "MIT BSD" # we no longer build the libxine backend, since the gstreamer backend seems more promising DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base" -RRECOMMENDS_${PN} = "emotion-backend-gstreamer" PV = "0.1.0+cvs${SRCDATE}" -PR = "r0" +PR = "r1" inherit efl_library EXTRA_OECONF = "--disable-xine --enable-gstreamer" -PACKAGES =+ "emotion-backend-gstreamer emotion-test" +PACKAGES =+ "emotion-backend-gstreamer" FILES_emotion-backend-gstreamer = "${libdir}/emotion/*.so" -FILES_emotion-test = "${bindir}/emotion_test ${datadir}" +RRECOMMENDS_${PN} = "emotion-backend-gstreamer" -- cgit v1.2.3 From 7f89cc0fbaf8135d70120d8934ba39e9bc89cef7 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 20 Mar 2008 20:37:33 +0000 Subject: evas cvs explicitly state rot-180 configuration --- packages/efl1/evas_cvs.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages/efl1') diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb index 862cc51370..ebe604ec2b 100644 --- a/packages/efl1/evas_cvs.bb +++ b/packages/efl1/evas_cvs.bb @@ -47,6 +47,7 @@ EXTRA_OECONF = "\ --disable-convert-16-rgb-ipq \ --enable-convert-16-rgb-rot-0 \ --enable-convert-16-rgb-rot-90 \ + --disable-convert-16-rgb-rot-180 \ --enable-convert-16-rgb-rot-270 \ --enable-convert-24-rgb-888 \ --enable-convert-24-bgr-888 \ @@ -56,5 +57,6 @@ EXTRA_OECONF = "\ --enable-convert-32-bgrx-8888 \ --enable-convert-32-rgb-rot-0 \ --enable-convert-32-rgb-rot-90 \ + --disable-convert-32-rgb-rot-180 \ --enable-convert-32-rgb-rot-270" -- cgit v1.2.3