summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/fbreader/fbreader_0.7.3d.bb24
-rw-r--r--packages/fbreader/files/fbreader-0.7.3d_buildsys_oe.patch158
-rw-r--r--packages/fbreader/files/set-target.patch5
-rw-r--r--packages/ipkg/ipkg.inc9
-rw-r--r--packages/ipkg/ipkg_0.99.154.bb2
-rw-r--r--packages/irda-utils/irdadump_0.9.16.bb22
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.16.bb2
-rw-r--r--packages/mysql/files/.mtn2git_empty (renamed from packages/mysql/mysql-4.1.16/.mtn2git_empty)0
-rw-r--r--packages/mysql/files/autofoo.patch (renamed from packages/mysql/mysql-4.1.16/autofoo.patch)0
-rw-r--r--packages/mysql/files/gen_lex_hash.patch (renamed from packages/mysql/mysql-4.1.16/gen_lex_hash.patch)0
-rw-r--r--packages/mysql/mysql-native_4.1.18.bb (renamed from packages/mysql/mysql-native_4.1.16.bb)0
-rw-r--r--packages/mysql/mysql_4.1.18.bb (renamed from packages/mysql/mysql_4.1.16.bb)0
-rw-r--r--packages/netbase/netbase_4.21.bb4
-rw-r--r--packages/openssh/openssh_4.0p1.bb8
-rw-r--r--packages/slugos-init/files/conffiles5
-rw-r--r--packages/slugos-init/files/turnup12
-rw-r--r--packages/slugos-init/slugos-init_0.10.bb2
-rw-r--r--packages/wpa-supplicant/wpa-gui_0.4.8.bb20
-rw-r--r--packages/x11-apps/app-common.inc4
-rw-r--r--packages/xcb/.mtn2git_empty0
-rw-r--r--packages/xcb/libxcb_0.9.bb72
-rw-r--r--packages/xcb/libxcb_git.bb78
-rw-r--r--packages/xcb/xcb-demo_0.1.bb12
-rw-r--r--packages/xcb/xcb-demo_git.bb16
-rw-r--r--packages/xcb/xcb-proto_0.9.bb14
-rw-r--r--packages/xcb/xcb-proto_git.bb18
-rw-r--r--packages/xcb/xcb-util_0.1.bb42
-rw-r--r--packages/xcb/xcb-util_git.bb46
-rw-r--r--packages/xlibs/libx11_git.bb32
-rw-r--r--packages/xproto/xcb-proto_0.9.bb6
30 files changed, 586 insertions, 27 deletions
diff --git a/packages/fbreader/fbreader_0.7.3d.bb b/packages/fbreader/fbreader_0.7.3d.bb
new file mode 100644
index 0000000000..a75d2b0de6
--- /dev/null
+++ b/packages/fbreader/fbreader_0.7.3d.bb
@@ -0,0 +1,24 @@
+
+DESCRIPTION = "FBreader is an ebook reader"
+LICENSE = "GPL2"
+HOMEPAGE = "http://only.mawhrin.net/fbreader/"
+SECTION = "x11/utils"
+PRIORITY = "optional"
+DEPENDS = "gtk+ enca expat"
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
+
+SRC_URI = "http://only.mawhrin.net/fbreader/fbreader-sources-${PV}.tgz \
+ file://fbreader-0.7.3d_buildsys_oe.patch;patch=1"
+
+FILES_${PN} += "${datadir}/FBReader"
+
+CFLAGS_append = " RESOLUTION=240x320 INSTALLDIR=/usr"
+
+inherit autotools pkgconfig
+
+do_install_append() {
+ install -d ${D}${datadir}/applications
+ install -d ${D}${datadir}/pixmaps
+ install -m 0644 ${WORKDIR}/${PN}-${PV}/fbreader/openzaurus/gpe/fbreader.desktop ${D}${datadir}/applications/fbreader.desktop
+ install -m 0644 ${WORKDIR}/${PN}-${PV}/fbreader/icons/34x28/FBReader.png ${D}${datadir}/pixmaps/fbreader.png
+}
diff --git a/packages/fbreader/files/fbreader-0.7.3d_buildsys_oe.patch b/packages/fbreader/files/fbreader-0.7.3d_buildsys_oe.patch
new file mode 100644
index 0000000000..44efdd8583
--- /dev/null
+++ b/packages/fbreader/files/fbreader-0.7.3d_buildsys_oe.patch
@@ -0,0 +1,158 @@
+diff -urd fbreader-0.7.3d_orig/fbreader/Makefile fbreader-0.7.3d/fbreader/Makefile
+--- fbreader-0.7.3d_orig/fbreader/Makefile 2006-05-03 23:56:31.000000000 +0200
++++ fbreader-0.7.3d/fbreader/Makefile 2006-05-04 12:02:42.000000000 +0200
+@@ -47,7 +47,7 @@
+ @$(LD) $(LDFLAGS) -o $(TARGET) `find common -name *.o` $(TARGET_ARCH)/$(UI_TYPE)/*.o $(LIBS)
+ @echo " OK"
+
+-install: all .really-install
++install: .really-install
+
+ .really-install:
+ @cd $(TARGET_ARCH); make install
+Nur in fbreader-0.7.3d/fbreader: Makefile~.
+diff -urd fbreader-0.7.3d_orig/fbreader/openzaurus/gpe/fbreader.desktop fbreader-0.7.3d/fbreader/openzaurus/gpe/fbreader.desktop
+--- fbreader-0.7.3d_orig/fbreader/openzaurus/gpe/fbreader.desktop 2006-05-03 23:56:31.000000000 +0200
++++ fbreader-0.7.3d/fbreader/openzaurus/gpe/fbreader.desktop 2006-05-05 09:42:06.000000000 +0200
+@@ -2,7 +2,7 @@
+ Name=FBReader
+ Comment=E-Book Reader
+ Exec=FBReader
+-Icon=fbreader/FBReader
++Icon=FBReader
+ Type=Application
+ Terminal=0
+ Categories=Application;Utility
+diff -urd fbreader-0.7.3d_orig/fbreader/openzaurus/Makefile fbreader-0.7.3d/fbreader/openzaurus/Makefile
+--- fbreader-0.7.3d_orig/fbreader/openzaurus/Makefile 2006-05-03 23:56:31.000000000 +0200
++++ fbreader-0.7.3d/fbreader/openzaurus/Makefile 2006-05-05 12:32:28.000000000 +0200
+@@ -1,5 +1,6 @@
+ ROOTDIR = $(PWD)/../..
+ include $(ROOTDIR)/makefiles/platforms.mk
++include $(ROOTDIR)/makefiles/config.mk
+
+ ifeq "$(UI_TYPE)" "opie"
+ BASEDIR = data/opt/QtPalmtop
+@@ -7,7 +8,7 @@
+ APPDIR = $(BASEDIR)/apps/Applications
+ STYLE = $(RESOLUTION)
+ else # UI_TYPE == gpe
+- BASEDIR = data/usr
++ BASEDIR = /usr
+ PICSDIR = $(BASEDIR)/share/pixmaps/fbreader
+ APPDIR = $(BASEDIR)/share/applications
+ STYLE = gpe$(RESOLUTION)
+@@ -34,7 +35,23 @@
+ @make .cleandir
+
+ install:
+-
++ @install -d $(DESTDIR)$(INSTALLDIR)/bin
++ @install -s ../FBReader $(DESTDIR)$(INSTALLDIR)/bin
++ @install -d $(DESTDIR)$(INSTALLDIR)/share/FBReader
++ @install -d $(DESTDIR)$(INSTALLDIR)/share/FBReader/formats/html
++ @install -m 0644 ../share/FBReader/formats/html/html.ent $(DESTDIR)$(INSTALLDIR)/share/FBReader/formats/html
++ @install -d $(DESTDIR)$(INSTALLDIR)/share/pixmaps/fbreader
++ @install -m 0644 ../icons/$(ICONSIZE)/FBReader.png $(DESTDIR)$(INSTALLDIR)/share/pixmaps/
++ @install -m 0644 $(wildcard ../icons/$(ICONSIZE)/FBReader/*) $(DESTDIR)$(INSTALLDIR)/share/pixmaps/fbreader/
++ @install -d $(DESTDIR)$(INSTALLDIR)/share/FBReader/encodings
++ @install -m 0644 $(wildcard ../share/FBReader/encodings/*) $(DESTDIR)$(INSTALLDIR)/share/FBReader/encodings
++ @install -m 0644 $(wildcard ../share/FBReader/*.zip) $(DESTDIR)$(INSTALLDIR)/share/FBReader
++ @install -d $(DESTDIR)$(INSTALLDIR)/share/FBReader/help
++ @install -m 0644 ../data/help/HowToStart.brownish.$(RESOLUTION).fb2 $(DESTDIR)$(INSTALLDIR)/share/FBReader/help/HowToStart.fb2
++ @install -d $(DESTDIR)$(INSTALLDIR)/share/FBReader/default
++ @install -m 0644 ../data/default/keymap.pdaxrom.xml $(DESTDIR)$(INSTALLDIR)/share/FBReader/default/keymap.xml
++ @install -m 0644 ../data/default/styles.$(STYLE).xml $(DESTDIR)$(INSTALLDIR)/share/FBReader/default/styles.xml
++
+ clean: .cleandir
+ @rm -f *.ipk
+
+Nur in fbreader-0.7.3d/fbreader/openzaurus: Makefile~.
+diff -urd fbreader-0.7.3d_orig/makefiles/arch/openzaurus.mk fbreader-0.7.3d/makefiles/arch/openzaurus.mk
+--- fbreader-0.7.3d_orig/makefiles/arch/openzaurus.mk 2006-05-03 23:56:31.000000000 +0200
++++ fbreader-0.7.3d/makefiles/arch/openzaurus.mk 2006-05-05 12:05:29.000000000 +0200
+@@ -1,28 +1,28 @@
+ include $(ROOTDIR)/makefiles/arch/dummy.mk
+
+-BASEDIR = /opt/openzaurus-3.5.4/usr/local/arm/oe
+-TOOLSDIR = $(BASEDIR)/bin
+-INCDIR = $(BASEDIR)/arm-linux/include
+-LIBDIR = $(BASEDIR)/arm-linux/lib
++INSTALLDIR=/usr/
+
+-RM = rm -rvf
+-RM_QUIET = rm -rf
+-QTINCLUDE = -I $(INCDIR)/qt2
+-GTKINCLUDE = -I$(LIBDIR)/glib-2.0/include -I$(LIBDIR)/gtk-2.0/include -I$(INCDIR)/glib-2.0 -I$(INCDIR)/gtk-2.0 -I$(INCDIR)/pango-1.0 -I$(INCDIR)/atk-1.0
+-MOC = $(TOOLSDIR)/moc
+-CC = $(TOOLSDIR)/arm-linux-gcc
+-AR = $(TOOLSDIR)/arm-linux-ar rsu
+-LD = $(TOOLSDIR)/arm-linux-g++
++CC = $(CCLD) $(TARGET_CFLAGS)
++AR = ar rsu
++LD = $(CXX)
+
+-EXPATLIBS = -lexpat
+-ENCALIBS = -lenca
+-BZIP2LIBS = -lbz2
++DEPGEN = $(CC) -MM
++CFLAGS = -pipe $(DUMMY_SECTIONS) -fno-exceptions -fno-rtti -Wall -Wno-ctor-dtor-privacy -W -DINSTALLDIR=\"$(INSTALLDIR)\"
+
+-ifeq "$(UI_TYPE)" "opie"
+- UILIBS = -lqte -lqpe
++#MOC = moc-qt3
++#QTINCLUDE = -I /usr/include/qt3
++
++GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0)
++
++ifeq "$(UI_TYPE)" "qt"
++ UILIBS = -lqt-mt
+ else
+- UILIBS = -lgpewidget -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0
++ UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget
+ endif
+
+-CFLAGS = -pipe -DOPIE_NO_DEBUG -DQT_NO_DEBUG $(DUMMY_SECTIONS) -DINSTALLDIR=\"$(INSTALLDIR)\" -DQWS -fno-exceptions -fno-rtti -march=armv4 -mtune=xscale --param large-function-growth=2000 --param inline-unit-growth=200 -Wall -Wno-ctor-dtor-privacy -W -Winline
+-DEPGEN = $(CC) -MM
++EXPATLIBS = -lexpat
++ENCALIBS = -lenca
++BZIP2LIBS = -lbz2
++
++RM = rm -rvf
++RM_QUIET = rm -rf
+diff -urd fbreader-0.7.3d_orig/makefiles/config.mk fbreader-0.7.3d/makefiles/config.mk
+--- fbreader-0.7.3d_orig/makefiles/config.mk 2006-05-03 23:56:31.000000000 +0200
++++ fbreader-0.7.3d/makefiles/config.mk 2006-05-04 10:13:13.000000000 +0200
+@@ -7,7 +7,7 @@
+ CFLAGS += -DLIBICONV_PLUG
+
+ ifeq "$(TARGET_STATUS)" "release"
+- CFLAGS += -O3
++ CFLAGS += -Os
+ LDFLAGS += -s
+ endif
+ ifeq "$(TARGET_STATUS)" "debug"
+diff -urd fbreader-0.7.3d_orig/makefiles/target.mk fbreader-0.7.3d/makefiles/target.mk
+--- fbreader-0.7.3d_orig/makefiles/target.mk 2006-05-03 23:56:31.000000000 +0200
++++ fbreader-0.7.3d/makefiles/target.mk 2006-05-04 10:25:20.000000000 +0200
+@@ -1,6 +1,7 @@
+-#TARGET_ARCH = openzaurus
++TARGET_ARCH = openzaurus
+ #UI_TYPE = opie
+-#UI_TYPE = gpe
++UI_TYPE = gpe
++RESOLUTION = 240x320
+
+ #TARGET_ARCH = opensimpad-0.9.0
+ #UI_TYPE = opie
+@@ -8,8 +9,8 @@
+ #TARGET_ARCH = qvfb
+ #UI_TYPE = opie
+
+-TARGET_ARCH = maemo
+-UI_TYPE = maemo
++#TARGET_ARCH = maemo
++#UI_TYPE = maemo
+
+ #TARGET_ARCH = desktop
+ #UI_TYPE = gtk
diff --git a/packages/fbreader/files/set-target.patch b/packages/fbreader/files/set-target.patch
index 5a3b87d422..504e44aae0 100644
--- a/packages/fbreader/files/set-target.patch
+++ b/packages/fbreader/files/set-target.patch
@@ -1,3 +1,4 @@
+
--- fbreader-0.7.1b/makefiles/target.mk.orig 2005-12-06 14:29:15.000000000 -0800
+++ fbreader-0.7.1b/makefiles/target.mk 2006-02-15 01:16:33.000000000 -0800
@@ -10,8 +10,8 @@
@@ -6,8 +7,8 @@
-#TARGET_ARCH = desktop
-#UI_TYPE = gtk
-+TARGET_ARCH = desktop
-+UI_TYPE = gtk
++TARGET_ARCH = openzaurus
++UI_TYPE = gpe
#UI_TYPE = qt
#TARGET_ARCH = zaurus
diff --git a/packages/ipkg/ipkg.inc b/packages/ipkg/ipkg.inc
index f535cfbef0..8fc6c9efe0 100644
--- a/packages/ipkg/ipkg.inc
+++ b/packages/ipkg/ipkg.inc
@@ -16,6 +16,11 @@ S = "${WORKDIR}/ipkg/C"
inherit autotools pkgconfig
+# Define a variable to allow distros to run configure earlier.
+# (for example, to enable loading of ethernet kernel modules before networking starts)
+IPKG_INIT_POSITION = "98"
+IPKG_INIT_POSITION_slugos = "41"
+
pkg_postinst_ipkg () {
#!/bin/sh
if [ "x$D" != "x" ]; then
@@ -23,8 +28,8 @@ if [ "x$D" != "x" ]; then
# this happens at S98 where our good 'ole packages script used to run
echo -e "#!/bin/sh
ipkg-cl configure
-" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
- chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure
+ chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure
fi
update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100
diff --git a/packages/ipkg/ipkg_0.99.154.bb b/packages/ipkg/ipkg_0.99.154.bb
index 9285c61819..de6af147b6 100644
--- a/packages/ipkg/ipkg_0.99.154.bb
+++ b/packages/ipkg/ipkg_0.99.154.bb
@@ -1,2 +1,2 @@
include ipkg.inc
-PR = "r2"
+PR = "r3"
diff --git a/packages/irda-utils/irdadump_0.9.16.bb b/packages/irda-utils/irdadump_0.9.16.bb
new file mode 100644
index 0000000000..98d28b60a3
--- /dev/null
+++ b/packages/irda-utils/irdadump_0.9.16.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Utility to dump IrDA traffic."
+SECTION = "base"
+LICENSE = "GPL"
+DEPENDS = "glib-1.2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz"
+
+S="${WORKDIR}/irda-utils-${PV}/irdadump"
+
+EXTRA_CFLAGS += "-I${STAGING_INCDIR}/glib-1.2/"
+EXTRA_LDFLAGS += "-lglib"
+
+inherit autotools
+
+do_compile() {
+ oe_runmake CFLAGS="${CFLAGS} ${EXTRA_CFLAGS}" LDFLAGS="${LDFLAGS} ${EXTRA_LDFLAGS}"
+}
+
+do_install () {
+ install -d ${D}${bindir}
+ install -m 0755 ${S}/shell/.libs/irdadump ${D}${bindir}
+}
diff --git a/packages/linux/ixp4xx-kernel_2.6.16.bb b/packages/linux/ixp4xx-kernel_2.6.16.bb
index d4fe2dfa5c..ca8a64e9ed 100644
--- a/packages/linux/ixp4xx-kernel_2.6.16.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.16.bb
@@ -3,7 +3,7 @@
# Increment PR_CONFIG for changes to the ixp4xx-kernel specific
# defconfig (do *NOT* increment anything in here for changes
# to other kernel configs!)
-PR_CONFIG = "1"
+PR_CONFIG = "2"
#
# Increment the number below (i.e. the digits after PR) when
# making changes within this file or for changes to the patches
diff --git a/packages/mysql/mysql-4.1.16/.mtn2git_empty b/packages/mysql/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/mysql/mysql-4.1.16/.mtn2git_empty
+++ b/packages/mysql/files/.mtn2git_empty
diff --git a/packages/mysql/mysql-4.1.16/autofoo.patch b/packages/mysql/files/autofoo.patch
index f2d5354572..f2d5354572 100644
--- a/packages/mysql/mysql-4.1.16/autofoo.patch
+++ b/packages/mysql/files/autofoo.patch
diff --git a/packages/mysql/mysql-4.1.16/gen_lex_hash.patch b/packages/mysql/files/gen_lex_hash.patch
index c398d048dc..c398d048dc 100644
--- a/packages/mysql/mysql-4.1.16/gen_lex_hash.patch
+++ b/packages/mysql/files/gen_lex_hash.patch
diff --git a/packages/mysql/mysql-native_4.1.16.bb b/packages/mysql/mysql-native_4.1.18.bb
index c871a8f9da..c871a8f9da 100644
--- a/packages/mysql/mysql-native_4.1.16.bb
+++ b/packages/mysql/mysql-native_4.1.18.bb
diff --git a/packages/mysql/mysql_4.1.16.bb b/packages/mysql/mysql_4.1.18.bb
index fe8c42dd88..fe8c42dd88 100644
--- a/packages/mysql/mysql_4.1.16.bb
+++ b/packages/mysql/mysql_4.1.18.bb
diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb
index 89a7d3c7cd..d5526776eb 100644
--- a/packages/netbase/netbase_4.21.bb
+++ b/packages/netbase/netbase_4.21.bb
@@ -2,7 +2,7 @@ SECTION = "base"
DESCRIPTION = "This package provides the necessary \
infrastructure for basic TCP/IP based networking."
LICENSE = "GPL"
-PR = "r9"
+PR = "r10"
inherit update-rc.d
@@ -12,7 +12,7 @@ INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ."
INITSCRIPT_PARAMS_openmn = "start 85 1 2 3 4 5 . stop 85 0 6 1 ."
# On SlugOS (NSLU2) delay the stop until after network apps have exited
# Do not stop in single user - there's no way to sulogin!
-INITSCRIPT_PARAMS_slugos = "start 40 S 0 6 ."
+INITSCRIPT_PARAMS_slugos = "start 42 S 0 6 ."
SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz \
file://options \
diff --git a/packages/openssh/openssh_4.0p1.bb b/packages/openssh/openssh_4.0p1.bb
index ee5df1421d..2c0e035c4b 100644
--- a/packages/openssh/openssh_4.0p1.bb
+++ b/packages/openssh/openssh_4.0p1.bb
@@ -1,8 +1,6 @@
DEPENDS = "zlib openssl"
-RREPLACES_openssh = "dropbear"
RCONFLICTS_openssh = "dropbear"
-RREPLACES_openssh-sshd = "dropbear"
RCONFLICTS_openssh-sshd = "dropbear"
SECTION = "console/network"
@@ -17,7 +15,7 @@ used to provide applications with a secure communication channel."
HOMEPAGE = "http://www.openssh.org/"
LICENSE = "BSD"
MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
-PR = "r8"
+PR = "r10"
SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
file://configure.patch;patch=1 \
@@ -107,5 +105,5 @@ else
fi
}
-CONFFILES_openssh-sshd_nylon = "${sysconfdir}/ssh/sshd_config"
-CONFFILES_openssh-ssh_nylon = "${sysconfdir}/ssh/ssh_config"
+CONFFILES_openssh-sshd = "${sysconfdir}/ssh/sshd_config"
+CONFFILES_openssh-ssh = "${sysconfdir}/ssh/ssh_config"
diff --git a/packages/slugos-init/files/conffiles b/packages/slugos-init/files/conffiles
index 68dd26d897..e1408a3227 100644
--- a/packages/slugos-init/files/conffiles
+++ b/packages/slugos-init/files/conffiles
@@ -31,6 +31,10 @@ diff etc/default/usbd
preserve etc/defaultdomain
preserve etc/dropbear/dropbear_dss_host_key
preserve etc/dropbear/dropbear_rsa_host_key
+preserve etc/ssh/ssh_host_dsa_key
+preserve etc/ssh/ssh_host_dsa_key.pub
+preserve etc/ssh/ssh_host_rsa_key
+preserve etc/ssh/ssh_host_rsa_key.pub
preserve etc/fstab
preserve etc/group
preserve etc/gshadow
@@ -48,3 +52,4 @@ preserve etc/resolv.conf
preserve etc/shadow
preserve etc/syslog.conf
preserve etc/timezone
+preserve root/.ssh/authorized_keys
diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup
index 55750dd5fe..ff1397e4c1 100644
--- a/packages/slugos-init/files/turnup
+++ b/packages/slugos-init/files/turnup
@@ -406,12 +406,12 @@ boot_rootfs() {
return 1
};;
*) { echo '#!/bin/sh'
- echo 'modprobe ehci-hcd'
- echo 'modprobe ohci-hcd'
- echo 'modprobe sd_mod'
- echo 'modprobe usb-storage'
- echo 'modprobe ext3'
- echo 'sleep 5'
+# echo 'modprobe ehci-hcd'
+# echo 'modprobe ohci-hcd'
+# echo 'modprobe sd_mod'
+# echo 'modprobe usb-storage'
+# echo 'modprobe ext3'
+# echo 'sleep 5'
echo 'leds beep'
test "$sleep" -gt 0 && echo -n "sleep='$sleep' "
test -n "$uuid" && echo -n "UUID='$uuid' "
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index 8b80bf4fda..6a46eb49d7 100644
--- a/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
LICENSE = "GPL"
DEPENDS = "base-files devio"
RDEPENDS = "busybox devio"
-PR = "r60"
+PR = "r62"
SRC_URI = "file://boot/flash \
file://boot/disk \
diff --git a/packages/wpa-supplicant/wpa-gui_0.4.8.bb b/packages/wpa-supplicant/wpa-gui_0.4.8.bb
new file mode 100644
index 0000000000..0908a5c995
--- /dev/null
+++ b/packages/wpa-supplicant/wpa-gui_0.4.8.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Qt interface for choosing which configured network to connect \
+to. It also provides a method for browsing 802.11 SSID scan results, an event \
+history log of messages generated by wpa_supplicant, and a method to add or \
+edit wpa_supplicant networks."
+SECTION = "network"
+LICENSE = "GPL BSD"
+HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
+
+SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz "
+
+S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_gui/"
+
+inherit qmake qt3x11
+
+EXTRA_QMAKEVARS_POST += "CONFIG+=thread"
+
+do_install () {
+ install -d ${D}${sbindir}
+ install -m 755 wpa_gui ${D}${sbindir}
+}
diff --git a/packages/x11-apps/app-common.inc b/packages/x11-apps/app-common.inc
index 04daf02b59..9d668cd9b2 100644
--- a/packages/x11-apps/app-common.inc
+++ b/packages/x11-apps/app-common.inc
@@ -2,7 +2,9 @@ DESCRIPTION = "X application"
SECTION = "x11/apps"
LICENSE= "MIT-X"
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2"
+
+S = ${WORKDIR}/${PN}-X11R7.0-${PV}
inherit autotools pkgconfig
diff --git a/packages/xcb/.mtn2git_empty b/packages/xcb/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xcb/.mtn2git_empty
diff --git a/packages/xcb/libxcb_0.9.bb b/packages/xcb/libxcb_0.9.bb
new file mode 100644
index 0000000000..95ea4ab1a1
--- /dev/null
+++ b/packages/xcb/libxcb_0.9.bb
@@ -0,0 +1,72 @@
+DESCRIPTION = "XCB: an X protocol C binding"
+SECTION = "x11/libs"
+LICENSE = "MIT-X"
+HOMEPAGE = "http://xcb.freedesktop.org"
+MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
+PR = "r0"
+
+PARALLEL_MAKE = ""
+DEPENDS = "xcb-proto xproto libxau"
+# DEPENDS += "xsltproc-native gperf-native"
+
+SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-0.9.tar.bz2"
+
+PACKAGES = "libxcb libxcb-dev libxcbcomposite libxcbcomposite-dev \
+ libxcbdamage libxcbdamage-dev libxcbdpms libxcbdpms-dev \
+ libxcbglx libxcbglx-dev libxcbrandr libxcbrandr-dev \
+ libxcbrecord libxcbrecord-dev libxcbrender libxcbrender-dev \
+ libxcbres libxcbres-dev libxcbscreensaver libxcbscreensaver-dev \
+ libxcbshape libxcbshape-dev libxcbshm libxcbshm-dev \
+ libxcbsync libxcbsync-dev libxcbxevie libxcbxevie-dev \
+ libxcbxf86dri libxcbxf86dri-dev libxcbxfixes libxcbxfixes-dev \
+ libxcbxprint libxcbxprint-dev libxcbxtest libxcbxtest-dev \
+ libxcbxv libxcbxv-dev libxcbxvmc libxcbxvmc-dev"
+
+FILES_${PN} = "${libdir}/libXCB.so.*"
+FILES_${PN}-dev = "${libdir}/libXCB.* ${libdir}/pkgconfig/xcb.pc ${includedir}/X11/XCB/xcb.h ${includedir}/X11/XCB/xcb_types.h \
+ ${includedir}/X11/XCB/xc_misc.h ${includedir}/X11/XCB/bigreq.h ${includedir}/X11/XCB/xproto.h \
+ ${includedir}/X11/XCB/xcbxlib.h ${includedir}/X11/XCB/xcbext.h"
+FILES_libxcbcomposite = "${libdir}/libXCBcomposite.so*"
+FILES_libxcbcomposite-dev = "${libdir}/libXCBcomposite.* ${libdir}/pkgconfig/xcb-composite.pc ${includedir}/X11/XCB/composite.h"
+FILES_libxcbdamage = "${libdir}/libXCBdamage.so.*"
+FILES_libxcbdamage-dev = "${libdir}/libXCBdamage.* ${libdir}/pkgconfig/xcb-damage.pc ${includedir}/X11/XCB/damage.h"
+FILES_libxcbdpms = "${libdir}/libXCBdpms.so.*"
+FILES_libxcbdpms-dev = "${libdir}/libXCBdpms.* ${libdir}/pkgconfig/xcb-dpms.pc ${includedir}/X11/XCB/dpms.h"
+FILES_libxcbglx = "${libdir}/libXCBglx.so.*"
+FILES_libxcbglx-dev = "${libdir}/libXCBglx.* ${libdir}/pkgconfig/xcb-glx.pc ${includedir}/X11/XCB/glx.h"
+FILES_libxcbrandr = "${libdir}/libXCBrandr.so.*"
+FILES_libxcbrandr-dev = "${libdir}/libXCBrandr.* ${libdir}/pkgconfig/xcb-randr.pc ${includedir}/X11/XCB/randr.h"
+FILES_libxcbrecord = "${libdir}/libXCBrecord.so.*"
+FILES_libxcbrecord-dev = "${libdir}/libXCBrecord.* ${libdir}/pkgconfig/xcb-record.pc ${includedir}/X11/XCB/record.h"
+FILES_libxcbrender = "${libdir}/libXCBrender.so.*"
+FILES_libxcbrender-dev = "${libdir}/libXCBrender.* ${libdir}/pkgconfig/xcb-render.pc ${includedir}/X11/XCB/render.h"
+FILES_libxcbres = "${libdir}/libXCBres.so.*"
+FILES_libxcbres-dev = "${libdir}/libXCBres.* ${libdir}/pkgconfig/xcb-res.pc ${includedir}/X11/XCB/res.h"
+FILES_libxcbscreensaver = "${libdir}/libXCBscreensaver.so.*"
+FILES_libxcbscreensaver-dev = "${libdir}/libXCBscreensaver.* ${libdir}/pkgconfig/xcb-screensaver.pc ${includedir}/X11/XCB/screensaver.h"
+FILES_libxcbshape = "${libdir}/libXCBshape.so.*"
+FILES_libxcbshape-dev = "${libdir}/libXCBshape.* ${libdir}/pkgconfig/xcb-shape.pc ${includedir}/X11/XCB/shape.h"
+FILES_libxcbshm = "${libdir}/libXCBshm.so.*"
+FILES_libxcbshm-dev = "${libdir}/libXCBshm.* ${libdir}/pkgconfig/xcb-shm.pc ${includedir}/X11/XCB/shm.h"
+FILES_libxcbsync = "${libdir}/libXCBsync.so.*"
+FILES_libxcbsync-dev = "${libdir}/libXCBsync.* ${libdir}/pkgconfig/xcb-sync.pc ${includedir}/X11/XCB/sync.h"
+FILES_libxcbxevie = "${libdir}/libXCBxevie.so.*"
+FILES_libxcbxevie-dev = "${libdir}/libXCBxevie.* ${libdir}/pkgconfig/xcb-xevie.pc ${includedir}/X11/XCB/xevie.h"
+FILES_libxcbxf86dri = "${libdir}/libXCBxf86dri.so.*"
+FILES_libxcbxf86dri-dev = "${libdir}/libXCBxf86dri.* ${libdir}/pkgconfig/xcb-xf86dri.pc ${includedir}/X11/XCB/xf86dri.h"
+FILES_libxcbxfixes = "${libdir}/libXCBxfixes.so.*"
+FILES_libxcbxfixes-dev = "${libdir}/libXCBxfixes.* ${libdir}/pkgconfig/xcb-xfixes.pc ${includedir}/X11/XCB/xfixes.h"
+FILES_libxcbxprint = "${libdir}/libXCBxprint.so.*"
+FILES_libxcbxprint-dev = "${libdir}/libXCBxprint.* ${libdir}/pkgconfig/xcb-xprint.pc ${includedir}/X11/XCB/xprint.h"
+FILES_libxcbxtest = "${libdir}/libXCBxtest.so.*"
+FILES_libxcbxtest-dev = "${libdir}/libXCBxtest.* ${libdir}/pkgconfig/xcb-xtest.pc ${includedir}/X11/XCB/xtest.h"
+FILES_libxcbxv = "${libdir}/libXCBxv.so.*"
+FILES_libxcbxv-dev = "${libdir}/libXCBxv.* ${libdir}/pkgconfig/xcb-xv.pc ${includedir}/X11/XCB/xv.h"
+FILES_libxcbxvmc = "${libdir}/libXCBxvmc.so.*"
+FILES_libxcbxvmc-dev = "${libdir}/libXCBxvmc.* ${libdir}/pkgconfig/xcb-xvmc.pc ${includedir}/X11/XCB/xvmc.h"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xcb/libxcb_git.bb b/packages/xcb/libxcb_git.bb
new file mode 100644
index 0000000000..1ca23bc946
--- /dev/null
+++ b/packages/xcb/libxcb_git.bb
@@ -0,0 +1,78 @@
+DEFAULT_PREFERENCE = "-1"
+
+DESCRIPTION = "XCB: an X protocol C binding"
+SECTION = "x11/libs"
+LICENSE = "MIT-X"
+HOMEPAGE = "http://xcb.freedesktop.org"
+MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
+PV = "0.9+git"
+PR = "r0"
+
+PARALLEL_MAKE = ""
+
+
+DEPENDS = "xcb-proto xproto libxau"
+# DEPENDS += "xsltproc-native gperf-native"
+
+SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git"
+S = "${WORKDIR}/git/xcb"
+
+PACKAGES = "libxcb libxcb-dev libxcbcomposite libxcbcomposite-dev \
+ libxcbdamage libxcbdamage-dev libxcbdpms libxcbdpms-dev \
+ libxcbglx libxcbglx-dev libxcbrandr libxcbrandr-dev \
+ libxcbrecord libxcbrecord-dev libxcbrender libxcbrender-dev \
+ libxcbres libxcbres-dev libxcbscreensaver libxcbscreensaver-dev \
+ libxcbshape libxcbshape-dev libxcbshm libxcbshm-dev \
+ libxcbsync libxcbsync-dev libxcbxevie libxcbxevie-dev \
+ libxcbxf86dri libxcbxf86dri-dev libxcbxfixes libxcbxfixes-dev \
+ libxcbxprint libxcbxprint-dev libxcbxtest libxcbxtest-dev \
+ libxcbxv libxcbxv-dev libxcbxvmc libxcbxvmc-dev"
+
+FILES_${PN} = "${libdir}/libXCB.so.*"
+FILES_${PN}-dev = "${libdir}/libXCB.* ${libdir}/pkgconfig/xcb.pc ${includedir}/X11/XCB/xcb.h ${includedir}/X11/XCB/xcb_types.h \
+ ${includedir}/X11/XCB/xc_misc.h ${includedir}/X11/XCB/bigreq.h ${includedir}/X11/XCB/xproto.h \
+ ${includedir}/X11/XCB/xcbxlib.h ${includedir}/X11/XCB/xcbext.h"
+FILES_libxcbcomposite = "${libdir}/libXCBcomposite.so*"
+FILES_libxcbcomposite-dev = "${libdir}/libXCBcomposite.* ${libdir}/pkgconfig/xcb-composite.pc ${includedir}/X11/XCB/composite.h"
+FILES_libxcbdamage = "${libdir}/libXCBdamage.so.*"
+FILES_libxcbdamage-dev = "${libdir}/libXCBdamage.* ${libdir}/pkgconfig/xcb-damage.pc ${includedir}/X11/XCB/damage.h"
+FILES_libxcbdpms = "${libdir}/libXCBdpms.so.*"
+FILES_libxcbdpms-dev = "${libdir}/libXCBdpms.* ${libdir}/pkgconfig/xcb-dpms.pc ${includedir}/X11/XCB/dpms.h"
+FILES_libxcbglx = "${libdir}/libXCBglx.so.*"
+FILES_libxcbglx-dev = "${libdir}/libXCBglx.* ${libdir}/pkgconfig/xcb-glx.pc ${includedir}/X11/XCB/glx.h"
+FILES_libxcbrandr = "${libdir}/libXCBrandr.so.*"
+FILES_libxcbrandr-dev = "${libdir}/libXCBrandr.* ${libdir}/pkgconfig/xcb-randr.pc ${includedir}/X11/XCB/randr.h"
+FILES_libxcbrecord = "${libdir}/libXCBrecord.so.*"
+FILES_libxcbrecord-dev = "${libdir}/libXCBrecord.* ${libdir}/pkgconfig/xcb-record.pc ${includedir}/X11/XCB/record.h"
+FILES_libxcbrender = "${libdir}/libXCBrender.so.*"
+FILES_libxcbrender-dev = "${libdir}/libXCBrender.* ${libdir}/pkgconfig/xcb-render.pc ${includedir}/X11/XCB/render.h"
+FILES_libxcbres = "${libdir}/libXCBres.so.*"
+FILES_libxcbres-dev = "${libdir}/libXCBres.* ${libdir}/pkgconfig/xcb-res.pc ${includedir}/X11/XCB/res.h"
+FILES_libxcbscreensaver = "${libdir}/libXCBscreensaver.so.*"
+FILES_libxcbscreensaver-dev = "${libdir}/libXCBscreensaver.* ${libdir}/pkgconfig/xcb-screensaver.pc ${includedir}/X11/XCB/screensaver.h"
+FILES_libxcbshape = "${libdir}/libXCBshape.so.*"
+FILES_libxcbshape-dev = "${libdir}/libXCBshape.* ${libdir}/pkgconfig/xcb-shape.pc ${includedir}/X11/XCB/shape.h"
+FILES_libxcbshm = "${libdir}/libXCBshm.so.*"
+FILES_libxcbshm-dev = "${libdir}/libXCBshm.* ${libdir}/pkgconfig/xcb-shm.pc ${includedir}/X11/XCB/shm.h"
+FILES_libxcbsync = "${libdir}/libXCBsync.so.*"
+FILES_libxcbsync-dev = "${libdir}/libXCBsync.* ${libdir}/pkgconfig/xcb-sync.pc ${includedir}/X11/XCB/sync.h"
+FILES_libxcbxevie = "${libdir}/libXCBxevie.so.*"
+FILES_libxcbxevie-dev = "${libdir}/libXCBxevie.* ${libdir}/pkgconfig/xcb-xevie.pc ${includedir}/X11/XCB/xevie.h"
+FILES_libxcbxf86dri = "${libdir}/libXCBxf86dri.so.*"
+FILES_libxcbxf86dri-dev = "${libdir}/libXCBxf86dri.* ${libdir}/pkgconfig/xcb-xf86dri.pc ${includedir}/X11/XCB/xf86dri.h"
+FILES_libxcbxfixes = "${libdir}/libXCBxfixes.so.*"
+FILES_libxcbxfixes-dev = "${libdir}/libXCBxfixes.* ${libdir}/pkgconfig/xcb-xfixes.pc ${includedir}/X11/XCB/xfixes.h"
+FILES_libxcbxprint = "${libdir}/libXCBxprint.so.*"
+FILES_libxcbxprint-dev = "${libdir}/libXCBxprint.* ${libdir}/pkgconfig/xcb-xprint.pc ${includedir}/X11/XCB/xprint.h"
+FILES_libxcbxtest = "${libdir}/libXCBxtest.so.*"
+FILES_libxcbxtest-dev = "${libdir}/libXCBxtest.* ${libdir}/pkgconfig/xcb-xtest.pc ${includedir}/X11/XCB/xtest.h"
+FILES_libxcbxv = "${libdir}/libXCBxv.so.*"
+FILES_libxcbxv-dev = "${libdir}/libXCBxv.* ${libdir}/pkgconfig/xcb-xv.pc ${includedir}/X11/XCB/xv.h"
+FILES_libxcbxvmc = "${libdir}/libXCBxvmc.so.*"
+FILES_libxcbxvmc-dev = "${libdir}/libXCBxvmc.* ${libdir}/pkgconfig/xcb-xvmc.pc ${includedir}/X11/XCB/xvmc.h"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xcb/xcb-demo_0.1.bb b/packages/xcb/xcb-demo_0.1.bb
new file mode 100644
index 0000000000..9f7ab023c6
--- /dev/null
+++ b/packages/xcb/xcb-demo_0.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "XCB: an X protocol C binding"
+SECTION = "x11"
+LICENSE = "MIT-X"
+HOMEPAGE = "http://xcb.freedesktop.org"
+MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
+PR = "r0"
+
+DEPENDS = "libxcb xcb-util"
+
+SRC_URI = "http://xcb.freedesktop.org/dist/xcb-demo-0.1.tar.bz2"
+
+inherit autotools pkgconfig
diff --git a/packages/xcb/xcb-demo_git.bb b/packages/xcb/xcb-demo_git.bb
new file mode 100644
index 0000000000..6a98d240a3
--- /dev/null
+++ b/packages/xcb/xcb-demo_git.bb
@@ -0,0 +1,16 @@
+DEFAULT_PREFERENCE = "-1"
+
+DESCRIPTION = "XCB: an X protocol C binding"
+SECTION = "x11"
+LICENSE = "MIT-X"
+HOMEPAGE = "http://xcb.freedesktop.org"
+MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
+PV = "0.1+git"
+PR = "r0"
+
+DEPENDS = "libxcb xcb-util"
+
+SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git"
+S = "${WORKDIR}/git/xcb-demo"
+
+inherit autotools pkgconfig
diff --git a/packages/xcb/xcb-proto_0.9.bb b/packages/xcb/xcb-proto_0.9.bb
new file mode 100644
index 0000000000..481f2c5a25
--- /dev/null
+++ b/packages/xcb/xcb-proto_0.9.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "XCB: an X protocol C binding"
+SECTION = "x11/libs"
+LICENSE = "MIT-X"
+HOMEPAGE = "http://xcb.freedesktop.org"
+MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
+PR = "r0"
+
+SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-0.9.tar.bz2"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xcb/xcb-proto_git.bb b/packages/xcb/xcb-proto_git.bb
new file mode 100644
index 0000000000..55b941a321
--- /dev/null
+++ b/packages/xcb/xcb-proto_git.bb
@@ -0,0 +1,18 @@
+DEFAULT_PREFERENCE = "-1"
+
+DESCRIPTION = "XCB: an X protocol C binding"
+SECTION = "x11/libs"
+LICENSE = "MIT-X"
+HOMEPAGE = "http://xcb.freedesktop.org"
+MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
+PV = "0.9+git"
+PR = "r0"
+
+SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git"
+S = "${WORKDIR}/git/xcb-proto"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xcb/xcb-util_0.1.bb b/packages/xcb/xcb-util_0.1.bb
new file mode 100644
index 0000000000..949d3db116
--- /dev/null
+++ b/packages/xcb/xcb-util_0.1.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "XCB: an X protocol C binding"
+SECTION = "x11/libs"
+LICENSE = "MIT-X"
+HOMEPAGE = "http://xcb.freedesktop.org"
+MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
+PR = "r0"
+
+DEPENDS = "libxcb"
+# DEPENDS += "gperf-native"
+
+PARALLEL_MAKE = ""
+
+SRC_URI = "http://xcb.freedesktop.org/dist/xcb-util-0.1.tar.bz2"
+
+PACKAGES = "libxcbatom libxcbatom-dev libxcbaux libxcbaux-dev libxcbevent libxcbevent-dev libxcbicccm libxcbicccm-dev \
+ libxcbimage libxcbimage-dev libxcbkeysyms libxcbkeysyms-dev libxcbproperty libxcbproperty-dev \
+ libxcbreply libxcbreply-dev libxcbwm libxcbwm-dev"
+
+FILES_libxcbatom = "${libdir}/libXCBAtom.so.*"
+FILES_libxcbatom-dev = "${libdir}/libXCBAtom.* ${libdir}/pkgconfig/xcb-atom.pc ${includedir}/X11/XCB/xcb_atom.h"
+FILES_libxcbaux = "${libdir}/libXCBAux.so.*"
+FILES_libxcbaux-dev = "${libdir}/libXCBAux.* ${libdir}/pkgconfig/xcb-aux.pc ${includedir}/X11/XCB/xcb_aux.h"
+FILES_libxcbevent = "${libdir}/libXCBEvent.so.*"
+FILES_libxcbevent-dev = "${libdir}/libXCBEvent.* ${libdir}/pkgconfig/xcb-event.pc ${includedir}/X11/XCB/xcb_event.h"
+FILES_libxcbicccm = "${libdir}/libXCBICCCM.so.*"
+FILES_libxcbicccm-dev = "${libdir}/libICCCM.* ${libdir}/pkgconfig/xcb-icccm.pc ${includedir}/X11/XCB/xcb_icccm.h"
+FILES_libxcbimage = "${libdir}/libXCBImage.so.*"
+FILES_libxcbimage-dev = "${libdir}/libXCBImage.* ${libdir}/pkgconfig/xcb-image.pc ${includedir}/X11/XCB/xcb_image.h"
+FILES_libxcbkeysyms = "${libdir}/libXCBKeysyms.so.*"
+FILES_libxcbkeysyms-dev = "${libdir}/libXCBKeysyms.* ${libdir}/pkgconfig/xcb-keysyms.pc ${includedir}/X11/XCB/xcb_keysyms.h"
+FILES_libxcbproperty = "${libdir}/libXCBProperty.so.*"
+FILES_libxcbproperty-dev = "${libdir}/libXCBProperty.* ${libdir}/pkgconfig/xcb-property.pc ${includedir}/X11/XCB/xcb_property.h"
+FILES_libxcbreply = "${libdir}/libXCBReply.so.*"
+FILES_libxcbreply-dev = "${libdir}/libXCBReply.* ${libdir}/pkgconfig/xcb-reply.pc ${includedir}/X11/XCB/xcb_reply.h"
+FILES_libxcbwm = "${libdir}/libXCBWM.so.*"
+FILES_libxcbwm-dev = "${libdir}/libXCBWM.* ${libdir}/pkgconfig/xcb-wm.pc ${includedir}/X11/XCB/xcb_wm.h"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
diff --git a/packages/xcb/xcb-util_git.bb b/packages/xcb/xcb-util_git.bb
new file mode 100644
index 0000000000..5e8c7d6536
--- /dev/null
+++ b/packages/xcb/xcb-util_git.bb
@@ -0,0 +1,46 @@
+DEFAULT_PREFERENCE = "-1"
+
+DESCRIPTION = "XCB: an X protocol C binding"
+SECTION = "x11/libs"
+LICENSE = "MIT-X"
+HOMEPAGE = "http://xcb.freedesktop.org"
+MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
+PV = "0.1+git"
+PR = "r0"
+
+DEPENDS = "libxcb"
+# DEPENDS += "gperf-native"
+
+PARALLEL_MAKE = ""
+
+SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git"
+S = "${WORKDIR}/git/xcb-util"
+
+PACKAGES = "libxcbatom libxcbatom-dev libxcbaux libxcbaux-dev libxcbevent libxcbevent-dev libxcbicccm libxcbicccm-dev \
+ libxcbimage libxcbimage-dev libxcbkeysyms libxcbkeysyms-dev libxcbproperty libxcbproperty-dev \
+ libxcbreply libxcbreply-dev libxcbwm libxcbwm-dev"
+
+FILES_libxcbatom = "${libdir}/libXCBAtom.so.*"
+FILES_libxcbatom-dev = "${libdir}/libXCBAtom.* ${libdir}/pkgconfig/xcb-atom.pc ${includedir}/X11/XCB/xcb_atom.h"
+FILES_libxcbaux = "${libdir}/libXCBAux.so.*"
+FILES_libxcbaux-dev = "${libdir}/libXCBAux.* ${libdir}/pkgconfig/xcb-aux.pc ${includedir}/X11/XCB/xcb_aux.h"
+FILES_libxcbevent = "${libdir}/libXCBEvent.so.*"
+FILES_libxcbevent-dev = "${libdir}/libXCBEvent.* ${libdir}/pkgconfig/xcb-event.pc ${includedir}/X11/XCB/xcb_event.h"
+FILES_libxcbicccm = "${libdir}/libXCBICCCM.so.*"
+FILES_libxcbicccm-dev = "${libdir}/libICCCM.* ${libdir}/pkgconfig/xcb-icccm.pc ${includedir}/X11/XCB/xcb_icccm.h"
+FILES_libxcbimage = "${libdir}/libXCBImage.so.*"
+FILES_libxcbimage-dev = "${libdir}/libXCBImage.* ${libdir}/pkgconfig/xcb-image.pc ${includedir}/X11/XCB/xcb_image.h"
+FILES_libxcbkeysyms = "${libdir}/libXCBKeysyms.so.*"
+FILES_libxcbkeysyms-dev = "${libdir}/libXCBKeysyms.* ${libdir}/pkgconfig/xcb-keysyms.pc ${includedir}/X11/XCB/xcb_keysyms.h"
+FILES_libxcbproperty = "${libdir}/libXCBProperty.so.*"
+FILES_libxcbproperty-dev = "${libdir}/libXCBProperty.* ${libdir}/pkgconfig/xcb-property.pc ${includedir}/X11/XCB/xcb_property.h"
+FILES_libxcbreply = "${libdir}/libXCBReply.so.*"
+FILES_libxcbreply-dev = "${libdir}/libXCBReply.* ${libdir}/pkgconfig/xcb-reply.pc ${includedir}/X11/XCB/xcb_reply.h"
+FILES_libxcbwm = "${libdir}/libXCBWM.so.*"
+FILES_libxcbwm-dev = "${libdir}/libXCBWM.* ${libdir}/pkgconfig/xcb-wm.pc ${includedir}/X11/XCB/xcb_wm.h"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libx11_git.bb b/packages/xlibs/libx11_git.bb
new file mode 100644
index 0000000000..ed6623f03a
--- /dev/null
+++ b/packages/xlibs/libx11_git.bb
@@ -0,0 +1,32 @@
+DEFAULT_PREFERENCE = "-1"
+
+DESCRIPTION = "Xlib/XCB: Xlib with XCB transport"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "XFree86"
+
+DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
+PROVIDES = "x11"
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
+FILES_${PN}-locale += "${datadir}/X11/locale"
+
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_compile() {
+ (
+ unset CC LD CXX CCLD
+ oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
+ )
+ rm -f ${STAGING_INCDIR}/X11/Xlib.h
+ oe_runmake
+}
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xproto/xcb-proto_0.9.bb b/packages/xproto/xcb-proto_0.9.bb
deleted file mode 100644
index ba5e3ed953..0000000000
--- a/packages/xproto/xcb-proto_0.9.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-include proto-common.inc
-
-SRC_URI = "http://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-
-