[oe-commits] org.oe.dev merge of '2756e6b25efd4532c1a23fd31f68481d2f8b68a3'
oe commit
openembedded-commits at lists.openembedded.org
Thu Nov 29 23:07:00 UTC 2007
merge of '2756e6b25efd4532c1a23fd31f68481d2f8b68a3'
and '9c32fcb38cb012f79311cd1b07560964873c6307'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 51ded612bc452aac916208944c235f4a6515ceef
ViewMTN: http://monotone.openembedded.org/revision/info/51ded612bc452aac916208944c235f4a6515ceef
Files:
1
packages/wesnoth
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch
packages/wesnoth/wesnoth_svn.bb
conf/distro/include/sane-srcrevs.inc
packages/linux/linux_2.6.23.bb
packages/zaurusd/files/zaurus-hinge.bl-off
packages/zaurusd/files/zaurus-hinge.bl-on
packages/zaurusd/files/zaurus-hinge.matchbox-landscape
packages/zaurusd/files/zaurus-hinge.matchbox-portrait
packages/zaurusd/zaurusd_svn.bb
packages/gtk+/gdk-pixbuf-csource_2.10.14.bb
packages/gtk+/gdk-pixbuf_2.10.14.bb
Diffs:
#
# mt diff -r2756e6b25efd4532c1a23fd31f68481d2f8b68a3 -r51ded612bc452aac916208944c235f4a6515ceef
#
#
#
# add_dir "packages/wesnoth"
#
# add_file "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch"
# content [953bccbd5cef5767c0a922ebc7eeae4691dbfb65]
#
# add_file "packages/wesnoth/wesnoth_svn.bb"
# content [de8bbc9e99d99055231c5edc26d756f2d06012dc]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [9f3cdfb4521c1a35261f43b7b2016b5f26a65a26]
# to [d1197862572f9af8fe6c4149155a577f214c326d]
#
# patch "packages/linux/linux_2.6.23.bb"
# from [24ff32f454e2986756b191f3d2024191467b032b]
# to [1ad744b33520a65188c10577d6ef70a69a3554aa]
#
# patch "packages/zaurusd/files/zaurus-hinge.bl-off"
# from [6b5b6c2065f8cbf3dd7bc5b7a072b9a764a11ee0]
# to [87e4a1fb6db37f2ea10378ad5f16b108e4d776ae]
#
# patch "packages/zaurusd/files/zaurus-hinge.bl-on"
# from [1ee2f2e97eb96e6dbedfc4f6932cc72538219b6b]
# to [a404c868701b2d3e35654159015ae6d17b9e7a9d]
#
# patch "packages/zaurusd/files/zaurus-hinge.matchbox-landscape"
# from [e8f23204b8c84cf6729bc660e08557b142b9a44f]
# to [6286ae2f378c8f1957380d5d7de3685230da505a]
#
# patch "packages/zaurusd/files/zaurus-hinge.matchbox-portrait"
# from [9b9c517d633741164770bdcc173cafb2d78ed0fe]
# to [96a2bedfd5c53f713a461c275b147293229eb629]
#
# patch "packages/zaurusd/zaurusd_svn.bb"
# from [f709b2aca8b8c4c78926edcec52fc48ed0c06540]
# to [1c6948752ce366ab73d19f934f67c028b61ebc87]
#
============================================================
--- packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch 953bccbd5cef5767c0a922ebc7eeae4691dbfb65
+++ packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch 953bccbd5cef5767c0a922ebc7eeae4691dbfb65
@@ -0,0 +1,32 @@
+diff -urN linux-2.6.23.orig/arch/powerpc/boot/dts/mpc8313erdb.dts linux-2.6.23/arch/powerpc/boot/dts/mpc8313erdb.dts
+--- linux-2.6.23.orig/arch/powerpc/boot/dts/mpc8313erdb.dts 2007-10-09 22:31:38.000000000 +0200
++++ linux-2.6.23/arch/powerpc/boot/dts/mpc8313erdb.dts 2007-11-29 19:32:21.000000000 +0100
+@@ -60,6 +60,12 @@
+ interrupts = <e 8>;
+ interrupt-parent = < &ipic >;
+ dfsrr;
++
++ rtc at 68 {
++ device_type = "rtc";
++ compatible = "dallas,ds1339";
++ reg = <68>;
++ };
+ };
+
+ i2c at 3100 {
+diff -urN linux-2.6.23.orig/arch/powerpc/sysdev/fsl_soc.c linux-2.6.23/arch/powerpc/sysdev/fsl_soc.c
+--- linux-2.6.23.orig/arch/powerpc/sysdev/fsl_soc.c 2007-10-09 22:31:38.000000000 +0200
++++ linux-2.6.23/arch/powerpc/sysdev/fsl_soc.c 2007-11-29 19:31:58.000000000 +0100
+@@ -319,6 +319,12 @@
+ {"ricoh,rs5c372b", "rtc-rs5c372", "rs5c372b",},
+ {"ricoh,rv5c386", "rtc-rs5c372", "rv5c386",},
+ {"ricoh,rv5c387a", "rtc-rs5c372", "rv5c387a",},
++ {"dallas,ds1307", "rtc-ds1307", "ds1307",},
++ {"dallas,ds1337", "rtc-ds1307", "ds1337",},
++ {"dallas,ds1338", "rtc-ds1307", "ds1338",},
++ {"dallas,ds1339", "rtc-ds1307", "ds1339",},
++ {"dallas,ds1340", "rtc-ds1307", "ds1340",},
++ {"stm,m41t00", "rtc-ds1307", "m41t00"},
+ };
+
+ static int __init of_find_i2c_driver(struct device_node *node, struct i2c_board_info *info)
============================================================
--- packages/wesnoth/wesnoth_svn.bb de8bbc9e99d99055231c5edc26d756f2d06012dc
+++ packages/wesnoth/wesnoth_svn.bb de8bbc9e99d99055231c5edc26d756f2d06012dc
@@ -0,0 +1,19 @@
+DESCRIPTION = "fantasy turn-based strategy game"
+PV = "0.01+svnr${SRCREV}"
+PR = "r1"
+SECTION = "games"
+LICENSE = "GPL"
+DEPENDS += "libsdl-image libsdl-mixer libsdl-net"
+SRC_URI = "svn://svn.gna.org/svn/wesnoth;module=trunk;proto=http"
+
+EXTRA_OECONF += " --enable-tinygui --disable-python --enable-lite --enable-lowmem"
+
+S = "${WORKDIR}/trunk"
+
+inherit autotools
+
+addtask autogen after do_patch before do_configure
+
+do_autogen() {
+ cd ${WORKDIR}/trunk/ && ./autogen.sh --host=armv4t-angstrom-linux-gnueabi
+}
============================================================
--- conf/distro/include/sane-srcrevs.inc 9f3cdfb4521c1a35261f43b7b2016b5f26a65a26
+++ conf/distro/include/sane-srcrevs.inc d1197862572f9af8fe6c4149155a577f214c326d
@@ -123,6 +123,7 @@ SRCREV_pn-webkit-qtopia ?= "27222"
SRCREV_pn-webkit-gtk ?= "27222"
SRCREV_pn-webkit-qt ?= "27222"
SRCREV_pn-webkit-qtopia ?= "27222"
+SRCREV_pn-wesnoth ?= "22021"
SRCREV_pn-xoo ?= "1623"
SRCREV_pn-mplayer ?= "24587"
SRCREV_pn-networkmanager ?= "2887"
============================================================
--- packages/linux/linux_2.6.23.bb 24ff32f454e2986756b191f3d2024191467b032b
+++ packages/linux/linux_2.6.23.bb 1ad744b33520a65188c10577d6ef70a69a3554aa
@@ -25,7 +25,8 @@ SRC_URI_append_mpc8313e-rdb = "\
SRC_URI_append_mpc8313e-rdb = "\
file://mpc831x-nand.patch;patch=1 \
- file://mpc8313e-rdb-leds.patch;patch=1"
+ file://mpc8313e-rdb-leds.patch;patch=1 \
+ file://mpc8313e-rdb-rtc.patch;patch=1"
SRC_URI_append_mpc8323e-rdb = "\
file://mpc832x-leds.patch;patch=1"
============================================================
--- packages/zaurusd/files/zaurus-hinge.bl-off 6b5b6c2065f8cbf3dd7bc5b7a072b9a764a11ee0
+++ packages/zaurusd/files/zaurus-hinge.bl-off 87e4a1fb6db37f2ea10378ad5f16b108e4d776ae
@@ -6,5 +6,13 @@
# 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"
+
+cat "$BRIGHTNESS_FILE" > /var/run/display_brightness.tmp
+echo 0 > "$BRIGHTNESS_FILE"
-test -z "${ZD_BINDIR}" && ZD_BINDIR="/usr/bin"
-${ZD_BINDIR}/bl off
============================================================
--- packages/zaurusd/files/zaurus-hinge.bl-on 1ee2f2e97eb96e6dbedfc4f6932cc72538219b6b
+++ packages/zaurusd/files/zaurus-hinge.bl-on a404c868701b2d3e35654159015ae6d17b9e7a9d
@@ -12,7 +12,7 @@ ${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"
+( if test "`bl | awk '{print $2}'`" = "0"
then
x=0
while test "$x" != 4
@@ -24,5 +24,29 @@ then
let x=$x+1
done
-fi
+
+ if mkdir /var/run/display_brightness.lock
+ then
+ if test -e /var/run/display_brightness.tmp
+ then
+ OLD_VALUE="`cat /var/run/display_brightness.tmp`"
+ echo "OLD BRIGHTNESS SETTING FOUND: $OLD_VALUE"
+ 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"
+ rm /var/run/display_brightness.tmp
+ echo "FINISH!"
+ fi
+ fi
+ rm -rf /var/run/display_brightness.lock
+ else
+ echo "BRIGHTNESS IS LOCKED"
+ fi
+fi ) &
+
============================================================
--- packages/zaurusd/files/zaurus-hinge.matchbox-landscape e8f23204b8c84cf6729bc660e08557b142b9a44f
+++ packages/zaurusd/files/zaurus-hinge.matchbox-landscape 6286ae2f378c8f1957380d5d7de3685230da505a
@@ -16,6 +16,10 @@
# urg mbinputmgr should kill below
killproc ${ZD_BINDIR}/matchbox-keyboard
killproc ${ZD_BINDIR}/matchbox-stroke
+
if [ -x ${ZD_BINDIR}/xrandr ]; then
- xrandr -o normal
+ if ! ( xrandr | awk '{print $4}' | grep -q normal )
+ then
+ ${ZD_BINDIR}/xrandr -o normal
+ fi
fi
============================================================
--- packages/zaurusd/files/zaurus-hinge.matchbox-portrait 9b9c517d633741164770bdcc173cafb2d78ed0fe
+++ packages/zaurusd/files/zaurus-hinge.matchbox-portrait 96a2bedfd5c53f713a461c275b147293229eb629
@@ -1,7 +1,10 @@
#!/bin/sh
if [ -x ${ZD_BINDIR}/xrandr ]; then
- ${ZD_BINDIR}/xrandr -o left
+ if ! ( xrandr | awk '{print $4}' | grep -q left )
+ then
+ ${ZD_BINDIR}/xrandr -o left
+ fi
fi
# just to be extra safe
sleep 1
============================================================
--- packages/zaurusd/zaurusd_svn.bb f709b2aca8b8c4c78926edcec52fc48ed0c06540
+++ packages/zaurusd/zaurusd_svn.bb 1c6948752ce366ab73d19f934f67c028b61ebc87
@@ -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 = "r13"
+PR = "r14"
SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
file://zaurus-hinge.in \
#
# mt diff -r9c32fcb38cb012f79311cd1b07560964873c6307 -r51ded612bc452aac916208944c235f4a6515ceef
#
#
#
# rename "packages/gtk+/gdk-pixbuf-csource_2.10.14.bb"
# to "packages/gtk+/gdk-pixbuf_2.10.14.bb"
#
# patch "packages/gtk+/gdk-pixbuf_2.10.14.bb"
# from [a2ef39d2f5b1d4cfee0c652d063ffca9ebded3d9]
# to [3c53647f0df0c1e147fdccf3679a22bc6128bc18]
#
============================================================
--- packages/gtk+/gdk-pixbuf-csource_2.10.14.bb a2ef39d2f5b1d4cfee0c652d063ffca9ebded3d9
+++ packages/gtk+/gdk-pixbuf_2.10.14.bb 3c53647f0df0c1e147fdccf3679a22bc6128bc18
@@ -1,14 +1,60 @@
-require gtk+_${PV}.bb
+DESCRIPTION = "GDK PixBuf is a pixelmap image support library from the GTK+ \
+multi-platform toolkit for creating graphical user interfaces."
+HOMEPAGE = "http://www.gtk.org/"
+SECTION = "libs"
+LICENSE = "LGPL"
+PRIORITY = "optional"
DEPENDS = "jpeg libpng gettext glib-2.0"
+
S = "${WORKDIR}/gtk+-${PV}"
FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files"
-SRC_URI += "file://reduce-dependencies.patch;patch=1"
+PR = "r0"
-#clear recommends for uclibc builds
-RRECOMMENDS = " "
-RRECOMMENDS_${PN}_linux = " "
-RRECOMMENDS_${PN}_linux-gnueabi = " "
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
+ file://automake-lossage.patch;patch=1 \
+ file://reduce-dependencies.patch;patch=1"
+# file://no-xwc.patch;patch=1 \
+# file://disable-tooltips.patch;patch=1 \
+# file://gtklabel-resize-patch;patch=1 \
+# file://menu-deactivate.patch;patch=1 \
+# file://xsettings.patch;patch=1 \
+# file://scroll-timings.patch;patch=1 \
+# file://small-gtkfilesel.patch;patch=1 \
+# file://migration.patch;patch=1;pnum=0 \
+# file://run-iconcache.patch;patch=1 \
+# file://hardcoded_libtool.patch;patch=1 \
+# file://no-demos.patch;patch=1 \
+# file://single-click.patch;patch=1 \
+# file://spinbutton.patch;patch=1 \
+# file://gtk+-handhelds.patch;patch=1 \
+# file://filesel-fix-segfault.patch;patch=1 \
+# file://combo-arrow-size.patch;patch=1;pnum=0 \
+# file://range-no-redraw.patch;patch=1;pnum=0 \
+# file://scrolled-placement.patch;patch=1;pnum=0 \
+# file://treeview-checkbox-size.patch;patch=1;pnum=0 \
+# file://cell-renderer-edit-focus.patch;patch=1;pnum=0 \
+
+# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
+require gtk-fpu.inc
+EXTRA_OECONF += "${@get_gtk_fpu_setting(bb, d)}"
+
+inherit autotools pkgconfig
+
+FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
+ ${bindir}/gtk-update-icon-cache \
+ ${libdir}/lib*.so.*"
+
+FILES_${PN}-dev += " \
+ ${datadir}/gtk-2.0/include \
+ ${libdir}/gtk-2.0/include \
+ ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
+ ${bindir}/gdk-pixbuf-csource \
+ ${bindir}/gtk-builder-convert"
+
+FILES_${PN}-dbg += " \
+ ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/*"
+
EXTRA_OECONF = "\
--without-x \
--with-gdktarget=linux-fb \
@@ -17,12 +63,14 @@ EXTRA_OECONF = "\
--with-libpng \
"
+LIBV = "2.10.0"
+
do_compile() {
cd gdk-pixbuf && oe_runmake
}
do_stage() {
-# oe_libinstall -C gdk-pixbuf -so libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -C gdk-pixbuf -so libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
cd gdk-pixbuf && oe_runmake install DESTDIR=${STAGING_DIR}/usr
autotools_stage_includes
# install -d -m 0755 ${STAGING_LIBDIR}/gtk-2.0/include
@@ -30,10 +78,26 @@ do_install() {
}
do_install() {
- :
+ oe_libinstall -C gdk-pixbuf -so libgdk_pixbuf-2.0 ${D}/${libdir}
+ cd gdk-pixbuf && oe_runmake install DESTDIR=${D}
}
-# override the function in gtk-*.inc (included by gtk+*.bb)
-populate_packages_prepend () {
+postinst_prologue() {
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+}
+PACKAGES_DYNAMIC = "gdk-pixbuf-loader-*"
+
+python populate_packages_prepend () {
+ import os.path
+
+ prologue = bb.data.getVar("postinst_prologue", d, 1)
+
+ gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
+ loaders_root = os.path.join(gtk_libdir, 'loaders')
+ do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
+ if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+ bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
}
More information about the Openembedded-commits
mailing list