[oe-commits] org.oe.dev merge of '2d067cd21ac0062a769daf58cd58b0453c54c071'

[hrw commit]

merge of '2d067cd21ac0062a769daf58cd58b0453c54c071'
     and 'c2307b4d7d1657b17b06fcbfbc5612555e1f7a00'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: a187b155f67dbd2f069abfa8caf8b3e0b5d8c896
ViewMTN: http://monotone.openembedded.org/revision/info/a187b155f67dbd2f069abfa8caf8b3e0b5d8c896
Files:
1
packages/pimlico/contacts.inc
packages/pimlico/dates.inc
packages/efl1/evas_cvs.bb
packages/efl1/ewl_cvs.bb
Diffs:

#
# mt diff -r2d067cd21ac0062a769daf58cd58b0453c54c071 -ra187b155f67dbd2f069abfa8caf8b3e0b5d8c896
#
# 
# 
# patch "packages/pimlico/contacts.inc"
#  from [38562bb570c26dae7efe5495e05642d1e60d2401]
#    to [a72e504109936a7b880eab839a9a87875c068a38]
# 
# patch "packages/pimlico/dates.inc"
#  from [3bf8c125be87bac049b6da0893eaecfce67b0c7e]
#    to [bafdd6c556d9fa89501cc790456bdd165d63e266]
# 
============================================================
--- packages/pimlico/contacts.inc	38562bb570c26dae7efe5495e05642d1e60d2401
+++ packages/pimlico/contacts.inc	a72e504109936a7b880eab839a9a87875c068a38
@@ -1,7 +1,7 @@ SECTION = "x11"
 DESCRIPTION = "Address-book application."
 LICENSE = "LGPL"
 SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ eds-dbus"
+DEPENDS = "glib-2.0 gtk+ eds-dbus libowl"
 RDEPENDS = "libedata-book"
 
 inherit autotools pkgconfig
============================================================
--- packages/pimlico/dates.inc	3bf8c125be87bac049b6da0893eaecfce67b0c7e
+++ packages/pimlico/dates.inc	bafdd6c556d9fa89501cc790456bdd165d63e266
@@ -1,7 +1,7 @@ SECTION = "x11"
 DESCRIPTION = "Dates is a calendar application."
 LICENSE = "LGPL"
 SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
+DEPENDS = "glib-2.0 gtk+ libglade eds-dbus libowl"
 RDEPENDS = "libedata-cal"
 
 inherit autotools pkgconfig gtk-icon-cache


#
# mt diff -rc2307b4d7d1657b17b06fcbfbc5612555e1f7a00 -ra187b155f67dbd2f069abfa8caf8b3e0b5d8c896
#
# 
# 
# patch "packages/efl1/evas_cvs.bb"
#  from [e7c55714a5e2929a7519afee0c537e8259fdaa83]
#    to [bf66442121095eca949f9fd7637e93fecdfcaf1c]
# 
# patch "packages/efl1/ewl_cvs.bb"
#  from [dc929b34b3fd94b358ec70f0cc96d56aa4f08a60]
#    to [c054e8480d8c515eb1aa7d7fc623fd4d60cfd3c4]
# 
============================================================
--- packages/efl1/evas_cvs.bb	e7c55714a5e2929a7519afee0c537e8259fdaa83
+++ packages/efl1/evas_cvs.bb	bf66442121095eca949f9fd7637e93fecdfcaf1c
@@ -1,5 +1,5 @@ require evas.inc
 require evas.inc
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
@@ -11,7 +11,7 @@ EXTRA_OECONF = "\
 		--disable-software-ddraw	\
 		--disable-software-qtopia	\
 		--enable-software-x11		\
-		--disable-software-16-x11	\
+		--enable-software-16-x11	\
 		--disable-software-xcb		\
 		--disable-gl-x11			\
 		--enable-xrender-x11		\
============================================================
--- packages/efl1/ewl_cvs.bb	dc929b34b3fd94b358ec70f0cc96d56aa4f08a60
+++ packages/efl1/ewl_cvs.bb	c054e8480d8c515eb1aa7d7fc623fd4d60cfd3c4
@@ -1,14 +1,26 @@ based on the enlightenment foundation li
 DESCRIPTION = "The Enlightened Widget Library, \
 a simple-to-use general purpose widget library \
 based on the enlightenment foundation libraries."
-DEPENDS = "evas ecore edje emotion efreet"
+DEPENDS = "evas ecore edje emotion efreet epsilon"
 RSUGGESTS_${PN} += "ewl-themes"
 LICENSE = "MIT"
 PV = "0.5.1+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 inherit efl_library
 
+EXTRA_OECONF = "\
+  --enable-software-x11 \
+  --enable-software-16-x11 \
+  --enable-xrender-x11 \
+  --disable-opengl-x11 \
+  --disable-software-xcb \
+  --disable-software-sdl \
+  --enable-framebuffer \
+  --enable-software-buffer \
+  --disable-opengl-glew \
+"
+
 # TODO package engines more granular
 PACKAGES += "${PN}-plugins ${PN}-engines"