summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/altboot/altboot_1.0.5.bb1
-rw-r--r--packages/altboot/altboot_1.0.6.bb1
-rw-r--r--packages/altboot/altboot_1.0.7-rc2.bb1
-rw-r--r--packages/anthy/anthy-native_6801.bb2
-rw-r--r--packages/bootchart/.mtn2git_empty0
-rw-r--r--packages/bootchart/bootchart_0.9.bb29
-rw-r--r--packages/dcop/.mtn2git_empty0
-rw-r--r--packages/dcop/dcopidl-native_3.5.4.bb29
-rw-r--r--packages/dcop/dcopidl2cpp-native_3.5.4.bb30
-rw-r--r--packages/dcop/files/.mtn2git_empty0
-rw-r--r--packages/dcop/files/dcopidl-compile.patch12
-rw-r--r--packages/gammu/gammu_1.06.00.bb (renamed from packages/gammu/gammu_1.05.00.bb)0
-rw-r--r--packages/hostap/hostap-daemon.inc1
-rw-r--r--packages/kdepimpi/files/.mtn2git_empty0
-rw-r--r--packages/kdepimpi/files/gcc4.patch104
-rw-r--r--packages/kdepimpi/kdepimpi_2.2.7.bb5
-rw-r--r--packages/kdepimpi/pwmpi.inc1
-rw-r--r--packages/konqueror/konqueror-embedded_20060404.bb2
-rw-r--r--packages/linux/ep93xx-kernel/eabi-enums.patch16
-rw-r--r--packages/linux/ep93xx-kernel_2.6.16.bb27
-rw-r--r--packages/linux/handhelds-pxa-2.6/eabi-enums.patch16
-rw-r--r--packages/linux/handhelds-pxa-2.6_cvs.bb2
-rw-r--r--packages/mesa/mesa_6.4.1+cvs20060101.bb31
-rw-r--r--packages/meta/slugos-packages.bb10
-rw-r--r--packages/meta/task-python-everything_20060425.bb (renamed from packages/meta/task-python-everything_1.0.0.bb)4
-rw-r--r--packages/nfs-utils/nfs-utils_1.0.6.bb3
-rw-r--r--packages/ntp/ntp_4.2.0.bb2
-rw-r--r--packages/opie-keyview/opie-keyview.inc1
-rw-r--r--packages/pvrusb2-mci/pvrusb2-mci-20060423/.mtn2git_empty0
-rw-r--r--packages/pvrusb2-mci/pvrusb2-mci-20060423/Makefile.patch25
-rw-r--r--packages/pvrusb2-mci/pvrusb2-mci_20060423.bb34
-rw-r--r--packages/python/python-egenix-mx-base_2.0.6.bb4
-rw-r--r--packages/python/python-pygtk_0.6.12.bb (renamed from packages/python/python-pygtk-0_0.6.12.bb)14
-rw-r--r--packages/wlan-ng/wlan-ng-modules.inc2
-rw-r--r--packages/x11-apps/.mtn2git_empty0
-rw-r--r--packages/x11-apps/app-common.inc11
-rw-r--r--packages/x11-apps/bdftopcf_1.0.0.bb2
-rw-r--r--packages/x11-apps/iceauth_1.0.1.bb2
-rw-r--r--packages/x11-apps/mkfontdir_1.0.1.bb2
-rw-r--r--packages/x11-apps/mkfontscale_1.0.1.bb2
-rw-r--r--packages/x11-apps/rgb_1.0.0.bb2
-rw-r--r--packages/x11-apps/twm_1.0.1.bb2
-rw-r--r--packages/x11-apps/xauth_1.0.1.bb2
-rw-r--r--packages/x11-apps/xclock_1.0.1.bb2
-rw-r--r--packages/x11-apps/xeyes_1.0.1.bb2
-rw-r--r--packages/x11-apps/xinit_1.0.1.bb2
-rw-r--r--packages/x11-apps/xkbcomp_1.0.1.bb2
-rw-r--r--packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty0
-rw-r--r--packages/xlibs/liblbxutil-1.0.0/mkg3states.patch51
-rw-r--r--packages/xlibs/liblbxutil_1.0.0.bb19
-rw-r--r--packages/xlibs/libxkbui_1.0.1.bb15
-rw-r--r--packages/xlibs/libxxf86misc_1.0.0.bb16
-rw-r--r--packages/xorg-data/.mtn2git_empty0
-rw-r--r--packages/xorg-data/data-common.inc11
-rw-r--r--packages/xorg-data/xbitmaps_1.0.1.bb1
-rw-r--r--packages/xorg-data/xkbdata_1.0.1.bb3
-rw-r--r--packages/xorg-fonts/.mtn2git_empty0
-rw-r--r--packages/xorg-fonts/font-alias_1.0.1.bb4
-rw-r--r--packages/xorg-fonts/font-common.inc30
-rw-r--r--packages/xorg-fonts/font-cursor-misc_1.0.0.bb4
-rw-r--r--packages/xorg-fonts/font-misc-misc_1.0.0.bb7
-rw-r--r--packages/xorg-fonts/font-util_1.0.0.bb5
-rw-r--r--packages/zaurus-updater/zaurus-updater.bb4
63 files changed, 588 insertions, 24 deletions
diff --git a/packages/altboot/altboot_1.0.5.bb b/packages/altboot/altboot_1.0.5.bb
index 3c2a269b64..c5f641f11f 100644
--- a/packages/altboot/altboot_1.0.5.bb
+++ b/packages/altboot/altboot_1.0.5.bb
@@ -9,6 +9,7 @@
DESCRIPTION = "The altboot bootmanager"
MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
+LICENSE = "GPL"
######################################################################################
diff --git a/packages/altboot/altboot_1.0.6.bb b/packages/altboot/altboot_1.0.6.bb
index 5f76d1b516..ee0fb7c1df 100644
--- a/packages/altboot/altboot_1.0.6.bb
+++ b/packages/altboot/altboot_1.0.6.bb
@@ -9,6 +9,7 @@
DESCRIPTION = "The altboot bootmanager"
MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
+LICENSE = "GPL"
######################################################################################
diff --git a/packages/altboot/altboot_1.0.7-rc2.bb b/packages/altboot/altboot_1.0.7-rc2.bb
index 18ba022a71..385e30907e 100644
--- a/packages/altboot/altboot_1.0.7-rc2.bb
+++ b/packages/altboot/altboot_1.0.7-rc2.bb
@@ -9,6 +9,7 @@
DESCRIPTION = "The altboot bootmanager"
MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
+LICENSE = "GPL"
######################################################################################
diff --git a/packages/anthy/anthy-native_6801.bb b/packages/anthy/anthy-native_6801.bb
index 508b9ff027..eed500560c 100644
--- a/packages/anthy/anthy-native_6801.bb
+++ b/packages/anthy/anthy-native_6801.bb
@@ -1,6 +1,8 @@
require anthy_${PV}.bb
+DEPENDS =""
inherit native
+
do_stage() {
autotools_stage_all
}
diff --git a/packages/bootchart/.mtn2git_empty b/packages/bootchart/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bootchart/.mtn2git_empty
diff --git a/packages/bootchart/bootchart_0.9.bb b/packages/bootchart/bootchart_0.9.bb
new file mode 100644
index 0000000000..b9b4029590
--- /dev/null
+++ b/packages/bootchart/bootchart_0.9.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "Bootchart is a tool for performance analysis and visualization of the GNU/Linux boot process."
+LICENSE = "GPLv2"
+HOMEPAGE = "http://www.bootchart.org/"
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
+
+
+#this only installs the loggers, you will need to run the renderers on your workstation
+#boot with 'init=/sbin/bootchartd' and do '/sbin/bootchartd stop' to end the logging
+
+#needed for a real /bin/sh and /bin/sleep
+DEPENDS = "bash coreutils"
+RDEPENDS = "bash coreutils"
+
+#this is a plain shell script
+PACKAGE_ARCH = "all"
+
+SRC_URI = "file://bootchart \
+ file://bootchartd \
+ file://bootchartd.conf"
+
+
+do_install() {
+ install -d ${D}/sbin
+ install -d ${D}/etc
+ install -m 755 ${WORKDIR}/bootchart ${D}/sbin
+ install -m 755 ${WORKDIR}/bootchartd ${D}/sbin
+ install -m 644 ${WORKDIR}/bootchart ${D}/etc
+}
+
diff --git a/packages/dcop/.mtn2git_empty b/packages/dcop/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dcop/.mtn2git_empty
diff --git a/packages/dcop/dcopidl-native_3.5.4.bb b/packages/dcop/dcopidl-native_3.5.4.bb
new file mode 100644
index 0000000000..8a2e8738a7
--- /dev/null
+++ b/packages/dcop/dcopidl-native_3.5.4.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "DCOP IDL parser"
+SECTION = "kde/dev"
+PRIORITY = "optional"
+MAINTAINER = "freyther@kde.org"
+LICENSE = "GPL"
+DEPENDS = "uicmoc3-native"
+
+
+SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl \
+ file://dcopidl-compile.patch;patch=1 "
+S = "${WORKDIR}/dcopidl"
+
+
+inherit native qmake qt3e
+
+export OE_QMAKE_LINK="${CXX}"
+EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl "
+EXTRA_QMAKEVARS_POST_append = "CONFIG-=thread "
+
+# create a .pro file now
+do_configure_prepend() {
+ echo "SOURCES += main.cpp yacc.cc scanner.cc " > dcopidl.pro
+ echo "HEADERS += yacc.cc.h " >> dcopidl.pro
+}
+
+do_stage() {
+ install -d ${STAGING_BINDIR}
+ install -m 0755 dcopidl ${STAGING_BINDIR}
+}
diff --git a/packages/dcop/dcopidl2cpp-native_3.5.4.bb b/packages/dcop/dcopidl2cpp-native_3.5.4.bb
new file mode 100644
index 0000000000..5828bc35ec
--- /dev/null
+++ b/packages/dcop/dcopidl2cpp-native_3.5.4.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "DCOP IDL parser"
+SECTION = "kde/dev"
+PRIORITY = "optional"
+MAINTAINER = "freyther@kde.org"
+LICENSE = "GPL"
+DEPENDS = "uicmoc3-native"
+
+
+SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl2cpp "
+#\
+# file://dcopidl-compile.patch;patch=1 "
+S = "${WORKDIR}/dcopidl2cpp"
+
+
+inherit native qmake qt3e
+
+export OE_QMAKE_LINK="${CXX}"
+EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl "
+EXTRA_QMAKEVARS_POST_append = "CONFIG-=thread "
+
+# create a .pro file now
+do_configure_prepend() {
+ echo "SOURCES += main.cpp skel.cpp stub.cpp stubimpl.cpp" > dcopidl2cpp.pro
+ echo "HEADERS += main.h " >> dcopidl2cpp.pro
+}
+
+do_stage() {
+ install -d ${STAGING_BINDIR}
+ install -m 0755 dcopidl2cpp ${STAGING_BINDIR}
+}
diff --git a/packages/dcop/files/.mtn2git_empty b/packages/dcop/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dcop/files/.mtn2git_empty
diff --git a/packages/dcop/files/dcopidl-compile.patch b/packages/dcop/files/dcopidl-compile.patch
new file mode 100644
index 0000000000..320112395f
--- /dev/null
+++ b/packages/dcop/files/dcopidl-compile.patch
@@ -0,0 +1,12 @@
+Index: dcopidl/yacc.cc
+===================================================================
+--- dcopidl.orig/yacc.cc 2006-04-26 21:59:13.000000000 +0200
++++ dcopidl/yacc.cc 2006-04-26 22:28:28.859672808 +0200
+@@ -213,7 +213,6 @@
+
+ ******************************************************************/
+
+-#include <config.h>
+
+ // Workaround for a bison issue:
+ // bison.simple concludes from _GNU_SOURCE that stpcpy is available,
diff --git a/packages/gammu/gammu_1.05.00.bb b/packages/gammu/gammu_1.06.00.bb
index 514819935c..514819935c 100644
--- a/packages/gammu/gammu_1.05.00.bb
+++ b/packages/gammu/gammu_1.06.00.bb
diff --git a/packages/hostap/hostap-daemon.inc b/packages/hostap/hostap-daemon.inc
index c95059efe8..83491bfb14 100644
--- a/packages/hostap/hostap-daemon.inc
+++ b/packages/hostap/hostap-daemon.inc
@@ -5,6 +5,7 @@ PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
RDEPENDS = "hostap-modules hostap-utils (${PV})"
+DEPENDS = "openssl"
DEPENDS_mtx-1_append = "madwifi-modules"
SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
diff --git a/packages/kdepimpi/files/.mtn2git_empty b/packages/kdepimpi/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kdepimpi/files/.mtn2git_empty
diff --git a/packages/kdepimpi/files/gcc4.patch b/packages/kdepimpi/files/gcc4.patch
new file mode 100644
index 0000000000..70bd00c889
--- /dev/null
+++ b/packages/kdepimpi/files/gcc4.patch
@@ -0,0 +1,104 @@
+--- ./gammu/emb/gammu/depend/siemens/dsiemens.c 2006/04/14 23:30:53 1.1
++++ ./gammu/emb/gammu/depend/siemens/dsiemens.c 2006/04/14 23:31:08
+@@ -351,7 +351,7 @@
+ GSM_Terminate();
+ }
+
+-static GSM_Reply_Function UserReplyFunctionsAtS[] = {
++GSM_Reply_Function UserReplyFunctionsAtS[] = {
+ {ATSIEMENS_Reply_GetSAT, "AT^SSTK", 0x00,0x00,ID_User1 },
+ {ATSIEMENS_Reply_GetNetmon, "AT^S^MI", 0x00,0x00,ID_User2 },
+ {NULL, "\x00", 0x00,0x00,ID_None }
+--- ./gammu/emb/gammu/depend/nokia/dct4.c 2006/04/14 23:28:56 1.1
++++ ./gammu/emb/gammu/depend/nokia/dct4.c 2006/04/14 23:29:17
+@@ -1288,7 +1288,7 @@
+ GSM_Terminate();
+ }
+
+-static GSM_Reply_Function UserReplyFunctions4[] = {
++GSM_Reply_Function UserReplyFunctions4[] = {
+
+ #ifdef DEBUG
+ {DCT4_ReplyResetSecurityCode, "\x08",0x03,0x05,ID_User2 },
+--- ./gammu/emb/gammu/depend/nokia/dct3trac/wmx.c 2006/04/14 23:31:48 1.1
++++ ./gammu/emb/gammu/depend/nokia/dct3trac/wmx.c 2006/04/14 23:31:55
+@@ -462,7 +462,7 @@
+ GSMDecoder_free(gsmdec);
+ }
+
+-static GSM_Reply_Function UserReplyFunctionsX[] = {
++GSM_Reply_Function UserReplyFunctionsX[] = {
+ {DCT3_ReplySwitchDebug, "\x40",0x02,0x70,ID_DebugSwitch },
+ {DCT3_ReplySwitchDebug, "\x40",0x02,0x71,ID_DebugSwitch },
+ {DCT3_ReplyDebugTrace, "\x00",0x00,0x00,ID_IncomingFrame },
+--- ./gammu/emb/gammu/depend/nokia/dct3.c 2006/04/14 23:25:59 1.1
++++ ./gammu/emb/gammu/depend/nokia/dct3.c 2006/04/14 23:27:52
+@@ -770,7 +770,7 @@
+ }
+ #endif
+
+-static GSM_Reply_Function UserReplyFunctions3[] = {
++GSM_Reply_Function UserReplyFunctions3[] = {
+ #ifdef GSM_ENABLE_NOKIA6110
+ {DCT3_ReplyDisplayOutput, "\x0D",0x03,0x50,ID_IncomingFrame },
+ {DCT3_ReplyDisplayOutput, "\x0D",0x03,0x54,ID_User7 },
+--- ./gammu/emb/common/phone/alcatel/alcatel.c 2006/04/14 23:23:19 1.1
++++ ./gammu/emb/common/phone/alcatel/alcatel.c 2006/04/14 23:24:16
+@@ -3833,7 +3833,7 @@
+ return ATGEN_SetFastSMSSending(s, enable);
+ }
+
+-static GSM_Reply_Function ALCATELReplyFunctions[] = {
++GSM_Reply_Function ALCATELReplyFunctions[] = {
+ {ALCATEL_ReplyGeneric, "\x02",0x00,0x00, ID_AlcatelAttach },
+ {ALCATEL_ReplyGeneric, "\x02",0x00,0x00, ID_AlcatelDetach },
+ {ALCATEL_ReplyGeneric, "\x02",0x00,0x00, ID_AlcatelCommit },
+--- ./kaddressbook/addresseeeditorwidget.h 2006/04/14 23:14:39 1.1
++++ ./kaddressbook/addresseeeditorwidget.h 2006/04/14 23:14:51
+@@ -43,6 +43,8 @@
+ class QMultiLineEdit;
+ #endif //KAB_EMBEDDED
+
++class QComboBox;
++
+ class KComboBox;
+ class KDateEdit;
+ class KLineEdit;
+--- ./korganizer/koeditordetails.cpp 2006/04/14 22:51:27 1.1
++++ ./korganizer/koeditordetails.cpp 2006/04/14 23:04:05
+@@ -54,13 +54,13 @@
+ #include "koeditordetails.h"
+
+ template <>
+-CustomListViewItem<class Attendee *>::~CustomListViewItem()
++CustomListViewItem<KCal::Attendee *>::~CustomListViewItem()
+ {
+ delete mData;
+ }
+
+ template <>
+-void CustomListViewItem<class Attendee *>::updateItem()
++void CustomListViewItem<KCal::Attendee *>::updateItem()
+ {
+ setText(0,mData->name());
+ setText(1,mData->email());
+--- ./pwmanager/libcrypt/cipher/serpent.c 2006/04/15 00:30:57 1.1
++++ ./pwmanager/libcrypt/cipher/serpent.c 2006/04/15 00:33:06
+@@ -687,7 +687,7 @@
+ if (! serpent_init_done)
+ {
+ /* Execute a self-test the first time, Serpent is used. */
+- static const char *serpent_test (void);
++ const char *serpent_test (void);
+
+ serpent_test_ret = serpent_test ();
+ if (serpent_test_ret)
+@@ -864,7 +864,7 @@
+
+ /* Serpent test. */
+
+-static const char *
++const char *
+ serpent_test (void)
+ {
+ serpent_context_t context;
diff --git a/packages/kdepimpi/kdepimpi_2.2.7.bb b/packages/kdepimpi/kdepimpi_2.2.7.bb
index f3dde1a2fd..843863c575 100644
--- a/packages/kdepimpi/kdepimpi_2.2.7.bb
+++ b/packages/kdepimpi/kdepimpi_2.2.7.bb
@@ -1,3 +1,6 @@
-SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz "
+SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz \
+ file://gcc4.patch;patch=1"
include kdepimpi-base.inc
+
+PR = "r1"
diff --git a/packages/kdepimpi/pwmpi.inc b/packages/kdepimpi/pwmpi.inc
index 2b77eed0de..c737d40e83 100644
--- a/packages/kdepimpi/pwmpi.inc
+++ b/packages/kdepimpi/pwmpi.inc
@@ -7,6 +7,7 @@ SUBDIRS="pwmanager/libcrypt/mpi \
"
export OE_QMAKE_LINK="${CXX}"
+OE_QMAKE_CFLAGS_prepend="-I${S}/pwmanager/libcrypt/crypt "
EXTRA_QMAKEVARS_POST += " \
INCLUDEPATH+=${STAGING_INCDIR}/kdepimpi/ \
LIBS+=-L${STAGING_LIBDIR}/kdepimpi/ \
diff --git a/packages/konqueror/konqueror-embedded_20060404.bb b/packages/konqueror/konqueror-embedded_20060404.bb
index 1d269e611e..e5f2901cb8 100644
--- a/packages/konqueror/konqueror-embedded_20060404.bb
+++ b/packages/konqueror/konqueror-embedded_20060404.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition
SECTION = "opie/applications"
PRIORITY = "optional"
HOMEPAGE = "http://www.konqueror.org/"
-DEPENDS = "openssl pcre virtual/libqte2 dcopidl-native"
+DEPENDS = "openssl pcre virtual/libqte2 dcopidl-native dcopidl2cpp-native"
LICENSE = "LGPL/GPL"
PR = "r2"
diff --git a/packages/linux/ep93xx-kernel/eabi-enums.patch b/packages/linux/ep93xx-kernel/eabi-enums.patch
new file mode 100644
index 0000000000..9e5e9ec571
--- /dev/null
+++ b/packages/linux/ep93xx-kernel/eabi-enums.patch
@@ -0,0 +1,16 @@
+Index: linux-2.6.16/arch/arm/Makefile
+===================================================================
+--- linux-2.6.16.orig/arch/arm/Makefile 2006-03-20 05:53:29.000000000 +0000
++++ linux-2.6.16/arch/arm/Makefile 2006-04-24 20:10:27.000000000 +0100
+@@ -57,7 +57,7 @@
+ tune-$(CONFIG_CPU_V6) :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)
+
+ ifeq ($(CONFIG_AEABI),y)
+-CFLAGS_ABI :=-mabi=aapcs -mno-thumb-interwork
++CFLAGS_ABI :=-mabi=aapcs-linux -mno-thumb-interwork
+ else
+ CFLAGS_ABI :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,)
+ endif
+
+
+
diff --git a/packages/linux/ep93xx-kernel_2.6.16.bb b/packages/linux/ep93xx-kernel_2.6.16.bb
index a472e9379c..068b9671d0 100644
--- a/packages/linux/ep93xx-kernel_2.6.16.bb
+++ b/packages/linux/ep93xx-kernel_2.6.16.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines"
SECTION = "kernel"
MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
COMPATIBLE_MACHINE = "ep93xx"
@@ -11,6 +11,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
http://cowebs.contec.at/ep93xx/EP93XX_Framebuffer1.patch;patch=1 \
http://cowebs.contec.at/ep93xx/EP93XX_Framebuffer1_registers.patch;patch=1 \
http://cowebs.contec.at/ep93xx/EP93XX_Framebuffer1_registers_raster.patch;patch=1 \
+ file://eabi-enums.patch;patch=1 \
file://defconfig \
"
@@ -21,8 +22,28 @@ inherit kernel
KERNEL_IMAGETYPE = "zImage"
do_configure() {
- install -m 644 ${WORKDIR}/defconfig ${S}/.config
- make ARCH=arm oldconfig
+ rm -f ${S}/.config
+
+ if [ ! -e ${WORKDIR}/defconfig ]; then
+ die "No default configuration for ${MACHINE} available."
+ fi
+
+
+ if [ "${TARGET_OS}" == "linux-gnueabi" ]; then
+ echo "CONFIG_AEABI=y" >> ${S}/.config
+ echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config
+ else
+ echo "# CONFIG_AEABI is not set" >> ${S}/.config
+ echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config
+ fi
+
+ sed -e '/CONFIG_AEABI/d' \
+ -e '/CONFIG_OABI_COMPAT=/d' \
+ '${WORKDIR}/defconfig' >>'${S}/.config'
+
+ yes '' | oe_runmake oldconfig
+
+
}
do_deploy() {
diff --git a/packages/linux/handhelds-pxa-2.6/eabi-enums.patch b/packages/linux/handhelds-pxa-2.6/eabi-enums.patch
new file mode 100644
index 0000000000..9e5e9ec571
--- /dev/null
+++ b/packages/linux/handhelds-pxa-2.6/eabi-enums.patch
@@ -0,0 +1,16 @@
+Index: linux-2.6.16/arch/arm/Makefile
+===================================================================
+--- linux-2.6.16.orig/arch/arm/Makefile 2006-03-20 05:53:29.000000000 +0000
++++ linux-2.6.16/arch/arm/Makefile 2006-04-24 20:10:27.000000000 +0100
+@@ -57,7 +57,7 @@
+ tune-$(CONFIG_CPU_V6) :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)
+
+ ifeq ($(CONFIG_AEABI),y)
+-CFLAGS_ABI :=-mabi=aapcs -mno-thumb-interwork
++CFLAGS_ABI :=-mabi=aapcs-linux -mno-thumb-interwork
+ else
+ CFLAGS_ABI :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,)
+ endif
+
+
+
diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb
index af3cae9b73..0423268abe 100644
--- a/packages/linux/handhelds-pxa-2.6_cvs.bb
+++ b/packages/linux/handhelds-pxa-2.6_cvs.bb
@@ -3,12 +3,14 @@ DESCRIPTION = "handhelds.org Linux kernel for PXA based devices."
MAINTAINER = "Greg Gilbert <greg@treke.net>"
LICENSE = "GPL"
PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}"
+PR = "r1"
#
COMPATIBLE_HOST = "arm.*-linux"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \
+ file://eabi-enums.patch;patch=1 \
file://defconfig"
S = "${WORKDIR}/kernel26"
diff --git a/packages/mesa/mesa_6.4.1+cvs20060101.bb b/packages/mesa/mesa_6.4.1+cvs20060101.bb
new file mode 100644
index 0000000000..788b8d3cef
--- /dev/null
+++ b/packages/mesa/mesa_6.4.1+cvs20060101.bb
@@ -0,0 +1,31 @@
+SECTION = "unknown"
+
+SRCDATE = "20060101"
+PV = "6.4.1+cvs${SRCDATE}"
+
+SRC_URI = "${FREEDESKTOP_CVS}/mesa;module=Mesa;method=pserver;date=${SRCDATE}"
+S = "${WORKDIR}/Mesa"
+
+LICENSE = "LGPL"
+
+RDEPENDS = "expat libx11 libxext libxxf86vm libxi libxmu libice"
+DEPENDS = "xf86vidmodeproto glproto"
+
+# gcc-3.4 blows up in gtktext with -frename-registers on arm-linux
+CXXFLAGS := "${@'${CXXFLAGS}'.replace('-frename-registers', '')}"
+
+do_compile() {
+ oe_runmake linux CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}"
+}
+
+do_install() {
+ install -d ${D}${libdir}
+ cp -pd lib/* ${D}${libdir}/
+ install -d ${D}${includedir}
+ cp -r include/GL ${D}${includedir}/
+}
+
+do_stage() {
+ cp -pd lib/* ${STAGING_LIBDIR}/
+ cp -r include/GL ${STAGING_INCDIR}/
+}
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 7f14c35e2f..285e6ad756 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -68,6 +68,9 @@ SLUGOS_PACKAGES = "\
grep \
gtk-doc \
gzip \
+ hostap-daemon \
+ hostap-modules \
+ hostap-utils \
ifupdown \
ipkg-utils \
iptables \
@@ -114,7 +117,7 @@ SLUGOS_PACKAGES = "\
netpbm \
nmap \
ntp \
- openobex-apps ircp \
+ openobex-apps \
openldap \
openntpd \
openssh \
@@ -127,9 +130,7 @@ SLUGOS_PACKAGES = "\
ppp \
procps \
puppy \
- pwc \
python \
- qc-usb-messenger \
quilt \
reiserfsprogs reiser4progs \
rsync \
@@ -167,6 +168,8 @@ SLUGOS_BROKEN_PACKAGES = "\
irssi \
obexftp openobex \
pvrusb2-mci \
+ pwc \
+ qc-usb-messenger \
setpwc \
watchdog \
memtester \
@@ -188,6 +191,7 @@ UCLIBC_UNSUPPORTABLE_PACKAGES = "\
UCLIBC_BROKEN_PACKAGES = "\
alsa-utils \
bogofilter \
+ ircp \
"
# Packages which build only with glibc (some of these use internal
diff --git a/packages/meta/task-python-everything_1.0.0.bb b/packages/meta/task-python-everything_20060425.bb
index c98b3231f3..1095f3e941 100644
--- a/packages/meta/task-python-everything_1.0.0.bb
+++ b/packages/meta/task-python-everything_20060425.bb
@@ -4,13 +4,15 @@ HOMEPAGE = "http://www.vanille.de/projects/python.spy"
LICENSE = "MIT"
PR = "ml3"
+BROKEN_BECAUSE_GCC4 = "\
+ python-egenix-mx-base"
+
RDEPENDS = "\
python-ao \
python-pybluez \
python-constraint \
python-crypto \
python-dialog \
- python-egenix-mx-base \
python-pycurl \
python-fnorb \
python-fpconst \
diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb
index 06029dc7c9..17bc5a6f9f 100644
--- a/packages/nfs-utils/nfs-utils_1.0.6.bb
+++ b/packages/nfs-utils/nfs-utils_1.0.6.bb
@@ -11,8 +11,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
file://stat-include.patch;patch=1 \
file://nfsserver \
file://forgotten-defines"
+
S = ${WORKDIR}/nfs-utils-${PV}/
+PARALLEL_MAKE = ""
+
# Only kernel-module-nfsd is required here - the nfsd module will
# pull in the remainder of the dependencies.
RDEPENDS = "portmap kernel-module-nfsd"
diff --git a/packages/ntp/ntp_4.2.0.bb b/packages/ntp/ntp_4.2.0.bb
index bf5bf9b4e2..d6d103f542 100644
--- a/packages/ntp/ntp_4.2.0.bb
+++ b/packages/ntp/ntp_4.2.0.bb
@@ -8,7 +8,7 @@ PRIORITY = "optional"
LICENSE = "ntp"
PR = "r7"
-SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${P}.tar.gz \
+SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \
file://ntpdc.Makefile.am.maybe-layout.patch;patch=1 \
file://ipv6only-workaround.patch;patch=1 \
file://gcc4.patch;patch=1 \
diff --git a/packages/opie-keyview/opie-keyview.inc b/packages/opie-keyview/opie-keyview.inc
index ee4dc825d4..0fa8b683bc 100644
--- a/packages/opie-keyview/opie-keyview.inc
+++ b/packages/opie-keyview/opie-keyview.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "Keyview Development Inputmethod"
SECTION = "opie/inputmethods"
PRIORITY = "optional"
LICENSE = "GPL"
-DEPENDS = "virtual/libqpe"
APPNAME = "keyview"
diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060423/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20060423/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pvrusb2-mci/pvrusb2-mci-20060423/.mtn2git_empty
diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060423/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20060423/Makefile.patch
new file mode 100644
index 0000000000..3db0b2c9d6
--- /dev/null
+++ b/packages/pvrusb2-mci/pvrusb2-mci-20060423/Makefile.patch
@@ -0,0 +1,25 @@
+*** driver/Makefile.orig 2006-04-02 03:40:31.000000000 +0200
+--- driver/Makefile 2006-04-26 21:56:46.000000000 +0200
+***************
+*** 57,66 ****
+ CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y
+
+ modules modules_install clean:
+! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) $@
+
+ install:
+! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) modules_install
+
+ else
+
+--- 57,66 ----
+ CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y
+
+ modules modules_install clean:
+! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) $@
+
+ install:
+! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) modules_install
+
+ else
+
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb
new file mode 100644
index 0000000000..0089bbc717
--- /dev/null
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
+PRIORITY = "optional"
+SECTION = "kernel/modules"
+MAINTAINER = "eFfeM <fransmeulenbroeks at yahoo dot com>"
+LICENSE = "GPL"
+PR = "r0"
+RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
+
+SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
+ file://Makefile.patch;patch=1"
+
+S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
+
+inherit module
+
+CFLAGS = "'-I${KERNEL_SOURCE}/include' \
+ '-I${KERNEL_SOURCE}/drivers/media/video' "
+
+CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' "
+
+CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' "
+
+EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
+ 'CC=${KERNEL_CC}' \
+ 'LD=${KERNEL_LD}' \
+ 'KDIR=${STAGING_KERNEL_DIR}'"
+
+export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
+ -rpath-link ${STAGING_DIR}/${TARGET_SYS}/lib"
+
+do_install() {
+ install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
+ install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
+}
diff --git a/packages/python/python-egenix-mx-base_2.0.6.bb b/packages/python/python-egenix-mx-base_2.0.6.bb
index 84bf7e2e3c..49a61c97b0 100644
--- a/packages/python/python-egenix-mx-base_2.0.6.bb
+++ b/packages/python/python-egenix-mx-base_2.0.6.bb
@@ -6,8 +6,10 @@ PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "EGENIX"
SRCNAME = "egenix-mx-base"
+PR = "r1"
-SRC_URI = "http://www.egenix.com/files/python/egenix-mx-base-${PV}.tar.gz"
+SRC_URI = "http://www.egenix.com/files/python/egenix-mx-base-${PV}.tar.gz \
+ file://gcc4.patch;patch=1"
S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit distutils
diff --git a/packages/python/python-pygtk-0_0.6.12.bb b/packages/python/python-pygtk_0.6.12.bb
index 3c9dc3a895..d01918bf05 100644
--- a/packages/python/python-pygtk-0_0.6.12.bb
+++ b/packages/python/python-pygtk_0.6.12.bb
@@ -1,15 +1,12 @@
-LICENSE = "LGPL"
DESCRIPTION = "Python GTK+ 1.2 Bindings"
+HOMEPAGE = "http://www.gtk.org"
SECTION = "devel/python"
-PRIORITY = "optional"
+LICENSE = "LGPL"
MAINTAINER = "Rob Taylor <robtaylor@fastmail.fm>"
-DEPENDS = "gtk+-1.2 python"
-RDEPENDS = "python-core python-shell python-re"
+DEPENDS = "gtk+-1.2"
+RDEPENDS = "python-shell python-re"
SRCNAME = "pygtk"
-PR = "r4"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/python-pygtk-${PV}"
-
+PR = "r0"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/python/v1.2/${SRCNAME}-${PV}.tar.gz \
file://remove-imlib-et-al;patch=1"
@@ -27,4 +24,3 @@ do_configure_prepend() {
do_stage() {
autotools_stage_includes
}
-
diff --git a/packages/wlan-ng/wlan-ng-modules.inc b/packages/wlan-ng/wlan-ng-modules.inc
index 8be211d4c9..53910d47b9 100644
--- a/packages/wlan-ng/wlan-ng-modules.inc
+++ b/packages/wlan-ng/wlan-ng-modules.inc
@@ -3,6 +3,7 @@ HOMEPAGE = "http://www.linux-wlan.org"
SECTION = "kernel/modules"
DEPENDS = "virtual/kernel"
RRECOMMENDS = "wlan-ng-utils"
+RPROVIDES += "wlan-ng-modules-usb"
LICENSE = "GPL"
SRC_URI = "file://no-compat.patch;patch=1 \
@@ -12,7 +13,6 @@ SRC_URI = "file://no-compat.patch;patch=1 \
# file://module_param_array.patch;patch=1 \
file://scripts-makefile-hostcc.patch;patch=1 \
file://pcmciasrc.patch;patch=1 \
- file://usb-owner.patch;patch=1 \
file://pcmcia-driver.patch;patch=1 \
file://config.in"
diff --git a/packages/x11-apps/.mtn2git_empty b/packages/x11-apps/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/x11-apps/.mtn2git_empty
diff --git a/packages/x11-apps/app-common.inc b/packages/x11-apps/app-common.inc
new file mode 100644
index 0000000000..04daf02b59
--- /dev/null
+++ b/packages/x11-apps/app-common.inc
@@ -0,0 +1,11 @@
+DESCRIPTION = "X application"
+SECTION = "x11/apps"
+LICENSE= "MIT-X"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
diff --git a/packages/x11-apps/bdftopcf_1.0.0.bb b/packages/x11-apps/bdftopcf_1.0.0.bb
new file mode 100644
index 0000000000..96492be848
--- /dev/null
+++ b/packages/x11-apps/bdftopcf_1.0.0.bb
@@ -0,0 +1,2 @@
+include app-common.inc
+DEPENDS = "libxfont"
diff --git a/packages/x11-apps/iceauth_1.0.1.bb b/packages/x11-apps/iceauth_1.0.1.bb
new file mode 100644
index 0000000000..19b59b8381
--- /dev/null
+++ b/packages/x11-apps/iceauth_1.0.1.bb
@@ -0,0 +1,2 @@
+include app-common.inc
+DEPENDS = "libx11 libice"
diff --git a/packages/x11-apps/mkfontdir_1.0.1.bb b/packages/x11-apps/mkfontdir_1.0.1.bb
new file mode 100644
index 0000000000..eff2e125e7
--- /dev/null
+++ b/packages/x11-apps/mkfontdir_1.0.1.bb
@@ -0,0 +1,2 @@
+include app-common.inc
+DEPENDS = "mkfontscale"
diff --git a/packages/x11-apps/mkfontscale_1.0.1.bb b/packages/x11-apps/mkfontscale_1.0.1.bb
new file mode 100644
index 0000000000..ead4663781
--- /dev/null
+++ b/packages/x11-apps/mkfontscale_1.0.1.bb
@@ -0,0 +1,2 @@
+include app-common.inc
+DEPENDS = "libfontenc freetype"
diff --git a/packages/x11-apps/rgb_1.0.0.bb b/packages/x11-apps/rgb_1.0.0.bb
new file mode 100644
index 0000000000..714ab3f83f
--- /dev/null
+++ b/packages/x11-apps/rgb_1.0.0.bb
@@ -0,0 +1,2 @@
+include app-common.inc
+DEPENDS = "libx11 libxt"
diff --git a/packages/x11-apps/twm_1.0.1.bb b/packages/x11-apps/twm_1.0.1.bb
new file mode 100644
index 0000000000..27dbb79eef
--- /dev/null
+++ b/packages/x11-apps/twm_1.0.1.bb
@@ -0,0 +1,2 @@
+include app-common.inc
+DEPENDS = "libx11 libxt libxmu"
diff --git a/packages/x11-apps/xauth_1.0.1.bb b/packages/x11-apps/xauth_1.0.1.bb
new file mode 100644
index 0000000000..c9d1a12ba2
--- /dev/null
+++ b/packages/x11-apps/xauth_1.0.1.bb
@@ -0,0 +1,2 @@
+include app-common.inc
+DEPENDS = "libx11 libxau libxext libxmu"
diff --git a/packages/x11-apps/xclock_1.0.1.bb b/packages/x11-apps/xclock_1.0.1.bb
new file mode 100644
index 0000000000..8a4b59d811
--- /dev/null
+++ b/packages/x11-apps/xclock_1.0.1.bb
@@ -0,0 +1,2 @@
+include app-common.inc
+DEPENDS = "libx11 libxrender libxft libxkbfile libxaw"
diff --git a/packages/x11-apps/xeyes_1.0.1.bb b/packages/x11-apps/xeyes_1.0.1.bb
new file mode 100644
index 0000000000..c9d1a12ba2
--- /dev/null
+++ b/packages/x11-apps/xeyes_1.0.1.bb
@@ -0,0 +1,2 @@
+include app-common.inc
+DEPENDS = "libx11 libxau libxext libxmu"
diff --git a/packages/x11-apps/xinit_1.0.1.bb b/packages/x11-apps/xinit_1.0.1.bb
new file mode 100644
index 0000000000..2e65b76202
--- /dev/null
+++ b/packages/x11-apps/xinit_1.0.1.bb
@@ -0,0 +1,2 @@
+include app-common.inc
+DEPENDS = "libx11 twm xclock xeyes xrdb"
diff --git a/packages/x11-apps/xkbcomp_1.0.1.bb b/packages/x11-apps/xkbcomp_1.0.1.bb
new file mode 100644
index 0000000000..808f5d0a6d
--- /dev/null
+++ b/packages/x11-apps/xkbcomp_1.0.1.bb
@@ -0,0 +1,2 @@
+include app-common.inc
+DEPENDS = "libx11 libxkbfile"
diff --git a/packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty b/packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty
diff --git a/packages/xlibs/liblbxutil-1.0.0/mkg3states.patch b/packages/xlibs/liblbxutil-1.0.0/mkg3states.patch
new file mode 100644
index 0000000000..58463db46b
--- /dev/null
+++ b/packages/xlibs/liblbxutil-1.0.0/mkg3states.patch
@@ -0,0 +1,51 @@
+--- liblbxutil-1.0.0/configure.ac.old 2006-03-31 02:38:44.000000000 -0500
++++ liblbxutil-1.0.0/configure.ac 2006-03-31 02:39:06.000000000 -0500
+@@ -60,4 +60,5 @@ XORG_RELEASE_VERSION
+
+ AC_OUTPUT([Makefile
+ src/Makefile
++ src/image/Makefile
+ lbxutil.pc])
+--- liblbxutil-1.0.0/src/Makefile.am.old 2006-03-31 02:38:51.000000000 -0500
++++ liblbxutil-1.0.0/src/Makefile.am 2006-03-31 02:39:49.000000000 -0500
+@@ -1,9 +1,6 @@
+ lib_LTLIBRARIES = liblbxutil.la
+
+-noinst_PROGRAMS = mkg3states
+-
+-mkg3states_SOURCES = \
+- $(srcdir)/image/mkg3states.c
++SUBDIRS = image
+
+ liblbxutil_la_SOURCES = \
+ $(srcdir)/lbx_zlib/reqstats.h \
+@@ -28,9 +25,8 @@ INCLUDES = @LBXUTIL_CFLAGS@
+
+ $(srcdir)/image/dfaxg42d.c: g3states.h
+
+-g3states.h: mkg3states
+- -rm -f g3states.h
+- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
++g3states.h: image/mkg3states
++ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
+
+ liblbxutil_la_LDFLAGS = -version-number 1:0:0
+
+--- liblbxutil-1.0.0/src/image/Makefile.am.old 2006-03-31 02:41:19.000000000 -0500
++++ liblbxutil-1.0.0/src/image/Makefile.am 2006-03-31 02:40:40.000000000 -0500
+@@ -0,0 +1,15 @@
++# evil hack
++CFLAGS=$(CFLAGS_FOR_BUILD)
++CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++LDFLAGS=$(LDFLAGS_FOR_BUILD)
++
++CC=$(CC_FOR_BUILD)
++LIBTOOL = @LIBTOOL@ --tag=CC
++
++noinst_PROGRAMS = mkg3states
++
++mkg3states_SOURCES = \
++ mkg3states.c
++
++mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
++mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)
diff --git a/packages/xlibs/liblbxutil_1.0.0.bb b/packages/xlibs/liblbxutil_1.0.0.bb
new file mode 100644
index 0000000000..4edaa71ba4
--- /dev/null
+++ b/packages/xlibs/liblbxutil_1.0.0.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "X11 keyboard library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "xextproto"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2 \
+ file://mkg3states.patch;patch=1"
+
+inherit autotools pkgconfig
+
+export CC_FOR_BUILD = "${BUILD_CC}"
+export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxkbui_1.0.1.bb b/packages/xlibs/libxkbui_1.0.1.bb
new file mode 100644
index 0000000000..b1ce4f4c11
--- /dev/null
+++ b/packages/xlibs/libxkbui_1.0.1.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "X11 keyboard library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11 libxt libxkbfile kbproto"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxxf86misc_1.0.0.bb b/packages/xlibs/libxxf86misc_1.0.0.bb
new file mode 100644
index 0000000000..dfb65af2bc
--- /dev/null
+++ b/packages/xlibs/libxxf86misc_1.0.0.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Xxf86vm extension library."
+SECTION = "x11/libs"
+LICENSE = "MIT"
+
+DEPENDS = "libx11 libxext xf86miscproto"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXxf86misc-${PV}.tar.bz2"
+S = "${WORKDIR}/libXxf86misc-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xorg-data/.mtn2git_empty b/packages/xorg-data/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-data/.mtn2git_empty
diff --git a/packages/xorg-data/data-common.inc b/packages/xorg-data/data-common.inc
new file mode 100644
index 0000000000..4d01e474c7
--- /dev/null
+++ b/packages/xorg-data/data-common.inc
@@ -0,0 +1,11 @@
+DESCRIPTION = "X data files"
+SECTION = "x11/data"
+LICENSE= "MIT-X"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/data/${PN}-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
diff --git a/packages/xorg-data/xbitmaps_1.0.1.bb b/packages/xorg-data/xbitmaps_1.0.1.bb
new file mode 100644
index 0000000000..aa6c16c802
--- /dev/null
+++ b/packages/xorg-data/xbitmaps_1.0.1.bb
@@ -0,0 +1 @@
+include data-common.inc
diff --git a/packages/xorg-data/xkbdata_1.0.1.bb b/packages/xorg-data/xkbdata_1.0.1.bb
new file mode 100644
index 0000000000..9b34b04ad2
--- /dev/null
+++ b/packages/xorg-data/xkbdata_1.0.1.bb
@@ -0,0 +1,3 @@
+include data-common.inc
+FILES_${PN} = "/usr/share/X11/*"
+RDEPENDS = "xkbcomp"
diff --git a/packages/xorg-fonts/.mtn2git_empty b/packages/xorg-fonts/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-fonts/.mtn2git_empty
diff --git a/packages/xorg-fonts/font-alias_1.0.1.bb b/packages/xorg-fonts/font-alias_1.0.1.bb
new file mode 100644
index 0000000000..f757dd39bf
--- /dev/null
+++ b/packages/xorg-fonts/font-alias_1.0.1.bb
@@ -0,0 +1,4 @@
+include font-common.inc
+
+DEPENDS = "mkfontscale"
+FILES_${PN} = "${libdir}/X11/fonts/*"
diff --git a/packages/xorg-fonts/font-common.inc b/packages/xorg-fonts/font-common.inc
new file mode 100644
index 0000000000..0acd27406a
--- /dev/null
+++ b/packages/xorg-fonts/font-common.inc
@@ -0,0 +1,30 @@
+DESCRIPTION = "X font files"
+SECTION = "x11/fonts"
+LICENSE= "MIT-X"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/font/${PN}-${PV}.tar.bz2"
+FONT_DIR = "${datadir}/share/fonts"
+DEPENDS = "encodings mkfontscale mkfontdir"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
+
+
+FILES_${PN} += " ${libdir}/X11/fonts/*.gz ${libdir}/X11/fonts/*/*.gz"
+
+pkg_postinst_${PN} () {
+
+ if [ "x$D" != "x" ]; then
+ exit 1
+ fi
+
+ for fontdir in /usr/lib/X11/fonts/* /usr/lib/X11/fonts/*/* ; do
+ if test -d $fontdir ; then
+ mkfontdir $fontdir
+ mkfontscale $fontdir
+ fi
+ done
+}
diff --git a/packages/xorg-fonts/font-cursor-misc_1.0.0.bb b/packages/xorg-fonts/font-cursor-misc_1.0.0.bb
new file mode 100644
index 0000000000..a7b1ceaf0d
--- /dev/null
+++ b/packages/xorg-fonts/font-cursor-misc_1.0.0.bb
@@ -0,0 +1,4 @@
+include font-common.inc
+
+DEPENDS = "bdftopcf font-util"
+FILES_${PN} = "${libdir}/X11/fonts/*"
diff --git a/packages/xorg-fonts/font-misc-misc_1.0.0.bb b/packages/xorg-fonts/font-misc-misc_1.0.0.bb
new file mode 100644
index 0000000000..14022adaf9
--- /dev/null
+++ b/packages/xorg-fonts/font-misc-misc_1.0.0.bb
@@ -0,0 +1,7 @@
+include font-common.inc
+
+DEPENDS = "bdftopcf font-util"
+
+FILES_${PN} = "${libdir}/X11/fonts/misc/*"
+
+EXTRA_OECONF = "--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-6 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-12 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-15 --disable-iso8859-16 --disable-jisx0201 --disable-koi8-r"
diff --git a/packages/xorg-fonts/font-util_1.0.0.bb b/packages/xorg-fonts/font-util_1.0.0.bb
new file mode 100644
index 0000000000..5bbf7e0809
--- /dev/null
+++ b/packages/xorg-fonts/font-util_1.0.0.bb
@@ -0,0 +1,5 @@
+include font-common.inc
+
+DEPENDS = "bdftopcf"
+
+FILES_${PN} = "${bindir}/* ${libdir}/X11/fonts/util/*"
diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb
index 0040ebeebb..26cf1e5453 100644
--- a/packages/zaurus-updater/zaurus-updater.bb
+++ b/packages/zaurus-updater/zaurus-updater.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
DEPENDS = "encdec-updater-native"
LICENSE = "zaurus-updater"
-PR = "r4"
+PR = "r5"
PACKAGES = ""
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -16,7 +16,7 @@ do_compile() {
}
do_deploy() {
- install -d ${DEPLOY_DIR}/images/
+ install -d ${DEPLOY_DIR_IMAGE}
install -m 0755 updater.sh ${DEPLOY_DIR_IMAGE}/updater.sh.${MACHINE}
case ${MACHINE} in