diff options
17 files changed, 281 insertions, 266 deletions
diff --git a/packages/gdb/gdb_6.6.bb b/packages/gdb/gdb_6.6.bb index 2c0f2c67d9..3650b927da 100644 --- a/packages/gdb/gdb_6.6.bb +++ b/packages/gdb/gdb_6.6.bb @@ -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/gtk+/composite-pixbuf_0.0.bb b/packages/gtk+/composite-pixbuf_0.0.bb new file mode 100644 index 0000000000..729343fb44 --- /dev/null +++ b/packages/gtk+/composite-pixbuf_0.0.bb @@ -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/no-chmod.patch b/packages/kismet/kismet-2006-04-R1/no-chmod.patch deleted file mode 100644 index b22c513b68..0000000000 --- a/packages/kismet/kismet-2006-04-R1/no-chmod.patch +++ /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 index 2b29af51df..0000000000 --- a/packages/kismet/kismet_2005-04-R1.bb +++ /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 index c5e58b6edb..0000000000 --- a/packages/kismet/kismet_2005-08-R1.bb +++ /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 index aa51f2afa9..0000000000 --- a/packages/kismet/kismet_2006-04-R1.bb +++ /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" diff --git a/packages/kismet/kismet_2007-01-R1b.bb b/packages/kismet/kismet_2007-01-R1b.bb index 774e71e286..5c10300573 100644 --- a/packages/kismet/kismet_2007-01-R1b.bb +++ b/packages/kismet/kismet_2007-01-R1b.bb @@ -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/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 634d6eb835..7bcd483c24 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -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/kismet/kismet-2006-04-R1/.mtn2git_empty b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/kismet/kismet-2006-04-R1/.mtn2git_empty +++ b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/.mtn2git_empty 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 index 0000000000..ccc19139c8 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/disable-xf86-dga-xorgcfg.patch @@ -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 index 0000000000..8ec3a37c78 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-epson.patch @@ -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 index 0000000000..9a59530ed3 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-tslib.patch @@ -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 index 0000000000..717e72f93f --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch @@ -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 index 0000000000..a580b500b7 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch @@ -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 index 0000000000..8c6db70987 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb @@ -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}" diff --git a/packages/xorg-xserver/xserver-xorg_1.2.0.bb b/packages/xorg-xserver/xserver-xorg_1.2.0.bb index 900c3266cb..08b965bb75 100644 --- a/packages/xorg-xserver/xserver-xorg_1.2.0.bb +++ b/packages/xorg-xserver/xserver-xorg_1.2.0.bb @@ -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 index 0000000000..08b965bb75 --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb @@ -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 += " " |