import clean BK tree at cset 1.3670

5 files changed, 67 insertions, 0 deletions

diff --git a/packages/skippy/.mtn2git_empty b/packages/skippy/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/skippy/.mtn2git_empty
diff --git a/packages/skippy/files/.mtn2git_empty b/packages/skippy/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/skippy/files/.mtn2git_empty
diff --git a/packages/skippy/files/event_base.patch b/packages/skippy/files/event_base.patch
index e69de29bb2..20632edf15 100644
--- a/packages/skippy/files/event_base.patch
+++ b/packages/skippy/files/event_base.patch
@@ -0,0 +1,11 @@
+--- skippy-xd-0.5.0/mainwin.c.old	2005-04-29 03:54:32 +01:00
++++ skippy-xd-0.5.0/mainwin.c	2005-04-29 03:55:06 +01:00
+@@ -67,7 +67,7 @@
+ 	XRenderPictureAttributes pa;
+ 	XRenderColor clear;
+ 	int error_base;
+-#ifdef XINERAMA
++#if 1
+ 	int event_base;
+ #endif /* XINERAMA */
+ 	
diff --git a/packages/skippy/files/fix-makefile.patch b/packages/skippy/files/fix-makefile.patch
index e69de29bb2..843be52467 100644
--- a/packages/skippy/files/fix-makefile.patch
+++ b/packages/skippy/files/fix-makefile.patch
@@ -0,0 +1,37 @@
+--- skippy-xd-0.5.0/Makefile.old	2005-04-29 03:42:33 +01:00
++++ skippy-xd-0.5.0/Makefile	2005-04-29 03:45:21 +01:00
+@@ -1,17 +1,17 @@
+-PREFIX = /usr/local
+-BINDIR = ${PREFIX}/bin
++#PREFIX = /usr
++#BINDIR = ${PREFIX}/bin
+ 
+-X11PREFIX = /usr/X11R6
++#X11PREFIX = /usr/X11R6
+ 
+-CFLAGS += -I${X11PREFIX}/include `pkg-config xft xrender xcomposite xdamage xfixes --cflags` -g -pedantic -Wall
+-LDFLAGS += -L${X11PREFIX}/lib -lX11 -lm `pkg-config xft xrender xcomposite xdamage xfixes --libs`
++CFLAGS += `${PKG_CONFIG} xft xrender xcomposite xdamage xfixes --cflags` -Wall
++LDFLAGS += -lX11 -lm `${PKG_CONFIG} xft xrender xcomposite xdamage xfixes --libs`
+ 
+ # Disable post-processing effects
+-# CFLAGS += -DNOEFFECTS
++CFLAGS += -DNOEFFECTS
+ 
+ # Comment these out to disable Xinerama support
+-CFLAGS += -DXINERAMA
+-LDFLAGS += -lXext -lXinerama
++#CFLAGS += -DXINERAMA
++#LDFLAGS += -lXext -lXinerama
+ 
+ # Uncomment this for Xinerama debugging
+ #CFLAGS += -DDEBUG
+@@ -24,7 +24,7 @@
+ all: skippy-xd${EXESUFFIX}
+ 
+ skippy-xd${EXESUFFIX}: Makefile ${SOURCES} ${HEADERS}
+-	gcc ${CFLAGS} -o skippy-xd${EXESUFFIX} ${SOURCES} ${LDFLAGS}
++	${CC} ${CFLAGS} -o skippy-xd${EXESUFFIX} ${SOURCES} ${LDFLAGS}
+ 
+ clean:
+ 	rm -f skippy-xd${EXESUFFIX}
diff --git a/packages/skippy/skippy-xd_0.5.0.bb b/packages/skippy/skippy-xd_0.5.0.bb
index e69de29bb2..39d8266ca1 100644
--- a/packages/skippy/skippy-xd_0.5.0.bb
+++ b/packages/skippy/skippy-xd_0.5.0.bb
@@ -0,0 +1,19 @@
+LICENSE = "GPLV2"
+DESCRIPTION = "Skippy is a full-screen task-switcher for X11."
+SECTION = "x11"
+MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
+DEPENDS = "virtual/xserver xdamage xcomposite"
+
+inherit pkgconfig
+
+SRC_URI = "http://thegraveyard.org/files/${PN}-${PV}.tar.bz2 \
+           file://fix-makefile.patch;patch=1 \
+           file://event_base.patch;patch=1"
+
+EXTRA_OEMAKE = "X11PREFIX='${STAGING_DIR}/${TARGET_SYS}' PKG_CONFIG='${STAGING_BINDIR}/pkg-config'"
+CFLAGS_append = " -I${STAGING_DIR}/${TARGET_SYS}/include/X11"
+LDFLAGS_append = " -L${STAGING_DIR}/${TARGET_SYS}/lib/X11"
+
+do_install() {
+	oe_runmake 'BINDIR=${D}${bindir}' install
+}