[oe-commits] org.oe.dev merge of '8d612652f6f73c5720cff0a8820757b036cf5d26'
coredump2 commit
openembedded-commits at lists.openembedded.org
Sun Dec 23 16:51:17 UTC 2007
merge of '8d612652f6f73c5720cff0a8820757b036cf5d26'
and 'aa5081b608a304952b8206352eacb9effc61db7e'
Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: 00f472a5d9f429f2ddaf71b4250bd3d82697ee19
ViewMTN: http://monotone.openembedded.org/revision/info/00f472a5d9f429f2ddaf71b4250bd3d82697ee19
Files:
1
packages/efl1/epdf/fix-plugin-path-check.patch
packages/efl1/epdf_cvs.bb
packages/efl1/etk_cvs.bb
packages/efl1/evas.inc
packages/efl1/evas_cvs.bb
packages/efl1/ewl_cvs.bb
packages/zaurus-updater/zaurus-updater.bb
packages/zaurusd/files/zaurus-hinge.bl-off
packages/zaurusd/files/zaurus-hinge.bl-on
packages/zaurusd/zaurusd_svn.bb
Diffs:
#
# mt diff -r8d612652f6f73c5720cff0a8820757b036cf5d26 -r00f472a5d9f429f2ddaf71b4250bd3d82697ee19
#
#
#
# patch "packages/efl1/epdf/fix-plugin-path-check.patch"
# from [917c11e702bf01b1b341e285286bb27f75393f93]
# to [5fe150879be09f990f3a76f3c8d7186e8f283c11]
#
# patch "packages/efl1/epdf_cvs.bb"
# from [9250d539c8f86f2eda976014a30908c6b3905ba0]
# to [9efa1ebb461046746f606f717f62c2d06eeda613]
#
# patch "packages/efl1/etk_cvs.bb"
# from [30cb3b710327fe056966375324ff69d0f0335450]
# to [73f6a2bacad4d3504deaf7b78fd4d80aed9a3baa]
#
# patch "packages/efl1/evas.inc"
# from [597ab85948221435b09749c151bb454d6bc7c247]
# to [4cd4cdcaa21c3ceb07a4a0332e00f4e195d48a01]
#
# patch "packages/efl1/evas_cvs.bb"
# from [dbafdc3234a73fe9ef33b6fb8fdc7de99921d04b]
# to [26e997cd12f7bb18a715bc41e044c55a98858c6c]
#
# patch "packages/efl1/ewl_cvs.bb"
# from [c054e8480d8c515eb1aa7d7fc623fd4d60cfd3c4]
# to [0b0845d0af43245cad7efe54d5d63ab7dab600a2]
#
# patch "packages/zaurus-updater/zaurus-updater.bb"
# from [4e7ce92476e14eae15da3323c9fee7f76494fe15]
# to [f8f7bbf562514bec8076212836576397889ee6ed]
#
============================================================
--- packages/efl1/epdf/fix-plugin-path-check.patch 917c11e702bf01b1b341e285286bb27f75393f93
+++ packages/efl1/epdf/fix-plugin-path-check.patch 5fe150879be09f990f3a76f3c8d7186e8f283c11
@@ -1,20 +1,20 @@ Index: epdf/configure.in
Index: epdf/configure.in
===================================================================
--- epdf.orig/configure.in
+++ epdf/configure.in
-@@ -27,8 +27,8 @@ PKG_CHECK_MODULES(EWL,
+@@ -95,8 +95,8 @@
+ [
+ have_ewl="yes"
+ requirements="$requirements ewl"
+- EWL_TEST_LIBS_DIR="`$PKG_CONFIG --variable=testsdir ewl`"
+- EWL_TEST_SOURCE_DIR="`$PKG_CONFIG --variable=testssrcdir ewl`"
++ EWL_TEST_LIBS_DIR="/usr/lib/ewl/tests/"
++ EWL_TEST_SOURCE_DIR="/usr/share/ewl/examples/"
+ AC_SUBST(EWL_TEST_LIBS_DIR)
+ AC_SUBST(EWL_TEST_SOURCE_DIR)
+ ],
+@@ -144,7 +144,7 @@
[
- have_ewl="yes"
- requirements="$requirements ewl"
-- EWL_TEST_LIBS_DIR="`$PKG_CONFIG --variable=testsdir ewl`"
-- EWL_TEST_SOURCE_DIR="`$PKG_CONFIG --variable=testssrcdir ewl`"
-+ EWL_TEST_LIBS_DIR="/usr/lib/ewl/tests/"
-+ EWL_TEST_SOURCE_DIR="/usr/share/ewl/examples/"
- AC_SUBST(EWL_TEST_LIBS_DIR)
- AC_SUBST(EWL_TEST_SOURCE_DIR)
- ],
-@@ -55,7 +55,7 @@ PKG_CHECK_MODULES(EPSILON,
- [
have_epsilon="yes"
requirements="$requirements epsilon imlib2"
- EPSILON_PLUGINS_DIR="`$PKG_CONFIG --variable=pluginsdir epsilon`"
============================================================
--- packages/efl1/epdf_cvs.bb 9250d539c8f86f2eda976014a30908c6b3905ba0
+++ packages/efl1/epdf_cvs.bb 9efa1ebb461046746f606f717f62c2d06eeda613
@@ -1,8 +1,7 @@ LICENSE = "BSD"
DESCRIPTION = "Epdf is the glue between EFL and libpoppler"
LICENSE = "BSD"
-DEPENDS = "poppler0.6 evas ecore etk ewl"
+DEPENDS = "poppler evas ecore etk ewl"
PV = "0.1.0+cvs${SRCDATE}"
-
PR = "r1"
inherit efl_library
============================================================
--- packages/efl1/etk_cvs.bb 30cb3b710327fe056966375324ff69d0f0335450
+++ packages/efl1/etk_cvs.bb 73f6a2bacad4d3504deaf7b78fd4d80aed9a3baa
@@ -1,8 +1,8 @@ PV = "0.1.0+cvs${SRCDATE}"
DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foundation Libraries."
DEPENDS = "evas ecore edje"
LICENSE = "MIT"
PV = "0.1.0+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
inherit efl_library
@@ -15,3 +15,4 @@ FILES_${PN}-dbg += "${libdir}/etk/engine
FILES_${PN}-dev += "${libdir}/etk/engines/*.a ${libdir}/etk/engines/*.la"
FILES_${PN}-dbg += "${libdir}/etk/engines/.debug/"
+RRECOMMENDS_${PN} = "${PN}-engines"
============================================================
--- packages/efl1/evas.inc 597ab85948221435b09749c151bb454d6bc7c247
+++ packages/efl1/evas.inc 4cd4cdcaa21c3ceb07a4a0332e00f4e195d48a01
@@ -35,3 +35,17 @@ PACKAGES_DYNAMIC = "libevas-engine-* lib
FILES_${PN} = "${libdir}/libevas*.so*"
PACKAGES_DYNAMIC = "libevas-engine-* libevas-loader-* libevas-saver-*"
+
+RRECOMMENDS_${PN} = "\
+ libevas-engine-buffer \
+ libevas-engine-fb \
+ libevas-engine-software-generic \
+ libevas-engine-software-x11 \
+ libevas-engine-software-16 \
+ libevas-engine-xrender-x11 \
+ \
+ libevas-loader-png \
+ libevas-loader-jpeg \
+ libevas-loader-eet \
+ libevas-loader-svg \
+"
============================================================
--- packages/efl1/evas_cvs.bb dbafdc3234a73fe9ef33b6fb8fdc7de99921d04b
+++ packages/efl1/evas_cvs.bb 26e997cd12f7bb18a715bc41e044c55a98858c6c
@@ -1,5 +1,5 @@ require evas.inc
require evas.inc
-PR = "r3"
+PR = "r4"
EXTRA_OECONF = "\
--x-includes=${STAGING_INCDIR}/X11 \
============================================================
--- packages/efl1/ewl_cvs.bb c054e8480d8c515eb1aa7d7fc623fd4d60cfd3c4
+++ packages/efl1/ewl_cvs.bb 0b0845d0af43245cad7efe54d5d63ab7dab600a2
@@ -1,11 +1,10 @@ DEPENDS = "evas ecore edje emotion efree
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 epsilon"
-RSUGGESTS_${PN} += "ewl-themes"
LICENSE = "MIT"
PV = "0.5.1+cvs${SRCDATE}"
-PR = "r1"
+PR = "r2"
inherit efl_library
@@ -31,3 +30,5 @@ FILES_${PN}-plugins = "${libdir}/ewl/plu
FILES_${PN}-engines = "${libdir}/ewl/engines/*.so*"
FILES_${PN}-plugins = "${libdir}/ewl/plugins/*.so*"
+
+RRECOMMENDS_${PN} = "${PN}-engines ${PN}-plugins ewl-themes"
============================================================
--- packages/zaurus-updater/zaurus-updater.bb 4e7ce92476e14eae15da3323c9fee7f76494fe15
+++ packages/zaurus-updater/zaurus-updater.bb f8f7bbf562514bec8076212836576397889ee6ed
@@ -12,8 +12,7 @@ do_configure() {
S = "${WORKDIR}"
do_configure() {
- cat "${S}/updater.sh" | sed "s/ZAURUS_UPDATER_VERSION/${PR}/" > "${S}/updater.sh_"
- mv "${S}/updater.sh_" "${S}/updater.sh"
+ sed -i "s/ZAURUS_UPDATER_VERSION/${PR}/" "${S}/updater.sh"
}
do_compile() {
#
# mt diff -raa5081b608a304952b8206352eacb9effc61db7e -r00f472a5d9f429f2ddaf71b4250bd3d82697ee19
#
#
#
# patch "packages/zaurusd/files/zaurus-hinge.bl-off"
# from [87e4a1fb6db37f2ea10378ad5f16b108e4d776ae]
# to [6f591519f65c3c93084f72f6f9665b4d6920f88d]
#
# patch "packages/zaurusd/files/zaurus-hinge.bl-on"
# from [a404c868701b2d3e35654159015ae6d17b9e7a9d]
# to [e8eff8a10926cc988aed7fb54f69feb14c703831]
#
# patch "packages/zaurusd/zaurusd_svn.bb"
# from [1c6948752ce366ab73d19f934f67c028b61ebc87]
# to [1d13c932ce4f3b43ef8ad3c05abb7f9e95de0566]
#
============================================================
--- packages/zaurusd/files/zaurus-hinge.bl-off 87e4a1fb6db37f2ea10378ad5f16b108e4d776ae
+++ packages/zaurusd/files/zaurus-hinge.bl-off 6f591519f65c3c93084f72f6f9665b4d6920f88d
@@ -6,13 +6,14 @@
# Filename: zaurus-hinge.bl-off
# Date: 04-Jun-06
-#test -z "${ZD_BINDIR}" && ZD_BINDIR="/usr/bin"
-#${ZD_BINDIR}/bl off
-
-
-STEP=5
DRIVER="`ls /sys/class/backlight/|head -n 1`"
BRIGHTNESS_FILE="/sys/class/backlight/$DRIVER/brightness"
+if mkdir /var/run/display_brightness.lock
+then
+ cat "$BRIGHTNESS_FILE" > /var/run/display_brightness.tmp
+ echo 0 > "$BRIGHTNESS_FILE"
+ rm -rf /var/run/display_brightness.lock
+else
+ echo "BRIGHTNESS IS LOCKED"
+fi
-cat "$BRIGHTNESS_FILE" > /var/run/display_brightness.tmp
-echo 0 > "$BRIGHTNESS_FILE"
============================================================
--- packages/zaurusd/files/zaurus-hinge.bl-on a404c868701b2d3e35654159015ae6d17b9e7a9d
+++ packages/zaurusd/files/zaurus-hinge.bl-on e8eff8a10926cc988aed7fb54f69feb14c703831
@@ -7,24 +7,39 @@ test -z "${ZD_BINDIR}" && ZD_BINDIR="/us
# Date: 04-Jun-06
test -z "${ZD_BINDIR}" && ZD_BINDIR="/usr/bin"
-${ZD_BINDIR}/bl on
+test -x ${ZD_BINDIR}/bl && ${ZD_BINDIR}/bl on
-# If the backlight does not come back on after a suspend, the driver is
-# still "on" (hence "bl on" does nothing) with a brightness of "0"
-( if test "`bl | awk '{print $2}'`" = "0"
+BL="fakeBl"
+
+fakeBl() {
+
+
+ case "$1" in
+ on) test -n "$2" && echo "$2" > "$BL_DRIVER" ;;
+ "") echo "on `cat "$BL_DRIVER"`";;
+ *) echo "$1" > "$BL_DRIVER" ;;
+ esac
+
+}
+
+for dir in `ls -1 /sys/class/backlight/`
+do
+ if test -e /sys/class/backlight/$dir/brightness
+ then
+ echo "Using [$dir] backlight driver"
+ BL_DRIVER="/sys/class/backlight/$dir/brightness"
+ break
+ fi
+done
+
+
+echo "### `$BL` ###"
+( if test "`$BL | awk '{print $2}'`" = "0"
then
- x=0
- while test "$x" != 4
- do
- bl 10
- usleep 10
- bl 50
- usleep 10
-
- let x=$x+1
- done
-
+
+ $BL 20
+
if mkdir /var/run/display_brightness.lock
then
if test -e /var/run/display_brightness.tmp
@@ -34,12 +49,8 @@ then
if test "$OLD_VALUE" -gt 1
then
- STEP=5
- DRIVER="`ls /sys/class/backlight/|head -n 1`"
- BRIGHTNESS_FILE="/sys/class/backlight/$DRIVER/brightness"
-
echo "SETTING $OLD_VALUE!"
- echo "$OLD_VALUE" > "$BRIGHTNESS_FILE"
+ $BL "$OLD_VALUE"
rm /var/run/display_brightness.tmp
echo "FINISH!"
fi
============================================================
--- packages/zaurusd/zaurusd_svn.bb 1c6948752ce366ab73d19f934f67c028b61ebc87
+++ packages/zaurusd/zaurusd_svn.bb 1d13c932ce4f3b43ef8ad3c05abb7f9e95de0566
@@ -1,10 +1,10 @@ PV = "0.0+svn${SRCDATE}"
DESCRIPTION = "Daemon to handle device specifc features."
SECTION = "base"
LICENSE = "GPL"
DEPENDS = "tslib"
RDEPENDS = "procps"
PV = "0.0+svn${SRCDATE}"
-PR = "r14"
+PR = "r15"
SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
file://zaurus-hinge.in \
More information about the Openembedded-commits
mailing list