merge of '2e1d9e05c5b3d9382dab5905a71f66a069c6915d'
authorMatthias Hentges <oe@hentges.net>
Thu, 24 May 2007 17:06:27 +0000 (17:06 +0000)
committerMatthias Hentges <oe@hentges.net>
Thu, 24 May 2007 17:06:27 +0000 (17:06 +0000)
     and '6f3630e0c94aef5b64cc3ea808814c67c4fb0fd1'

59 files changed:
MAINTAINERS
conf/distro/slugos.conf
conf/machine/guinness.conf
conf/machine/htcuniversal.conf
packages/alsa/alsa-utils_1.0.13.bb
packages/gdb/gdb_6.6.bb
packages/gnome/gnome-desktop/no-desktop-docs.patch [new file with mode: 0644]
packages/gnome/gnome-desktop_2.16.1.bb
packages/gtk+/composite-pixbuf_0.0.bb [new file with mode: 0644]
packages/kismet/kismet-2006-04-R1/.mtn2git_empty [deleted file]
packages/kismet/kismet-2006-04-R1/no-chmod.patch [deleted file]
packages/kismet/kismet_2005-04-R1.bb [deleted file]
packages/kismet/kismet_2005-08-R1.bb [deleted file]
packages/kismet/kismet_2006-04-R1.bb [deleted file]
packages/kismet/kismet_2007-01-R1b.bb
packages/libcap/libcap-1.10/syscall.patch [new file with mode: 0644]
packages/libcap/libcap_1.10.bb
packages/libgpevtype/libgpevtype_svn.bb
packages/libmpeg2/.mtn2git_empty [deleted file]
packages/libmpeg2/libmpeg2-0.4.0b/.mtn2git_empty [deleted file]
packages/libmpeg2/libmpeg2-0.4.0b/Makefile.patch [deleted file]
packages/libmpeg2/libmpeg2_0.4.0b.bb [deleted file]
packages/lighttpd/lighttpd_1.4.15.bb [new file with mode: 0644]
packages/linux-uml/linux-uml_2.4.26.bb
packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb
packages/linux/ipod_2.4.24-ipod0.bb
packages/linux/linux-dht-walnut_2.6.20.bb
packages/linux/linux-magicbox_2.6.19.2.bb
packages/meta/oplinux-packages.bb [new file with mode: 0644]
packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/wireless.patch [new file with mode: 0644]
packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
packages/rt2x00/rt2570-k2wrlz_1.6.0.bb [new file with mode: 0644]
packages/scummvm/scummvm-qpe_0.6.1b.bb
packages/scummvm/scummvm_0.6.0.bb
packages/scummvm/scummvm_0.6.1b.bb
packages/scummvm/scummvm_0.9.0.bb
packages/scummvm/scummvm_0.9.1.bb [new file with mode: 0644]
packages/telepathy/empathy_0.4.bb [new file with mode: 0644]
packages/telepathy/telepathy-mission-control_4.22.bb [new file with mode: 0644]
packages/uboot/u-boot.inc
packages/uclibc/uclibc-initial_0.9.29.bb [new file with mode: 0644]
packages/uclibc/uclibc_0.9.29.bb
packages/vsftpd/vsftpd-2.0.5/syscall.patch [new file with mode: 0644]
packages/vsftpd/vsftpd_2.0.5.bb
packages/watchdog/watchdog_5.3.1.bb [new file with mode: 0644]
packages/xorg-lib/files/errordb-keysymdb-path-fix.patch [deleted file]
packages/xorg-xserver/xorg-xserver-common.inc
packages/xorg-xserver/xserver-kdrive-1.3.0.0/.mtn2git_empty [new file with mode: 0644]
packages/xorg-xserver/xserver-kdrive-1.3.0.0/disable-xf86-dga-xorgcfg.patch [new file with mode: 0644]
packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-epson.patch [new file with mode: 0644]
packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-tslib.patch [new file with mode: 0644]
packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch [new file with mode: 0644]
packages/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch [new file with mode: 0644]
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb [new file with mode: 0644]
packages/xorg-xserver/xserver-xorg_1.2.0.bb
packages/xorg-xserver/xserver-xorg_1.3.0.0.bb [new file with mode: 0644]
packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
removal.txt

index aa45d73..7375ac5 100644 (file)
@@ -167,16 +167,17 @@ Website:    http://zerochaos.aircrack-ng.org
 Interests:  wifi, packet injection, security
 Distros:    Angstrom
 Machines:   akita
-Recipes:    aircrack-ng, kismet, mdk2, rfakeap, rglueap, void11
+Recipes:    aircrack-ng, kismet, lorcon, mdk, rfakeap, rglueap, 
+Recipes:    rt2570-k2wrlz, void11
 
 Person:            Rolf 'Laibsch' Leggewie
 Mail:       OE-recipes@rolf.leggewie.biz
 Website:    http://oz.leggewie.org
 Interests:  Japanese on the Zaurus
-Distros:    openzaurus
-Machines:   collie
+Distros:    Ångström
+Machines:   collie, spitz
 Recipes:    anthy, nunome, uim*, granule, qpobox*, qte-font-unifont*
-Recipes:    qpf-unismall, poboxserver, imkit*
+Recipes:    qpf-unismall, qpobox, poboxserver, imkit*, scim, zten
 
 Person:     Shane Volpe
 Mail:       shanevolpe@gmail.com
index 980c158..564a2d0 100644 (file)
@@ -14,3 +14,8 @@ ARM_INSTRUCTION_SET = "arm"
 TARGET_OS = "linux"
 
 require conf/distro/include/slugos.inc
+
+# glibc:
+PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
+PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
+PREFERRED_PROVIDER_virtual/libc ?= "glibc"
index 11dbada..1996a16 100644 (file)
@@ -7,6 +7,7 @@ TARGET_ARCH = "i686"
 
 PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
 PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
+PREFERRED_PROVIDER_xserver = "xserver-xorg"
 
 udevdir = "/dev"
 
index dbf7b76..95eb735 100644 (file)
@@ -40,7 +40,7 @@ MACHINE_EXTRA_RRECOMMENDS = "  kernel-module-nls-cp437 \
 #
 # Modules autoload and other boot properties
 #
-#module_autoload_acx = "acx"
+module_autoload_acx = "acx"
 module_autoload_htcuniversal_acx = "htcuniversal_acx"
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
index 93054a3..e1ae7aa 100644 (file)
@@ -3,10 +3,17 @@ HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib ncurses"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
 
+# lazy hack. needs proper fixing in gettext.m4, see
+# http://bugs.openembedded.org/show_bug.cgi?id=2348
+# please close bug and remove this comment when properly fixed
+#
+EXTRA_OECONF_linux-uclibc = "--disable-nls"
+EXTRA_OECONF_linux-uclibcgnueabi = "--disable-nls"
+
 inherit autotools
 
 # This are all packages that we need to make. Also, the now empty alsa-utils
index 2c0f2c6..3650b92 100644 (file)
@@ -1,6 +1,7 @@
 require gdb.inc
 
-PR = "r1"
+PR = "r2"
 
-#only append it for glib, not for uclibcc
+#only append it for glib, not for uclibc
 RRECOMMENDS_gdb_append_linux = " glibc-thread-db "
+RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db "
diff --git a/packages/gnome/gnome-desktop/no-desktop-docs.patch b/packages/gnome/gnome-desktop/no-desktop-docs.patch
new file mode 100644 (file)
index 0000000..c132341
--- /dev/null
@@ -0,0 +1,10 @@
+--- Makefile.am~       2007-05-22 16:50:35.000000000 +0200
++++ Makefile.am        2007-05-22 16:50:35.000000000 +0200
+@@ -3,7 +3,6 @@
+       libgnome-desktop        \
+       gnome-about             \
+       pixmaps                 \
+-      desktop-docs            \
+       docs                    \
+       man
index 1e3e814..4d4b80e 100644 (file)
@@ -1,14 +1,16 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome"
-PR = "r1"
+PR = "r2"
 DESCRIPTION = "GNOME library for reading .desktop files"
 inherit gnome pkgconfig
 
 DEPENDS = "gnome-common gnome-doc-utils libgnomeui"
 
-SRC_URI += "file://scrollkeeper.patch;patch=1"
+SRC_URI += "file://scrollkeeper.patch;patch=1 \
+            file://no-desktop-docs.patch;patch=1;pnum=0"
 
 EXTRA_OECONF = "--disable-scrollkeeper"
+
 EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros"
 
 do_configure_prepend () {
diff --git a/packages/gtk+/composite-pixbuf_0.0.bb b/packages/gtk+/composite-pixbuf_0.0.bb
new file mode 100644 (file)
index 0000000..729343f
--- /dev/null
@@ -0,0 +1,18 @@
+DESCRIPTION = "Pixbuf performance test"
+LICENSE = "Public domain"
+DEPENDS = "gtk+" 
+
+SRC_URI = "http://amelang.net/composite_pixbuf.c"
+
+S = "${WORKDIR}"
+
+do_compile() {
+        ${CC} ${CFLAGS} composite_pixbuf.c -o composite_pixbuf \
+            `pkg-config --cflags gdk-2.0` `pkg-config --libs gdk-2.0` `pkg-config --libs x11` `pkg-config --libs pango` \
+            -lxcb -lXext -lXinerama -lXrandr -lXcursor -lXfixes -lpangoft2-1.0 -lz -lexpat -lxcb-xlib -lXau -lXdmcp  
+}          
+
+do_install() {
+        install -d ${D}${bindir} 
+        install -m 755 composite_pixbuf ${D}${bindir}
+}
diff --git a/packages/kismet/kismet-2006-04-R1/.mtn2git_empty b/packages/kismet/kismet-2006-04-R1/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/packages/kismet/kismet-2006-04-R1/no-chmod.patch b/packages/kismet/kismet-2006-04-R1/no-chmod.patch
deleted file mode 100644 (file)
index b22c513..0000000
+++ /dev/null
@@ -1,173 +0,0 @@
---- kismet-2006-04-R1/Makefile.in.orig 2006-09-14 11:37:20.000000000 +0100
-+++ kismet-2006-04-R1/Makefile.in      2006-09-14 11:38:01.000000000 +0100
-@@ -130,52 +130,52 @@
-       fi
- binuserinstall:
--      install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(PS) $(BIN)/$(PS); 
--      install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(DRONE) $(BIN)/$(DRONE);
-+      install -m 755 $(PS) $(BIN)/$(PS); 
-+      install -m 755 $(DRONE) $(BIN)/$(DRONE);
- binsuidinstall:
--      install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(PS) $(BIN)/$(PS); 
--      install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(DRONE) $(BIN)/$(DRONE);
-+      install -m 4755 $(PS) $(BIN)/$(PS); 
-+      install -m 4755 $(DRONE) $(BIN)/$(DRONE);
-       
- commoninstall:
-       mkdir -p $(ETC)
-       mkdir -p $(BIN)
--      install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet $(BIN)/kismet
--      install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(NC) $(BIN)/$(NC)
--      # install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(HOPPER) $(BIN)/$(HOPPER)
-+      install -m 755 scripts/kismet $(BIN)/kismet
-+      install -m 755 $(NC) $(BIN)/$(NC)
-+      # install -m 755 $(HOPPER) $(BIN)/$(HOPPER)
-       @if test "$(ZAURUS)" = "yes"; then \
--              install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \
--              echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \
-+              install -m 755 $(BUZZER) $(BIN)/buzzme; \
-+              echo install -m 755 $(BUZZER) $(BIN)/buzzme; \
-       fi
--#install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_monitor $(BIN)/kismet_monitor
--#install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_unmonitor $(BIN)/kismet_unmonitor
-+#install -m 755 scripts/kismet_monitor $(BIN)/kismet_monitor
-+#install -m 755 scripts/kismet_unmonitor $(BIN)/kismet_unmonitor
-       mkdir -p $(MAN)/man1
--      install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet.1 $(MAN)/man1/kismet.1
--      # install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_monitor.1 $(MAN)/man1/kismet_monitor.1
--      # install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_hopper.1 $(MAN)/man1/kismet_hopper.1
--      install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.1 $(MAN)/man1/kismet_drone.1
-+      install -m 644 man/kismet.1 $(MAN)/man1/kismet.1
-+      # install -m 644 man/kismet_monitor.1 $(MAN)/man1/kismet_monitor.1
-+      # install -m 644 man/kismet_hopper.1 $(MAN)/man1/kismet_hopper.1
-+      install -m 644 man/kismet_drone.1 $(MAN)/man1/kismet_drone.1
-       mkdir -p $(MAN)/man5
--      install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet.conf.5 $(MAN)/man5/kismet.conf.5
--      install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_ui.conf.5 $(MAN)/man5/kismet_ui.conf.5
--      install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5
-+      install -m 644 man/kismet.conf.5 $(MAN)/man5/kismet.conf.5
-+      install -m 644 man/kismet_ui.conf.5 $(MAN)/man5/kismet_ui.conf.5
-+      install -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5
-       @if test "$(GPSLBUILD)" = "$(GPSL)"; then \
--              install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \
--              echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \
--              install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \
--              echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \
--              install -o $(INSTUSR) -g $(MANGRP) -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \
--              echo install -o $(INSTUSR) -g $(MANGRP) -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \
-+              install -m 755 $(GPSL) $(BIN)/$(GPSL); \
-+              echo install -m 755 $(GPSL) $(BIN)/$(GPSL); \
-+              install -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \
-+              echo install -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \
-+              install -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \
-+              echo install -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \
-       fi
-       mkdir -p $(WAV)
--      install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/new_network.wav $(WAV)/new_network.wav
--      install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/traffic.wav $(WAV)/traffic.wav
--      install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/junk_traffic.wav $(WAV)/junk_traffic.wav
--      install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/alert.wav $(WAV)/alert.wav
--      install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/ap_manuf $(ETC)/ap_manuf; 
--      install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/client_manuf $(ETC)/client_manuf; 
-+      install -m 644 wav/new_network.wav $(WAV)/new_network.wav
-+      install -m 644 wav/traffic.wav $(WAV)/traffic.wav
-+      install -m 644 wav/junk_traffic.wav $(WAV)/junk_traffic.wav
-+      install -m 644 wav/alert.wav $(WAV)/alert.wav
-+      install -m 644 conf/ap_manuf $(ETC)/ap_manuf; 
-+      install -m 644 conf/client_manuf $(ETC)/client_manuf; 
-       @if test -f $(BIN)/kismet_curses; then \
-               echo "Removing old kismet_curses binary.  The panels frontend is now kismet_client."; \
-@@ -188,22 +188,22 @@
-       @if test -f $(ETC)/kismet.conf; then \
-               $(MAKE) -e checkconfig; \
-     else \
--              install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
--              echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
-+              install -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
-+              echo install -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
-               echo "Installed config into $(ETC)/kismet.conf."; \
-       fi
-       @if test -f $(ETC)/kismet_drone.conf; then \
-               $(MAKE) -e checkdroneconfig; \
-     else \
--              install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
--              echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
-+              install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
-+              echo install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
-               echo "Installed drone config into $(ETC)/kismet_drone.conf."; \
-       fi
-       @if test -f $(ETC)/kismet_ui.conf; then \
-               $(MAKE) -e checkuiconfig; \
-       else \
--              install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
--              echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
-+              install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
-+              echo install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
-               echo "Installed UI config into $(ETC)/kismet_ui.conf."; \
-       fi
-       @echo "Installed kismet into $(BIN)/."
-@@ -221,22 +221,22 @@
-       @if test -f $(ETC)/kismet.conf; then \
-               $(MAKE) -e checkconfig; \
-     else \
--              install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
--              echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
-+              install -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
-+              echo install -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
-               echo "Installed config into $(ETC)/kismet.conf."; \
-       fi
-       @if test -f $(ETC)/kismet_drone.conf; then \
-               $(MAKE) -e checkdroneconfig; \
-     else \
--              install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
--              echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
-+              install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
-+              echo install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
-               echo "Installed drone config into $(ETC)/kismet_drone.conf."; \
-       fi
-       @if test -f $(ETC)/kismet_ui.conf; then \
-               $(MAKE) -e checkuiconfig; \
-       else \
--              install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
--              echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
-+              install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
-+              echo install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
-               echo "Installed UI config into $(ETC)/kismet_ui.conf."; \
-       fi
-       @echo "Installed kismet into $(BIN)/."
-@@ -252,11 +252,11 @@
- forceinstall: $(PS)
-       $(MAKE) -e commoninstall
-       $(MAKE) -e binuserinstall
--      install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
-+      install -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
-               echo "Installed config into $(ETC)/kismet.conf."; 
--      install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
-+      install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
-               echo "Installed drone config into $(ETC)/kismet_drone.conf."; 
--      install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
-+      install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
-               echo "Installed UI config into $(ETC)/kismet_ui.conf."; 
-       @echo "Installed kismet into $(BIN)/."
-       @echo "If you have not done so already, read the README file and the FAQ file.  Additional"
-@@ -271,11 +271,11 @@
- suidforceinstall: $(PS)
-       $(MAKE) -e commoninstall
-       $(MAKE) -e binsuidinstall
--      install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
-+      install -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
-               echo "Installed config into $(ETC)/kismet.conf."; 
--      install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
-+      install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
-               echo "Installed drone config into $(ETC)/kismet_drone.conf."; 
--      install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
-+      install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
-               echo "Installed UI config into $(ETC)/kismet_ui.conf."; 
-       @echo "Installed kismet into $(BIN)/."
-       @echo "If you have not done so already, read the README file and the FAQ file.  Additional"
diff --git a/packages/kismet/kismet_2005-04-R1.bb b/packages/kismet/kismet_2005-04-R1.bb
deleted file mode 100644 (file)
index 2b29af5..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-SECTION = "console/network"
-DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
-HOMEPAGE = "http://www.kismetwireless.net/"
-LICENSE = "GPLv2"
-DEPENDS = "expat gmp"
-
-SRC_URI = "http://www.kismetwireless.net/code/kismet-2005-04-R1.tar.gz \
-       file://no-strip.diff;patch=1;pnum=0 \
-       file://no-chmod.diff;patch=1;pnum=0 \
-       file://glibc3.3.2-getopt-throw.diff;patch=1;pnum=0"
-
-
-EXTRA_OECONF = "--with-pcap=linux --disable-setuid --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
-
-inherit autotools
-
-do_configure() {
-        oe_runconf
-}
-
-do_install_append() {
-       if test -e ${WORKDIR}/kismet.conf; then
-               install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/
-       fi
-}
-
-PACKAGES =+ "kismet-sounds"
-FILES_kismet-sounds = "/usr/share/kismet/wav"
-
-CONFFILES_${PN}_nylon = "${sysconfdir}/kismet.conf"
diff --git a/packages/kismet/kismet_2005-08-R1.bb b/packages/kismet/kismet_2005-08-R1.bb
deleted file mode 100644 (file)
index c5e58b6..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-SECTION = "console/network"
-DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
-HOMEPAGE = "http://www.kismetwireless.net/"
-LICENSE = "GPLv2"
-DEPENDS = "expat gmp"
-
-SRC_URI = "http://www.kismetwireless.net/code/kismet-2005-08-R1.tar.gz \
-       file://no-strip.diff;patch=1;pnum=0 \
-       file://no-chmod.diff;patch=1;pnum=0 \
-       file://glibc3.3.2-getopt-throw.diff;patch=1;pnum=0"
-
-
-EXTRA_OECONF = "--with-pcap=linux --disable-setuid --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
-
-inherit autotools
-
-do_configure() {
-        oe_runconf
-}
-
-do_install_append() {
-       if test -e ${WORKDIR}/kismet.conf; then
-               install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/
-       fi
-}
-
-PACKAGES =+ "kismet-sounds"
-FILES_kismet-sounds = "/usr/share/kismet/wav"
-
-CONFFILES_${PN}_nylon = "${sysconfdir}/kismet.conf"
diff --git a/packages/kismet/kismet_2006-04-R1.bb b/packages/kismet/kismet_2006-04-R1.bb
deleted file mode 100644 (file)
index aa51f2a..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-SECTION = "console/network"
-DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
-HOMEPAGE = "http://www.kismetwireless.net/"
-LICENSE = "GPLv2"
-DEPENDS = "expat gmp"
-
-SRC_URI = "http://www.kismetwireless.net/code/kismet-2006-04-R1.tar.gz \
-           file://no-chmod.patch;patch=1"
-
-
-EXTRA_OECONF = "--with-pcap=linux --disable-setuid --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
-
-inherit autotools
-
-do_configure() {
-        oe_runconf
-}
-
-do_install_append() {
-       if test -e ${WORKDIR}/kismet.conf; then
-               install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/
-       fi
-}
-
-PACKAGES =+ "kismet-sounds"
-FILES_kismet-sounds = "/usr/share/kismet/wav"
-
-CONFFILES_${PN}_nylon = "${sysconfdir}/kismet.conf"
index 774e71e..5c10300 100644 (file)
@@ -8,7 +8,7 @@ SRC_URI = "http://www.kismetwireless.net/code/kismet-2007-01-R1b.tar.gz \
            file://no-chmod.patch;patch=1"
 
 
-EXTRA_OECONF = "--with-pcap=linux --disable-setuid --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
+EXTRA_OECONF = "--with-pcap=linux --disable-setuid --with-linuxheaders=${STAGING_KERNEL_DIR}/include --disable-gpsmap"
 
 inherit autotools
 
diff --git a/packages/libcap/libcap-1.10/syscall.patch b/packages/libcap/libcap-1.10/syscall.patch
new file mode 100644 (file)
index 0000000..86163f2
--- /dev/null
@@ -0,0 +1,20 @@
+Index: libcap-1.10/libcap/cap_sys.c
+===================================================================
+--- libcap-1.10.orig/libcap/cap_sys.c  2007-05-24 10:59:24.000000000 +0200
++++ libcap-1.10/libcap/cap_sys.c       2007-05-24 11:01:42.000000000 +0200
+@@ -11,6 +11,7 @@
+ #define __LIBRARY__
+ #include <linux/unistd.h>
++#if 0
+ _syscall2(int, capget,
+         cap_user_header_t, header,
+         cap_user_data_t, data)
+@@ -18,6 +19,7 @@
+ _syscall2(int, capset,
+         cap_user_header_t, header,
+         const cap_user_data_t, data)
++#endif
+ /*
+  * $Log: cap_sys.c,v $
index a7e1068..172acac 100644 (file)
@@ -3,12 +3,14 @@ PRIORITY = "optional"
 SECTION = "libs"
 LICENSE = "GPL"
 DEPENDS = "bison-native flex-native"
+PR = "r1"
 
 CFLAGS_append = " -I${S}/libcap/include"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/kernel-2.4/${PN}-${PV}.tar.bz2 \
           file://makenames.patch;patch=1 \
-          file://make.patch;patch=1 "
+          file://make.patch;patch=1 \
+          file://syscall.patch;patch=1"
 
 FILES_${PN} = "${libdir}"
 FILES_${PN}-dev = "${includedir}"
index 88e03c9..44388ba 100644 (file)
@@ -2,7 +2,7 @@ DESCRIPTION = "Data interchange library for GPE"
 SECTION = "gpe/libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-DEPENDS = "libmimedir libeventdb"
+DEPENDS = "libmimedir libeventdb libtododb"
 PV = "0.50+svn${SRCDATE}"
 PR = "r1"
 
diff --git a/packages/libmpeg2/.mtn2git_empty b/packages/libmpeg2/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/packages/libmpeg2/libmpeg2-0.4.0b/.mtn2git_empty b/packages/libmpeg2/libmpeg2-0.4.0b/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/packages/libmpeg2/libmpeg2-0.4.0b/Makefile.patch b/packages/libmpeg2/libmpeg2-0.4.0b/Makefile.patch
deleted file mode 100644 (file)
index 78cf8b7..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./src/Makefile.am.old
-+++ ./src/Makefile.am
-@@ -8,7 +8,9 @@
- mpeg2dec_SOURCES = mpeg2dec.c dump_state.c getopt.c gettimeofday.c
- mpeg2dec_LDADD = $(libvo) $(libmpeg2) $(libmpeg2convert)
- extract_mpeg2_SOURCES = extract_mpeg2.c getopt.c
-+extract_mpeg2_LDADD = $(libvo) $(libmpeg2) $(libmpeg2convert)
- corrupt_mpeg2_SOURCES = corrupt_mpeg2.c getopt.c
-+corrupt_mpeg2_LDADD = $(libvo) $(libmpeg2) $(libmpeg2convert)
- man_MANS = mpeg2dec.1 extract_mpeg2.1
diff --git a/packages/libmpeg2/libmpeg2_0.4.0b.bb b/packages/libmpeg2/libmpeg2_0.4.0b.bb
deleted file mode 100644 (file)
index bd57ed8..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "MPEG Video Decoder Library"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "virtual/libsdl"
-LICENSE = "GPL"
-
-PR = "r2"
-
-SRC_URI = "http://libmpeg2.sourceforge.net/files/mpeg2dec-${PV}.tar.gz \
-                       file://Makefile.patch;patch=1 "
-S = "${WORKDIR}/mpeg2dec-0.4.0"
-
-inherit autotools lib_package
-
-EXTRA_OECONF="--enable-shared"
-
-LEAD_SONAME = "libmpeg2.so.0"
-
-PACKAGES =+ "libmpeg2convert libmpeg2convert-dev"
-
-FILES_libmpeg2convert = "${libdir}/libmpeg2convert.so.*"
-FILES_libmpeg2convert-dev = "${libdir}/libmpeg2convert.so \
-                             ${libdir}/libmpeg2convert.*a \
-                             ${libdir}/pkgconfig/libmpeg2convert.pc \
-                             ${includedir}/mpeg2dec/mpeg2convert.h"
-
-
-do_stage() {
-       oe_libinstall -a -so -C libmpeg2 libmpeg2 ${STAGING_LIBDIR}
-       oe_libinstall -a -so -C libmpeg2/convert libmpeg2convert ${STAGING_LIBDIR}
-
-       install -d ${STAGING_INCDIR}/mpeg2dec/
-       install -m 0644 include/mpeg2.h ${STAGING_INCDIR}/mpeg2dec/
-       install -m 0644 include/mpeg2convert.h ${STAGING_INCDIR}/mpeg2dec/
-}
diff --git a/packages/lighttpd/lighttpd_1.4.15.bb b/packages/lighttpd/lighttpd_1.4.15.bb
new file mode 100644 (file)
index 0000000..c759188
--- /dev/null
@@ -0,0 +1,40 @@
+DESCRIPTION = "Web server"
+SECTION = "net"
+LICENSE = "BSD"
+PR = "r0"
+
+SRC_URI = "http://www.lighttpd.net/download/lighttpd-1.4.15.tar.gz \
+          file://configure.in.patch;patch=1 \
+          file://src-server.c.patch;patch=1 \
+          file://index.html \
+          file://lighttpd.conf \
+          file://lighttpd"
+
+EXTRA_OECONF="--without-bzip2 \
+               --without-ldap \
+               --without-lua \
+               --without-memcache \
+               --without-pcre \
+               --without-webdav-props \
+               --without-webdav-locks \
+               --without-openssl \
+               --disable-nls \
+               --disable-static"
+
+inherit autotools pkgconfig update-rc.d
+
+INITSCRIPT_NAME = "lighttpd"
+INITSCRIPT_PARAMS = "defaults 70"
+
+do_install_append() {
+       install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var
+       install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
+       install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
+       install -m 0644 ${WORKDIR}/index.html ${D}/www/pages/
+}
+
+do_stage() {
+       autotools_stage_all
+}
+
+FILES_${PN} += "${libdir}/mod_*.so ${sysconfdir} /www"
index a5dbfd8..11b2a22 100644 (file)
@@ -13,6 +13,7 @@ S = "${WORKDIR}/linux-${PV}"
 inherit kernel
 
 COMPATIBLE_HOST = 'i.86.*-linux'
+COMPATIBLE_MACHINE = "x86-uml"
 
 export OS = "Linux"
 ARCH = "um"
index e71199d..915378c 100644 (file)
@@ -21,6 +21,7 @@ S = "${WORKDIR}/linux-${LV}"
 inherit kernel
 
 COMPATIBLE_HOST = 'i.86.*-linux'
+COMPATIBLE_MACHINE = "x86-uml"
 
 export OS = "Linux"
 ARCH = "um"
index e6248e5..b0fe988 100644 (file)
@@ -10,6 +10,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
 
 S = "${WORKDIR}/linux-${KV}"
 
+COMPATIBLE_MACHINE = "ipod"
+
 inherit kernel
 
 EXTRA_OEMAKE = ""
index 4a93954..c770c6a 100644 (file)
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for DHT-Walnut (ppc)  machine"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 DEPENDS = "u-boot"
 
 KERNEL_CCSUFFIX = "-3.4.4"
@@ -49,7 +49,7 @@ do_install_append () {
         install -d  ${DEPLOY_DIR}/images
         install -m 0755 arch/ppc/boot/images/zImage.elf ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.elf
         install -m 0755 vmlinux ${DEPLOY_DIR}/images/
-        powerpc-${TARGET_OS}-objcopy -O binary -R .note -R .comment -S ${DEPLOY_DIR}/images/vmlinux ${DEPLOY_DIR}/images/linux.bin
+        powerpc${TARGET_VENDOR}-${TARGET_OS}-objcopy -O binary -R .note -R .comment -S ${DEPLOY_DIR}/images/vmlinux ${DEPLOY_DIR}/images/linux.bin
         gzip -f -9 ${DEPLOY_DIR}/images/linux.bin
         mkimage -A ppc -O linux -T kernel -C gzip -a 0 -e 0 -n "ppc405"+${PV} -d ${DEPLOY_DIR}/images/linux.bin.gz ${DEPLOY_DIR}/images/uImage-${PV}-${MACHINE}-${DATETIME}.bin        
         rm ${DEPLOY_DIR}/images/vmlinux
index f76d391..4e07abd 100644 (file)
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for Magicbox ver 1.1 and 2.0 router boards"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 DEPENDS = "u-boot"
 
 COMPATIBLE_MACHINE = "magicbox"
@@ -89,7 +89,7 @@ do_install_append () {
         install -d  ${DEPLOY_DIR}/images
         install -m 0755 arch/ppc/boot/images/zImage.elf ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.elf
         install -m 0755 vmlinux ${DEPLOY_DIR}/images/
-        powerpc-${TARGET_OS}-objcopy -O binary -R .note -R .comment -S ${DEPLOY_DIR}/images/vmlinux ${DEPLOY_DIR}/images/linux.bin
+        powerpc${TARGET_VENDOR}-${TARGET_OS}-objcopy -O binary -R .note -R .comment -S ${DEPLOY_DIR}/images/vmlinux ${DEPLOY_DIR}/images/linux.bin
         gzip -f -9 ${DEPLOY_DIR}/images/linux.bin
         cp -a ${DEPLOY_DIR}/images/linux.bin.gz ${DEPLOY_DIR}/images/linux-${PV}-${MACHINE}-${DATETIME}.bin.gz        
         mkimage -A ppc -O linux -T kernel -C gzip -a 00000000 -e 00000000 -n "magicbox"-${PV} \
diff --git a/packages/meta/oplinux-packages.bb b/packages/meta/oplinux-packages.bb
new file mode 100644 (file)
index 0000000..dcbbea9
--- /dev/null
@@ -0,0 +1,645 @@
+# Meta package containing all the packages which build for OPLinux and OPLinux uclibc distro
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+DESCRIPTION = "Packages that are compatible with the OPLinux distro"
+HOMEPAGE = "http://www.digital-opsis/oplinux"
+LICENSE = "MIT"
+PR = "r0"
+PROVIDES += "${OPLINUX_IMAGENAME}-packages"
+
+EXCLUDE_FROM_WORLD = "1"
+INHIBIT_DEFAULT_DEPS = "1"
+ALLOW_EMPTY = "1"
+
+
+python __anonymous () {
+
+    import bb
+
+#Get all the packages we can build/exist in OE
+    package_list =  bb.data.getVar('PACKAGES_LIST', d) or "none"
+    package_list = package_list.split()
+#Get the packages that are broken on all architectures
+    broken_package_list =  bb.data.expand('${OPLINUX_BROKEN_PACKAGES}', d)
+
+#Get the arch we are building for
+    building_arch = bb.data.getVar('FEED_ARCH',d) 
+
+#Now add the broken packages list the ones that fail for the arch we build now
+    if (building_arch=="i486") or (building_arch=="i586") or (building_arch=="i686"):
+        broken_package_list = broken_package_list + bb.data.expand('${OPLINUX_BROKEN_PACKAGES_ARCH_x8}', d)
+
+    elif  (building_arch=="ppc405"):
+        broken_package_list = broken_package_list + bb.data.expand('${OPLINUX_BROKEN_PACKAGES_ARCH_PPC}', d)
+
+    elif (building_arch=="ppc603e"):       
+        broken_package_list = broken_package_list + bb.data.expand('${OPLINUX_BROKEN_PACKAGES_ARCH_POWERPC}', d)
+
+    for chk_package in package_list :
+        build_package="yes"
+
+    if chk_package in broken_package_list:
+        build_package="no"
+    else :
+        bb.data.setVar('DEPENDS', (bb.data.getVar('DEPENDS', d) + chk_package +" "), d)   
+
+#add the OPLinux extra packages to the DEPENDS list
+    bb.data.setVar('DEPENDS', (bb.data.getVar('DEPENDS', d) + bb.data.getVar('OPLINUX_EXTRA_PACKAGES', d)), d)   
+
+    bb.data.setVar('DEPENDS', (bb.data.getVar('DEPENDS', d) + "package-index"), d)   
+}
+
+
+
+
+
+# The list of packages availiable to OE 
+# KEEP IN ALPHABETICAL ORDER
+# Do *not* simply comment out a line. That will break. Instead
+# remove the package and place it in the corresponding "broken" list
+PACKAGES_LIST = "\
+        acct \
+        acpid \
+        adns \
+        aiostress \
+        aircrack \
+       alsa-lib \
+       alsa-utils \
+       apache2 \
+        appweb \
+        apmd \
+        apt \
+        ark3116 \
+        arpwatch \
+        at       \
+        atd \
+       atftp \
+        atmelwlandriver \ 
+       audiofile \
+       aumix \
+       autoconf \
+       automake \
+        autofs \
+        aspell \
+        avahi \
+        bacula-client \
+        balsa \
+       bash \
+        bazaar \
+        bb \
+        bc \
+       beep \
+        beecrypt \ 
+        beepmp \
+       bind \
+       binutils \
+        bing \
+       bison \
+        bitchx \
+        blueprobe \
+        bmon \
+        boa \ 
+        bochs \
+        bogofilter \
+        boost \      
+        boost-asio \
+        bonnie++ \
+        bootchart \
+        bootmenu \
+        bootsplash \
+       bridge-utils \
+        bt950-cs \
+        btscanner \
+        btsco \
+        btsco-module \
+        btxml \
+        bvi \
+       bwmon \
+        bluez-utils \
+        bzflag \
+        bzflag-server \
+       bzip2 \
+        came \
+        chillispot \
+        camsource \
+        cscope \
+        cups \
+       ccxstream \
+       cdparanoia \
+       cdstatus \
+        cetools \
+       cherokee \
+        ckermit \
+        clish \
+       coreutils \
+        conserver \
+        corkscrew \
+        cpusage \
+       cron \
+       ctorrent \
+       cvs \
+       cyrus-sasl \
+       cyrus-imapd \
+        dialog \
+       db \
+        ddclient \
+        dhclient \
+        dhcp \
+        didiwiki \
+       devlabel \
+       diffstat \
+       diffutils \
+       dnsmasq \
+        ebtables \
+        elftoaout \
+        emul \
+        enscript \
+       e2fsprogs \
+       e2fsprogs-libs \
+        esmtp \
+        etherpuppet \
+        ethload \
+        ethtool \
+        ettercap \
+       expat \
+       ez-ipupdate \
+        fortune-mod \
+        fakeconnect \
+        fbgrab \
+       fetchmail \
+       file \
+       findutils \
+       flac \
+       flex \
+       flite \
+        frotz \
+        fush \
+        g15daemon \
+       gallery \
+        gammu \
+       gawk \
+       gcc \
+       gdb \
+       gdbm \
+        genext2fs \
+       gphoto2 \
+        git \
+        gift \
+       glib-2.0 \
+        gpm \
+        gpsbabel \
+        gs \
+       gnu-config \
+        gnuplot \
+        gpsd \
+       grep \
+       gtk-doc \
+       gzip \
+       hdparm \
+        hydra \
+       ifupdown \
+        iputils \
+       ipkg-utils \
+       iptables \
+        intercom \
+       ircp \
+       irssi \
+       joe \
+       jpeg \
+        kismet \
+        kbdd \
+        ksymoops \
+        lame \
+        lxt \
+       lcdproc \
+       less \
+       libao \
+       libpcre \
+       libid3tag \
+       liblockfile \
+       libmad \
+       libmikmod \
+       libogg \
+       libol \
+       libpng \
+       libtool \
+       libupnp \
+       libusb \
+       libvorbis \
+       litestream \
+       lrzsz \
+       lsof \
+       lvm2 \
+       m4 \
+       madplay \
+       mailx \
+       make \
+        mc \
+        mikmod \
+       mdadm \
+        memtester \
+       mgetty \
+       miau \
+       microcom \
+       minicom \
+       modphp \
+        modplugplay \
+        mp3blaster \
+        mpg321 \
+       mt-daapd \
+       mtd-utils \
+       mutt \
+        mysql \
+        mystun-server \
+       nail \
+       nano \
+       ncftp \
+       ncurses \
+       netcat \
+       nmap \
+        nmixer \
+       ntp \
+        netkit-ftp \
+        netperf \
+        net-snmp \
+        nfs-utils \
+        ngrep \
+        nmap \
+        nsd \
+        ntp \
+        ntpdate \
+       openobex-apps \
+       openldap \
+       openntpd \
+       openobex \
+        obexftp \
+        obexpush \
+        olsrd \
+        openswan \
+       openssh \
+       openvpn \
+       patch \
+       pciutils \
+        pcmcia-cs \        
+        portmap \
+        privoxy \
+       perl \
+       pkgconfig \
+       ppp \
+       procps \
+       pvrusb2-mci \
+       pwc \
+       quilt \
+       rng-tools \
+       rsync \
+       samba \
+       sane-backends \
+       sed \
+       setpwc \
+       setserial \
+        shorewall \
+       smartmontools \
+       ssmtp \
+       strace \
+       streamripper \
+       sysfsutils \
+       syslog-ng \
+        stunnel \
+        spandsp \
+        subversion \
+        slutils \
+        strace \
+        sudo \
+        tcpdump \
+        tor \
+       tar \
+       thttpd \
+       tiff \
+        texinfo \
+       unzip \
+        unrar \ 
+       usbutils \
+       util-linux \
+       vim \
+       vlan \
+        vorbis-tools \
+        vpnc \
+       vsftpd \
+        vtun \
+       watchdog \
+       wget \
+       zd1211-firmware \
+       zip \
+       zlib \
+        zsh \
+       lirc \
+       masqmail \
+       wakelan \
+       wireless-tools \
+       wpa-supplicant \
+       libxml2 \
+       libdvb \
+       madwifi-ng \
+       motion \
+       ftpd-topfield \
+       eciadsl \
+       netpbm \
+       reiserfsprogs reiser4progs \
+       python \
+       mpd \
+       memtester \
+       puppy \
+
+       ctrlproxy \
+       dsniff \    
+       iperf \
+       groff \
+       man man-pages \
+       psmisc \
+       screen \
+       timezones \
+        wview-sim wview-vpro wview-wxt510 \
+        wview-sim-mysql wview-vpro-mysql \
+        wview-wxt510-mysql \
+       xinetd \
+       obexftp \
+       qc-usb-messenger \
+       unionfs-modules \
+       unionfs-utils \
+       erlang \
+       ctrlproxy \
+       dsniff \    
+        fortune-mod \
+       libpam \
+       nfs-utils \
+       rng-tools \
+       postfix \
+       yp-tools ypbind ypserv \
+"
+
+
+
+# Packages currently broken on all platforms (glibc)
+OPLINUX_BROKEN_PACKAGES = "irssi \
+       unionfs-modules \
+       unionfs-utils \
+
+"
+
+#Here we define the packages that are broken on a specific architecture
+#i486, i586, i686
+OPLINUX_BROKEN_PACKAGES_ARCH_x86 =" \
+        aircrack \
+        appweb \
+        apt \
+        ark3116 \
+        at \
+        atmelwlandriver \ 
+       atftp \
+        autofs \
+        balsa \
+        bazaar \
+        bb \
+        beecrypt \
+        beepmp \
+        bitchx \
+        bochs \
+        bmon \
+        bt950-cs \
+        btscanner \
+        btsco-module \
+       bwmon \
+        came \
+       ctrlproxy \
+       cyrus-sasl \
+       cyrus-imapd \
+       dsniff \    
+       eciadsl \
+       erlang \
+        fortune-mod \
+       gphoto2 \
+        gpsd   \
+        intercom \
+        lcdproc  \
+       lirc \
+       mpd \
+       puppy \
+       pvrusb2-mci \
+       pwc \
+       qc-usb-messenger \
+       sane-backends \
+       setpwc \
+        slutils \
+        texinfo \
+       vsftpd \
+       libpam \
+        aircrack \
+        appweb \
+        apt \
+        ark3116 \
+        gcc \
+        gpsd \
+        pvrusb2-mci \
+        pwc \
+        setpwc \
+        cyrus-sasl \
+        atftp \
+        gphoto2 \
+        lirc \
+        libdvb \
+        netpbm \
+"
+#
+#ppc405
+OPLINUX_BROKEN_PACKAGES_ARC_PPC = " \
+        aircrack \
+        appweb \
+        apt \
+        ark3116 \
+        at \
+        atmelwlandriver \ 
+       atftp \
+        autofs \
+        balsa \
+        bazaar \
+        bb \
+        beecrypt \
+        beepmp \
+        bitchx \
+        bochs \
+        bmon \
+        bt950-cs \
+        btscanner \
+        btsco-module \
+       bwmon \
+        came \
+       ctrlproxy \
+       cyrus-sasl \
+       cyrus-imapd \
+       dsniff \    
+       eciadsl \
+       erlang \
+        fortune-mod \
+       gphoto2 \
+        gpsd   \
+        intercom \
+        lcdproc  \
+       lirc \
+       mpd \
+       puppy \
+       pvrusb2-mci \
+       pwc \
+       qc-usb-messenger \
+       sane-backends \
+       setpwc \
+        slutils \
+        texinfo \
+       vsftpd \
+"
+
+
+
+#
+#ppc440 ppc603e
+OPLINUX_BROKEN_PACKAGES_ARCH_POWERPC = " \
+        aircrack \
+        appweb \
+        apt \
+        ark3116 \
+        arpwatch \
+        at \
+        atmelwlandriver \ 
+       atftp \
+        autofs \
+        balsa \
+        bazaar \
+        bb \
+        beecrypt \
+        beepmp \
+        bitchx \
+        bochs \
+        bmon \
+        bt950-cs \
+        btscanner \
+        btsco-module \
+       bwmon \
+        came \
+       ctrlproxy \
+       cyrus-sasl \
+       cyrus-imapd \
+       dsniff \    
+       eciadsl \
+       erlang \
+        fortune-mod \
+       gphoto2 \
+        gpsd   \
+        intercom \
+        lcdproc  \
+       lirc \
+       mpd \
+       puppy \
+       pvrusb2-mci \
+       pwc \
+       qc-usb-messenger \
+       sane-backends \
+       setpwc \
+        slutils \
+        spandsp \
+        texinfo \
+       vsftpd \
+
+       libpam \
+        aircrack \
+        appweb \
+        apt \
+        ark3116 \
+        gcc \
+        gpsd \
+        pvrusb2-mci \
+        pwc \
+        setpwc \
+        cyrus-sasl \
+        atftp \
+        gphoto2 \
+        lirc \
+        libdvb \
+        netpbm \
+"
+
+
+
+
+#Packages broken per machine (if we ever need such a thing)
+OPLINUX_BROKEN_PACKAGES_append_x86 =" \
+"
+OPLINUX_BROKEN_PACKAGES_append_i586-generic =" \
+"
+OPLINUX_BROKEN_PACKAGES_append_i686-generic =" \
+"
+OPLINUX_BROKEN_PACKAGES_append_epia =" \
+"
+OPLINUX_BROKEN_PACKAGES_append_wrap = "\
+"
+
+#ppc targets
+OPLINUX_BROKEN_PACKAGES_append_magicbox = "\
+"
+OPLINUX_BROKEN_PACKAGES_append_dht-walnut = "\
+"
+#powerpc targets
+OPLINUX_BROKEN_PACKAGES_append_efika = "\
+"
+
+
+#
+#
+OPLINUX_UCLIBC_UNSUPPORTABLE_PACKAGES = "\
+       libpam \
+       nfs-utils \
+       rng-tools \
+       postfix \
+       yp-tools ypbind ypserv \
+       "
+
+# These packages work with glibc, but break on uclibc.
+OPLINUX_UCLIBC_BROKEN_PACKAGES = "\
+#      bwmon \
+#      erlang \
+#      apr \
+#      bogofilter \
+#      boost \
+#      linphone \
+#      sudo \
+#      ushare \
+       "
+
+OPLINUX_UCLIBC_BROKEN_PACKAGES_append_x86 = "\
+       "
+
+OPLINUX_UCLIBC_BROKEN_PACKAGES_append_epia = "\
+       "
+
+OPLINUX_UCLIBC_BROKEN_PACKAGES_append_wrap = "\
+       "
+
+OPLINUX_UCLIBC_BROKEN_PACKAGES_append_magicbox = "\
+       "
+
+OPLINUX_UCLIBC_BROKEN_PACKAGES_append_dht-walnut = "\
+       "
+
+
+# Packages which build only with glibc (some of these use internal
+# glibc functions and so will probably never run on uclibc).
+OPLINUX_BROKEN_PACKAGES_append_uclibc-linux = "\
+       ${OPLINUX_UCLIBC_UNSUPPORTABLE_PACKAGES} \
+       ${OPLINUX_UCLIBC_BROKEN_PACKAGES} \
+
+"
+
+#
+#Any extra packages defined 
+#
+OPLINUX_EXTRA_PACKAGES ?= ""
diff --git a/packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/wireless.patch b/packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/wireless.patch
new file mode 100644 (file)
index 0000000..dfa579f
--- /dev/null
@@ -0,0 +1,12 @@
+diff -ur prismstumbler-0.7.4pre1_old/src/daemon/cards.c prismstumbler-0.7.4pre1/src/daemon/cards.c
+--- prismstumbler-0.7.4pre1_old/src/daemon/cards.c     2006-03-28 19:31:26.000000000 +0200
++++ prismstumbler-0.7.4pre1/src/daemon/cards.c 2007-05-22 14:59:15.000000000 +0200
+@@ -9,6 +9,8 @@
+ #include <stdio.h>
+ #include <sys/socket.h>
++#include <linux/types.h>
++#include <net/if.h>
+ #include <linux/wireless.h>
+ #include <glib.h>
+ #include <string.h>
index 9311f89..3005476 100644 (file)
@@ -1,5 +1,5 @@
 SECTION = "x11/network"
-PR = "r1"
+PR = "r2"
 
 PACKAGES = "prismstumbler prismstumbler-frontend prismstumbler-doc"
 DESCRIPTION = "Prismstumbler wireless LAN scanner"
@@ -10,7 +10,8 @@ RDEPENDS = "wireless-tools"
 RRECOMMENDS = "gpsd"
 
 SRC_URI = "http://projects.linuxtogo.org/frs/download.php/14/${PN}-0.7.4pre1.tar.gz \
-           file://gpsapi.patch;patch=1"
+           file://gpsapi.patch;patch=1 \
+           file://wireless.patch;patch=1"
 
 S = "${WORKDIR}/${PN}-0.7.4pre1"
 
diff --git a/packages/rt2x00/rt2570-k2wrlz_1.6.0.bb b/packages/rt2x00/rt2570-k2wrlz_1.6.0.bb
new file mode 100644 (file)
index 0000000..b22a395
--- /dev/null
@@ -0,0 +1,17 @@
+DESCRIPTION = "Driver for Ralink rt2570 USB 802.11g WiFi sticks"
+HOMEPAGE = "http://rt2x00.serialmonkey.com/"
+SECTION = "kernel/modules"
+LICENSE = "GPL"
+
+SRC_URI = "http://homepages.tu-darmstadt.de/~p_larbig/wlan/${PN}-${PV}.tar.bz2"
+
+inherit module
+
+S = "${WORKDIR}/${PN}-${PV}/Module/"
+
+EXTRA_OEMAKE = "KERNDIR=${STAGING_KERNEL_DIR}"
+
+do_install() {
+       install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
+       install -m 0644 rt2570${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/
+}
index 44035e6..50d107d 100644 (file)
@@ -1,5 +1,5 @@
 require scummvm.inc
-DEPENDS = "libsdl-qpe libmad tremor libogg zlib libmpeg2"
+DEPENDS = "libsdl-qpe libmad tremor libogg zlib mpeg2dec"
 
 S="${WORKDIR}/scummvm-${PV}/"
 
index 1aecd20..852ca5f 100644 (file)
@@ -1,7 +1,7 @@
 DESCRIPTION = "Virtual Machine for LucasArts Adventures for Qt/Embedded based palmtop environments w/ SDL."
 SECTION = "opie/games"
 PRIORITY = "optional"
-DEPENDS = "libsdl-qpe libmad tremor libogg zlib libmpeg2"
+DEPENDS = "libsdl-qpe libmad tremor libogg zlib mpeg2dec"
 LICENSE = "GPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \
index 6776270..a1d3dce 100644 (file)
@@ -1,5 +1,5 @@
 require scummvm.inc
-DEPENDS = "virtual/libsdl libmad tremor libogg zlib libmpeg2"
+DEPENDS = "virtual/libsdl libmad tremor libogg zlib mpeg2dec"
 SRC_URI += " file://mouse.patch;patch=1 \
              file://gcc-4.x.x-accept.patch;patch=1 \
             file://sh3-linux-new-arch.patch;patch=1 \
index 9719ee2..0403e6a 100644 (file)
@@ -1,5 +1,5 @@
 require scummvm.inc
-DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib libmpeg2"
+DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib mpeg2dec"
 SRC_URI += "file://sh3-arch-0.9.0+.patch;patch=1"
 
 EXTRA_OECONF += "--enable-lure \
diff --git a/packages/scummvm/scummvm_0.9.1.bb b/packages/scummvm/scummvm_0.9.1.bb
new file mode 100644 (file)
index 0000000..5d1e2c1
--- /dev/null
@@ -0,0 +1,16 @@
+DEFAULT_PREFERENCE = "-1"
+
+require scummvm.inc
+DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib mpeg2dec"
+
+EXTRA_OECONF += "--enable-lure \
+                --enable-agi \
+                --enable-cine \
+                "
+
+do_compile() {
+       oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \
+                   DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT  -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2"
+}
+
+
diff --git a/packages/telepathy/empathy_0.4.bb b/packages/telepathy/empathy_0.4.bb
new file mode 100644 (file)
index 0000000..d5e699c
--- /dev/null
@@ -0,0 +1,18 @@
+DESCRIPTION = "Empathy: a Telepathy based IM client"
+HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0"
+LICENSE = "GPL"
+DEPENDS = "libgnomeui telepathy-mission-control libtelepathy gtk+ gconf libglade"
+RDEPENDS = "telepathy-mission-control"
+RRECOMMENDS = "telepathy-gabble"
+
+PR="r0"
+
+inherit gnome
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/empathy/0.4/empathy-${PV}.tar.bz2 \
+          "
+
+FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \
+        ${datadir}/dbus-1/services/*.service \
+        ${datadir}/telepathy/managers/*.chandler \
+       ${datadir}/icons"
diff --git a/packages/telepathy/telepathy-mission-control_4.22.bb b/packages/telepathy/telepathy-mission-control_4.22.bb
new file mode 100644 (file)
index 0000000..2215d0a
--- /dev/null
@@ -0,0 +1,42 @@
+DESCRIPTION = "Telepathy Mission Control"
+HOMEPAGE = "http://mission-control.sourceforge.net/"
+LICENSE = "LGPL"
+SECTION = "libs"
+DEPENDS = "libtelepathy dbus-glib gconf"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/mission-control/telepathy-mission-control-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+PACKAGES =+ " \
+       libmissioncontrol \
+       libmissioncontrol-config \
+       libmissioncontrol-server \
+       libmissioncontrol-dev \
+       libmissioncontrol-config-dev \
+       libmissioncontrol-server-dev \
+       libmissioncontrol-dbg \
+       libmissioncontrol-config-dbg \
+       libmissioncontrol-server-dbg \
+"
+
+FILES_${PN} += "${datadir}/dbus*"
+
+FILES_libmissioncontrol = "${libdir}/libmissioncontrol.so.*"
+FILES_libmissioncontrol-config = "${libdir}/libmissioncontrol-config.so.*"
+FILES_libmissioncontrol-server = "${libdir}/libmissioncontrol-server.so.*"
+
+FILES_libmissioncontrol-dev = "${libdir}/libmissioncontrol.* \
+                               ${includedir}/libmissioncontrol/ \
+                              ${libdir}/pkgconfig/libmissioncontrol.pc"
+FILES_libmissioncontrol-config-dev = "${libdir}/libmissioncontrol-config.*"
+FILES_libmissioncontrol-server-dev = "${libdir}/libmissioncontrol-server.*"
+
+FILES_libmissioncontrol-dbg = "${libdir}/.debug/libmissioncontrol.so.*"
+FILES_libmissioncontrol-config-dbg = "${libdir}/.debug/libmissioncontrol-config.so.*"
+FILES_libmissioncontrol-server-dbg = "${libdir}/.debug/libmissioncontrol-server.so.*"
+
+do_stage() {
+        autotools_stage_all
+}
index d9b2f7b..9a01994 100644 (file)
@@ -27,5 +27,5 @@ addtask deploy before do_build after do_compile
 
 do_stage() {
        install -d ${STAGING_BINDIR_NATIVE}
-       install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE}/
+       install -m 755 tools/mkimage ${STAGING_BINDIR_NATIVE}/
 }
diff --git a/packages/uclibc/uclibc-initial_0.9.29.bb b/packages/uclibc/uclibc-initial_0.9.29.bb
new file mode 100644 (file)
index 0000000..840acaf
--- /dev/null
@@ -0,0 +1,32 @@
+SECTION = "base"
+require uclibc_${PV}.bb
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+DEPENDS = "linux-libc-headers"
+PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+PACKAGES = ""
+
+do_stage() {
+       # Install initial headers into the cross dir
+       make PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
+               RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
+               pregen install_dev
+
+       mkdir -p ${CROSS_DIR}/${TARGET_SYS}
+       mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include
+       mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
+       ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
+       rm -rf ${CROSS_DIR}/${TARGET_SYS}/${prefix}
+
+       # This conflicts with the c++ version of this header
+       rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h
+}
+
+do_install() {
+       :
+}
+
+do_compile () {
+       :
+}
index 00cb7af..293a00e 100644 (file)
@@ -7,7 +7,7 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.29"
-PR = "r2"
+PR = "r3"
 
 require uclibc.inc
 
diff --git a/packages/vsftpd/vsftpd-2.0.5/syscall.patch b/packages/vsftpd/vsftpd-2.0.5/syscall.patch
new file mode 100644 (file)
index 0000000..b91cd53
--- /dev/null
@@ -0,0 +1,12 @@
+Index: vsftpd-2.0.5/sysdeputil.c
+===================================================================
+--- vsftpd-2.0.5.orig/sysdeputil.c     2007-05-20 21:20:01.000000000 +0200
++++ vsftpd-2.0.5/sysdeputil.c  2007-05-20 21:20:28.000000000 +0200
+@@ -159,7 +159,6 @@
+ #include <linux/capability.h>
+ #include <errno.h>
+ #include <syscall.h>
+-_syscall2(int, capset, cap_user_header_t, header, const cap_user_data_t, data)
+ /* Gross HACK to avoid warnings - linux headers overlap glibc headers */
+ #undef __NFDBITS
+ #undef __FDMASK
index 81aec46..fc10d27 100644 (file)
@@ -1,12 +1,12 @@
 DESCRIPTION = "Secure ftp daemon"
 SECTION = "console/network"
 LICENSE = "GPL"
-DEPENDS = "openssl"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://vsftpd.beasts.org/users/cevans/vsftpd-${PV}.tar.gz \
            file://makefile.patch;patch=1 \
            file://nopam.patch;patch=1 \
+           file://syscall.patch;patch=1 \
            file://init \
            file://vsftpd.conf"
 
@@ -20,7 +20,7 @@ do_configure() {
 }
 
 do_compile() {
-        oe_runmake "LIBS=-lssl -lcrypto -lcrypt -L${STAGING_LIBDIR}"
+        oe_runmake "LIBS=-lcrypt -L${STAGING_LIBDIR}"
 }
 
 do_install() {
diff --git a/packages/watchdog/watchdog_5.3.1.bb b/packages/watchdog/watchdog_5.3.1.bb
new file mode 100644 (file)
index 0000000..fd8e756
--- /dev/null
@@ -0,0 +1,9 @@
+DESCRIPTION = "System watchdog daemon"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/${PN}_${PV}.tar.gz"
+
+inherit autotools
+
+FILES = "${sysconfdir}/watchdog.conf ${sbindir}/watchdog"
diff --git a/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch b/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch
deleted file mode 100644 (file)
index f43d380..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- X11/src/ErrDes.c.orig      2005-09-03 16:15:48 +0200
-+++ X11/src/ErrDes.c   2005-09-03 16:16:03 +0200
-@@ -56,7 +56,7 @@
- #include <stdio.h>
- #ifndef ERRORDB
--#define ERRORDB "/usr/lib/X11/XErrorDB"
-+#define ERRORDB "/usr/share/X11/XErrorDB"
- #endif
- /*
---- X11/src/StrKeysym.c.orig   2005-09-03 16:41:18 +0200
-+++ X11/src/StrKeysym.c        2005-09-03 16:41:33 +0200
-@@ -36,7 +36,7 @@
- #include "Key.h"
- #ifndef KEYSYMDB
--#define KEYSYMDB "/usr/lib/X11/XKeysymDB"
-+#define KEYSYMDB "/usr/share/X11/XKeysymDB"
- #endif
- static Bool initialized;
index 634d6eb..7bcd483 100644 (file)
@@ -42,6 +42,15 @@ FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compile
 FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug ${libdir}/xorg/modules/*/.debug"
 FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"
 
+PACKAGES =+ "${PN}-multimedia ${PN}-configtools"
+
+FILES_${PN}-multimedia = "${libdir}/xorg/modules/multimedia/*.so"
+FILES_${PN}-configtools = "${bindir}/xorgconfig ${bindir}/xorgcfg"
+
+do_configure_prepend() {
+        sed -i -e s:/usr/include/drm:${STAGING_INCDIR}/drm:g hw/xfree86/os-support/linux/Makefile.am 
+}
+
 do_stage() {
        autotools_stage_all
 }
diff --git a/packages/xorg-xserver/xserver-kdrive-1.3.0.0/.mtn2git_empty b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/packages/xorg-xserver/xserver-kdrive-1.3.0.0/disable-xf86-dga-xorgcfg.patch b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/disable-xf86-dga-xorgcfg.patch
new file mode 100644 (file)
index 0000000..ccc1913
--- /dev/null
@@ -0,0 +1,39 @@
+Index: xorg-server-1.3.0.0/configure.ac
+===================================================================
+--- xorg-server-1.3.0.0.orig/configure.ac      2007-04-20 03:23:40.000000000 +0200
++++ xorg-server-1.3.0.0/configure.ac   2007-05-09 16:51:34.000000000 +0200
+@@ -520,7 +520,11 @@
+ XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
+ dnl Core modules for most extensions, et al.
++if test "$KDRIVE" = yes; then
++REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]"
++else
+ REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]"
++fi
+ REQUIRED_LIBS="xfont xau fontenc"
+ AM_CONDITIONAL(XV, [test "x$XV" = xyes])
+@@ -1603,7 +1607,9 @@
+ AC_SUBST(XKB_COMPILED_DIR)
+ dnl and the rest of these are generic, so they're in config.h
++if test ! x"$KDRIVE" = xyes; then
+ AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
++fi
+ AC_DEFINE(XResExtension, 1, [Build XRes extension])
+ AC_TRY_COMPILE([
+@@ -1616,10 +1622,12 @@
+ AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
++if test ! "x$KDRIVE" = xyes ; then
+ dnl xorgconfig CLI configuration utility
+ PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11])
+ AC_SUBST(XORGCONFIG_DEP_CFLAGS)
+ AC_SUBST(XORGCONFIG_DEP_LIBS)
++fi
+ dnl xorgcfg GUI configuration utility
+ AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], 
diff --git a/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-epson.patch b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-epson.patch
new file mode 100644 (file)
index 0000000..8ec3a37
--- /dev/null
@@ -0,0 +1,11 @@
+Index: xorg-server-1.2.0/hw/kdrive/Makefile.am
+===================================================================
+--- xorg-server-1.2.0.orig/hw/kdrive/Makefile.am       2007-03-28 17:11:38.000000000 +0200
++++ xorg-server-1.2.0/hw/kdrive/Makefile.am    2007-03-28 17:12:28.000000000 +0200
+@@ -1,5 +1,5 @@
+ if KDRIVEFBDEV
+-FBDEV_SUBDIRS = fbdev
++FBDEV_SUBDIRS = fbdev epson
+ endif
+ if KDRIVEIMAGEON
diff --git a/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-tslib.patch
new file mode 100644 (file)
index 0000000..9a59530
--- /dev/null
@@ -0,0 +1,12 @@
+Index: xorg-server-1.2.0/configure.ac
+===================================================================
+--- xorg-server-1.2.0.orig/configure.ac        2007-03-29 13:28:10.000000000 +0200
++++ xorg-server-1.2.0/configure.ac     2007-03-29 13:28:35.000000000 +0200
+@@ -1517,6 +1517,7 @@
+             AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/])
+         fi
+         AC_DEFINE(TSLIB, 1, [Have tslib support])
++        AC_DEFINE(TOUCHSCREEN, 1, [Have touchscreen support])
+     fi
+     # damage shadow extension glx (NOTYET) fb mi
diff --git a/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch
new file mode 100644 (file)
index 0000000..717e72f
--- /dev/null
@@ -0,0 +1,101 @@
+---
+ Xext/Makefile.am           |    6 ++++++
+ configure.ac               |    9 ++++++++-
+ include/kdrive-config.h.in |    3 +++
+ mi/miinitext.c             |    6 ++++++
+ 4 files changed, 23 insertions(+), 1 deletion(-)
+
+Index: xorg-server-1.3.0.0/mi/miinitext.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/mi/miinitext.c    2007-05-15 16:05:34.000000000 +0100
++++ xorg-server-1.3.0.0/mi/miinitext.c 2007-05-15 16:05:39.000000000 +0100
+@@ -372,6 +372,9 @@ extern void ResExtensionInit(INITARGS);
+ #ifdef DMXEXT
+ extern void DMXExtensionInit(INITARGS);
+ #endif
++#ifdef XCALIBRATE
++extern void XCalibrateExtensionInit(INITARGS);
++#endif
+ #ifdef XEVIE
+ extern void XevieExtensionInit(INITARGS);
+ #endif
+@@ -663,6 +666,9 @@ InitExtensions(argc, argv)
+ #ifdef DAMAGE
+     if (!noDamageExtension) DamageExtensionInit();
+ #endif
++#ifdef  XCALIBRATE
++    XCalibrateExtensionInit ();
++#endif
+ }
+ void
+Index: xorg-server-1.3.0.0/configure.ac
+===================================================================
+--- xorg-server-1.3.0.0.orig/configure.ac      2007-05-15 16:05:34.000000000 +0100
++++ xorg-server-1.3.0.0/configure.ac   2007-05-15 16:17:54.000000000 +0100
+@@ -421,6 +421,7 @@ AC_ARG_ENABLE(xf86vidmode,    AS_HELP_ST
+ AC_ARG_ENABLE(xf86misc,       AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: enabled)]), [XF86MISC=$enableval], [XF86MISC=yes])
+ AC_ARG_ENABLE(xace,     AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes])
+ AC_ARG_ENABLE(xcsecurity,     AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (default: enabled)]), [XCSECURITY=$enableval], [XCSECURITY=$XACE])
++AC_ARG_ENABLE(xcalibrate,     AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no])
+ AC_ARG_ENABLE(appgroup,       AS_HELP_STRING([--disable-appgroup], [Build XC-APPGROUP extension (default: enabled)]), [APPGROUP=$enableval], [APPGROUP=$XCSECURITY])
+ AC_ARG_ENABLE(xcalibrate,     AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no])
+ AC_ARG_ENABLE(tslib,          AS_HELP_STRING([--enable-tslib], [Build kdrive tslib touchscreen support (default: disabled)]), [TSLIB=$enableval], [TSLIB=no])
+@@ -653,6 +654,12 @@ if test "x$XCSECURITY" = xyes; then
+       AC_DEFINE(XCSECURITY, 1, [Build Security extension])
+ fi
++AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes])
++if test "x$XCALIBRATE" = xyes; then
++      AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension])
++      REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto"
++fi
++
+ AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes])
+ if test "x$XEVIE" = xyes; then
+       AC_DEFINE(XEVIE, 1, [Build XEvIE extension])
+@@ -1547,7 +1554,7 @@ if test "$KDRIVE" = yes; then
+           ;;
+     esac
+     KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
+-    KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB $TSLIB_LIBS"
++    KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB $TSLIB_LIBS"
+     # check if we can build Xephyr
+     PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
+Index: xorg-server-1.3.0.0/include/kdrive-config.h.in
+===================================================================
+--- xorg-server-1.3.0.0.orig/include/kdrive-config.h.in        2007-05-15 16:05:34.000000000 +0100
++++ xorg-server-1.3.0.0/include/kdrive-config.h.in     2007-05-15 16:05:39.000000000 +0100
+@@ -25,4 +25,7 @@
+ /* Verbose debugging output hilarity */
+ #undef DEBUG
++/* Enable XCalibrate extension */
++#undef XCALIBRATE
++
+ #endif /* _KDRIVE_CONFIG_H_ */
+Index: xorg-server-1.3.0.0/Xext/Makefile.am
+===================================================================
+--- xorg-server-1.3.0.0.orig/Xext/Makefile.am  2007-05-15 16:05:34.000000000 +0100
++++ xorg-server-1.3.0.0/Xext/Makefile.am       2007-05-15 16:05:39.000000000 +0100
+@@ -91,6 +91,11 @@ BUILTIN_SRCS += $(XCALIBRATE_SRCS)
+ # XCalibrare needs tslib
+ endif
++XCALIBRATE_SRCS = xcalibrate.c
++if XCALIBRATE
++BUILTIN_SRCS += $(XCALIBRATE_SRCS)
++endif
++
+ # X EVent Interception Extension: allows accessibility helpers & composite
+ # managers to intercept events from input devices and transform as needed
+ # before the clients see them.
+@@ -169,6 +174,7 @@ EXTRA_DIST = \
+       $(XCSECURITY_SRCS) \
+       $(XCALIBRATE_SRCS) \
+       $(XINERAMA_SRCS) \
++      $(XCALIBRATE_SRCS) \
+       $(XEVIE_SRCS) \
+       $(XPRINT_SRCS) \
+       $(APPGROUP_SRCS) \
diff --git a/packages/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch
new file mode 100644 (file)
index 0000000..a580b50
--- /dev/null
@@ -0,0 +1,58 @@
+Index: xorg-server-1.2.0/Makefile.am
+===================================================================
+--- xorg-server-1.2.0.orig/Makefile.am 2007-01-23 06:39:15.000000000 +0100
++++ xorg-server-1.2.0/Makefile.am      2007-03-28 20:26:19.000000000 +0200
+@@ -30,6 +30,10 @@
+ XINPUT_DIR=Xi
+ endif
++if XKB
++XKB_DIR=xkb
++endif
++
+ if DBE
+ DBE_DIR=dbe
+ endif
+@@ -46,7 +50,7 @@
+       randr \
+       render  \
+       $(XINPUT_DIR) \
+-      xkb \
++      $(XKB_DIR) \
+       $(DBE_DIR) \
+       $(MFB_DIR) \
+       $(AFB_DIR) \
+Index: xorg-server-1.2.0/configure.ac
+===================================================================
+--- xorg-server-1.2.0.orig/configure.ac        2007-01-23 06:39:15.000000000 +0100
++++ xorg-server-1.2.0/configure.ac     2007-03-28 20:27:13.000000000 +0200
+@@ -428,6 +428,7 @@
+ AC_ARG_ENABLE(dpms,           AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes])
+ AC_ARG_ENABLE(xinput,         AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes])
+ AC_ARG_ENABLE(xfree86-utils,     AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes])
++AC_ARG_ENABLE(xkb,            AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes])
+ dnl DDXes.
+ AC_ARG_ENABLE(xorg,                 AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
+@@ -754,12 +755,15 @@
+ AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
+-AC_DEFINE(XKB, 1, [Build XKB])
+-AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
+-AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
+-REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
+-XKB_LIB='$(top_builddir)/xkb/libxkb.la'
+-XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
++AM_CONDITIONAL(XKB, [test "x$XKB" = xyes])
++if test "x$XKB" = xyes; then
++      AC_DEFINE(XKB, 1, [Build XKB])
++      AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
++      AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
++      REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
++      XKB_LIB='$(top_builddir)/xkb/libxkb.la'
++      XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
++fi
+ AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
+                                         [Do not have `strcasecmp'.]))
diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
new file mode 100644 (file)
index 0000000..8c6db70
--- /dev/null
@@ -0,0 +1,17 @@
+require xserver-kdrive-common.inc
+
+# it's missing the xw100 patch
+DEFAULT_PREFERENCE = "-1"
+
+DEPENDS += "libxkbfile libxcalibrate"
+
+PE = "1"
+PR = "r0"
+
+SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
+       ${KDRIVE_COMMON_PATCHES} \
+        file://fix_default_mode.patch;patch=1 \
+       file://enable-xcalibrate.patch;patch=1 \
+       file://hide-cursor-and-ppm-root.patch;patch=1"
+
+S = "${WORKDIR}/xorg-server-${PV}"
index 900c326..08b965b 100644 (file)
@@ -1,8 +1,8 @@
+MESA_VER = "6.5.2"
+
 require xorg-xserver-common.inc
 PE = "1"
 
-SRC_URI += "file://drmfix.patch;patch=1"
-
 EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no "
 
 #DESCRIPTION = ""
diff --git a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
new file mode 100644 (file)
index 0000000..08b965b
--- /dev/null
@@ -0,0 +1,10 @@
+MESA_VER = "6.5.2"
+
+require xorg-xserver-common.inc
+PE = "1"
+
+EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no "
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
index 66feaad..e59460f 100644 (file)
@@ -96,7 +96,7 @@ case `module_id` in
                 ;;
         "GTA01")
                 ARGS="$ARGS -dpi 285 -screen 480x640" ;;
-        Nokia N800")
+        "Nokia N800")
                ARGS="$ARGS -dpi 225 -screen 800x480x16 -mouse tslib" ;;
        *)
                # Its a device we dont know about - in which case force
index 108f0c6..9d9b577 100644 (file)
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r13"
+PR = "r14"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}
index fb5b8e4..60101a6 100644 (file)
@@ -26,8 +26,9 @@ Reason:         Obsoleted by task-base
 Proposed by:    Koen Kooi
 Note:          Moved to packages/obsolete/tasks on 2006-12-22
 
-Package Name:   libmpeg2 (not mpeg2dec!)
-Removal Date:   2007-03-15
-Maintainer:    unknown, checked in from BK repo, no updates after that
-Reason:                mpeg2dec provides libmpeg2, see bug 375
-Proposed by:   Laibsch
+Package Name:   gtkmm-2.4.8
+Removal Date:   2007-06-10
+Maintainer:     Joaquim Duran (joaquinduran@adtelecom.es)
+Reason:         fails compilation for at least half a year
+                newer version available
+Note:           Will contact Joaquim before dropping.