From bccc702aacd2f82030baae66b3d80358820574f7 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 27 Jan 2007 14:24:46 +0000
Subject: gtk+-2.6.10: patch GtkStatusBar .c|.h to work w/ glib >= 2.9.x

---
 .../gtk+-2.6.10/compile-against-newer-glib.patch   | 59 ++++++++++++++++++++++
 packages/gtk+/gtk+_2.6.10.bb                       |  5 +-
 2 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch

(limited to 'packages')

diff --git a/packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch b/packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch
new file mode 100644
index 0000000000..c92070c7aa
--- /dev/null
+++ b/packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch
@@ -0,0 +1,59 @@
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/gtkstatusbar.h,v
+retrieving revision 1.17
+retrieving revision 1.17.2.1
+diff -u -r1.17 -r1.17.2.1
+--- gtkstatusbar.h	2005/03/20 07:01:22	1.17
++++ gtkstatusbar.h	2005/12/06 14:25:30	1.17.2.1
+@@ -65,7 +65,7 @@
+ {
+   GtkHBoxClass parent_class;
+ 
+-  GMemChunk *messages_mem_chunk;
++  gpointer messages_mem_chunk;
+ 
+   void	(*text_pushed)	(GtkStatusbar	*statusbar,
+ 			 guint		 context_id,
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/gtkstatusbar.c,v
+retrieving revision 1.56
+retrieving revision 1.56.2.1
+diff -u -r1.56 -r1.56.2.1
+--- gtkstatusbar.c	2005/07/21 19:10:48	1.56
++++ gtkstatusbar.c	2005/12/06 14:25:30	1.56.2.1
+@@ -302,7 +302,7 @@
+   g_return_val_if_fail (text != NULL, 0);
+ 
+   class = GTK_STATUSBAR_GET_CLASS (statusbar);
+-  msg = g_chunk_new (GtkStatusbarMsg, class->messages_mem_chunk);
++  msg = g_chunk_new (GtkStatusbarMsg, (GMemChunk *)class->messages_mem_chunk);
+   msg->text = g_strdup (text);
+   msg->context_id = context_id;
+   msg->message_id = statusbar->seq_message_id++;
+@@ -343,7 +343,7 @@
+ 	      statusbar->messages = g_slist_remove_link (statusbar->messages,
+ 							 list);
+ 	      g_free (msg->text);
+-	      g_mem_chunk_free (class->messages_mem_chunk, msg);
++	      g_mem_chunk_free ((GMemChunk *)class->messages_mem_chunk, msg);
+ 	      g_slist_free_1 (list);
+ 	      break;
+ 	    }
+@@ -394,7 +394,7 @@
+ 	      class = GTK_STATUSBAR_GET_CLASS (statusbar);
+ 	      statusbar->messages = g_slist_remove_link (statusbar->messages, list);
+ 	      g_free (msg->text);
+-	      g_mem_chunk_free (class->messages_mem_chunk, msg);
++	      g_mem_chunk_free ((GMemChunk *)class->messages_mem_chunk, msg);
+ 	      g_slist_free_1 (list);
+ 	      
+ 	      break;
+@@ -459,7 +459,7 @@
+ 
+       msg = list->data;
+       g_free (msg->text);
+-      g_mem_chunk_free (class->messages_mem_chunk, msg);
++      g_mem_chunk_free ((GMemChunk *)class->messages_mem_chunk, msg);
+     }
+   g_slist_free (statusbar->messages);
+   statusbar->messages = NULL;
diff --git a/packages/gtk+/gtk+_2.6.10.bb b/packages/gtk+/gtk+_2.6.10.bb
index 8230515f3b..9af2dba568 100644
--- a/packages/gtk+/gtk+_2.6.10.bb
+++ b/packages/gtk+/gtk+_2.6.10.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
            file://help.patch;patch=1 \
@@ -23,7 +23,8 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
 	   file://small-gtkfilesel.patch;patch=1 \
 	   file://migration.patch;patch=1;pnum=0 \
 	   file://single-click.patch;patch=1 \
-	   file://menu-styling.patch;patch=1"
+	   file://menu-styling.patch;patch=1 \
+	   file://compile-against-newer-glib.patch;patch=1"
 
 inherit autotools pkgconfig
 
-- 
cgit v1.2.3


From ccdf1a772e36476ac991c1e9b48e6083e0d12759 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 27 Jan 2007 14:38:06 +0000
Subject: gtk+ 2.6.10 compile-against-newer-glib.patch rediff and make it -p1

---
 .../gtk+/gtk+-2.6.10/compile-against-newer-glib.patch  | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'packages')

diff --git a/packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch b/packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch
index c92070c7aa..3d8f3f614b 100644
--- a/packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch
+++ b/packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch
@@ -1,10 +1,5 @@
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtkstatusbar.h,v
-retrieving revision 1.17
-retrieving revision 1.17.2.1
-diff -u -r1.17 -r1.17.2.1
---- gtkstatusbar.h	2005/03/20 07:01:22	1.17
-+++ gtkstatusbar.h	2005/12/06 14:25:30	1.17.2.1
+--- gtk+-2.6.10/gtk/gtkstatusbar.h	2005/03/20 07:01:22	1.17
++++ gtk+-2.6.10/gtk/gtkstatusbar.h	2005/12/06 14:25:30	1.17.2.1
 @@ -65,7 +65,7 @@
  {
    GtkHBoxClass parent_class;
@@ -14,13 +9,8 @@ diff -u -r1.17 -r1.17.2.1
  
    void	(*text_pushed)	(GtkStatusbar	*statusbar,
  			 guint		 context_id,
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtkstatusbar.c,v
-retrieving revision 1.56
-retrieving revision 1.56.2.1
-diff -u -r1.56 -r1.56.2.1
---- gtkstatusbar.c	2005/07/21 19:10:48	1.56
-+++ gtkstatusbar.c	2005/12/06 14:25:30	1.56.2.1
+--- gtk+-2.6.10/gtk/gtkstatusbar.c	2005/07/21 19:10:48	1.56
++++ gtk+-2.6.10/gtk/gtkstatusbar.c	2005/12/06 14:25:30	1.56.2.1
 @@ -302,7 +302,7 @@
    g_return_val_if_fail (text != NULL, 0);
  
-- 
cgit v1.2.3


From 8a979a6304232624b772cc4b34e3cb24f25deed9 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 27 Jan 2007 19:09:15 +0000
Subject: libnl: add 0.5.0 (stable)

---
 packages/libnl/files/fix-helpers.patch        | 49 +++++++++++++++++++++++++++
 packages/libnl/files/libnl-0.5.0-include.diff | 10 ++++++
 packages/libnl/libnl_0.5.0.bb                 | 11 ++++++
 3 files changed, 70 insertions(+)
 create mode 100644 packages/libnl/files/fix-helpers.patch
 create mode 100644 packages/libnl/files/libnl-0.5.0-include.diff
 create mode 100644 packages/libnl/libnl_0.5.0.bb

(limited to 'packages')

diff --git a/packages/libnl/files/fix-helpers.patch b/packages/libnl/files/fix-helpers.patch
new file mode 100644
index 0000000000..b6a6ff8509
--- /dev/null
+++ b/packages/libnl/files/fix-helpers.patch
@@ -0,0 +1,49 @@
+Index: libnl-0.5.0/lib/helpers.c
+===================================================================
+--- libnl-0.5.0.orig/lib/helpers.c
++++ libnl-0.5.0/lib/helpers.c
+@@ -29,6 +29,7 @@
+ #include <netlink/netlink.h>
+ #include <netlink/helpers.h>
+ #include <linux/socket.h>
++#include <linux/if_ether.h>
+ 
+ int nl_debug = 0;
+ 
+Index: libnl-0.5.0/lib/route/filter.c
+===================================================================
+--- libnl-0.5.0.orig/lib/route/filter.c
++++ libnl-0.5.0/lib/route/filter.c
+@@ -40,6 +40,7 @@
+ #include <netlink/route/filter.h>
+ #include <netlink/route/link.h>
+ #include <netlink/route/rtattr.h>
++#include <linux/if_ether.h>
+ 
+ static struct rtnl_filter_ops *filter_ops;
+ 
+Index: libnl-0.5.0/lib/Makefile
+===================================================================
+--- libnl-0.5.0.orig/lib/Makefile
++++ libnl-0.5.0/lib/Makefile
+@@ -68,7 +68,7 @@ distclean:
+ 
+ install:
+ 	mkdir -p $(DESTDIR)$(prefix)/lib/
+-	install -o root -g root -m 0644 $(OUT_SLIB) $(DESTDIR)$(prefix)/lib
++	install -m 0644 $(OUT_SLIB) $(DESTDIR)$(prefix)/lib
+ 	rm -f $(DESTDIR)$(prefix)/lib/$(LN1_SLIB) ; \
+ 	$(LN) -s $(DESTDIR)$(prefix)/lib/$(OUT_SLIB) $(DESTDIR)$(prefix)/lib/$(LN1_SLIB)
+ 	rm -f $(DESTDIR)$(prefix)/lib/$(LN_SLIB) ; \
+Index: libnl-0.5.0/include/Makefile
+===================================================================
+--- libnl-0.5.0.orig/include/Makefile
++++ libnl-0.5.0/include/Makefile
+@@ -37,5 +37,5 @@ distclean:
+ 
+ install:
+ 	mkdir -p $(DESTDIR)$(prefix)/include/netlink/route/
+-	install -o root -g root -m 0644 netlink/*.h $(DESTDIR)$(prefix)/include/netlink/
+-	install -o root -g root -m 0644 netlink/route/*.h $(DESTDIR)$(prefix)/include/netlink/route/
++	install -m 0644 netlink/*.h $(DESTDIR)$(prefix)/include/netlink/
++	install -m 0644 netlink/route/*.h $(DESTDIR)$(prefix)/include/netlink/route/
diff --git a/packages/libnl/files/libnl-0.5.0-include.diff b/packages/libnl/files/libnl-0.5.0-include.diff
new file mode 100644
index 0000000000..f858953c8a
--- /dev/null
+++ b/packages/libnl/files/libnl-0.5.0-include.diff
@@ -0,0 +1,10 @@
+--- libnl-0.5.0.orig/include/netlink/route/tc.h	2005-09-08 19:13:15.000000000 -0300
++++ libnl-0.5.0/include/netlink/route/tc.h	2005-09-08 19:32:33.000000000 -0300
+@@ -24,6 +24,7 @@
+ #include <netlink/netlink.h>
+ #include <netlink/cache.h>
+ #include <netlink/data.h>
++#include <linux/pkt_sched.h>
+ 
+ #define TCA_HAS_HANDLE    0x001
+ #define TCA_HAS_PARENT    0x002
diff --git a/packages/libnl/libnl_0.5.0.bb b/packages/libnl/libnl_0.5.0.bb
new file mode 100644
index 0000000000..5d1e8d3fc0
--- /dev/null
+++ b/packages/libnl/libnl_0.5.0.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Netlink library"
+HOMEPAGE = "http://people.suug.ch/~tgr/libnl/"
+SECTION = "libraries/network"
+LICENSE = "GPLv2.1"
+PR = "r0"
+
+SRC_URI = "http://people.suug.ch/~tgr/libnl/files/libnl-0.5.0.tar.gz \
+           file://libnl-0.5.0-include.diff;patch=1 \
+           file://fix-helpers.patch;patch=1"
+
+inherit autotools
-- 
cgit v1.2.3


From 9a22ce8f81955d2c238d29ec43567506b27463e0 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 27 Jan 2007 19:11:41 +0000
Subject: bmon: add 2.1.0 (depends on libnl-0.5.0)

---
 packages/bmon/.mtn2git_empty       |  0
 packages/bmon/bmon_2.1.0.bb        | 16 ++++++++++++++++
 packages/bmon/files/.mtn2git_empty |  0
 packages/bmon/files/no-strip.patch | 13 +++++++++++++
 4 files changed, 29 insertions(+)
 create mode 100644 packages/bmon/.mtn2git_empty
 create mode 100644 packages/bmon/bmon_2.1.0.bb
 create mode 100644 packages/bmon/files/.mtn2git_empty
 create mode 100644 packages/bmon/files/no-strip.patch

(limited to 'packages')

diff --git a/packages/bmon/.mtn2git_empty b/packages/bmon/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/bmon/bmon_2.1.0.bb b/packages/bmon/bmon_2.1.0.bb
new file mode 100644
index 0000000000..32e956fb26
--- /dev/null
+++ b/packages/bmon/bmon_2.1.0.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Portable Bandwidth Monitor and rate estimator"
+HOMEPAGE = "http://people.suug.ch/~tgr/bmon/"
+SECTION = "console/utilities"
+LICENSE = "MIT"
+# only works with libnl-0.5.0
+DEPENDS = "libnl"
+PR = "r0"
+
+SRC_URI = "http://people.suug.ch/~tgr/bmon/files/bmon-2.1.0.tar.gz \
+           file://no-strip.patch;patch=1"
+
+inherit autotools
+
+do_compile() {
+    oe_runmake
+}
diff --git a/packages/bmon/files/.mtn2git_empty b/packages/bmon/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/bmon/files/no-strip.patch b/packages/bmon/files/no-strip.patch
new file mode 100644
index 0000000000..f09e816857
--- /dev/null
+++ b/packages/bmon/files/no-strip.patch
@@ -0,0 +1,13 @@
+Index: bmon-2.1.0/GNUmakefile
+===================================================================
+--- bmon-2.1.0.orig/GNUmakefile
++++ bmon-2.1.0/GNUmakefile
+@@ -50,7 +50,7 @@ distclean: clean
+ install:
+ 	./install-sh -d -m 0755 $(DESTDIR)$(prefix)/bin
+ 	./install-sh -d -m 0755 $(DESTDIR)$(mandir)/man1
+-	./install-sh -c -s -m 0755 src/bmon $(DESTDIR)$(prefix)/bin
++	./install-sh -c -m 0755 src/bmon $(DESTDIR)$(prefix)/bin
+ 	./install-sh -c    -m 0644 man/bmon.1 $(DESTDIR)$(mandir)/man1
+ 
+ show: Makefile.opts
-- 
cgit v1.2.3


From 86b3950bfb88bfadce14bfb09d81cfaeafed86cb Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 27 Jan 2007 20:08:05 +0000
Subject: aalib: stage lib and headers

---
 packages/aalib/aalib_1.4rc5.bb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'packages')

diff --git a/packages/aalib/aalib_1.4rc5.bb b/packages/aalib/aalib_1.4rc5.bb
index c2afe0856c..ed6ee78186 100644
--- a/packages/aalib/aalib_1.4rc5.bb
+++ b/packages/aalib/aalib_1.4rc5.bb
@@ -2,6 +2,7 @@ DEPENDS = "ncurses"
 DESCRIPTION = "An ASCII art gfx library."
 SECTION = "libs"
 LICENSE="LGPL"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/aa-project/aalib-${PV}.tar.gz \
 	   file://configure.patch;patch=1"
@@ -12,3 +13,9 @@ inherit autotools
 EXTRA_OECONF = '--without-x11-driver --without-slang-driver \
 		--with-curses-driver --without-gpm \
 		--without-x --with-ncurses=${STAGING_LIBDIR}/..'
+
+do_stage() {
+    oe_libinstall -a -so -C src libaa ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/
+	install -m 0644 src/*.h ${STAGING_INCDIR}/
+}
-- 
cgit v1.2.3


From 8db7cebf83b4a121f2596aa37b066740eb5abe02 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Sat, 27 Jan 2007 20:58:07 +0000
Subject: packages/gnome/gnome-vfs_2.16.3.bb : spell RREPLACES right

---
 packages/gnome/gnome-vfs_2.16.3.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/gnome/gnome-vfs_2.16.3.bb b/packages/gnome/gnome-vfs_2.16.3.bb
index 6efbe7249d..0c6176428e 100644
--- a/packages/gnome/gnome-vfs_2.16.3.bb
+++ b/packages/gnome/gnome-vfs_2.16.3.bb
@@ -2,13 +2,13 @@ LICENSE = "GPL"
 DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib"
 RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info"
 
-PR = "r1"
+PR = "r2"
 
 inherit gnome
 
 # This is to provide compatibility with the gnome-vfs DBus fork
 PROVIDES = "gnome-vfs-plugin-dbus"
-RRPEPLACES = "gnome-vfs-dbus"
+RREPLACES = "gnome-vfs-dbus"
 
 SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \
 	    file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0"
-- 
cgit v1.2.3


From 68e1462d95f8bdac57ce74e4583d92af8f754b40 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 27 Jan 2007 21:01:31 +0000
Subject: ixp4xx-related files: Replaced IXP4XX_MACHINE_ENDIAN with
 SITEINFO_ENDIANESS throughout OE, removing all instances of ixp4xx-specific
 ENDIAN checks in the OE metadata.

---
 packages/images/slugos-image.bb          |  6 ++--
 packages/ixp425-eth/ixp400-eth_1.4.bb    |  2 +-
 packages/ixp425-eth/ixp400-eth_1.5.1.bb  |  2 +-
 packages/ixp425-eth/ixp400-eth_1.5.bb    |  2 +-
 packages/ixp4xx/ixp-osal_2.0.bb          |  2 +-
 packages/ixp4xx/ixp-osal_2.1.1.bb        |  2 +-
 packages/ixp4xx/ixp-osal_2.1.bb          |  2 +-
 packages/ixp4xx/ixp4xx-csr_2.0.bb        |  2 +-
 packages/ixp4xx/ixp4xx-csr_2.1.1.bb      |  2 +-
 packages/ixp4xx/ixp4xx-csr_2.1.bb        |  2 +-
 packages/linux/ixp4xx-kernel.inc         | 62 ++++++++++++++++----------------
 packages/obsolete/nslu2/nslu2-kernel.inc |  4 +--
 12 files changed, 45 insertions(+), 45 deletions(-)

(limited to 'packages')

diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb
index a0be935613..64b7d8b8e0 100644
--- a/packages/images/slugos-image.bb
+++ b/packages/images/slugos-image.bb
@@ -123,7 +123,7 @@ slugos_pack_image() {
 			${STAGING_LIBDIR}/nslu2-binaries/SysConf \
 			${DEPLOY_DIR_IMAGE}/slug/
 	install -m 0644 ${STAGING_LOADER_DIR}/apex.bin ${DEPLOY_DIR_IMAGE}/slug/
-	install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${IXP4XX_MACHINE_ENDIAN} \
+	install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${SITEINFO_ENDIANESS} \
 		${DEPLOY_DIR_IMAGE}/slug/vmlinuz
 	install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 		${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2
@@ -137,7 +137,7 @@ slugos_pack_image() {
 
 	# Create an image for the DSM-G600 as well
 	install -d ${DEPLOY_DIR_IMAGE}/firmupgrade
-	install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-dsmg600${IXP4XX_MACHINE_ENDIAN} \
+	install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-dsmg600${SITEINFO_ENDIANESS} \
 		${DEPLOY_DIR_IMAGE}/firmupgrade/ip-ramdisk
 	install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 		${DEPLOY_DIR_IMAGE}/firmupgrade/rootfs.gz
@@ -154,7 +154,7 @@ slugos_pack_image() {
 
 	# Create an image for the NAS 100d as well
 	install -d ${DEPLOY_DIR_IMAGE}/firmupgrade
-	install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-nas100d${IXP4XX_MACHINE_ENDIAN} \
+	install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-nas100d${SITEINFO_ENDIANESS} \
 		${DEPLOY_DIR_IMAGE}/firmupgrade/ip-ramdisk
 	install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 		${DEPLOY_DIR_IMAGE}/firmupgrade/rootfs.gz
diff --git a/packages/ixp425-eth/ixp400-eth_1.4.bb b/packages/ixp425-eth/ixp400-eth_1.4.bb
index ad20f51b6b..6b1ff0c8d2 100644
--- a/packages/ixp425-eth/ixp400-eth_1.4.bb
+++ b/packages/ixp425-eth/ixp400-eth_1.4.bb
@@ -28,7 +28,7 @@ inherit module
 # This is a somewhat arbitrary choice:
 OSAL_DIR = "${STAGING_KERNEL_DIR}/ixp_osal"
 
-IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}"
+IX_TARGET = "linux${SITEINFO_ENDIANESS}"
 
 EXTRA_OEMAKE = "'CC=${KERNEL_CC}' \
 		'LD=${KERNEL_LD}' \
diff --git a/packages/ixp425-eth/ixp400-eth_1.5.1.bb b/packages/ixp425-eth/ixp400-eth_1.5.1.bb
index 66e765940e..2fa04fc672 100644
--- a/packages/ixp425-eth/ixp400-eth_1.5.1.bb
+++ b/packages/ixp425-eth/ixp400-eth_1.5.1.bb
@@ -39,7 +39,7 @@ inherit module
 # This is a somewhat arbitrary choice:
 OSAL_DIR = "${STAGING_KERNEL_DIR}/ixp_osal"
 
-IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}"
+IX_TARGET = "linux${SITEINFO_ENDIANESS}"
 IX_ENSURE = ""
 #IX_ENSURE = "-DIX_OSAL_ENSURE_ON=1"
 # The following controls the name of the ethernet devices which get
diff --git a/packages/ixp425-eth/ixp400-eth_1.5.bb b/packages/ixp425-eth/ixp400-eth_1.5.bb
index a708bd96f4..5e25deb1d4 100644
--- a/packages/ixp425-eth/ixp400-eth_1.5.bb
+++ b/packages/ixp425-eth/ixp400-eth_1.5.bb
@@ -38,7 +38,7 @@ inherit module
 # This is a somewhat arbitrary choice:
 OSAL_DIR = "${STAGING_KERNEL_DIR}/ixp_osal"
 
-IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}"
+IX_TARGET = "linux${SITEINFO_ENDIANESS}"
 IX_ENSURE = ""
 #IX_ENSURE = "-DIX_OSAL_ENSURE_ON=1"
 # The following controls the name of the ethernet devices which get
diff --git a/packages/ixp4xx/ixp-osal_2.0.bb b/packages/ixp4xx/ixp-osal_2.0.bb
index 03fb7fbdb3..009d45d67a 100644
--- a/packages/ixp4xx/ixp-osal_2.0.bb
+++ b/packages/ixp4xx/ixp-osal_2.0.bb
@@ -33,7 +33,7 @@ COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
 
 inherit module
 
-IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}"
+IX_TARGET = "linux${SITEINFO_ENDIANESS}"
 
 EXTRA_OEMAKE = "'CC=${KERNEL_CC}' \
 		'LD=${KERNEL_LD}' \
diff --git a/packages/ixp4xx/ixp-osal_2.1.1.bb b/packages/ixp4xx/ixp-osal_2.1.1.bb
index 8a43d49117..481033fd0a 100644
--- a/packages/ixp4xx/ixp-osal_2.1.1.bb
+++ b/packages/ixp4xx/ixp-osal_2.1.1.bb
@@ -49,7 +49,7 @@ do_pre_patch () {
 
 addtask pre_patch before do_patch
 
-IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}"
+IX_TARGET = "linux${SITEINFO_ENDIANESS}"
 IX_ENSURE = ""
 #IX_ENSURE = "IX_OSAL_ENSURE_ON=1"
 
diff --git a/packages/ixp4xx/ixp-osal_2.1.bb b/packages/ixp4xx/ixp-osal_2.1.bb
index 8b1bce6720..dd70289598 100644
--- a/packages/ixp4xx/ixp-osal_2.1.bb
+++ b/packages/ixp4xx/ixp-osal_2.1.bb
@@ -37,7 +37,7 @@ COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
 
 inherit module
 
-IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}"
+IX_TARGET = "linux${SITEINFO_ENDIANESS}"
 IX_ENSURE = ""
 #IX_ENSURE = "IX_OSAL_ENSURE_ON=1"
 
diff --git a/packages/ixp4xx/ixp4xx-csr_2.0.bb b/packages/ixp4xx/ixp4xx-csr_2.0.bb
index fefb98858f..a160fe4609 100644
--- a/packages/ixp4xx/ixp4xx-csr_2.0.bb
+++ b/packages/ixp4xx/ixp4xx-csr_2.0.bb
@@ -38,7 +38,7 @@ COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
 
 inherit module
 
-IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}"
+IX_TARGET = "linux${SITEINFO_ENDIANESS}"
 
 OSAL_PATH = "lib/ixp425/linux/${IX_TARGET}"
 # This is a somewhat arbitrary choice:
diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.1.bb
index 6d4c9d8c02..cc063b523e 100644
--- a/packages/ixp4xx/ixp4xx-csr_2.1.1.bb
+++ b/packages/ixp4xx/ixp4xx-csr_2.1.1.bb
@@ -53,7 +53,7 @@ do_pre_patch () {
 
 addtask pre_patch before do_patch
 
-IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}"
+IX_TARGET = "linux${SITEINFO_ENDIANESS}"
 IX_ENSURE = ""
 #IX_ENSURE = "IX_OSAL_ENSURE_ON=1"
 
diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.bb
index 9be5072f29..e72de05071 100644
--- a/packages/ixp4xx/ixp4xx-csr_2.1.bb
+++ b/packages/ixp4xx/ixp4xx-csr_2.1.bb
@@ -46,7 +46,7 @@ COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
 
 inherit module
 
-IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}"
+IX_TARGET = "linux${SITEINFO_ENDIANESS}"
 IX_ENSURE = ""
 #IX_ENSURE = "IX_OSAL_ENSURE_ON=1"
 
diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc
index 28b8d3b559..1a064a17e5 100644
--- a/packages/linux/ixp4xx-kernel.inc
+++ b/packages/linux/ixp4xx-kernel.inc
@@ -186,7 +186,7 @@ EXTRA_OEMAKE += "MAKEFLAGS='--no-print-directory'"
 do_configure_prepend() {
 	rm -f ${S}/.config
 	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >>'${S}/.config'
-	if test '${IXP4XX_MACHINE_ENDIAN}' = be
+	if test '${SITEINFO_ENDIANESS}' = be
 	then
 		echo 'CONFIG_CPU_BIG_ENDIAN=y' >>'${S}/.config'
 	fi
@@ -246,70 +246,70 @@ FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}-${MACHINE_ARCH}-${KERNEL_VERSION
 nslu2_MACHID = "597"
 PACKAGES += "kernel-image-nslu2"
 PKG_kernel-image-nslu2 = "kernel-image-${KERNEL_VERSION}"
-PACKAGE_ARCH_kernel-image-nslu2 = "nslu2${IXP4XX_MACHINE_ENDIAN}"
+PACKAGE_ARCH_kernel-image-nslu2 = "nslu2${SITEINFO_ENDIANESS}"
 DESCRIPTION_kernel-image-nslu2 = "Linux kernel for the LinkSys NSLU2"
-FILES_kernel-image-nslu2 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION}"
+FILES_kernel-image-nslu2 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${SITEINFO_ENDIANESS}-${KERNEL_VERSION}"
 pkg_postinst_kernel-image-nslu2 () {
-	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
+	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
 }
 pkg_postrm_kernel-image-nslu2 () {
-	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} || true
+	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true
 }
 
 # The correct settings for Loft:
 loft_MACHID = "849"
 PACKAGES += "kernel-image-loft"
 PKG_kernel-image-loft = "kernel-image-${KERNEL_VERSION}"
-PACKAGE_ARCH_kernel-image-loft = "loft${IXP4XX_MACHINE_ENDIAN}"
+PACKAGE_ARCH_kernel-image-loft = "loft${SITEINFO_ENDIANESS}"
 DESCRIPTION_kernel-image-loft = "Linux kernel for the Giant Shoulder Inc. Loft board"
-FILES_kernel-image-loft = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION}"
+FILES_kernel-image-loft = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${SITEINFO_ENDIANESS}-${KERNEL_VERSION}"
 pkg_postinst_kernel-image-loft () {
-	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
+	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
 }
 pkg_postrm_kernel-image-loft () {
-	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} || true
+	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true
 }
 
 # The correct settings for the NAS100D board:
 nas100d_MACHID = "865"
 PACKAGES += "kernel-image-nas100d"
 PKG_kernel-image-nas100d = "kernel-image-${KERNEL_VERSION}"
-PACKAGE_ARCH_kernel-image-nas100d = "nas100d${IXP4XX_MACHINE_ENDIAN}"
+PACKAGE_ARCH_kernel-image-nas100d = "nas100d${SITEINFO_ENDIANESS}"
 DESCRIPTION_kernel-image-nas100d = "Linux kernel for the IOMega NAS100D"
-FILES_kernel-image-nas100d = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION}"
+FILES_kernel-image-nas100d = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${SITEINFO_ENDIANESS}-${KERNEL_VERSION}"
 pkg_postinst_kernel-image-nas100d () {
-	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
+	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
 }
 pkg_postrm_kernel-image-nas100d () {
-	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} || true
+	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true
 }
 
 # The correct settings for the DSMG600 board:
 dsmg600_MACHID = "964"
 PACKAGES += "kernel-image-dsmg600"
 PKG_kernel-image-dsmg600 = "kernel-image-${KERNEL_VERSION}"
-PACKAGE_ARCH_kernel-image-dsmg600 = "dsmg600${IXP4XX_MACHINE_ENDIAN}"
+PACKAGE_ARCH_kernel-image-dsmg600 = "dsmg600${SITEINFO_ENDIANESS}"
 DESCRIPTION_kernel-image-dsmg600 = "Linux kernel for the D-Link DSM-G600"
-FILES_kernel-image-dsmg600 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION}"
+FILES_kernel-image-dsmg600 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${SITEINFO_ENDIANESS}-${KERNEL_VERSION}"
 pkg_postinst_kernel-image-dsmg600 () {
-	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
+	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
 }
 pkg_postrm_kernel-image-dsmg600 () {
-	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} || true
+	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true
 }
 
 # The correct settings for the FSG-3 board:
 fsg3_MACHID = "1091"
 PACKAGES += "kernel-image-fsg3"
 PKG_kernel-image-fsg3 = "kernel-image-${KERNEL_VERSION}"
-PACKAGE_ARCH_kernel-image-fsg3 = "fsg3${IXP4XX_MACHINE_ENDIAN}"
+PACKAGE_ARCH_kernel-image-fsg3 = "fsg3${SITEINFO_ENDIANESS}"
 DESCRIPTION_kernel-image-fsg3 = "Linux kernel for the Freecom FSG-3"
-FILES_kernel-image-fsg3 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION}"
+FILES_kernel-image-fsg3 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${SITEINFO_ENDIANESS}-${KERNEL_VERSION}"
 pkg_postinst_kernel-image-fsg3 () {
-	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
+	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
 }
 pkg_postrm_kernel-image-fsg3 () {
-	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} || true
+	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true
 }
 
 #FIXUP: the correct instructions to copy the kernel prepended with the le fixup
@@ -356,11 +356,11 @@ do_install_append() {
 	install_image '${MACHINE_ARCH}'
 
 	# Add the machine specific images, with appropriate suffixes
-	install_image 'nslu2${IXP4XX_MACHINE_ENDIAN}' '${nslu2_MACHID}'
-	install_image 'loft${IXP4XX_MACHINE_ENDIAN}' '${loft_MACHID}'
-	install_image 'nas100d${IXP4XX_MACHINE_ENDIAN}' '${nas100d_MACHID}'
-	install_image 'dsmg600${IXP4XX_MACHINE_ENDIAN}' '${dsmg600_MACHID}'
-	install_image 'fsg3${IXP4XX_MACHINE_ENDIAN}' '${fsg3_MACHID}'
+	install_image 'nslu2${SITEINFO_ENDIANESS}' '${nslu2_MACHID}'
+	install_image 'loft${SITEINFO_ENDIANESS}' '${loft_MACHID}'
+	install_image 'nas100d${SITEINFO_ENDIANESS}' '${nas100d_MACHID}'
+	install_image 'dsmg600${SITEINFO_ENDIANESS}' '${dsmg600_MACHID}'
+	install_image 'fsg3${SITEINFO_ENDIANESS}' '${fsg3_MACHID}'
 }
 
 do_deploy[dirs] = "${S}"
@@ -374,11 +374,11 @@ do_deploy() {
 	deploy_image '${MACHINE_ARCH}'
 
 	# And the machine specific images
-	deploy_image 'nslu2${IXP4XX_MACHINE_ENDIAN}' '${nslu2_MACHID}'
-	deploy_image 'loft${IXP4XX_MACHINE_ENDIAN}' '${loft_MACHID}'
-	deploy_image 'nas100d${IXP4XX_MACHINE_ENDIAN}' '${nas100d_MACHID}'
-	deploy_image 'dsmg600${IXP4XX_MACHINE_ENDIAN}' '${dsmg600_MACHID}'
-	deploy_image 'fsg3${IXP4XX_MACHINE_ENDIAN}' '${fsg3_MACHID}'
+	deploy_image 'nslu2${SITEINFO_ENDIANESS}' '${nslu2_MACHID}'
+	deploy_image 'loft${SITEINFO_ENDIANESS}' '${loft_MACHID}'
+	deploy_image 'nas100d${SITEINFO_ENDIANESS}' '${nas100d_MACHID}'
+	deploy_image 'dsmg600${SITEINFO_ENDIANESS}' '${dsmg600_MACHID}'
+	deploy_image 'fsg3${SITEINFO_ENDIANESS}' '${fsg3_MACHID}'
 }
 
 addtask deploy before do_build after do_compile
diff --git a/packages/obsolete/nslu2/nslu2-kernel.inc b/packages/obsolete/nslu2/nslu2-kernel.inc
index a622c50f08..6b866100ca 100644
--- a/packages/obsolete/nslu2/nslu2-kernel.inc
+++ b/packages/obsolete/nslu2/nslu2-kernel.inc
@@ -150,7 +150,7 @@ N2K_PATCHES ?= ""
 # Image suffix - actually set in conf/machine/nslu2.conf as it is also
 # used by anything which needs to know the name of the generated image.
 # Should be overridden in the distro if patches or defconfig are changed.
-N2K_SUFFIX ?= "nslu2${IXP4XX_MACHINE_ENDIAN}"
+N2K_SUFFIX ?= "nslu2${SITEINFO_ENDIANESS}"
 
 SRC_URI  = "${N2K_SRCURI}"
 SRC_URI += "${N2K_PATCHES}"
@@ -186,7 +186,7 @@ addtask unpacklocal before do_patch after do_unpack
 do_configure_prepend() {
 	rm -f ${S}/.config
 	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >>'${S}/.config'
-	if test '${IXP4XX_MACHINE_ENDIAN}' = be
+	if test '${SITEINFO_ENDIANESS}' = be
 	then
 		echo 'CONFIG_CPU_BIG_ENDIAN=y' >>'${S}/.config'
 	fi
-- 
cgit v1.2.3


From 38d79683af2a1cc808b8574cada33c1e333f43d6 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 27 Jan 2007 21:34:01 +0000
Subject: bb: add bb 1.2, currently does not cross-compile

---
 packages/bb/.mtn2git_empty          |   0
 packages/bb/bb_1.2.bb               |  15 ++++
 packages/bb/files/.mtn2git_empty    |   0
 packages/bb/files/fix-compile.patch | 166 ++++++++++++++++++++++++++++++++++++
 4 files changed, 181 insertions(+)
 create mode 100644 packages/bb/.mtn2git_empty
 create mode 100644 packages/bb/bb_1.2.bb
 create mode 100644 packages/bb/files/.mtn2git_empty
 create mode 100644 packages/bb/files/fix-compile.patch

(limited to 'packages')

diff --git a/packages/bb/.mtn2git_empty b/packages/bb/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/bb/bb_1.2.bb b/packages/bb/bb_1.2.bb
new file mode 100644
index 0000000000..9904acae24
--- /dev/null
+++ b/packages/bb/bb_1.2.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "bb, The portable aalib demo"
+HOMEPAGE = "http://aa-project.sourceforge.net/bb/"
+SECTION = "console/misc"
+DEPENDS = "aalib"
+PR = "r1"
+
+SRC_URI = "http://prdownloads.sourceforge.net/aa-project/bb-1.2.tar.gz \
+           file://fix-compile.patch;patch=1"
+
+inherit autotools
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 755 bb ${D}${bindir}
+}
diff --git a/packages/bb/files/.mtn2git_empty b/packages/bb/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/bb/files/fix-compile.patch b/packages/bb/files/fix-compile.patch
new file mode 100644
index 0000000000..75641da1e5
--- /dev/null
+++ b/packages/bb/files/fix-compile.patch
@@ -0,0 +1,166 @@
+Index: bb-1.2/bb.h
+===================================================================
+--- bb-1.2.orig/bb.h
++++ bb-1.2/bb.h
+@@ -23,7 +23,11 @@
+ 
+ #ifndef BB_H
+ #define BB_H
++//#include <aaint.h>
+ #include <aalib.h>
++struct parameters {
++    unsigned int p[AA_NPARAMS];
++};
+ #include "image.h"
+ #include "timers.h"
+ struct font {
+Index: bb-1.2/textform.c
+===================================================================
+--- bb-1.2.orig/textform.c
++++ bb-1.2/textform.c
+@@ -155,41 +155,41 @@ static char *text = "#cWell we've reache
+ "#c\n"
+ "#bThree goals of AA-Project:#n"
+ "\n\n"
+-"#f1)Port all important software (like Doom, Second Reality, X windows etc..) on new AA-lib.
+-
+-2)Port AA-lib on all available platforms (mainly ZX-Spectrum and Sharp).
+-
+-3)Force IBM to start manufacturing MDA cards again.
+-
+-AA-project was started by Jan Hubicka. In that times just few people knew about \
+-it. Then a new demo named BB has been relased to show the power \
+-of AA-lib technology. Now the project is freely available and anyone can help.
+-
+-Just join our mailing list: #baa#n at#b horac.ta.jcu.cz.#n by sending #bsubscribe aa#n to majordomo.
+-
+-All programs covered under AA-project can be obtained at
+-#c#bftp://ftp.ta.jcu.cz://pub/aa#n
+-#c
+-Or just browse our homepage at #bhttp://www.ta.jcu.cz://aa#n. Ton of \
+-examples of ascii-art generated by aalib, pointers to other AA-Project \
+-resources etc. 
+-        
+-   We decided to distribute all of our aa-related programs freely (see \
+-COPYING for details). But if you want to help us develop more such software \
+-send a small amount (or big one ;-) to AA/BB maintainer address: 
+-
+-Kamil Toman
+-CS Armady 1930, Tabor
+-390 03
+-Czech republic
+-
+-and contact us at:
+-
+-kupsaf@feld.cvut.cz (Filip Kupsa)
+-hubicka@paru.cas.cz (Jan Hubicka)
+-titania@horac.ta.jcu.cz (Mojmir Svoboda)
+-toman@horac.ta.jcu.cz (Kamil Toman)
+-#f"
++"#f1)Port all important software (like Doom, Second Reality, X windows etc..) on new AA-lib.\n"
++"\n"
++"2)Port AA-lib on all available platforms (mainly ZX-Spectrum and Sharp).\n"
++"\n"
++"3)Force IBM to start manufacturing MDA cards again.\n"
++"\n"
++"AA-project was started by Jan Hubicka. In that times just few people knew about "
++"it. Then a new demo named BB has been relased to show the power "
++"of AA-lib technology. Now the project is freely available and anyone can help.\n"
++"\n"
++"Just join our mailing list: #baa#n at#b horac.ta.jcu.cz.#n by sending #bsubscribe aa#n to majordomo.\n"
++"\n"
++"All programs covered under AA-project can be obtained at\n"
++"#c#bftp://ftp.ta.jcu.cz://pub/aa#n\n"
++"#c\n"
++"Or just browse our homepage at #bhttp://www.ta.jcu.cz://aa#n. Ton of "
++"examples of ascii-art generated by aalib, pointers to other AA-Project "
++"resources etc. \n"
++"        \n"
++"   We decided to distribute all of our aa-related programs freely (see "
++"COPYING for details). But if you want to help us develop more such software "
++"send a small amount (or big one ;-) to AA/BB maintainer address: \n"
++"\n"
++"Kamil Toman\n"
++"CS Armady 1930, Tabor\n"
++"390 03\n"
++"Czech republic\n"
++"\n"
++"and contact us at:\n"
++"\n"
++"kupsaf@feld.cvut.cz (Filip Kupsa)\n"
++"hubicka@paru.cas.cz (Jan Hubicka)\n"
++"titania@horac.ta.jcu.cz (Mojmir Svoboda)\n"
++"toman@horac.ta.jcu.cz (Kamil Toman)\n"
++"#f"
+ "\n"
+ "#l\n"
+ "#c#bAvailable programs#n\n"
+@@ -245,37 +245,37 @@ toman@horac.ta.jcu.cz (Kamil Toman)
+ "\n#l"
+ "\n"
+ "#c#bThe AA-Lib#n\n"
+-"#f#c
+-AA-lib is a low level gfx library just as many other libraries are. The \
+-main difference is that AA-lib does not require graphics device. In fact, \
+-there is no graphical output possible. AA-lib replaces those old-fashioned \
+-output methods with powerful ascii-art renderer. Now my linux boots \
+-with a nice penguin logo at secondary display (yes! Like Win95 does:) \
+-AA-lib API is designed to be similar to other graphics libraries. Learning \
+-a new API would be a piece of cake! \
+-#f
+-
+-#l
+-#c#bThe history#n
+-#f
+-Once upon a time we've (my friend Kamil and I) bought two old Herculeses \
+-as secondary monitors. We didn't know for that time that our Diamond \
+-Stealths 64 cards would become obsolete soon. Next day we downloaded \
+-the logo of Linux Texas Users Group \
+-- nice silly penguin looking like a cowboy! It was so exciting logo ... we \
+-decided that we couldn't live without it and we wanted to see it every time \
+-at a boot time as a logo on our secondary monitors. There was a small problem \
+-- Hercules doesn't support color graphics. So we decided to convert an image \
+-to ascii art using netpbm tools.
+-
+-The output was very ugly because the converting algorithm was absolutly stupid. \
+-During the night I designed a new convertor that used a font bitmap for \
+-creating aproximation table. The output wasn't very good since the algorithm \
+-wasn't so well tuned. Many months this small piece of code was waiting on my \
+-disc for the day \"D\". Meanwhile I started a new project XaoS (a fractal zoomer) \
+-with my friend Thomas. And then I got an idea: Ascii Art Mandelbrots! \
+-I was really impressed by the result! XaoS was faster, portable and looking \
+-much better than ever before. I found a new way to go... "
++"#f#c"
++"AA-lib is a low level gfx library just as many other libraries are. The "
++"main difference is that AA-lib does not require graphics device. In fact, "
++"there is no graphical output possible. AA-lib replaces those old-fashioned "
++"output methods with powerful ascii-art renderer. Now my linux boots "
++"with a nice penguin logo at secondary display (yes! Like Win95 does:) "
++"AA-lib API is designed to be similar to other graphics libraries. Learning "
++"a new API would be a piece of cake! "
++"#f"
++"\n"
++"#l"
++"#c#bThe history#n"
++"#f"
++"Once upon a time we've (my friend Kamil and I) bought two old Herculeses "
++"as secondary monitors. We didn't know for that time that our Diamond "
++"Stealths 64 cards would become obsolete soon. Next day we downloaded "
++"the logo of Linux Texas Users Group "
++"- nice silly penguin looking like a cowboy! It was so exciting logo ... we "
++"decided that we couldn't live without it and we wanted to see it every time "
++"at a boot time as a logo on our secondary monitors. There was a small problem "
++"- Hercules doesn't support color graphics. So we decided to convert an image "
++"to ascii art using netpbm tools."
++"\n"
++"The output was very ugly because the converting algorithm was absolutly stupid. "
++"During the night I designed a new convertor that used a font bitmap for "
++"creating aproximation table. The output wasn't very good since the algorithm "
++"wasn't so well tuned. Many months this small piece of code was waiting on my "
++"disc for the day \"D\". Meanwhile I started a new project XaoS (a fractal zoomer) "
++"with my friend Thomas. And then I got an idea: Ascii Art Mandelbrots! "
++"I was really impressed by the result! XaoS was faster, portable and looking "
++"much better than ever before. I found a new way to go... "
+ "#c\n"
+ "#f\n"
+ "\n"
-- 
cgit v1.2.3


From 94bd7ff377096c9bbfd0bb5954005e2c7294e6c0 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 27 Jan 2007 21:39:14 +0000
Subject: xaos: add 3.2.2, compiles but cannot find drivers when run

---
 packages/xaos/.mtn2git_empty                  |  0
 packages/xaos/files/.mtn2git_empty            |  0
 packages/xaos/files/fix-aalib-configure.patch | 81 +++++++++++++++++++++++++++
 packages/xaos/files/fix-build.patch           | 61 ++++++++++++++++++++
 packages/xaos/xaos_3.2.3.bb                   | 29 ++++++++++
 5 files changed, 171 insertions(+)
 create mode 100644 packages/xaos/.mtn2git_empty
 create mode 100644 packages/xaos/files/.mtn2git_empty
 create mode 100644 packages/xaos/files/fix-aalib-configure.patch
 create mode 100644 packages/xaos/files/fix-build.patch
 create mode 100644 packages/xaos/xaos_3.2.3.bb

(limited to 'packages')

diff --git a/packages/xaos/.mtn2git_empty b/packages/xaos/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/xaos/files/.mtn2git_empty b/packages/xaos/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/xaos/files/fix-aalib-configure.patch b/packages/xaos/files/fix-aalib-configure.patch
new file mode 100644
index 0000000000..120d85b6fe
--- /dev/null
+++ b/packages/xaos/files/fix-aalib-configure.patch
@@ -0,0 +1,81 @@
+Index: XaoS-3.2.3/configure.in
+===================================================================
+--- XaoS-3.2.3.orig/configure.in
++++ XaoS-3.2.3/configure.in
+@@ -130,25 +130,7 @@ if test -z "`${CC-cc} -mno-ieee-fp -c co
+ 	rm -f conftest*
+ ])])
+ 
+-AC_DEFUN(AC_PROG_AALIB_VER_OK,
+-[AC_CACHE_CHECK(whether aalib version >= 1.4, ac_aalib_ver_ok,
+-[echo '#include <aalib.h>
+-#include <aalib.h>
+-void f(){ 
+-#if AA_LIB_VERSIONCODE < 104000
+-#error aa_lib is probably buggy 
+-/* I am using SuSE 7.3 and 8.0. Both contains version 1.3,
+- * however they report 102000 version code.
+- */ 
+-#endif 
+-}' > conftest.c
+-if test -z "`${CC-cc} -c conftest.c 2>&1`"; then
+-    ac_aalib_ver_ok=yes
+-    else
+-        ac_aalib_ver_ok=no
+-    fi
+-	rm -f conftest*
+-])])
++ac_aalib_ver_ok=yes
+ 
+ AC_DEFUN(PROG_CC_SWITCH1,
+ [AC_CACHE_CHECK(whether ${CC-cc} accepts -$1, ac_$2,
+@@ -478,7 +460,6 @@ AC_DEFUN(AC_AALIB, [
+             AC_CHECK_LIB(aa, aa_init)
+             if test "x$ac_cv_lib_aa_aa_init" = xyes; then
+               AC_MSG_RESULT(Found aalib on $1/aalib.h)
+-              AC_PROG_AALIB_VER_OK
+  	      if test $ac_aalib_ver_ok = yes; then
+                #LIBS="$LIBS $2"
+ 	       x11_linked=yes
+@@ -616,22 +597,22 @@ if test "$aa_driver_test" = yes; then
+     dnl Replace `main' with a function in -lm:
+     AC_CHECK_LIB(slang, SLsmg_init_smg)
+ 
+-    AC_NCURSES(/usr/include, ncurses.h, , -I/usr/include/ncurses , "ncurses on /usr/include")
+-    AC_NCURSES(/usr/include/ncurses, ncurses.h, , -I/usr/include/ncurses, "ncurses on /usr/include/ncurses")
+-    AC_NCURSES(/usr/local/include, ncurses.h, ,-L/usr/local/lib, -I/usr/local/include, "ncurses on /usr/local")
+-    AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses")
++    AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, ncurses.h, , -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses , "ncurses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include")
++    AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, ncurses.h, , -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, "ncurses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses")
++    AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, ncurses.h, ,-L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib, -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, "ncurses on /usr/local")
++    AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, ncurses.h, -L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib -L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib/ncurses, -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, "ncurses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses")
+ 
+-    AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses")
++    AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, curses.h, -L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib, -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses")
+ 
+-    AC_NCURSES(/usr/include/ncurses, curses.h, , -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
+-    AC_CURSES(/usr/include, curses.h, , , "curses on /usr/include")
++    AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, curses.h, , -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses")
++    AC_CURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, curses.h, , , "curses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include")
+ 
+     dnl
+     dnl We couldn't find ncurses, try SysV curses
+     dnl
+     if $search_ncurses 
+     then
+-        AC_EGREP_HEADER(init_color, /usr/include/curses.h,
++        AC_EGREP_HEADER(init_color, /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/curses.h,
+ 	    AC_USE_SYSV_CURSES)
+     fi
+ 
+@@ -653,8 +634,8 @@ if test "$aa_driver_test" = yes; then
+        LIBS="$LIBS $X_EXTRA_LIBS $X_LIBS"
+        CFLAGS="$CFLAGS $X_CFLAGS"
+     fi
+-    AC_AALIB(/usr/include, , )
+-    AC_AALIB(/usr/local/include, -L/usr/local/lib, -I/usr/local/include)
++    AC_AALIB(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, , )
++    AC_AALIB(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, -L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib, -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include)
+     for name in ../aalib-*.*
+     do
+       AC_AALIB($name,"-L$name","-I$name")
diff --git a/packages/xaos/files/fix-build.patch b/packages/xaos/files/fix-build.patch
new file mode 100644
index 0000000000..064c0fb853
--- /dev/null
+++ b/packages/xaos/files/fix-build.patch
@@ -0,0 +1,61 @@
+Index: XaoS-3.2.3/src/util/xstdio.c
+===================================================================
+--- XaoS-3.2.3.orig/src/util/xstdio.c
++++ XaoS-3.2.3/src/util/xstdio.c
+@@ -1,3 +1,4 @@
++#define DATAPATH "/usr/share/XaoS"
+ #ifndef _plan9_
+ #include <string.h>
+ #if defined(__EMX__) || defined(__APPLE__)
+Index: XaoS-3.2.3/src/engine/formulas.c
+===================================================================
+--- XaoS-3.2.3.orig/src/engine/formulas.c
++++ XaoS-3.2.3/src/engine/formulas.c
+@@ -69,6 +69,8 @@
+ #endif
+ 
+ 
++#include "../include/complex.h"
++
+ CONST char *CONST incolorname[] = {
+   "0",
+   "zmag",
+Index: XaoS-3.2.3/src/engine/plane.c
+===================================================================
+--- XaoS-3.2.3.orig/src/engine/plane.c
++++ XaoS-3.2.3/src/engine/plane.c
+@@ -53,6 +53,8 @@ CONST char *CONST planename[] = {
+ };
+ 
+ 
++#include "../include/complex.h"
++
+ REGISTERS (3)
+      void recalculate (int plane, number_t * x1, number_t * y1)
+ {
+Index: XaoS-3.2.3/src/engine/fractal.c
+===================================================================
+--- XaoS-3.2.3.orig/src/engine/fractal.c
++++ XaoS-3.2.3/src/engine/fractal.c
+@@ -66,6 +66,8 @@
+ #endif
+ #include <xerror.h>
+ 
++#include "../include/complex.h"
++
+ struct symetryinfo2 cursymetry;
+ struct palette cpalette;
+ struct image cimage;
+Index: XaoS-3.2.3/src/engine/zoom.c
+===================================================================
+--- XaoS-3.2.3.orig/src/engine/zoom.c
++++ XaoS-3.2.3/src/engine/zoom.c
+@@ -69,6 +69,8 @@
+ #define gettext(STRING) STRING
+ #endif
+ 
++#include "../include/complex.h"
++
+ #define ASIZE 16
+ #define ALIGN(x) (((x)+ASIZE-1)&(~(ASIZE-1)))
+ static int nsymetrized;
diff --git a/packages/xaos/xaos_3.2.3.bb b/packages/xaos/xaos_3.2.3.bb
new file mode 100644
index 0000000000..c54f646c2b
--- /dev/null
+++ b/packages/xaos/xaos_3.2.3.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "GNU XaoS, a realtime fractal generator zoomer"
+HOMEPAGE = "http://wmi.math.u-szeged.hu/xaos/doku.php"
+SECTION = "graphics"
+LICENSE = "GPLv2"
+DEPENDS = "aalib x11 zlib libpng"
+RDEPENDS += "libxxf86dga1"
+PR = "r0"
+
+SRC_URI = "http://easynews.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.3.tar.gz \
+           file://fix-build.patch;patch=1 \
+           file://fix-aalib-configure.patch;patch=1"
+
+S = "${WORKDIR}/XaoS-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-nls"
+#--with-x --with-ncurses=${STAGING_INCDIR} --with-dga-driver=no --with-x11-driver=no --with-aa-driver=yes
+
+do_configure_prepend() {
+    sed -i 's~/usr/include~${STAGING_INCDIR}~' ${S}/configure.in
+    sed -i 's~/usr/local/include~${STAGING_INCDIR}~' ${S}/configure.in
+    sed -i 's~/usr/lib~${STAGING_LIBDIR}~' ${S}/configure.in
+    sed -i 's~/usr/local/lib~${STAGING_LIBDIR}~' ${S}/configure.in
+}
+
+FILES_${PN} = "${bindir} ${datadir}/XaoS/catalogs"
+
+CFLAGS = "-L${STAGING_LIBDIR}"
-- 
cgit v1.2.3


From 0ff0fc1e03d059a9c69e95d389b9ab00949bdc5a Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 27 Jan 2007 21:41:37 +0000
Subject: bb: add LICENSE

---
 packages/bb/bb_1.2.bb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages')

diff --git a/packages/bb/bb_1.2.bb b/packages/bb/bb_1.2.bb
index 9904acae24..0629f74faf 100644
--- a/packages/bb/bb_1.2.bb
+++ b/packages/bb/bb_1.2.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "bb, The portable aalib demo"
 HOMEPAGE = "http://aa-project.sourceforge.net/bb/"
 SECTION = "console/misc"
+LICENSE = "GPLv2"
 DEPENDS = "aalib"
 PR = "r1"
 
-- 
cgit v1.2.3


From 3e37a0c55a6f7232bc2e02ef81829dd9874a8c6e Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 27 Jan 2007 21:47:12 +0000
Subject: xaos: fix DEPENDS

---
 packages/xaos/xaos_3.2.3.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/xaos/xaos_3.2.3.bb b/packages/xaos/xaos_3.2.3.bb
index c54f646c2b..22cedeb296 100644
--- a/packages/xaos/xaos_3.2.3.bb
+++ b/packages/xaos/xaos_3.2.3.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "GNU XaoS, a realtime fractal generator zoomer"
 HOMEPAGE = "http://wmi.math.u-szeged.hu/xaos/doku.php"
 SECTION = "graphics"
 LICENSE = "GPLv2"
-DEPENDS = "aalib x11 zlib libpng"
-RDEPENDS += "libxxf86dga1"
+DEPENDS = "aalib libx11 zlib libpng"
+RDEPENDS += "libxxf86dga"
 PR = "r0"
 
 SRC_URI = "http://easynews.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.3.tar.gz \
-- 
cgit v1.2.3


From 5f953ef49e4be710792f1bd829d540d986a20952 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 27 Jan 2007 22:32:20 +0000
Subject: mpd: add pulse support, fix mod support

---
 packages/musicpd/mpd/fix-mod-support.patch | 21 +++++++++++++++++++++
 packages/musicpd/mpd_svn.bb                |  9 +++++----
 2 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 packages/musicpd/mpd/fix-mod-support.patch

(limited to 'packages')

diff --git a/packages/musicpd/mpd/fix-mod-support.patch b/packages/musicpd/mpd/fix-mod-support.patch
new file mode 100644
index 0000000000..bbf0513e58
--- /dev/null
+++ b/packages/musicpd/mpd/fix-mod-support.patch
@@ -0,0 +1,21 @@
+Index: trunk/src/inputPlugins/mod_plugin.c
+===================================================================
+--- trunk.orig/src/inputPlugins/mod_plugin.c
++++ trunk/src/inputPlugins/mod_plugin.c
+@@ -64,9 +64,13 @@ static MDRIVER drv_mpd = {
+ 	"MPD Output Driver v0.1",
+ 	0,
+ 	255,
+-	"mpd",
+-	NULL,
+-	mod_mpd_IsThere,
++#if (LIBMIKMOD_VERSION > 0x030106)
++    "mpd", /* alias */
++    NULL, /* cmd help line*/
++#endif
++#if (LIBMIKMOD_VERSION >= 0x030200)
++    NULL, /*Command Line */
++#endif	mod_mpd_IsThere,
+ 	VC_SampleLoad,
+ 	VC_SampleUnload,
+ 	VC_SampleSpace,
diff --git a/packages/musicpd/mpd_svn.bb b/packages/musicpd/mpd_svn.bb
index bc10a923fb..a9c30b2104 100644
--- a/packages/musicpd/mpd_svn.bb
+++ b/packages/musicpd/mpd_svn.bb
@@ -2,12 +2,13 @@ DESCRIPTION = "Music Player Daemon (mpd)"
 HOMEPAGE = "http://www.musicpd.org"
 LICENSE = "GPLv2"
 SECTION = "console/multimedia"
-DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2"
+DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2 pulseaudio"
 SRCDATE = "20070120"
 PV = "0.12.1+svn${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https"
+SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https \
+           file://fix-mod-support.patch;patch=1"
 #           file://save-volume-state.patch;patch=1"
 S = "${WORKDIR}/trunk"
 
@@ -26,7 +27,7 @@ EXTRA_OECONF = "--enable-ogg \
         --with-faad-libraries=${STAGING_LIBDIR} \
 		--with-faad-includes=${STAGING_INCDIR} \
         --disable-jack \
-        --disable-pulse \
+        --enable-pulse \
         --enable-mod \
         --disable-oggflac"
 
-- 
cgit v1.2.3


From 4e14757e455f60c3d29747412a2364b29aec53e8 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 27 Jan 2007 22:37:14 +0000
Subject: efl, e17: update ot newest versions

---
 packages/e17/e-wm_0.16.999.036.bb             | 41 ---------------------
 packages/e17/e-wm_0.16.999.037.bb             | 41 +++++++++++++++++++++
 packages/e17/entrance/Sessions/Enlightenment  |  3 +-
 packages/e17/entrance_0.9.0.007.bb            |  4 +-
 packages/efl/ecore-fb_0.9.9.036.bb            | 29 ---------------
 packages/efl/ecore-fb_0.9.9.037.bb            | 31 ++++++++++++++++
 packages/efl/ecore-native_0.9.9.036.bb        |  6 ---
 packages/efl/ecore-native_0.9.9.037.bb        |  6 +++
 packages/efl/ecore-x11_0.9.9.036.bb           | 30 ---------------
 packages/efl/ecore-x11_0.9.9.037.bb           | 30 +++++++++++++++
 packages/efl/ecore.inc                        |  2 +-
 packages/efl/ecore/fix-tslib-configure.patch  | 24 ++++++------
 packages/efl/edb-native/.mtn2git_empty        |  0
 packages/efl/edb-native/no-gtk-forkbomb.patch | 12 ++++++
 packages/efl/edb-native_1.0.5.007.bb          |  2 +
 packages/efl/edb_1.0.5.007.bb                 |  1 +
 packages/efl/edje-native_0.5.0.036.bb         | 20 ----------
 packages/efl/edje-native_0.5.0.037.bb         | 20 ++++++++++
 packages/efl/edje-utils_0.5.0.036.bb          | 23 ------------
 packages/efl/edje-utils_0.5.0.037.bb          | 23 ++++++++++++
 packages/efl/edje_0.5.0.036.bb                | 32 ----------------
 packages/efl/edje_0.5.0.037.bb                | 32 ++++++++++++++++
 packages/efl/eet-native_0.9.10.036.bb         |  4 --
 packages/efl/eet-native_0.9.10.037.bb         |  4 ++
 packages/efl/eet_0.9.10.036.bb                |  9 -----
 packages/efl/eet_0.9.10.037.bb                |  9 +++++
 packages/efl/embryo-native_0.9.1.036.bb       |  7 ----
 packages/efl/embryo-native_0.9.1.037.bb       |  7 ++++
 packages/efl/embryo-utils_0.9.1.036.bb        | 18 ---------
 packages/efl/embryo-utils_0.9.1.037.bb        | 18 +++++++++
 packages/efl/embryo_0.9.1.036.bb              | 11 ------
 packages/efl/embryo_0.9.1.037.bb              | 11 ++++++
 packages/efl/evas-fb_0.9.9.036.bb             | 47 ------------------------
 packages/efl/evas-fb_0.9.9.037.bb             | 47 ++++++++++++++++++++++++
 packages/efl/evas-native_0.9.9.036.bb         |  5 ---
 packages/efl/evas-native_0.9.9.037.bb         |  5 +++
 packages/efl/evas-x11_0.9.9.036.bb            | 53 ---------------------------
 packages/efl/evas-x11_0.9.9.037.bb            | 53 +++++++++++++++++++++++++++
 packages/efl/evas/fix-configure.patch         | 19 +++++-----
 39 files changed, 378 insertions(+), 361 deletions(-)
 delete mode 100644 packages/e17/e-wm_0.16.999.036.bb
 create mode 100644 packages/e17/e-wm_0.16.999.037.bb
 delete mode 100644 packages/efl/ecore-fb_0.9.9.036.bb
 create mode 100644 packages/efl/ecore-fb_0.9.9.037.bb
 delete mode 100644 packages/efl/ecore-native_0.9.9.036.bb
 create mode 100644 packages/efl/ecore-native_0.9.9.037.bb
 delete mode 100644 packages/efl/ecore-x11_0.9.9.036.bb
 create mode 100644 packages/efl/ecore-x11_0.9.9.037.bb
 create mode 100644 packages/efl/edb-native/.mtn2git_empty
 create mode 100644 packages/efl/edb-native/no-gtk-forkbomb.patch
 delete mode 100644 packages/efl/edje-native_0.5.0.036.bb
 create mode 100644 packages/efl/edje-native_0.5.0.037.bb
 delete mode 100644 packages/efl/edje-utils_0.5.0.036.bb
 create mode 100644 packages/efl/edje-utils_0.5.0.037.bb
 delete mode 100644 packages/efl/edje_0.5.0.036.bb
 create mode 100644 packages/efl/edje_0.5.0.037.bb
 delete mode 100644 packages/efl/eet-native_0.9.10.036.bb
 create mode 100644 packages/efl/eet-native_0.9.10.037.bb
 delete mode 100644 packages/efl/eet_0.9.10.036.bb
 create mode 100644 packages/efl/eet_0.9.10.037.bb
 delete mode 100644 packages/efl/embryo-native_0.9.1.036.bb
 create mode 100644 packages/efl/embryo-native_0.9.1.037.bb
 delete mode 100644 packages/efl/embryo-utils_0.9.1.036.bb
 create mode 100644 packages/efl/embryo-utils_0.9.1.037.bb
 delete mode 100644 packages/efl/embryo_0.9.1.036.bb
 create mode 100644 packages/efl/embryo_0.9.1.037.bb
 delete mode 100644 packages/efl/evas-fb_0.9.9.036.bb
 create mode 100644 packages/efl/evas-fb_0.9.9.037.bb
 delete mode 100644 packages/efl/evas-native_0.9.9.036.bb
 create mode 100644 packages/efl/evas-native_0.9.9.037.bb
 delete mode 100644 packages/efl/evas-x11_0.9.9.036.bb
 create mode 100644 packages/efl/evas-x11_0.9.9.037.bb

(limited to 'packages')

diff --git a/packages/e17/e-wm_0.16.999.036.bb b/packages/e17/e-wm_0.16.999.036.bb
deleted file mode 100644
index 3084fd99bc..0000000000
--- a/packages/e17/e-wm_0.16.999.036.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "E17 - the Enlightenment Window Mananger"
-DEPENDS = "evas-x11 ecore-x11 edje eet embryo"
-LICENSE = "MIT"
-PR = "r4"
-
-inherit e update-alternatives
-
-SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \
-           file://fix-configure.patch;patch=1 \
-           file://set-autoscroll-defaults.patch;patch=1 \
-           file://Xsession.d/98enlightenment"
-
-S = "${WORKDIR}/enlightenment-${PV}"
-
-PROFILE = "LOWRES_PDA"
-PROFILE_c7x0 = "HIRES_PDA"
-PROFILE_tosa = "HIRES_PDA"
-PROFILE_spitz = "HIRES_PDA"
-PROFILE_akita = "HIRES_PDA"
-
-EXTRA_OECONF = "--with-profile=${PROFILE} \
-                --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
-                --x-includes=${STAGING_INCDIR}/X11 \
-                --x-libraries=${STAGING_LIBDIR}"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}"
-
-do_compile_prepend() {
-        find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
-	find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:'
-}
-
-do_install_append() {
-	install -d ${D}/${sysconfdir}/X11/Xsession.d
-	install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d
-}
-
-ALTERNATIVE_PATH = "${bindir}/enlightenment"
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PRIORITY = "16"
diff --git a/packages/e17/e-wm_0.16.999.037.bb b/packages/e17/e-wm_0.16.999.037.bb
new file mode 100644
index 0000000000..3084fd99bc
--- /dev/null
+++ b/packages/e17/e-wm_0.16.999.037.bb
@@ -0,0 +1,41 @@
+DESCRIPTION = "E17 - the Enlightenment Window Mananger"
+DEPENDS = "evas-x11 ecore-x11 edje eet embryo"
+LICENSE = "MIT"
+PR = "r4"
+
+inherit e update-alternatives
+
+SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \
+           file://fix-configure.patch;patch=1 \
+           file://set-autoscroll-defaults.patch;patch=1 \
+           file://Xsession.d/98enlightenment"
+
+S = "${WORKDIR}/enlightenment-${PV}"
+
+PROFILE = "LOWRES_PDA"
+PROFILE_c7x0 = "HIRES_PDA"
+PROFILE_tosa = "HIRES_PDA"
+PROFILE_spitz = "HIRES_PDA"
+PROFILE_akita = "HIRES_PDA"
+
+EXTRA_OECONF = "--with-profile=${PROFILE} \
+                --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+                --x-includes=${STAGING_INCDIR}/X11 \
+                --x-libraries=${STAGING_LIBDIR}"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}"
+
+do_compile_prepend() {
+        find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
+	find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:'
+}
+
+do_install_append() {
+	install -d ${D}/${sysconfdir}/X11/Xsession.d
+	install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d
+}
+
+ALTERNATIVE_PATH = "${bindir}/enlightenment"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "16"
diff --git a/packages/e17/entrance/Sessions/Enlightenment b/packages/e17/entrance/Sessions/Enlightenment
index 4d33bbb2e9..61498c2c6c 100644
--- a/packages/e17/entrance/Sessions/Enlightenment
+++ b/packages/e17/entrance/Sessions/Enlightenment
@@ -1,4 +1,3 @@
 #!/bin/sh
 
-enlightenment
-
+enlightenment_start
diff --git a/packages/e17/entrance_0.9.0.007.bb b/packages/e17/entrance_0.9.0.007.bb
index 7f0a9a181e..50126cb5a9 100644
--- a/packages/e17/entrance_0.9.0.007.bb
+++ b/packages/e17/entrance_0.9.0.007.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "Entrance is the Enlightenment login manager"
 LICENSE = "MIT"
 # can also use pam and crypt
-DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch xserver-common login-manager"
+DEPENDS = "evas-x11 ecore-x11 edje esmart-x11 bash keylaunch xserver-common login-manager"
 RDEPENDS += "bash keylaunch xserver-common glibc-gconv-iso8859-1 login-manager entrance-themes"
 HOMEPAGE = "http://www.enlightenment.org"
-PR = "r13"
+PR = "r14"
 
 inherit e
 
diff --git a/packages/efl/ecore-fb_0.9.9.036.bb b/packages/efl/ecore-fb_0.9.9.036.bb
deleted file mode 100644
index 49c32927af..0000000000
--- a/packages/efl/ecore-fb_0.9.9.036.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-require ecore.inc
-PR = "r2"
-
-EXTRA_OECONF = "--enable-ecore-fb \
-		--enable-ecore-job \
-		--enable-ecore-file \
-		--enable-poll \
-		--enable-ecore-dbus \
-		--enable-ecore-evas \
-        --enable-ecore-evas-buffer \
-		--enable-ecore-evas-fb \
-		--disable-ecore-evas-x \
-		--disable-ecore-evas-xrender \
-		--disable-ecore-evas-gl \
-		--enable-ecore-con \
-		--enable-ecore-config \
-		--enable-ecore-ipc \
-		--enable-ecore-txt \
-		--disable-ecore-x \
-		--disable-curl \
-		--without-curl-config \
-		--enable-ecore-config \
-        --enable-ecore-desktop \
-		--disable-openssl"
-
-parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \
-	 Ecore_Txt Ecore_Fb Ecore_Con \
-	 Ecore_Ipc Ecore_Evas Ecore_Config \
-     Ecore_Desktop"
diff --git a/packages/efl/ecore-fb_0.9.9.037.bb b/packages/efl/ecore-fb_0.9.9.037.bb
new file mode 100644
index 0000000000..b856d38bd9
--- /dev/null
+++ b/packages/efl/ecore-fb_0.9.9.037.bb
@@ -0,0 +1,31 @@
+require ecore.inc
+PR = "r2"
+
+SRC_URI += "file://remove-bad-code.patch;patch=1"
+
+EXTRA_OECONF = "--enable-ecore-fb \
+		--enable-ecore-job \
+		--enable-ecore-file \
+		--enable-poll \
+		--enable-ecore-dbus \
+		--enable-ecore-evas \
+        --enable-ecore-evas-buffer \
+		--enable-ecore-evas-fb \
+		--disable-ecore-evas-x \
+		--disable-ecore-evas-xrender \
+		--disable-ecore-evas-gl \
+		--enable-ecore-con \
+		--enable-ecore-config \
+		--enable-ecore-ipc \
+		--enable-ecore-txt \
+		--disable-ecore-x \
+		--disable-curl \
+		--without-curl-config \
+		--enable-ecore-config \
+        --enable-ecore-desktop \
+		--disable-openssl"
+
+parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \
+	 Ecore_Txt Ecore_Fb Ecore_Con \
+	 Ecore_Ipc Ecore_Evas Ecore_Config \
+     Ecore_Desktop"
diff --git a/packages/efl/ecore-native_0.9.9.036.bb b/packages/efl/ecore-native_0.9.9.036.bb
deleted file mode 100644
index 7d7ed2370a..0000000000
--- a/packages/efl/ecore-native_0.9.9.036.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require ecore-fb_${PV}.bb
-inherit native
-# disable curl for now (see EXTRA_OECONF in ecore-fb), we may reenable it when we need it
-# DEPENDS = "curl-native eet-native evas-native"
-DEPENDS = "eet-native evas-native"
-PROVIDES = "ecore-native"
\ No newline at end of file
diff --git a/packages/efl/ecore-native_0.9.9.037.bb b/packages/efl/ecore-native_0.9.9.037.bb
new file mode 100644
index 0000000000..7d7ed2370a
--- /dev/null
+++ b/packages/efl/ecore-native_0.9.9.037.bb
@@ -0,0 +1,6 @@
+require ecore-fb_${PV}.bb
+inherit native
+# disable curl for now (see EXTRA_OECONF in ecore-fb), we may reenable it when we need it
+# DEPENDS = "curl-native eet-native evas-native"
+DEPENDS = "eet-native evas-native"
+PROVIDES = "ecore-native"
\ No newline at end of file
diff --git a/packages/efl/ecore-x11_0.9.9.036.bb b/packages/efl/ecore-x11_0.9.9.036.bb
deleted file mode 100644
index 1deb641326..0000000000
--- a/packages/efl/ecore-x11_0.9.