[oe-commits] org.oe.dev merge of '5bee5fc529fd2691fe3b0a867bbb28edcd59b01d'

[jluebbe commit]

merge of '5bee5fc529fd2691fe3b0a867bbb28edcd59b01d'
     and '805d2f01c6463550c4d0dd1f943fc6f32ae13613'

Author: jluebbe at openembedded.org
Branch: org.openembedded.dev
Revision: 812ef7daa38cb7e71c9e1bb3ef0358566d20c3ee
ViewMTN: http://monotone.openembedded.org/revision/info/812ef7daa38cb7e71c9e1bb3ef0358566d20c3ee
Files:
1
packages/subversion/subversion_1.4.5.bb
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/zaurusd/zaurusd_svn.bb
packages/wesnoth
packages/wesnoth/wesnoth_svn.bb
conf/distro/include/sane-srcrevs.inc
Diffs:

#
# mt diff -r5bee5fc529fd2691fe3b0a867bbb28edcd59b01d -r812ef7daa38cb7e71c9e1bb3ef0358566d20c3ee
#
# 
# 
# add_file "packages/subversion/subversion_1.4.5.bb"
#  content [680bf01cbd49adaec6a24e728327d7aec6fbaa94]
# 
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
#  from [770b82ced5d1af46c020f23520a1ab4505a112cf]
#    to [17503c55f830f3a3deb1876d7d390a42edb3bc6b]
# 
# patch "packages/zaurusd/zaurusd_svn.bb"
#  from [fd7e6ab176fd80995c6a4aa697765dd21900decd]
#    to [f709b2aca8b8c4c78926edcec52fc48ed0c06540]
# 
============================================================
--- packages/subversion/subversion_1.4.5.bb	680bf01cbd49adaec6a24e728327d7aec6fbaa94
+++ packages/subversion/subversion_1.4.5.bb	680bf01cbd49adaec6a24e728327d7aec6fbaa94
@@ -0,0 +1,33 @@
+DESCRIPTION = "The Subversion (svn) client"
+SECTION = "console/network"
+DEPENDS = "apr-util neon"
+RDEPENDS = "neon"
+LICENSE = "Apache BSD"
+HOMEPAGE = "http://subversion.tigris.org"
+
+PR = "r0"
+
+SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
+           file://disable-revision-install.patch;patch=1 \
+	   file://neon-detection.patch;patch=1"
+
+EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \
+                --without-berkeley-db --without-apxs --without-apache \
+                --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
+                --with-apr-util=${STAGING_BINDIR_CROSS}"
+
+
+inherit autotools
+
+export LDFLAGS += " -L${STAGING_LIBDIR} "
+
+do_configure() {
+	gnu-configize
+	libtoolize --force
+	aclocal -I build/ -I build/ac-macros/ && autoconf
+	oe_runconf
+}
+
+do_stage() {
+	autotools_stage_all
+}
============================================================
--- packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch	770b82ced5d1af46c020f23520a1ab4505a112cf
+++ packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch	17503c55f830f3a3deb1876d7d390a42edb3bc6b
@@ -145,7 +145,7 @@ diff -urN linux-2.6.23.orig/drivers/leds
 +
 +MODULE_AUTHOR("Leon Woestenberg <leon at sidebranch.com>");
 +MODULE_DESCRIPTION("MPC8313E-RDB LED driver");
-+
++MODULE_LICENSE("GPL");
 diff -urN linux-2.6.23.orig/drivers/leds/Makefile linux-2.6.23/drivers/leds/Makefile
 --- linux-2.6.23.orig/drivers/leds/Makefile	2007-10-09 22:31:38.000000000 +0200
 +++ linux-2.6.23/drivers/leds/Makefile	2007-11-29 09:03:09.000000000 +0100
============================================================
--- packages/zaurusd/zaurusd_svn.bb	fd7e6ab176fd80995c6a4aa697765dd21900decd
+++ packages/zaurusd/zaurusd_svn.bb	f709b2aca8b8c4c78926edcec52fc48ed0c06540
@@ -1,10 +1,10 @@ LICENSE = "GPL"
 DESCRIPTION = "Daemon to handle device specifc features."
 SECTION = "base"
 LICENSE = "GPL"
-DEPENDS = "tslib gpe-conf"
-RDEPENDS = "procps gpe-conf"
+DEPENDS = "tslib"
+RDEPENDS = "procps"
 PV = "0.0+svn${SRCDATE}"
-PR = "r12"
+PR = "r13"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
            file://zaurus-hinge.in \


#
# mt diff -r805d2f01c6463550c4d0dd1f943fc6f32ae13613 -r812ef7daa38cb7e71c9e1bb3ef0358566d20c3ee
#
# 
# 
# add_dir "packages/wesnoth"
# 
# add_file "packages/wesnoth/wesnoth_svn.bb"
#  content [de8bbc9e99d99055231c5edc26d756f2d06012dc]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [9f3cdfb4521c1a35261f43b7b2016b5f26a65a26]
#    to [d1197862572f9af8fe6c4149155a577f214c326d]
# 
============================================================
--- 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"