merge of '9b6cdd024207fb27c1273c341b1610c554f948e9'

     and 'a8e71f07bc5697f18dc65c9774d84f92706d66b8'

10 files changed, 58 insertions, 7 deletions

diff --git a/classes/openmoko2.bbclass b/classes/openmoko2.bbclass
index 17b3bbafa6..872dd4915c 100644
--- a/classes/openmoko2.bbclass
+++ b/classes/openmoko2.bbclass
@@ -18,6 +18,7 @@ def openmoko_two_get_subdir(d):
     elif section == "panel-plugin": return "panel-plugins"
     elif section == "inputmethods": return "inputmethods"
     elif section == "daemons": return "daemons"
+    elif section == "misc": return "misc"
     else: return section
 
 LICENSE = "${@openmoko_two_get_license(d)}"
@@ -30,4 +31,3 @@ FILES_${PN} += "${datadir}/icons"
 
 # SVNREV = "r${SRCREV}"
 SVNREV = "${SRCDATE}"
-
diff --git a/packages/hsetroot/.mtn2git_empty b/packages/hsetroot/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/hsetroot/.mtn2git_empty
diff --git a/packages/hsetroot/files/.mtn2git_empty b/packages/hsetroot/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/hsetroot/files/.mtn2git_empty
diff --git a/packages/hsetroot/files/pkgconfigize-imlib.patch b/packages/hsetroot/files/pkgconfigize-imlib.patch
new file mode 100644
index 0000000000..862b74fad2
--- /dev/null
+++ b/packages/hsetroot/files/pkgconfigize-imlib.patch
@@ -0,0 +1,22 @@
+Index: hsetroot-1.0.2/configure.ac
+===================================================================
+--- hsetroot-1.0.2.orig/configure.ac	2003-09-05 21:41:38.000000000 +0000
++++ hsetroot-1.0.2/configure.ac	2007-08-09 21:14:09.000000000 +0000
+@@ -39,16 +39,7 @@
+ AC_C_CONST
+ 
+ # Check for imlib2
+-AC_CHECK_PROGS(imlib2config_cmd, imlib2-config)
+-if test x$imlib2config_cmd = "x"; then
+-  AC_MSG_ERROR([error. Imlib2 is required to compile.])
+-fi
+-
+-IMLIB2_CFLAGS=`$imlib2config_cmd --cflags`
+-AC_SUBST(IMLIB2_CFLAGS)
+-
+-IMLIB2_LIBS=`$imlib2config_cmd --libs`
+-AC_SUBST(IMLIB2_LIBS)
++PKG_CHECK_MODULES(IMLIB2, imlib2)
+ 
+ # Some extra definitions for config.h
+ AC_DEFINE(DESCRIPTION, "yet another wallpaper application", [single line package description])
diff --git a/packages/hsetroot/hsetroot_1.0.2.bb b/packages/hsetroot/hsetroot_1.0.2.bb
new file mode 100644
index 0000000000..64ff997b50
--- /dev/null
+++ b/packages/hsetroot/hsetroot_1.0.2.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Yet another X Wallpaper Utility"
+DEPENDS += "imlib2 freetype zlib virtual/libx11 libxext"
+RDEPENDS += "imlib2-loaders"
+LICENSE = "GPL"
+
+SRC_URI = "http://thegraveyard.org/files/hsetroot-${PV}.tar.gz \
+           file://pkgconfigize-imlib.patch;patch=1"
+
+inherit autotools
+
diff --git a/packages/openmoko2/openmoko-today2-folders_svn.bb b/packages/openmoko2/openmoko-today2-folders_svn.bb
new file mode 100644
index 0000000000..7a7c90c091
--- /dev/null
+++ b/packages/openmoko2/openmoko-today2-folders_svn.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "The OpenMoko Today2 vfolder files"
+SECTION = "openmoko/misc"
+PV = "0.1.0+svn${SVNREV}"
+PR = "r1"
+
+inherit openmoko2
+
+FILES_${PN} += "${datadir}"
diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb
index 93e0b47456..bfc5fc201d 100644
--- a/packages/openmoko2/openmoko-today2_svn.bb
+++ b/packages/openmoko2/openmoko-today2_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The OpenMoko Application Launcher"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm"
-RDEPENDS = "libedata-cal"
+RDEPENDS = "libedata-cal openmoko-today2-folders"
 PV = "0.1.0+svn${SVNREV}"
 PR = "r1"
 
diff --git a/packages/xorg-app/xsetroot_1.0.1.bb b/packages/xorg-app/xsetroot_1.0.1.bb
new file mode 100644
index 0000000000..0f63feb79f
--- /dev/null
+++ b/packages/xorg-app/xsetroot_1.0.1.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "Sets the visual appearance of the X root window"
+LICENSE = "MIT"
+DEPENDS += "libxmu xbitmaps"
+PE = "1"
diff --git a/packages/xorg-data/xbitmaps_1.0.1.bb b/packages/xorg-data/xbitmaps_1.0.1.bb
new file mode 100644
index 0000000000..7d9dc18c84
--- /dev/null
+++ b/packages/xorg-data/xbitmaps_1.0.1.bb
@@ -0,0 +1,6 @@
+require xorg-data-common.inc
+
+DESCRIPTION = "Common X11 Bitmaps"
+LICENSE = "MIT"
+DEPENDS += "libxmu xbitmaps"
+
diff --git a/packages/xorg-data/xorg-data-common.inc b/packages/xorg-data/xorg-data-common.inc
index 9b236c852f..46b14d73af 100644
--- a/packages/xorg-data/xorg-data-common.inc
+++ b/packages/xorg-data/xorg-data-common.inc
@@ -1,15 +1,14 @@
-DESCRIPTION = "X data files"
 HOMEPAGE = "http://www.x.org"
-SECTION = "x11/datas"
+SECTION = "x11/data"
 LICENSE = "MIT-X"
 
-#DEPENDS = ""
 XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/data/${XORG_PN}-${PV}.tar.bz2"
+
+SRC_URI = "${XORG_MIRROR}/individual/data/${XORG_PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
 
 do_stage() {
-	autotools_stage_all
+        autotools_stage_all
 }