diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2008-06-30 12:55:29 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2008-06-30 12:55:29 +0000 |
| commit | d4e56ff4dc8a0528550eb8503956bdcddb2fe516 (patch) | |
| tree | 2d6f8114da90ab526a5d7595c55ad8559de64366 | |
| parent | af593cbceefb461c8c089395ff257c05cd290af7 (diff) | |
| download | buildroot-novena-d4e56ff4dc8a0528550eb8503956bdcddb2fe516.tar.gz buildroot-novena-d4e56ff4dc8a0528550eb8503956bdcddb2fe516.zip | |
packages: fix xorg to compile modular and tiny versions
Based on googlecode r558 by John Voltz.
125 files changed, 804 insertions, 2526 deletions
diff --git a/package/Config.in b/package/Config.in index e9145f87b..29e1b37af 100644 --- a/package/Config.in +++ b/package/Config.in @@ -353,24 +353,15 @@ source "package/qtopia4/Config.in" #source "package/microwin/Config.in" -choice -prompt "X Window System server" - default BR2_PACKAGE_XSERVER_none - help - Xserver to use. - For more information about the X protocol see - http://www.x.org - You may have to enable LOCALE and WCHAR to build +menu "X Window System server" config BR2_PACKAGE_XSERVER_none bool "none" -config BR2_PACKAGE_XSERVER_x11r7 - bool "x11r7" config BR2_PACKAGE_XSERVER_xorg - bool "xorg" + bool "modular xorg" config BR2_PACKAGE_XSERVER_tinyx bool "tinyx" -endchoice +endmenu config BR2_X11_PREFIX string @@ -379,16 +370,9 @@ config BR2_X11_PREFIX help X11 apps root location -if BR2_PACKAGE_XSERVER_x11r7 +if !BR2_PACKAGE_XSERVER_none source "package/x11r7/Config.in" endif -if BR2_PACKAGE_XSERVER_xorg -source "package/xorg/Config.in" -endif -if BR2_PACKAGE_XSERVER_tinyx -source "package/tinyx/Config.in" -source "package/tinyx-old/Config.in" -endif comment "X libraries and helper libraries" #XXX: maybe some of these should depend on !BR2_PACKAGE_XSERVER_none diff --git a/package/tinyx-old/Config.in b/package/tinyx-old/Config.in deleted file mode 100644 index 523eae236..000000000 --- a/package/tinyx-old/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_TINYX_OLD - bool "tinyx (old version. which supposedly builds)" - default n - depends on BR2_PACKAGE_TINYX - help - A tiny X server. Also known as 'Xfbdev' and 'kdrive'. diff --git a/package/tinyx-old/tinyx-011010.patch b/package/tinyx-old/tinyx-011010.patch deleted file mode 100644 index 7ff6da5ef..000000000 --- a/package/tinyx-old/tinyx-011010.patch +++ /dev/null @@ -1,195 +0,0 @@ ---- xc-011010/config/cf/X11.tmpl.orig 2005-05-12 16:16:17.000000000 -0600 -+++ xc-011010/config/cf/X11.tmpl 2005-05-12 16:16:23.000000000 -0600 -@@ -3055,7 +3055,7 @@ - $(RM) index.raw file.nPS file.PS file.txt - #endif - --#ifndef MakeSimpleDoc(file,srcs) -+#ifndef MakeSimpleDoc - #define MakeSimpleDoc(file,srcs) MakeDepSimpleDoc(file,srcs,srcs) - #endif - ---- xc-011010/config/cf/kdrive.cf.orig 2005-05-12 16:14:50.000000000 -0600 -+++ xc-011010/config/cf/kdrive.cf 2005-05-12 16:15:03.000000000 -0600 -@@ -201,7 +201,7 @@ - #undef ServerOSDefines - #define ServerOSDefines -DDDXOSINIT - --#ifndef Other IConfigFiles -+#ifndef OtherIConfigFiles - #define OtherIConfigFile $(IRULESRC)/kdrive.cf - #endif - -diff -Nur --exclude=CVS xc-011010.src/include/extensions/lbxstr.h xc-011010/include/extensions/lbxstr.h ---- xc-011010.src/include/extensions/lbxstr.h Tue Jul 31 20:44:35 2001 -+++ xc-011010/include/extensions/lbxstr.h Sun Apr 21 12:35:05 2002 -@@ -25,7 +25,7 @@ - #ifndef _LBXSTR_H_ - #define _LBXSTR_H_ - --#include <X11/extensions/XLbx.h> -+#include "XLbx.h" - - #define LBXNAME "LBX" - -diff -Nur --exclude=CVS xc-011010.src/programs/Xserver/hw/kdrive/fbdev/fbdev.h xc-011010/programs/Xserver/hw/kdrive/fbdev/fbdev.h ---- xc-011010.src/programs/Xserver/hw/kdrive/fbdev/fbdev.h Sun Jun 3 17:52:45 2001 -+++ xc-011010/programs/Xserver/hw/kdrive/fbdev/fbdev.h Sun Apr 21 12:36:25 2002 -@@ -29,6 +29,7 @@ - #include <linux/fb.h> - #include <unistd.h> - #include <sys/mman.h> -+#include <sys/types.h> - #include "kdrive.h" - #include "layer.h" - -diff -Nur xc-011010.src2/lib/X11/Xlib.h xc-011010/lib/X11/Xlib.h ---- xc-011010.src/programs/Xserver/hw/kdrive/linux/ts.c Tue Jul 10 22:58:19 2001 -+++ xc-011010/programs/Xserver/hw/kdrive/linux/ts.c Tue Apr 23 20:16:23 2002 -@@ -33,65 +33,48 @@ - #include "kdrive.h" - #include "Xpoll.h" - #include <sys/ioctl.h> --#include <linux/h3600_ts.h> /* touch screen events */ -+ -+typedef struct { -+ unsigned short pressure; -+ unsigned short x; -+ unsigned short y; -+ unsigned short pad; -+ struct timeval stamp; -+} TS_EVENT; - - static long lastx = 0, lasty = 0; - int TsScreen; - extern int TsFbdev; - --void --TsRead (int tsPort, void *closure) --{ -- TS_EVENT event; -- long buf[3]; -- int n; -- long pressure; -- long x, y; -- unsigned long flags; -- unsigned long buttons; -- -- n = Ps2ReadBytes (tsPort, (char *) &event, -- sizeof (event), sizeof (event)); -- if (n == sizeof (event)) -- { -- if (event.pressure) -- { -- /* -- * HACK ATTACK. (static global variables used !) -- * Here we test for the touch screen driver actually being on the -- * touch screen, if it is we send absolute coordinates. If not, -- * then we send delta's so that we can track the entire vga screen. -- */ -- if (TsScreen == TsFbdev) { -- flags = KD_BUTTON_1; -- x = event.x; -- y = event.y; -- } else { -- flags = /* KD_BUTTON_1 |*/ KD_MOUSE_DELTA; -- if ((lastx == 0) || (lasty == 0)) { -- x = 0; -- y = 0; -- } else { -- x = event.x - lastx; -- y = event.y - lasty; -- } -- lastx = event.x; -- lasty = event.y; -- } -- } else { -- flags = KD_MOUSE_DELTA; -- x = 0; -- y = 0; -- lastx = 0; -- lasty = 0; -- } -- KdEnqueueMouseEvent (flags, x, y); -+void TsRead (int tsPort, void *closure) { -+ TS_EVENT event; -+ long buf[3]; -+ int n; -+ long pressure; -+ long x, y; -+ unsigned long flags; -+ unsigned long buttons; -+ -+ n = Ps2ReadBytes(tsPort, (char *) &event, sizeof (event), sizeof (event)); -+ if (n >= sizeof (event)) { -+ if (event.pressure >= 100) { -+ flags = KD_BUTTON_1; -+ x = (960 - event.x) * 640 / (920); -+ y = (960 - event.y) * 480 / (920); -+ //ErrorF("flags %d x %d y %dn",flags,event.x,event.y); -+ } -+ else { -+ flags = KD_MOUSE_DELTA; -+ x = lastx; -+ y = lasty; - } -+ KdEnqueueMouseEvent(flags, x, y); -+ } - } - - char *TsNames[] = { -- "/dev/ts", -- "/dev/h3600_ts" /* temporary name; note this code can try -+ "/dev/ucb1x00-ts", -+ "/dev/ts" /* temporary name; note this code can try - to open more than one device */ - }; - -@@ -99,9 +82,7 @@ - - int TsInputType; - --int --TsInit (void) --{ -+int TsInit (void) { - int i; - int TsPort; - -diff -Nur xc-011010.src/startx xc-011010/startx ---- ../../buildroot-tux.Apr25-1/build/xc-011010.src/startx Thu Apr 25 05:20:35 2002 -+++ xc-011010/startx Sun Apr 28 05:35:35 2002 -@@ -0,0 +1,11 @@ -+#!/bin/sh -+killall Xfbdev -+sleep 1 -+export DISPLAY=":0" -+/usr/X11R6/bin/Xfbdev -ac & -+sleep 4 -+/usr/X11R6/bin/matchbox & -+sleep 1 -+/usr/X11R6/bin/minisys & -+/usr/X11R6/bin/minitime & -+/usr/X11R6/bin/rxvt & -diff -Nur xc-011010.src/lib/Xft/xftgram.y xc-011010/lib/Xft/xftgram.y ---- ../../buildroot-tux.Apr25-1/build/xc-011010/lib/Xft/xftgram.y Thu Apr 25 05:20:35 2002 -+++ xc-011010/lib/Xft/xftgram.y Sun Apr 28 05:35:35 2002 -@@ -165,6 +165,7 @@ - matrix.yx = $4; - matrix.__REALLY_YY__ = $5; - } -+ ; - number : INTEGER - { $$ = (double) $1; } - | DOUBLE -diff -Nur xc-011010.src/programs/twm/gram.y xc-011010/programs/twm/gram.y ---- ../../buildroot-tux.Apr25-1/build/xc-011010/programs/twm/gram.y Thu Apr 25 05:20:35 2002 -+++ xc-011010/programs/twm/gram.y Sun Apr 28 05:35:35 2002 -@@ -650,6 +650,7 @@ - RemoveDQuote(ptr); - $$ = ptr; - } -+ ; - number : NUMBER { $$ = $1; } - ; - diff --git a/package/tinyx-old/tinyx-build.patch b/package/tinyx-old/tinyx-build.patch deleted file mode 100644 index 64dbb0c40..000000000 --- a/package/tinyx-old/tinyx-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xc-011010/programs/xfs/os/config.c.orig 2001-07-31 18:45:05.000000000 -0600 -+++ xc-011010/programs/xfs/os/config.c 2005-05-12 15:51:35.000000000 -0600 -@@ -661,6 +661,8 @@ - val = config_parse_int (val, &ret, &scan); - if (ret == -1) - return val; -+#ifdef SNFFORMAT - SnfSetFormat (bit, byte, glyph, scan); -+#endif - return val; - } diff --git a/package/tinyx-old/tinyx-config.patch b/package/tinyx-old/tinyx-config.patch deleted file mode 100644 index ce2a06c9a..000000000 --- a/package/tinyx-old/tinyx-config.patch +++ /dev/null @@ -1,112 +0,0 @@ ---- xc/config/cf/host.def~ 2005-04-02 14:51:31.000000000 -0700 -+++ xc/config/cf/host.def 2005-04-26 01:22:00.000000000 -0600 -@@ -0,0 +1,36 @@ -+#define KDriveXServer YES -+#define TinyXServer YES -+#define XfbdevServer YES -+#define CrossCompiling YES -+#define ProjectRoot /usr/X11R6 -+#define NothingOutsideProjectRoot YES -+ -+#define HasFreetype2 NO -+#define HasFontconfig NO -+#define HasLibpng YES -+#define HasZlib YES -+ -+#define HasExpat NO -+#define XprtServer NO -+#define BuildXprintClients NO -+#define TouchScreen NO -+#define HasTsLib NO -+#define BuildDocs NO -+#define BuildXF86DRI NO -+#define BuildGlxExt NO -+#define BuildOSMesaLib NO -+#define BuildLBX NO -+#define BuildLowMem NO -+#define BuildIPv6 NO -+ -+/* -+#define XF86CardDrivers mga glint nv tga s3virge sis rendition \ -+ neomagic i740 tdfx savage \ -+ cirrus vmware tseng trident chips apm \ -+ GlideDriver fbdev i128 \ -+ ati AgpGartDrivers DevelDrivers ark \ -+ cyrix siliconmotion vesa vga \ -+ XF86OSCardDrivers XF86ExtraCardDrivers -+*/ -+ -+#define XInputDrivers mouse keyboard ---- xc/config/cf/cross.def.orig 2001-03-29 19:15:17.000000000 -0700 -+++ xc/config/cf/cross.def 2005-05-12 16:09:23.000000000 -0600 -@@ -5,34 +5,56 @@ - * compiler images. It will have to be edited to reflect these - * given your local configuration. - */ -+ -+#undef Arm32Architecture - #undef i386Architecture -+#undef Arm32Architecture -+#undef Arm32Architecture -+ -+#if defined(__arm__) - #define Arm32Architecture -+#endif -+#if defined(__i386__) -+#defined i386Architecture -+#endif -+#if defined(__mc68000__) -+#define Mc68020Architecture -+#endif -+#if defined(__mips__) -+#define MipsArchitecture -+#endif -+#if defined(__powerpc__) -+#define PpcArchitecture -+#endif - - #undef OptimizedCDebugFlags --#define OptimizedCDebugFlags -O2 --#define ServerCDebugFlags -O2 -+#define OptimizedCDebugFlags -Os -+#define ServerCDebugFlags -Os - #undef StandardDefines --#define StandardDefines -Dlinux -D__arm__ -D_POSIX_SOURCE \ -- -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE --#undef CcCmd --#define StdIncDir /skiff/local/arm-linux/include --#define PreIncDir -+#define StandardDefines -Dlinux -D__REPLACE_ARCH__ -D_POSIX_SOURCE \ -+ -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE -+#define StdIncDir REPLACE_STAGING_DIR/include -+#define PreIncDir - #undef PostIncDir --#define PostIncDir /skiff/local/lib/gcc-lib/arm-linux/2.95.2/include --#define CcCmd /skiff/local/bin/arm-linux-gcc -+#define PostIncDir REPLACE_STAGING_DIR/lib/gcc-lib/REPLACE_ARCH-linux-uclibc/3.3.3/include -+#undef CcCmd -+#define CcCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-gcc -+#undef HasCplusplus -+#define HasCplusplus NO - #undef CplusplusCmd --#define HasCplusplus YES --#define CplusplusCmd /skiff/local/bin/arm-linux-g++ -+#define CplusplusCmd NO - #define DoRanlibCmd YES --#define RanlibCmd /skiff/local/bin/arm-linux-ranlib -+#define RanlibCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-ranlib - #undef ExtraLoadFlags - #define ExtraLoadFlags - #define FbNoPixelAddrCode - #undef TermcapLibrary --#define TermcapLibrary -ltermcap -+#define TermcapLibrary -lncurses - - #undef LdPostLib --#define LdPostLib -L/skiff/local/arm-linux/lib -+#define LdPostLib -LREPLACE_STAGING_DIR/REPLACE_ARCH-linux-uclibc/lib -+#undef LdCmd -+#define LdCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-ld - - #undef ExtensionOSDefines - #define ExtensionOSDefines diff --git a/package/tinyx-old/tinyx.mk b/package/tinyx-old/tinyx.mk deleted file mode 100644 index 87074d200..000000000 --- a/package/tinyx-old/tinyx.mk +++ /dev/null @@ -1,156 +0,0 @@ -############################################################# -# -# tinyx - a small footprint X-server for the TuxScreen -# -############################################################# -# Copyright (C) 2002 by Tom Walsh <Tom@OpenHardware.net> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Library General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# - - -ifneq ($(strip $(BR2_PACKAGE_XORG)),y) -ifeq ($(strip $(BR2_PACKAGE_TINYX_OLD)),y) - -############################################################# -# You may want to change these. -############################################################# - -TINYX_APPS:=xlsfonts/xlsfonts xmodmap/xmodmap -#xset/xset xdpyinfo/xdpyinfo xsetroot/xsetroot \ -# xrdb/xrdb xrandr/xrandr \ -# xhost/xhost xauth/xauth oclock/oclock xeyes/xeyes -# - -TINYX_LIBS:=ICE X11 Xext Xpm -# Xaw SM Xt Xmu - -############################################################# -# Stuff below this line shouldn't need changes. -# if you do change, look in rxvt & matchbox for the impact! -############################################################# -# -# Where resources are found. -# - -TINYX_DIR:=$(BUILD_DIR)/xc-011010 -TINYX_LDIR:=$(TINYX_DIR)/lib -TINYX_PROGS:=$(TINYX_DIR)/programs -TINYX_SOURCE:=xc-011010.tar.bz2 -TINYX_SITE:= http://intimate.handhelds.org/jacques/ -TINYX_CF:=$(TINYX_DIR)/config/cf -# -# Some things that you may want to change. -TINYX_XFBDEV:=$(TINYX_DIR)/programs/Xserver/Xfbdev -TINYX_CAT:=$(BZCAT) -TINYX_BINX:=$(TARGET_DIR)/usr/X11R6/bin/ -TINYX_LIBX:=$(TARGET_DIR)/usr/lib/ - -# -# These rules fetch various tinyx source files. -# -$(DL_DIR)/$(TINYX_SOURCE): - $(WGET) -P $(DL_DIR) $(TINYX_SITE)/$(TINYX_SOURCE) - -# -# rule to make sure that we have the source, and it is configured. -# -$(TINYX_DIR)/.configure: $(DL_DIR)/$(TINYX_SOURCE) - $(TINYX_CAT) $(DL_DIR)/$(TINYX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(TINYX_DIR) package/tinyx/ tinyx\*.patch - $(SED) 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' $(TINYX_CF)/cross.def - $(SED) 's:REPLACE_ARCH:$(ARCH):g' $(TINYX_CF)/cross.def - $(SED) 's:#define CcCmd.*:#define CcCmd $(TARGET_CROSS)gcc:g' $(TINYX_CF)/cross.def - $(SED) 's:#define RanlibCmd.*:#define RanlibCmd $(TARGET_CROSS)ranlib:g' $(TINYX_CF)/cross.def - $(SED) 's:#define LdCmd.*:#define LdCmd $(TARGET_CROSS)ld:g' $(TINYX_CF)/cross.def - touch $(TINYX_DIR)/.configure - -# -# Now that we have the source, build it... -# -$(TINYX_XFBDEV): $(TINYX_DIR)/.configure - rm -f $(TINYX_BINX)/Xfbdev - #make World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=<cross compiler dir>" - #( cd $(TINYX_DIR); $(MAKE) World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=$(STAGING_DIR)/bin" ) - #( cd $(TINYX_DIR); $(TARGET_CONFIGURE_OPTS) $(MAKE) World ) - # - #mv $(TINYX_DIR)/Makefile $(TINYX_DIR)/Makefile.xxxx - #echo "AS=$(TARGET_CROSS)as" > $(TINYX_DIR)/Makefile - #echo "LD=$(TARGET_CROSS)ld" >> $(TINYX_DIR)/Makefile - #echo "NM=$(TARGET_CROSS)nm" >> $(TINYX_DIR)/Makefile - #echo "CC=$(TARGET_CROSS)gcc" >> $(TINYX_DIR)/Makefile - #echo "GCC=$(TARGET_CROSS)gcc" >> $(TINYX_DIR)/Makefile - #echo "CXX=$(TARGET_CROSS)g++" >> $(TINYX_DIR)/Makefile - #echo "RANLIB=$(TARGET_CROSS)ranlib" >> $(TINYX_DIR)/Makefile - #echo "OBJCOPY=$(TARGET_CROSS)objcopy" >> $(TINYX_DIR)/Makefile - #cat $(TINYX_DIR)/Makefile.xxxx >> $(TINYX_DIR)/Makefile - ( cd $(TINYX_DIR); $(MAKE) World ) - -# -# Install x-includes and x-libraries in $(STAGING_DIR)/usr/X11R6/ -# and add a symbolic link between /usr/bin/X11 and /usr/X11R6/bin -$(STAGING_DIR)/usr/X11R6/lib/libX11.so.6.2: $(TINYX_XFBDEV) - mkdir -p $(STAGING_DIR)/usr/X11R6/lib - mkdir -p $(STAGING_DIR)/usr/X11R6/include - cp -fRL $(TINYX_DIR)/exports/include/* $(STAGING_DIR)/usr/X11R6/include/ - cp -fRL $(TINYX_DIR)/exports/lib/* $(STAGING_DIR)/usr/X11R6/lib/ - ln -s /usr/X11R6/bin $(TARGET_DIR)/usr/bin/X11 - -# -# Once Frame Buffer is built, we install executables. -$(TINYX_BINX)/Xfbdev: $(TINYX_XFBDEV) - -mkdir $(TARGET_DIR)/usr/X11R6 - -mkdir $(TINYX_BINX) - for file in $(TINYX_APPS); do \ - cp -f $(TINYX_DIR)/programs/$$file $(TINYX_BINX); \ - $(STRIPCMD) $(TINYX_PROGS)/$$file; \ - done - cp $(TINYX_DIR)/programs/Xserver/Xfbdev $(TINYX_BINX) - $(STRIPCMD) $(TINYX_BINX)/Xfbdev - cp -f $(TINYX_DIR)/startx $(TARGET_DIR)/bin - chmod a+x $(TARGET_DIR)/bin/startx - -# -# After we have executables installed, install the libraries. -$(TINYX_LIBX)/libX11.so.6.2: $(TINYX_XFBDEV) - for dirs in $(TINYX_LIBS); do \ - file=`find $(TINYX_LDIR)/$$dirs -type f -iname "lib$$dirs.so*"`; \ - $(STRIPCMD) --strip-unneeded $$file; \ - cp -f $$file $(TINYX_LIBX); \ - file=`find $(TINYX_LDIR)/$$dirs -type l -iname "lib$$dirs.so*"`; \ - cp -pRf $$file $(TINYX_LIBX); \ - done - -tinyx: zlib $(STAGING_DIR)/usr/X11R6/lib/libX11.so.6.2 \ - $(TINYX_LIBX)/libX11.so.6.2 $(TINYX_BINX)/Xfbdev - -tinyx-source: $(DL_DIR)/$(TINYX_SOURCE) - -tinyx-clean: - -rm -rf $(TARGET_DIR)/usr/X11R6 - -$(MAKE) -C $(TINYX_DIR) clean - -tinyx-dirclean: - -rm -rf $(TINYX_DIR) - -rm -rf $(TARGET_DIR)/usr/X11R6 -############################################################# -# -# Toplevel Makefile options -# -############################################################# -TARGETS+=tinyx -endif -endif diff --git a/package/tinyx/Config.in b/package/tinyx/Config.in deleted file mode 100644 index a3bc0d4b9..000000000 --- a/package/tinyx/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_TINYX - bool "tinyx" - default y if BR2_PACKAGE_XSERVER_tinyx - select BR2_USE_WCHAR - select BR2_ENABLE_LOCALE - help - A tiny X server. Also known as 'Xfbdev' and 'kdrive'. - -comment "tinyx X Window System disabled" - depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7 - diff --git a/package/tinyx/tinyx-011010-MB_CUR_MAX.patch b/package/tinyx/tinyx-011010-MB_CUR_MAX.patch deleted file mode 100644 index 5c25a30ad..000000000 --- a/package/tinyx/tinyx-011010-MB_CUR_MAX.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN xc-011010-0rig/lib/X11/lcGenConv.c xc-011010/lib/X11/lcGenConv.c ---- xc-011010-0rig/lib/X11/lcGenConv.c 2001-08-15 13:54:21.000000000 +0200 -+++ xc-011010/lib/X11/lcGenConv.c 2007-08-13 12:55:18.000000000 +0200 -@@ -48,6 +48,7 @@ - * Platforms: all systems. - */ - -+#include <stdlib.h> - #include "Xlibint.h" - #include "XlcGeneric.h" - #include <stdio.h> diff --git a/package/tinyx/tinyx-011010-strings.patch b/package/tinyx/tinyx-011010-strings.patch deleted file mode 100644 index 263116f8f..000000000 --- a/package/tinyx/tinyx-011010-strings.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN xc-011010-0rig/include/Xfuncs.h xc-011010/include/Xfuncs.h ---- xc-011010-0rig/include/Xfuncs.h 2001-07-25 17:04:42.000000000 +0200 -+++ xc-011010/include/Xfuncs.h 2007-08-13 13:08:39.000000000 +0200 -@@ -45,6 +45,9 @@ - #include <strings.h> - /* bcopy, bcmp, bzero declared */ - #define _XFUNCS_H_INCLUDED_STRING_H -+#elif defined(__UCLIBC__) -+#include <string.h> -+#define _XFUNCS_H_INCLUDED_STRING_H - #else - #include <string.h> - #define _XFUNCS_H_INCLUDED_STRING_H diff --git a/package/tinyx/tinyx-011010.patch b/package/tinyx/tinyx-011010.patch deleted file mode 100644 index 7ff6da5ef..000000000 --- a/package/tinyx/tinyx-011010.patch +++ /dev/null @@ -1,195 +0,0 @@ ---- xc-011010/config/cf/X11.tmpl.orig 2005-05-12 16:16:17.000000000 -0600 -+++ xc-011010/config/cf/X11.tmpl 2005-05-12 16:16:23.000000000 -0600 -@@ -3055,7 +3055,7 @@ - $(RM) index.raw file.nPS file.PS file.txt - #endif - --#ifndef MakeSimpleDoc(file,srcs) -+#ifndef MakeSimpleDoc - #define MakeSimpleDoc(file,srcs) MakeDepSimpleDoc(file,srcs,srcs) - #endif - ---- xc-011010/config/cf/kdrive.cf.orig 2005-05-12 16:14:50.000000000 -0600 -+++ xc-011010/config/cf/kdrive.cf 2005-05-12 16:15:03.000000000 -0600 -@@ -201,7 +201,7 @@ - #undef ServerOSDefines - #define ServerOSDefines -DDDXOSINIT - --#ifndef Other IConfigFiles -+#ifndef OtherIConfigFiles - #define OtherIConfigFile $(IRULESRC)/kdrive.cf - #endif - -diff -Nur --exclude=CVS xc-011010.src/include/extensions/lbxstr.h xc-011010/include/extensions/lbxstr.h ---- xc-011010.src/include/extensions/lbxstr.h Tue Jul 31 20:44:35 2001 -+++ xc-011010/include/extensions/lbxstr.h Sun Apr 21 12:35:05 2002 -@@ -25,7 +25,7 @@ - #ifndef _LBXSTR_H_ - #define _LBXSTR_H_ - --#include <X11/extensions/XLbx.h> -+#include "XLbx.h" - - #define LBXNAME "LBX" - -diff -Nur --exclude=CVS xc-011010.src/programs/Xserver/hw/kdrive/fbdev/fbdev.h xc-011010/programs/Xserver/hw/kdrive/fbdev/fbdev.h ---- xc-011010.src/programs/Xserver/hw/kdrive/fbdev/fbdev.h Sun Jun 3 17:52:45 2001 -+++ xc-011010/programs/Xserver/hw/kdrive/fbdev/fbdev.h Sun Apr 21 12:36:25 2002 -@@ -29,6 +29,7 @@ - #include <linux/fb.h> - #include <unistd.h> - #include <sys/mman.h> -+#include <sys/types.h> - #include "kdrive.h" - #include "layer.h" - -diff -Nur xc-011010.src2/lib/X11/Xlib.h xc-011010/lib/X11/Xlib.h ---- xc-011010.src/programs/Xserver/hw/kdrive/linux/ts.c Tue Jul 10 22:58:19 2001 -+++ xc-011010/programs/Xserver/hw/kdrive/linux/ts.c Tue Apr 23 20:16:23 2002 -@@ -33,65 +33,48 @@ - #include "kdrive.h" - #include "Xpoll.h" - #include <sys/ioctl.h> --#include <linux/h3600_ts.h> /* touch screen events */ -+ -+typedef struct { -+ unsigned short pressure; -+ unsigned short x; -+ unsigned short y; -+ unsigned short pad; -+ struct timeval stamp; -+} TS_EVENT; - - static long lastx = 0, lasty = 0; - int TsScreen; - extern int TsFbdev; - --void --TsRead (int tsPort, void *closure) --{ -- TS_EVENT event; -- long buf[3]; -- int n; -- long pressure; -- long x, y; -- unsigned long flags; -- unsigned long buttons; -- -- n = Ps2ReadBytes (tsPort, (char *) &event, -- sizeof (event), sizeof (event)); -- if (n == sizeof (event)) -- { -- if (event.pressure) -- { -- /* -- * HACK ATTACK. (static global variables used !) -- * Here we test for the touch screen driver actually being on the -- * touch screen, if it is we send absolute coordinates. If not, -- * then we send delta's so that we can track the entire vga screen. -- */ -- if (TsScreen == TsFbdev) { -- flags = KD_BUTTON_1; -- x = event.x; -- y = event.y; -- } else { -- flags = /* KD_BUTTON_1 |*/ KD_MOUSE_DELTA; -- if ((lastx == 0) || (lasty == 0)) { -- x = 0; -- y = 0; -- } else { -- x = event.x - lastx; -- y = event.y - lasty; -- } -- lastx = event.x; -- lasty = event.y; -- } -- } else { -- flags = KD_MOUSE_DELTA; -- x = 0; -- y = 0; -- lastx = 0; -- lasty = 0; -- } -- KdEnqueueMouseEvent (flags, x, y); -+void TsRead (int tsPort, void *closure) { -+ TS_EVENT event; -+ long buf[3]; -+ int n; -+ long pressure; -+ long x, y; -+ unsigned long flags; -+ unsigned long buttons; -+ -+ n = Ps2ReadBytes(tsPort, (char *) &event, sizeof (event), sizeof (event)); -+ if (n >= sizeof (event)) { -+ if (event.pressure >= 100) { -+ flags = KD_BUTTON_1; -+ x = (960 - event.x) * 640 / (920); -+ y = (960 - event.y) * 480 / (920); -+ //ErrorF("flags %d x %d y %dn",flags,event.x,event.y); -+ } -+ else { -+ flags = KD_MOUSE_DELTA; -+ x = lastx; -+ y = lasty; - } -+ KdEnqueueMouseEvent(flags, x, y); -+ } - } - - char *TsNames[] = { -- "/dev/ts", -- "/dev/h3600_ts" /* temporary name; note this code can try -+ "/dev/ucb1x00-ts", -+ "/dev/ts" /* temporary name; note this code can try - to open more than one device */ - }; - -@@ -99,9 +82,7 @@ - - int TsInputType; - --int --TsInit (void) --{ -+int TsInit (void) { - int i; - int TsPort; - -diff -Nur xc-011010.src/startx xc-011010/startx ---- ../../buildroot-tux.Apr25-1/build/xc-011010.src/startx Thu Apr 25 05:20:35 2002 -+++ xc-011010/startx Sun Apr 28 05:35:35 2002 -@@ -0,0 +1,11 @@ -+#!/bin/sh -+killall Xfbdev -+sleep 1 -+export DISPLAY=":0" -+/usr/X11R6/bin/Xfbdev -ac & -+sleep 4 -+/usr/X11R6/bin/matchbox & -+sleep 1 -+/usr/X11R6/bin/minisys & -+/usr/X11R6/bin/minitime & -+/usr/X11R6/bin/rxvt & -diff -Nur xc-011010.src/lib/Xft/xftgram.y xc-011010/lib/Xft/xftgram.y ---- ../../buildroot-tux.Apr25-1/build/xc-011010/lib/Xft/xftgram.y Thu Apr 25 05:20:35 2002 -+++ xc-011010/lib/Xft/xftgram.y Sun Apr 28 05:35:35 2002 -@@ -165,6 +165,7 @@ - matrix.yx = $4; - matrix.__REALLY_YY__ = $5; - } -+ ; - number : INTEGER - { $$ = (double) $1; } - | DOUBLE -diff -Nur xc-011010.src/programs/twm/gram.y xc-011010/programs/twm/gram.y ---- ../../buildroot-tux.Apr25-1/build/xc-011010/programs/twm/gram.y Thu Apr 25 05:20:35 2002 -+++ xc-011010/programs/twm/gram.y Sun Apr 28 05:35:35 2002 -@@ -650,6 +650,7 @@ - RemoveDQuote(ptr); - $$ = ptr; - } -+ ; - number : NUMBER { $$ = $1; } - ; - diff --git a/package/tinyx/tinyx-build.patch b/package/tinyx/tinyx-build.patch deleted file mode 100644 index 64dbb0c40..000000000 --- a/package/tinyx/tinyx-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xc-011010/programs/xfs/os/config.c.orig 2001-07-31 18:45:05.000000000 -0600 -+++ xc-011010/programs/xfs/os/config.c 2005-05-12 15:51:35.000000000 -0600 -@@ -661,6 +661,8 @@ - val = config_parse_int (val, &ret, &scan); - if (ret == -1) - return val; -+#ifdef SNFFORMAT - SnfSetFormat (bit, byte, glyph, scan); -+#endif - return val; - } diff --git a/package/tinyx/tinyx-config.patch b/package/tinyx/tinyx-config.patch deleted file mode 100644 index ce2a06c9a..000000000 --- a/package/tinyx/tinyx-config.patch +++ /dev/null @@ -1,112 +0,0 @@ ---- xc/config/cf/host.def~ 2005-04-02 14:51:31.000000000 -0700 -+++ xc/config/cf/host.def 2005-04-26 01:22:00.000000000 -0600 -@@ -0,0 +1,36 @@ -+#define KDriveXServer YES -+#define TinyXServer YES -+#define XfbdevServer YES -+#define CrossCompiling YES -+#define ProjectRoot /usr/X11R6 -+#define NothingOutsideProjectRoot YES -+ -+#define HasFreetype2 NO -+#define HasFontconfig NO -+#define HasLibpng YES -+#define HasZlib YES -+ -+#define HasExpat NO -+#define XprtServer NO -+#define BuildXprintClients NO -+#define TouchScreen NO -+#define HasTsLib NO -+#define BuildDocs NO -+#define BuildXF86DRI NO -+#define BuildGlxExt NO -+#define BuildOSMesaLib NO -+#define BuildLBX NO -+#define BuildLowMem NO -+#define BuildIPv6 NO -+ -+/* -+#define XF86CardDrivers mga glint nv tga s3virge sis rendition \ -+ neomagic i740 tdfx savage \ -+ cirrus vmware tseng trident chips apm \ -+ GlideDriver fbdev i128 \ -+ ati AgpGartDrivers DevelDrivers ark \ -+ cyrix siliconmotion vesa vga \ -+ XF86OSCardDrivers XF86ExtraCardDrivers -+*/ -+ -+#define XInputDrivers mouse keyboard ---- xc/config/cf/cross.def.orig 2001-03-29 19:15:17.000000000 -0700 -+++ xc/config/cf/cross.def 2005-05-12 16:09:23.000000000 -0600 -@@ -5,34 +5,56 @@ - * compiler images. It will have to be edited to reflect these - * given your local configuration. - */ -+ -+#undef Arm32Architecture - #undef i386Architecture -+#undef Arm32Architecture -+#undef Arm32Architecture -+ -+#if defined(__arm__) - #define Arm32Architecture -+#endif -+#if defined(__i386__) -+#defined i386Architecture -+#endif -+#if defined(__mc68000__) -+#define Mc68020Architecture -+#endif -+#if defined(__mips__) -+#define MipsArchitecture -+#endif -+#if defined(__powerpc__) -+#define PpcArchitecture -+#endif - - #undef OptimizedCDebugFlags --#define OptimizedCDebugFlags -O2 --#define ServerCDebugFlags -O2 -+#define OptimizedCDebugFlags -Os -+#define ServerCDebugFlags -Os - #undef StandardDefines --#define StandardDefines -Dlinux -D__arm__ -D_POSIX_SOURCE \ -- -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE --#undef CcCmd --#define StdIncDir /skiff/local/arm-linux/include --#define PreIncDir -+#define StandardDefines -Dlinux -D__REPLACE_ARCH__ -D_POSIX_SOURCE \ -+ -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE -+#define StdIncDir REPLACE_STAGING_DIR/include -+#define PreIncDir - #undef PostIncDir --#define PostIncDir /skiff/local/lib/gcc-lib/arm-linux/2.95.2/include --#define CcCmd /skiff/local/bin/arm-linux-gcc -+#define PostIncDir REPLACE_STAGING_DIR/lib/gcc-lib/REPLACE_ARCH-linux-uclibc/3.3.3/include -+#undef CcCmd -+#define CcCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-gcc -+#undef HasCplusplus -+#define HasCplusplus NO - #undef CplusplusCmd --#define HasCplusplus YES --#define CplusplusCmd /skiff/local/bin/arm-linux-g++ -+#define CplusplusCmd NO - #define DoRanlibCmd YES --#define RanlibCmd /skiff/local/bin/arm-linux-ranlib -+#define RanlibCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-ranlib - #undef ExtraLoadFlags - #define ExtraLoadFlags - #define FbNoPixelAddrCode - #undef TermcapLibrary --#define TermcapLibrary -ltermcap -+#define TermcapLibrary -lncurses - - #undef LdPostLib --#define LdPostLib -L/skiff/local/arm-linux/lib -+#define LdPostLib -LREPLACE_STAGING_DIR/REPLACE_ARCH-linux-uclibc/lib -+#undef LdCmd -+#define LdCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-ld - - #undef ExtensionOSDefines - #define ExtensionOSDefines diff --git a/package/tinyx/tinyx.mk b/package/tinyx/tinyx.mk deleted file mode 100644 index 1e6f51147..000000000 --- a/package/tinyx/tinyx.mk +++ /dev/null @@ -1,157 +0,0 @@ -############################################################# -# -# tinyx - a small footprint X-server for the TuxScreen -# -############################################################# -# Copyright (C) 2002 by Tom Walsh <Tom@OpenHardware.net> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Library General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# - - -ifneq ($(strip $(BR2_PACKAGE_XORG)),y) -ifeq ($(strip $(BR2_PACKAGE_TINYX)),y) -ifeq ($(strip $(BR2_PACKAGE_TINYX_OLD)),y) -############################################################# -# You may want to change these. -############################################################# - -TINYX_APPS:=xlsfonts/xlsfonts xmodmap/xmodmap -#xset/xset xdpyinfo/xdpyinfo xsetroot/xsetroot \ -# xrdb/xrdb xrandr/xrandr \ -# xhost/xhost xauth/xauth oclock/oclock xeyes/xeyes -# - -TINYX_LIBS:=ICE X11 Xext Xpm -# Xaw SM Xt Xmu - -############################################################# -# Stuff below this line shouldn't need changes. -# if you do change, look in rxvt & matchbox for the impact! -############################################################# -# -# Where resources are found. -# -TINYX_VERSION:=011010 -TINYX_DIR:=$(BUILD_DIR)/xc-$(TINYX_VERSION) -TINYX_LDIR:=$(TINYX_DIR)/lib -TINYX_PROGS:=$(TINYX_DIR)/programs -TINYX_SOURCE:=xc-$(TINYX_VERSION).tar.bz2 -TINYX_SITE:= http://intimate.handhelds.org/jacques/ -TINYX_CF:=$(TINYX_DIR)/config/cf -# -# Some things that you may want to change. -TINYX_XFBDEV:=$(TINYX_DIR)/programs/Xserver/Xfbdev -TINYX_CAT:=$(BZCAT) -TINYX_BINX:=$(TARGET_DIR)/usr/X11R6/bin/ -TINYX_LIBX:=$(TARGET_DIR)/usr/lib/ - -# -# These rules fetch various tinyx source files. -# -$(DL_DIR)/$(TINYX_SOURCE): - $(WGET) -P $(DL_DIR) $(TINYX_SITE)/$(TINYX_SOURCE) - -# -# rule to make sure that we have the source, and it is configured. -# -$(TINYX_DIR)/.configure: $(DL_DIR)/$(TINYX_SOURCE) - $(TINYX_CAT) $(DL_DIR)/$(TINYX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(TINYX_DIR) package/tinyx/ tinyx\*.patch - $(SED) 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' $(TINYX_CF)/cross.def - $(SED) 's:REPLACE_ARCH:$(ARCH):g' $(TINYX_CF)/cross.def - $(SED) 's:#define CcCmd.*:#define CcCmd $(TARGET_CROSS)gcc:g' $(TINYX_CF)/cross.def - $(SED) 's:#define RanlibCmd.*:#define RanlibCmd $(TARGET_CROSS)ranlib:g' $(TINYX_CF)/cross.def - $(SED) 's:#define LdCmd.*:#define LdCmd $(TARGET_CROSS)ld:g' $(TINYX_CF)/cross.def - touch $(TINYX_DIR)/.configure - -# -# Now that we have the source, build it... -# -$(TINYX_XFBDEV): $(TINYX_DIR)/.configure - rm -f $(TINYX_BINX)/Xfbdev - #make World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=<cross compiler dir>" - #( cd $(TINYX_DIR); $(MAKE) World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=$(STAGING_DIR)/bin" ) - #( cd $(TINYX_DIR); $(MAKE) $(TARGET_CONFIGURE_OPTS) World ) - # - #mv $(TINYX_DIR)/Makefile $(TINYX_DIR)/Makefile.xxxx - #echo "AS=$(TARGET_CROSS)as" > $(TINYX_DIR)/Makefile - #echo "LD=$(TARGET_CROSS)ld" >> $(TINYX_DIR)/Makefile - #echo "NM=$(TARGET_CROSS)nm" >> $(TINYX_DIR)/Makefile - #echo "CC=$(TARGET_CROSS)gcc" >> $(TINYX_DIR)/Makefile - #echo "GCC=$(TARGET_CROSS)gcc" >> $(TINYX_DIR)/Makefile - #echo "CXX=$(TARGET_CROSS)g++" >> $(TINYX_DIR)/Makefile - #echo "RANLIB=$(TARGET_CROSS)ranlib" >> $(TINYX_DIR)/Makefile - #echo "OBJCOPY=$(TARGET_CROSS)objcopy" >> $(TINYX_DIR)/Makefile - #cat $(TINYX_DIR)/Makefile.xxxx >> $(TINYX_DIR)/Makefile - ( cd $(TINYX_DIR); $(MAKE) $(TARGET_CONFIGURE_OPTS) World ) - -# -# Install x-includes and x-libraries in $(STAGING_DIR)/usr/X11R6/ -# and add a symbolic link between /usr/bin/X11 and /usr/X11R6/bin -$(STAGING_DIR)/usr/X11R6/lib/libX11.so.6.2: $(TINYX_XFBDEV) - mkdir -p $(STAGING_DIR)/usr/X11R6/lib - mkdir -p $(STAGING_DIR)/usr/X11R6/include - cp -fRL $(TINYX_DIR)/exports/include/* $(STAGING_DIR)/usr/X11R6/include/ - cp -fRL $(TINYX_DIR)/exports/lib/* $(STAGING_DIR)/usr/X11R6/lib/ - ln -s /usr/X11R6/bin $(TARGET_DIR)/usr/bin/X11 - -# -# Once Frame Buffer is built, we install executables. -$(TINYX_BINX)/Xfbdev: $(TINYX_XFBDEV) - -mkdir $(TARGET_DIR)/usr/X11R6 - -mkdir $(TINYX_BINX) - for file in $(TINYX_APPS); do \ - cp -f $(TINYX_DIR)/programs/$$file $(TINYX_BINX); \ - $(STRIPCMD) $(TINYX_PROGS)/$$file; \ - done - cp $(TINYX_DIR)/programs/Xserver/Xfbdev $(TINYX_BINX) - $(STRIPCMD) $(TINYX_BINX)/Xfbdev - cp -f $(TINYX_DIR)/startx $(TARGET_DIR)/bin - chmod a+x $(TARGET_DIR)/bin/startx - -# -# After we have executables installed, install the libraries. -$(TINYX_LIBX)/libX11.so.6.2: $(TINYX_XFBDEV) - for dirs in $(TINYX_LIBS); do \ - file=`find $(TINYX_LDIR)/$$dirs -type f -iname "lib$$dirs.so*"`; \ - $(STRIPCMD) --strip-unneeded $$file; \ - cp -f $$file $(TINYX_LIBX); \ - file=`find $(TINYX_LDIR)/$$dirs -type l -iname "lib$$dirs.so*"`; \ - cp -pRf $$file $(TINYX_LIBX); \ - done - -tinyx: zlib $(STAGING_DIR)/usr/X11R6/lib/libX11.so.6.2 \ - $(TINYX_LIBX)/libX11.so.6.2 $(TINYX_BINX)/Xfbdev - -tinyx-source: $(DL_DIR)/$(TINYX_SOURCE) - -tinyx-clean: - -rm -rf $(TARGET_DIR)/usr/X11R6 - -$(MAKE) -C $(TINYX_DIR) clean - -tinyx-dirclean: - -rm -rf $(TINYX_DIR) - -rm -rf $(TARGET_DIR)/usr/X11R6 -############################################################# -# -# Toplevel Makefile options -# -############################################################# -TARGETS+=tinyx -endif -endif -endif diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 140c508a5..c3bfc4e45 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -152,6 +152,7 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xapp_xwininfo/Config.in source package/x11r7/xapp_xwud/Config.in endmenu + if BR2_PACKAGE_XSERVER_xorg menu "X11R7 Drivers" source package/x11r7/openchrome/Config.in source package/x11r7/xdriver_xf86-input-acecad/Config.in @@ -178,6 +179,7 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xdriver_xf86-input-penmount/Config.in source package/x11r7/xdriver_xf86-input-spaceorb/Config.in source package/x11r7/xdriver_xf86-input-summa/Config.in + source package/x11r7/xdriver_xf86-input-synaptics/Config.in source package/x11r7/xdriver_xf86-input-tek4957/Config.in source package/x11r7/xdriver_xf86-input-ur98/Config.in source package/x11r7/xdriver_xf86-input-vmmouse/Config.in @@ -227,6 +229,7 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xdriver_xf86-video-vmware/Config.in source package/x11r7/xdriver_xf86-video-voodoo/Config.in endmenu + endif menu "X11R7 Fonts" source package/x11r7/xfont_font-util/Config.in source package/x11r7/xfont_encodings/Config.in @@ -311,7 +314,6 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xdata_xbitmaps/Config.in source package/x11r7/xdata_xcursor-themes/Config.in source package/x11r7/xkeyboard-config/Config.in - source package/x11r7/xdata_xkbdata/Config.in endmenu endif diff --git a/package/xorg/mcookie.c b/package/x11r7/mcookie/mcookie.c index 902d92fc4..902d92fc4 100644 --- a/package/xorg/mcookie.c +++ b/package/x11r7/mcookie/mcookie.c diff --git a/package/x11r7/mcookie/mcookie.mk b/package/x11r7/mcookie/mcookie.mk index c26c9e519..67e2cd84e 100644 --- a/package/x11r7/mcookie/mcookie.mk +++ b/package/x11r7/mcookie/mcookie.mk @@ -4,8 +4,8 @@ # ############################################################# -$(TARGET_DIR)/usr/bin/mcookie: package/xorg/mcookie.c - $(TARGET_CC) -Wall -Os -s package/xorg/mcookie.c -o $(TARGET_DIR)/usr/bin/mcookie +$(TARGET_DIR)/usr/bin/mcookie: package/x11r7/mcookie/mcookie.c + $(TARGET_CC) -Wall -Os -s package/x11r7/mcookie/mcookie.c -o $(TARGET_DIR)/usr/bin/mcookie mcookie: $(TARGET_DIR)/usr/bin/mcookie diff --git a/package/x11r7/openchrome/openchrome-r355-cross-compile.patch b/package/x11r7/openchrome/openchrome-0.2.902-cross-compile.patch index de12e5493..c7bfc9350 100644 --- a/package/x11r7/openchrome/openchrome-r355-cross-compile.patch +++ b/package/x11r7/openchrome/openchrome-0.2.902-cross-compile.patch @@ -1,7 +1,7 @@ ---- openchrome-r355/configure.ac.orig 2007-06-10 15:07:43.000000000 +0200 -+++ openchrome-r355/configure.ac 2007-06-10 15:11:16.000000000 +0200 -@@ -69,12 +69,18 @@ - AC_HEADER_STDC +--- a/configure.ac 2008-04-09 15:42:55.000000000 -0400 ++++ b/configure.ac 2008-06-23 09:39:06.000000000 -0400 +@@ -87,12 +87,18 @@ if test x$XSERVER_LIBPCIACCESS = xyes; t + fi if test "$DRI" != no; then + if test "$cross_compiling" = "no" ; then @@ -19,17 +19,18 @@ fi AC_MSG_CHECKING([whether to include DRI support]) -@@ -113,8 +119,12 @@ +@@ -133,8 +139,12 @@ AC_MSG_RESULT([$XVMC]) AM_CONDITIONAL(XVMC, test x$XVMC = xyes) -AC_CHECK_FILE([${sdkdir}/xf86Module.h], +- [have_xf86Module_h="yes"], [have_xf86Module_h="no"]) +if test "$cross_compiling" = "no" ; then + AC_CHECK_FILE([${sdkdir}/xf86Module.h], - [have_xf86Module_h="yes"], [have_xf86Module_h="no"]) ++ [have_xf86Module_h="yes"], [have_xf86Module_h="no"]) +else + have_xf86Module_h="yes" +fi # Check the ABI_VIDEODRV_VERSION - SAVE_CPPFLAGS="$CPPFLAGS" + SAVE_CFLAGS="$CFLAGS" diff --git a/package/x11r7/openchrome/openchrome.mk b/package/x11r7/openchrome/openchrome.mk index 986eadf0e..65b470d72 100644 --- a/package/x11r7/openchrome/openchrome.mk +++ b/package/x11r7/openchrome/openchrome.mk @@ -3,13 +3,13 @@ # openchrome # ############################################################# -OPENCHROME_VERSION = r355 -OPENCHROME_SOURCE = openchrome-$(OPENCHROME_VERSION).tar.bz2 -OPENCHROME_SITE = http://bazaar.mezis.net/ +OPENCHROME_VERSION = 0.2.902 +OPENCHROME_SOURCE = xf86-video-openchrome-$(OPENCHROME_VERSION).tar.bz2 +OPENCHROME_SITE = http://www.openchrome.org/releases OPENCHROME_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto -OPENCHROME_AUTORECONF = NO +OPENCHROME_AUTORECONF = YES OPENCHROME_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,package/x11r7,openchrome)) diff --git a/package/x11r7/xdata_xkbdata/Config.in b/package/x11r7/xdata_xkbdata/Config.in deleted file mode 100644 index cd56f7473..000000000 --- a/package/x11r7/xdata_xkbdata/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XDATA_XKBDATA - bool "xkbdata" - default n - depends on !BR2_PACKAGE_XKEYBOARD_CONFIG - help - xkbdata 1.0.1 - No description available diff --git a/package/x11r7/xdata_xkbdata/xdata_xkbdata.mk b/package/x11r7/xdata_xkbdata/xdata_xkbdata.mk deleted file mode 100644 index 32b8dc634..000000000 --- a/package/x11r7/xdata_xkbdata/xdata_xkbdata.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xdata_xkbdata -- No description available -# -################################################################################ - -XDATA_XKBDATA_VERSION = 1.0.1 -XDATA_XKBDATA_SOURCE = xkbdata-$(XDATA_XBITMAPS_VERSION).tar.bz2 -XDATA_XKBDATA_SITE = http://xorg.freedesktop.org/releases/individual/data -XDATA_XKBDATA_AUTORECONF = NO -XDATA_XKBDATA_INSTALL_STAGING = YES -XDATA_XKBDATA_INSTALL_TARGET = YES -XDATA_XKBDATA_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install -XDATA_XKBDATA_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install - -$(eval $(call AUTOTARGETS,package/x11r7,xdata_xkbdata)) diff --git a/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk b/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk index f0b7a8fbb..30538e297 100644 --- a/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk +++ b/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_ACECAD_VERSION = 1.2.0 +XDRIVER_XF86_INPUT_ACECAD_VERSION = 1.2.2 XDRIVER_XF86_INPUT_ACECAD_SOURCE = xf86-input-acecad-$(XDRIVER_XF86_INPUT_ACECAD_VERSION).tar.bz2 XDRIVER_XF86_INPUT_ACECAD_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_ACECAD_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk index 8c2447a14..67360d86b 100644 --- a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk +++ b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_AIPTEK_VERSION = 1.0.1 +XDRIVER_XF86_INPUT_AIPTEK_VERSION = 1.1.1 XDRIVER_XF86_INPUT_AIPTEK_SOURCE = xf86-input-aiptek-$(XDRIVER_XF86_INPUT_AIPTEK_VERSION).tar.bz2 XDRIVER_XF86_INPUT_AIPTEK_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_AIPTEK_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk b/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk index 98571553a..d34e2304b 100644 --- a/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk +++ b/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_CALCOMP_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_CALCOMP_VERSION = 1.1.2 XDRIVER_XF86_INPUT_CALCOMP_SOURCE = xf86-input-calcomp-$(XDRIVER_XF86_INPUT_CALCOMP_VERSION).tar.bz2 XDRIVER_XF86_INPUT_CALCOMP_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_CALCOMP_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk b/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk index 60e175ddc..720e3f56d 100644 --- a/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk +++ b/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_CITRON_VERSION = 2.2.0 +XDRIVER_XF86_INPUT_CITRON_VERSION = 2.2.1 XDRIVER_XF86_INPUT_CITRON_SOURCE = xf86-input-citron-$(XDRIVER_XF86_INPUT_CITRON_VERSION).tar.bz2 XDRIVER_XF86_INPUT_CITRON_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_CITRON_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk b/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk index 37206e874..b87040dbf 100644 --- a/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk +++ b/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_DMC_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_DMC_VERSION = 1.1.2 XDRIVER_XF86_INPUT_DMC_SOURCE = xf86-input-dmc-$(XDRIVER_XF86_INPUT_DMC_VERSION).tar.bz2 XDRIVER_XF86_INPUT_DMC_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_DMC_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk b/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk index 562562c5e..3f15c5a22 100644 --- a/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk +++ b/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_DYNAPRO_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_DYNAPRO_VERSION = 1.1.2 XDRIVER_XF86_INPUT_DYNAPRO_SOURCE = xf86-input-dynapro-$(XDRIVER_XF86_INPUT_DYNAPRO_VERSION).tar.bz2 XDRIVER_XF86_INPUT_DYNAPRO_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_DYNAPRO_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk b/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk index 64d7277c7..965423e8f 100644 --- a/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk +++ b/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_ELO2300_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_ELO2300_VERSION = 1.1.2 XDRIVER_XF86_INPUT_ELO2300_SOURCE = xf86-input-elo2300-$(XDRIVER_XF86_INPUT_ELO2300_VERSION).tar.bz2 XDRIVER_XF86_INPUT_ELO2300_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_ELO2300_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk b/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk index c036cb66f..42e44ca06 100644 --- a/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk +++ b/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_ELOGRAPHICS_VERSION = 1.0.0.5 +XDRIVER_XF86_INPUT_ELOGRAPHICS_VERSION = 1.2.1 XDRIVER_XF86_INPUT_ELOGRAPHICS_SOURCE = xf86-input-elographics-$(XDRIVER_XF86_INPUT_ELOGRAPHICS_VERSION).tar.bz2 XDRIVER_XF86_INPUT_ELOGRAPHICS_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_ELOGRAPHICS_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-10-bitfield-fixes.patch b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-10-bitfield-fixes.patch new file mode 100644 index 000000000..e2748724a --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-10-bitfield-fixes.patch @@ -0,0 +1,324 @@ +From: Zephaniah E. Hull <warp@aehallh.com> +Date: Sun, 14 May 2006 11:55:50 +0000 (+0000) +Subject: Tweak credits and references. +X-Git-Tag: xf86-video-impact-0_2_0 +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-evdev.git;a=commitdiff;h=e9c60da89a9c55b81b2dedcf6ee3d1aefb4ff591 + +Tweak credits and references. +Change the longs to unsigned longs in the bitfields. +Cleanup our includes. +Stop pulling in asm/types.h and asm/bitops.h. +Conditionally define the stuff that used to come from the above, including + our own test_bit, set_bit and clear_bit. +Change the longs to unsigned longs in the bitfields. +Change the longs to unsigned longs in the bitfields. +Use the bitop defines in evdev.h properly. +Change the longs to unsigned longs in the bitfields. +Change the longs to unsigned longs in the bitfields. +Use the bitop defines in evdev.h properly. +Change the longs to unsigned longs in the bitfields. +Use the bitop defines in evdev.h properly. +Add HPPA/HPPA64 entries. (Thanks to Fabio M. Di Nitto + <fabbione@ubuntu.com>) +--- + +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,37 @@ ++2006-05-14 Zephaniah E. Hull <warp@aehallh.com> ++ ++ * man/evdev.man: ++ Tweak credits and references. ++ * src/evdev.c: (EvdevParseBits), (EvdevParseBitOption), ++ (EvdevCorePreInit): ++ Change the longs to unsigned longs in the bitfields. ++ ++ Cleanup our includes. ++ * src/evdev.h: ++ Stop pulling in asm/types.h and asm/bitops.h. ++ ++ Conditionally define the stuff that used to come from ++ the above, including our own test_bit, set_bit and clear_bit. ++ ++ Change the longs to unsigned longs in the bitfields. ++ * src/evdev_axes.c: (EvdevAxisAbsNew), (EvdevAxisRelNew): ++ Change the longs to unsigned longs in the bitfields. ++ ++ Use the bitop defines in evdev.h properly. ++ * src/evdev_brain.c: (MatchAll), (MatchNot), (MatchAny): ++ Change the longs to unsigned longs in the bitfields. ++ * src/evdev_btn.c: (EvdevBtnNew): ++ Change the longs to unsigned longs in the bitfields. ++ ++ Use the bitop defines in evdev.h properly. ++ * src/evdev_key.c: (EvdevKeyNew): ++ Change the longs to unsigned longs in the bitfields. ++ ++ Use the bitop defines in evdev.h properly. ++ * src/inotify-syscalls.h: ++ Add HPPA/HPPA64 entries. (Thanks to Fabio M. Di Nitto ++ <fabbione@ubuntu.com>) ++ + 2006-04-30 Zephaniah E. Hull <warp@aehallh.com> + + * configure.ac: +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -61,8 +61,6 @@ + #include <X11/XF86keysym.h> + #include <X11/extensions/XIproto.h> + +-#include <string.h> +- + #include "evdev.h" + + #include <xf86.h> +@@ -328,7 +326,7 @@ EvdevNew(evdevDriverPtr driver, evdevDev + } + + static void +-EvdevParseBits (char *in, long *out, int len) ++EvdevParseBits (char *in, unsigned long *out, int len) + { + unsigned long v[2]; + int n, i, max_bits = len * BITS_PER_LONG; +@@ -351,7 +349,7 @@ EvdevParseBits (char *in, long *out, int + } + + static void +-EvdevParseBitOption (char *opt, long *all, long *not, long *any, int len) ++EvdevParseBitOption (char *opt, unsigned long *all, unsigned long *not, unsigned long *any, int len) + { + char *cur, *next; + +@@ -395,7 +393,7 @@ EvdevCorePreInit(InputDriverPtr drv, IDe + EvdevParseBitOption (tmp, pEvdev->all_bits.field, \ + pEvdev->not_bits.field, \ + pEvdev->any_bits.field, \ +- sizeof(pEvdev->not_bits.field) / sizeof (long)); \ ++ sizeof(pEvdev->not_bits.field) / sizeof (unsigned long)); \ + free (tmp); \ + } + bitoption(ev); +--- a/src/evdev.h ++++ b/src/evdev.h +@@ -72,20 +72,29 @@ + #include <stdarg.h> + #include <xf86Xinput.h> + ++#ifndef BITS_PER_LONG + #define BITS_PER_LONG (sizeof(long) * 8) ++#endif ++ + #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) +-#define OFF(x) ((x)%BITS_PER_LONG) +-#define LONG(x) ((x)/BITS_PER_LONG) +-#define BIT(x) (1UL<<((x)%BITS_PER_LONG)) +-#define test_bit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1) ++#define LONG(x) ((x) >> (sizeof(unsigned long) + 1)) ++#define MASK(x) (1 << ((x) & (sizeof (unsigned long) * 8 - 1))) ++ ++#ifndef test_bit ++#define test_bit(bit, array) (array[LONG(bit)] & MASK(bit)) ++#endif ++#ifndef set_bit ++#define set_bit(bit, array) (array[LONG(bit)] |= MASK(bit)) ++#endif ++#ifndef clear_bit ++#define clear_bit(bit, array) (array[LONG(bit)] &= ~MASK(bit)) ++#endif + + /* 2.4 compatibility */ + #ifndef EVIOCGSW + + #include <sys/time.h> + #include <sys/ioctl.h> +-#include <asm/types.h> +-#include <asm/bitops.h> + + #define EVIOCGSW(len) _IOC(_IOC_READ, 'E', 0x1b, len) /* get all switch states */ + +@@ -128,14 +137,14 @@ + #define EVDEV_MAXBUTTONS 96 + + typedef struct { +- long ev[NBITS(EV_MAX)]; +- long key[NBITS(KEY_MAX)]; +- long rel[NBITS(REL_MAX)]; +- long abs[NBITS(ABS_MAX)]; +- long msc[NBITS(MSC_MAX)]; +- long led[NBITS(LED_MAX)]; +- long snd[NBITS(SND_MAX)]; +- long ff[NBITS(FF_MAX)]; ++ unsigned long ev[NBITS(EV_MAX)]; ++ unsigned long key[NBITS(KEY_MAX)]; ++ unsigned long rel[NBITS(REL_MAX)]; ++ unsigned long abs[NBITS(ABS_MAX)]; ++ unsigned long msc[NBITS(MSC_MAX)]; ++ unsigned long led[NBITS(LED_MAX)]; ++ unsigned long snd[NBITS(SND_MAX)]; ++ unsigned long ff[NBITS(FF_MAX)]; + } evdevBitsRec, *evdevBitsPtr; + + typedef struct { +--- a/src/evdev_axes.c ++++ b/src/evdev_axes.c +@@ -49,14 +49,6 @@ + + #include <xf86_OSproc.h> + +-#define ArrayLength(a) (sizeof(a) / (sizeof((a)[0]))) +- +-#define BITS_PER_LONG (sizeof(long) * 8) +-#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) +-#define OFF(x) ((x)%BITS_PER_LONG) +-#define LONG(x) ((x)/BITS_PER_LONG) +-#define TestBit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1) +- + static char *rel_axis_names[] = { + "X", + "Y", +@@ -328,7 +320,7 @@ EvdevAxisAbsNew(InputInfoPtr pInfo) + + real_axes = 0; + for (i = 0; i < ABS_MAX; i++) +- if (TestBit (i, pEvdev->bits.abs)) ++ if (test_bit (i, pEvdev->bits.abs)) + real_axes++; + + if (!real_axes) +@@ -344,7 +336,7 @@ EvdevAxisAbsNew(InputInfoPtr pInfo) + pInfo->conversion_proc = EvdevConvert; + + for (i = 0, j = 0; i < ABS_MAX; i++) { +- if (!TestBit (i, pEvdev->bits.abs)) ++ if (!test_bit (i, pEvdev->bits.abs)) + continue; + + snprintf(option, sizeof(option), "%sAbsoluteAxisMap", abs_axis_names[i]); +@@ -389,7 +381,7 @@ EvdevAxisAbsNew(InputInfoPtr pInfo) + xf86Msg(X_CONFIG, "%s: Unknown Mode: %s.\n", pInfo->name, s); + } + +- if (TestBit (ABS_X, pEvdev->bits.abs) && TestBit (ABS_Y, pEvdev->bits.abs)) ++ if (test_bit (ABS_X, pEvdev->bits.abs) && test_bit (ABS_Y, pEvdev->bits.abs)) + k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", 0); + else + k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", -1); +@@ -417,7 +409,7 @@ EvdevAxisRelNew(InputInfoPtr pInfo) + + real_axes = 0; + for (i = 0; i < REL_MAX; i++) +- if (TestBit (i, pEvdev->bits.rel)) ++ if (test_bit (i, pEvdev->bits.rel)) + real_axes++; + + if (!real_axes && (!state->abs || state->abs->axes < 2)) +@@ -434,7 +426,7 @@ EvdevAxisRelNew(InputInfoPtr pInfo) + pInfo->conversion_proc = EvdevConvert; + + for (i = 0, j = 0; i < REL_MAX; i++) { +- if (!TestBit (i, pEvdev->bits.rel)) ++ if (!test_bit (i, pEvdev->bits.rel)) + continue; + + snprintf(option, sizeof(option), "%sRelativeAxisMap", rel_axis_names[i]); +--- a/src/evdev_brain.c ++++ b/src/evdev_brain.c +@@ -86,7 +86,7 @@ typedef struct { + } evdevDevInfoRec, *evdevDevInfoPtr; + + static Bool +-MatchAll (long *dev, long *match, int len) ++MatchAll (unsigned long *dev, unsigned long *match, int len) + { + int i; + +@@ -98,7 +98,7 @@ MatchAll (long *dev, long *match, int le + } + + static Bool +-MatchNot (long *dev, long *match, int len) ++MatchNot (unsigned long *dev, unsigned long *match, int len) + { + int i; + +@@ -110,7 +110,7 @@ MatchNot (long *dev, long *match, int le + } + + static Bool +-MatchAny (long *dev, long *match, int len) ++MatchAny (unsigned long *dev, unsigned long *match, int len) + { + int i, found = 0; + +--- a/src/evdev_btn.c ++++ b/src/evdev_btn.c +@@ -51,15 +51,6 @@ + + #include <xf86Module.h> + +- +-#define ArrayLength(a) (sizeof(a) / (sizeof((a)[0]))) +- +-#define BITS_PER_LONG (sizeof(long) * 8) +-#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) +-#define OFF(x) ((x)%BITS_PER_LONG) +-#define LONG(x) ((x)/BITS_PER_LONG) +-#define TestBit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1) +- + void + EvdevBtnPostFakeClicks(InputInfoPtr pInfo, int button, int count) + { +@@ -186,7 +177,7 @@ EvdevBtnNew(InputInfoPtr pInfo) + state->btn = Xcalloc (sizeof (evdevBtnRec)); + + for (i = BTN_MISC; i < (KEY_OK - 1); i++) +- if (TestBit (i, pEvdev->bits.key)) { ++ if (test_bit (i, pEvdev->bits.key)) { + bit = i; + if ((bit >= BTN_MOUSE) && (bit < BTN_JOYSTICK)) { + bit -= BTN_MOUSE - BTN_MISC; +--- a/src/evdev_key.c ++++ b/src/evdev_key.c +@@ -81,11 +81,6 @@ + + + #define ArrayLength(a) (sizeof(a) / (sizeof((a)[0]))) +-#define BITS_PER_LONG (sizeof(long) * 8) +-#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) +-#define OFF(x) ((x)%BITS_PER_LONG) +-#define LONG(x) ((x)/BITS_PER_LONG) +-#define TestBit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1) + + #define MIN_KEYCODE 8 + #define GLYPHS_PER_KEY 2 +@@ -356,13 +351,13 @@ EvdevKeyNew (InputInfoPtr pInfo) + int i, keys = 0; + + for (i = 0; i <= KEY_UNKNOWN; i++) +- if (TestBit (i, pEvdev->bits.key)) { ++ if (test_bit (i, pEvdev->bits.key)) { + keys = 1; + break; + } + if (!keys) + for (i = KEY_OK; i <= KEY_MAX; i++) +- if (TestBit (i, pEvdev->bits.key)) { ++ if (test_bit (i, pEvdev->bits.key)) { + keys = 1; + break; + } +--- a/src/inotify-syscalls.h ++++ b/src/inotify-syscalls.h +@@ -39,6 +39,10 @@ + # define __NR_inotify_init 290 + # define __NR_inotify_add_watch 291 + # define __NR_inotify_rm_watch 292 ++#elif defined (__hppa__) || defined (__hppa64__) ++# define __NR_inotify_init 269 ++# define __NR_inotify_add_watch 270 ++# define __NR_inotify_rm_watch 271 + #else + # error "Unsupported architecture!" + #endif diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-11-bitops-fixes.patch b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-11-bitops-fixes.patch new file mode 100644 index 000000000..91240faa3 --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-11-bitops-fixes.patch @@ -0,0 +1,42 @@ +From: Zephaniah E. Hull <warp@aehallh.com> +Date: Mon, 15 May 2006 22:47:23 +0000 (+0000) +Subject: Hopefully fix the bitops stuff to actually _work_. +X-Git-Tag: xf86-video-impact-0_2_0 +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-evdev.git;a=commitdiff;h=1b03250797daa0ac98323a9f43e895dd0b5c7761 + +Hopefully fix the bitops stuff to actually _work_. +--- + +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,8 @@ ++2006-05-15 Zephaniah E. Hull,,, <warp@aehallh.com> ++ ++ * src/evdev.h: ++ Hopefully fix the bitops stuff to actually _work_. ++ + 2006-05-14 Zephaniah E. Hull <warp@aehallh.com> + + * man/evdev.man: +--- a/src/evdev.h ++++ b/src/evdev.h +@@ -73,15 +73,15 @@ + #include <xf86Xinput.h> + + #ifndef BITS_PER_LONG +-#define BITS_PER_LONG (sizeof(long) * 8) ++#define BITS_PER_LONG (sizeof(unsigned long) * 8) + #endif + + #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) +-#define LONG(x) ((x) >> (sizeof(unsigned long) + 1)) +-#define MASK(x) (1 << ((x) & (sizeof (unsigned long) * 8 - 1))) ++#define LONG(x) ((x)/BITS_PER_LONG) ++#define MASK(x) (1UL << ((x) & (BITS_PER_LONG - 1))) + + #ifndef test_bit +-#define test_bit(bit, array) (array[LONG(bit)] & MASK(bit)) ++#define test_bit(bit, array) (!!(array[LONG(bit)] & MASK(bit))) + #endif + #ifndef set_bit + #define set_bit(bit, array) (array[LONG(bit)] |= MASK(bit)) diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-20-add-inotify-architectures.patch b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-20-add-inotify-architectures.patch new file mode 100644 index 000000000..a70832568 --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-20-add-inotify-architectures.patch @@ -0,0 +1,29 @@ +Index: xserver-xorg-input-evdev/src/inotify-syscalls.h +=================================================================== +--- xserver-xorg-input-evdev.orig/src/inotify-syscalls.h 2006-11-01 19:37:12.000000000 +1100 ++++ xserver-xorg-input-evdev/src/inotify-syscalls.h 2006-11-01 19:59:51.000000000 +1100 +@@ -43,6 +43,24 @@ + # define __NR_inotify_init 269 + # define __NR_inotify_add_watch 270 + # define __NR_inotify_rm_watch 271 ++#elif defined (__mips__) ++# if _MIPS_SIM == _MIPS_SIM_ABI32 ++# define __NR_inotify_init 4284 ++# define __NR_inotify_add_watch 4285 ++# define __NR_inotify_rm_watch 4286 ++# elif _MIPS_SIM == _MIPS_SIM_NABI32 ++# define __NR_inotify_init 6247 ++# define __NR_inotify_add_watch 6248 ++# define __NR_inotify_rm_watch 6249 ++# elif _MIPS_SIM == _MIPS_SIM_ABI64 ++# define __NR_inotify_init 5243 ++# define __NR_inotify_add_watch 5244 ++# define __NR_inotify_rm_watch 5245 ++# endif ++#elif defined (__mc68000__) ++# define __NR_inotify_init 284 ++# define __NR_inotify_add_watch 285 ++# define __NR_inotify_rm_watch 286 + #else + # error "Unsupported architecture!" + #endif diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-30-absolute-axis.patch b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-30-absolute-axis.patch new file mode 100644 index 000000000..5b3737eca --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-30-absolute-axis.patch @@ -0,0 +1,31 @@ +From: Adam Jackson <ajax@nwnk.net> +Date: Fri, 2 Jun 2006 19:39:52 +0000 (+0000) +Subject: Fix an obvious bogon to avoid crashing on absolute axis setup. +X-Git-Tag: xf86-video-impact-0_2_0 +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-evdev.git;a=commitdiff;h=57a7f2844108072bf03c9f82baf92e3447d18fbe + +Fix an obvious bogon to avoid crashing on absolute axis setup. +--- + +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,8 @@ ++2006-06-02 Adam Jackson <ajax@freedesktop.org> ++ ++ * src/evdev_axes.c: ++ Fix an obvious bogon to avoid crashing on absolute axis setup. ++ + 2006-05-15 Zephaniah E. Hull,,, <warp@aehallh.com> + + * src/evdev.h: +--- a/src/evdev_axes.c ++++ b/src/evdev_axes.c +@@ -385,7 +385,7 @@ EvdevAxisAbsNew(InputInfoPtr pInfo) + k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", 0); + else + k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", -1); +- if (k < screenInfo.numScreens) { ++ if (k < screenInfo.numScreens && k >= 0) { + state->abs->screen = k; + xf86Msg(X_CONFIG, "%s: AbsoluteScreen: %d.\n", pInfo->name, k); + } else { diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-40-close-fd.patch b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-40-close-fd.patch new file mode 100644 index 000000000..e00042406 --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-40-close-fd.patch @@ -0,0 +1,18 @@ +From: Zephaniah E. Hull <warp@agamemnon.b5> +Date: Tue, 11 Jul 2006 07:08:30 +0000 (-0400) +Subject: Set pInfo->fd to -1 when we close it in EvdevProc. +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-evdev.git;a=commitdiff;h=eba5ea8d5a19f2b1984cbf20c95d22e243f19567 + +Set pInfo->fd to -1 when we close it in EvdevProc. +--- + +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -200,6 +200,7 @@ EvdevProc(DeviceIntPtr device, int what) + RemoveEnabledDevice (pInfo->fd); + xf86RemoveSIGIOHandler (pInfo->fd); + close (pInfo->fd); ++ pInfo->fd = -1; + + if (pEvdev->state.axes) + EvdevAxesOff (device); diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-50-xinput.patch b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-50-xinput.patch new file mode 100644 index 000000000..d38f56689 --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev-1.1.2-50-xinput.patch @@ -0,0 +1,21 @@ +--- a/src/evdev.c 2008-06-23 08:40:50.000000000 -0400 ++++ b/src/evdev.c 2008-06-23 08:42:00.000000000 -0400 +@@ -233,10 +233,6 @@ EvdevSwitchMode (ClientPtr client, Devic + else + return !Success; + break; +- case SendCoreEvents: +- case DontSendCoreEvents: +- xf86XInputSetSendCoreEvents (pInfo, (mode == SendCoreEvents)); +- break; + default: + return !Success; + } +@@ -263,7 +259,6 @@ EvdevNew(evdevDriverPtr driver, evdevDev + pInfo->device_control = EvdevProc; + pInfo->read_input = EvdevReadInput; + pInfo->switch_mode = EvdevSwitchMode; +- pInfo->motion_history_proc = xf86GetMotionEvents; + pInfo->conf_idev = driver->dev; + + pInfo->private = device; diff --git a/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk b/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk index 65677e724..d524c9480 100644 --- a/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk +++ b/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_FPIT_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_FPIT_VERSION = 1.2.0 XDRIVER_XF86_INPUT_FPIT_SOURCE = xf86-input-fpit-$(XDRIVER_XF86_INPUT_FPIT_VERSION).tar.bz2 XDRIVER_XF86_INPUT_FPIT_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_FPIT_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk b/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk index 8363eda66..a441f4393 100644 --- a/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk +++ b/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_HYPERPEN_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_HYPERPEN_VERSION = 1.2.0 XDRIVER_XF86_INPUT_HYPERPEN_SOURCE = xf86-input-hyperpen-$(XDRIVER_XF86_INPUT_HYPERPEN_VERSION).tar.bz2 XDRIVER_XF86_INPUT_HYPERPEN_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_HYPERPEN_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk b/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk index 5bb2c39f4..da2d4d47c 100644 --- a/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk +++ b/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_JAMSTUDIO_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_JAMSTUDIO_VERSION = 1.2.0 XDRIVER_XF86_INPUT_JAMSTUDIO_SOURCE = xf86-input-jamstudio-$(XDRIVER_XF86_INPUT_JAMSTUDIO_VERSION).tar.bz2 XDRIVER_XF86_INPUT_JAMSTUDIO_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_JAMSTUDIO_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk index 627dac8ff..08e984421 100644 --- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk +++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.2.3 +XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.3.2 XDRIVER_XF86_INPUT_JOYSTICK_SOURCE = xf86-input-joystick-$(XDRIVER_XF86_INPUT_JOYSTICK_VERSION).tar.bz2 XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_JOYSTICK_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk index b3bd2080f..b0c376913 100644 --- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk +++ b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.2.2 +XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.3.1 XDRIVER_XF86_INPUT_KEYBOARD_SOURCE = xf86-input-keyboard-$(XDRIVER_XF86_INPUT_KEYBOARD_VERSION).tar.bz2 XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_KEYBOARD_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk b/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk index 3b8df81f5..9301219e4 100644 --- a/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk +++ b/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_MAGELLAN_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_MAGELLAN_VERSION = 1.2.0 XDRIVER_XF86_INPUT_MAGELLAN_SOURCE = xf86-input-magellan-$(XDRIVER_XF86_INPUT_MAGELLAN_VERSION).tar.bz2 XDRIVER_XF86_INPUT_MAGELLAN_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_MAGELLAN_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk b/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk index df9db25a9..e2d8708bf 100644 --- a/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk +++ b/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_MICROTOUCH_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_MICROTOUCH_VERSION = 1.2.0 XDRIVER_XF86_INPUT_MICROTOUCH_SOURCE = xf86-input-microtouch-$(XDRIVER_XF86_INPUT_MICROTOUCH_VERSION).tar.bz2 XDRIVER_XF86_INPUT_MICROTOUCH_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_MICROTOUCH_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk index 341ea4fdf..86f74f432 100644 --- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk +++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.2.2 +XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.3.0 XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.bz2 XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_MOUSE_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk b/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk index f5755404a..1e6f4cc9a 100644 --- a/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk +++ b/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_MUTOUCH_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_MUTOUCH_VERSION = 1.2.0 XDRIVER_XF86_INPUT_MUTOUCH_SOURCE = xf86-input-mutouch-$(XDRIVER_XF86_INPUT_MUTOUCH_VERSION).tar.bz2 XDRIVER_XF86_INPUT_MUTOUCH_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_MUTOUCH_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk b/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk index d9a5b3140..77e090801 100644 --- a/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk +++ b/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_PALMAX_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_PALMAX_VERSION = 1.2.0 XDRIVER_XF86_INPUT_PALMAX_SOURCE = xf86-input-palmax-$(XDRIVER_XF86_INPUT_PALMAX_VERSION).tar.bz2 XDRIVER_XF86_INPUT_PALMAX_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_PALMAX_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk b/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk index cabcf9230..a108dfe53 100644 --- a/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk +++ b/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_PENMOUNT_VERSION = 1.2.0 +XDRIVER_XF86_INPUT_PENMOUNT_VERSION = 1.3.0 XDRIVER_XF86_INPUT_PENMOUNT_SOURCE = xf86-input-penmount-$(XDRIVER_XF86_INPUT_PENMOUNT_VERSION).tar.bz2 XDRIVER_XF86_INPUT_PENMOUNT_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_PENMOUNT_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk b/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk index 0821c49f1..0a254b532 100644 --- a/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk +++ b/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_SPACEORB_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_SPACEORB_VERSION = 1.1.1 XDRIVER_XF86_INPUT_SPACEORB_SOURCE = xf86-input-spaceorb-$(XDRIVER_XF86_INPUT_SPACEORB_VERSION).tar.bz2 XDRIVER_XF86_INPUT_SPACEORB_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_SPACEORB_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk b/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk index 8bbd410da..2d093ca9d 100644 --- a/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk +++ b/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_SUMMA_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_SUMMA_VERSION = 1.2.0 XDRIVER_XF86_INPUT_SUMMA_SOURCE = xf86-input-summa-$(XDRIVER_XF86_INPUT_SUMMA_VERSION).tar.bz2 XDRIVER_XF86_INPUT_SUMMA_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_SUMMA_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-synaptics/Config.in b/package/x11r7/xdriver_xf86-input-synaptics/Config.in new file mode 100644 index 000000000..de3bd552a --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-synaptics/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_XDRIVER_XF86_INPUT_SYNAPTICS + bool "xf86-input-synaptics" + default n + select BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XPROTO_INPUTPROTO + select BR2_PACKAGE_XPROTO_RANDRPROTO + select BR2_PACKAGE_XPROTO_XPROTO + help + xf86-input-synaptics 0.14.7 + X.Org driver for synaptics input devices diff --git a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics-0.14.7~git20070706-configure.patch b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics-0.14.7~git20070706-configure.patch new file mode 100644 index 000000000..0bb70d506 --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics-0.14.7~git20070706-configure.patch @@ -0,0 +1,8 @@ +diff -Nwrup xfree86-driver-synaptics_0.14.7~git20070706.orig/configure xdriver_xf86-input-synaptics-0.14.7~git20070706/configure +--- a/.stamp_configured 1969-12-31 19:00:00.000000000 -0500 ++++ b/.stamp_configured 2008-06-23 11:01:16.000000000 -0400 +@@ -0,0 +1,4 @@ ++#!/bin/sh ++ ++echo "Dummy configure" ++ diff --git a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk new file mode 100644 index 000000000..48d464bec --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# xdriver_xf86-input-synaptics -- X.Org driver for synaptics input devices +# +################################################################################ + +XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 0.14.7~git20070706 +XDRIVER_XF86_INPUT_SYNAPTICS_SOURCE = xfree86-driver-synaptics_$(XDRIVER_XF86_INPUT_SYNAPTICS_VERSION).orig.tar.gz +XDRIVER_XF86_INPUT_SYNAPTICS_SITE = http://ftp.de.debian.org/debian/pool/main/x/xfree86-driver-synaptics +XDRIVER_XF86_INPUT_SYNAPTICS_AUTORECONF = NO +XDRIVER_XF86_INPUT_SYNAPTICS_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto +XDRIVER_XF86_INPUT_SYNAPTICS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install + +$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-synaptics)) diff --git a/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk b/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk index 30289d3b8..e0c2aa247 100644 --- a/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk +++ b/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_TEK4957_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_TEK4957_VERSION = 1.2.0 XDRIVER_XF86_INPUT_TEK4957_SOURCE = xf86-input-tek4957-$(XDRIVER_XF86_INPUT_TEK4957_VERSION).tar.bz2 XDRIVER_XF86_INPUT_TEK4957_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_TEK4957_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk index 6aecdbe5a..d59929c0e 100644 --- a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk +++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 12.4.1 +XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 12.5.1 XDRIVER_XF86_INPUT_VMMOUSE_SOURCE = xf86-input-vmmouse-$(XDRIVER_XF86_INPUT_VMMOUSE_VERSION).tar.bz2 XDRIVER_XF86_INPUT_VMMOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_VMMOUSE_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk index ced262b37..23160e84c 100644 --- a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk +++ b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_VOID_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_VOID_VERSION = 1.1.1 XDRIVER_XF86_INPUT_VOID_SOURCE = xf86-input-void-$(XDRIVER_XF86_INPUT_VOID_VERSION).tar.bz2 XDRIVER_XF86_INPUT_VOID_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_VOID_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk index 941ebfa3d..246269b7c 100644 --- a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk +++ b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_APM_VERSION = 1.1.1 +XDRIVER_XF86_VIDEO_APM_VERSION = 1.2.0 XDRIVER_XF86_VIDEO_APM_SOURCE = xf86-video-apm-$(XDRIVER_XF86_VIDEO_APM_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_APM_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_APM_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk index 08413f69a..1c5d07f6d 100644 --- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk +++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_ARK_VERSION = 0.6.0 +XDRIVER_XF86_VIDEO_ARK_VERSION = 0.7.0 XDRIVER_XF86_VIDEO_ARK_SOURCE = xf86-video-ark-$(XDRIVER_XF86_VIDEO_ARK_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_ARK_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_ARK_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-6.6.3.patch b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-6.6.3.patch deleted file mode 100644 index ba05f8841..000000000 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-6.6.3.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- xf86-video-ati-6.6.3/configure.ac.orig 2007-06-10 12:02:12.000000000 +0200 -+++ xf86-video-ati-6.6.3/configure.ac 2007-06-10 12:02:31.000000000 +0200 -@@ -84,13 +84,19 @@ - # Checks for header files. - AC_HEADER_STDC - --if test "$DRI" != no; then -+if test "x$DRI" != xno; then -+ if test "$cross_compiling" = no; then - AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) - AC_CHECK_FILE([${sdkdir}/sarea.h], - [have_sarea_h="yes"], [have_sarea_h="no"]) - AC_CHECK_FILE([${sdkdir}/dristruct.h], - [have_dristruct_h="yes"], [have_dristruct_h="no"]) -+ else -+ have_dri_h="yes" -+ have_sarea_h="yes" -+ have_dristruct_h="yes" -+ fi - fi - - AC_MSG_CHECKING([whether to include DRI support]) diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-cross-compile.patch b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-cross-compile.patch new file mode 100644 index 000000000..d27617606 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-cross-compile.patch @@ -0,0 +1,27 @@ +--- a/configure.ac 2008-06-23 10:39:28.000000000 -0400 ++++ b/configure.ac 2008-06-23 10:40:46.000000000 -0400 +@@ -85,14 +85,20 @@ sdkdir=$(pkg-config --variable=sdkdir xo + AC_HEADER_STDC + + if test "$DRI" != no; then +- AC_CHECK_FILE([${sdkdir}/dri.h], ++ if test "$cross_compiling" = "no" ; then ++ AC_CHECK_FILE([${sdkdir}/dri.h], + [have_dri_h="yes"], [have_dri_h="no"]) +- AC_CHECK_FILE([${sdkdir}/sarea.h], ++ AC_CHECK_FILE([${sdkdir}/sarea.h], + [have_sarea_h="yes"], [have_sarea_h="no"]) +- AC_CHECK_FILE([${sdkdir}/dristruct.h], ++ AC_CHECK_FILE([${sdkdir}/dristruct.h], + [have_dristruct_h="yes"], [have_dristruct_h="no"]) +- AC_CHECK_FILE([${sdkdir}/damage.h], ++ AC_CHECK_FILE([${sdkdir}/damage.h], + [have_damage_h="yes"], [have_damage_h="no"]) ++ else ++ have_dri_h="yes" ++ have_sarea_h="yes" ++ have_dristruct_h="yes" ++ fi + fi + + AC_MSG_CHECKING([whether to include DRI support]) diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk index 5c1f3f850..8c4ae9c5f 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk @@ -4,10 +4,10 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_ATI_VERSION = 6.6.3 +XDRIVER_XF86_VIDEO_ATI_VERSION = 6.8.191 XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_ATI_AUTORECONF = NO +XDRIVER_XF86_VIDEO_ATI_AUTORECONF = YES XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-ati)) diff --git a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk index fce6b04dd..7c7d1caca 100644 --- a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk +++ b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_CHIPS_VERSION = 1.1.1 +XDRIVER_XF86_VIDEO_CHIPS_VERSION = 1.2.0 XDRIVER_XF86_VIDEO_CHIPS_SOURCE = xf86-video-chips-$(XDRIVER_XF86_VIDEO_CHIPS_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_CHIPS_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_CHIPS_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk index b0eae40ed..c501f1fd4 100644 --- a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk +++ b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_CIRRUS_VERSION = 1.1.0 +XDRIVER_XF86_VIDEO_CIRRUS_VERSION = 1.2.1 XDRIVER_XF86_VIDEO_CIRRUS_SOURCE = xf86-video-cirrus-$(XDRIVER_XF86_VIDEO_CIRRUS_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_CIRRUS_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_CIRRUS_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix-1.1.0-cross-compile.patch b/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix-1.1.0-cross-compile.patch new file mode 100644 index 000000000..09b371273 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix-1.1.0-cross-compile.patch @@ -0,0 +1,31 @@ +--- a/configure 2006-04-07 14:48:07.000000000 -0400 ++++ b/configure 2008-06-23 11:09:35.000000000 -0400 +@@ -20264,28 +20264,8 @@ echo "$as_me: Building with package name + as_ac_File=`echo "ac_cv_file_$prefix/share/X11/sgml/defs.ent" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $prefix/share/X11/sgml/defs.ent" >&5 + echo $ECHO_N "checking for $prefix/share/X11/sgml/defs.ent... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_File+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- test "$cross_compiling" = yes && +- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +- { (exit 1); exit 1; }; } +-if test -r "$prefix/share/X11/sgml/defs.ent"; then +- eval "$as_ac_File=yes" +-else +- eval "$as_ac_File=no" +-fi +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +-if test `eval echo '${'$as_ac_File'}'` = yes; then +- DEFS_ENT_PATH=$prefix/share/X11/sgml +-else + DEFS_ENT_PATH= + +-fi +- + + # Extract the first word of "linuxdoc", so it can be a program name with args. + set dummy linuxdoc; ac_word=$2 diff --git a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk index f0000209e..a9dee77c5 100644 --- a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk +++ b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_FBDEV_VERSION = 0.3.1 +XDRIVER_XF86_VIDEO_FBDEV_VERSION = 0.4.0 XDRIVER_XF86_VIDEO_FBDEV_SOURCE = xf86-video-fbdev-$(XDRIVER_XF86_VIDEO_FBDEV_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_FBDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_FBDEV_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.1.1.patch b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.1.1.patch deleted file mode 100644 index 437e06bb1..000000000 --- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.1.1.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- xf86-video-glint-1.1.1/configure.ac.orig 2007-06-10 20:58:34.000000000 +0200 -+++ xf86-video-glint-1.1.1/configure.ac 2007-06-10 20:58:58.000000000 +0200 -@@ -69,12 +69,18 @@ - AC_HEADER_STDC - - if test "$DRI" != no; then -+ if test "$cross_compiling" = "no" ; then - AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) - AC_CHECK_FILE([${sdkdir}/sarea.h], - [have_sarea_h="yes"], [have_sarea_h="no"]) - AC_CHECK_FILE([${sdkdir}/dristruct.h], - [have_dristruct_h="yes"], [have_dristruct_h="no"]) -+ else -+ have_dri_h="yes" -+ have_sarea_h="yes" -+ have_dristruct_h="yes" -+ fi - fi - - AC_MSG_CHECKING([whether to include DRI support]) diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.0-cross-compile.patch b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.0-cross-compile.patch new file mode 100644 index 000000000..8c420d3a8 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.0-cross-compile.patch @@ -0,0 +1,29 @@ +--- a/configure.ac 2008-06-23 11:17:07.000000000 -0400 ++++ b/configure.ac 2008-06-23 11:16:31.000000000 -0400 +@@ -75,12 +75,20 @@ CPPFLAGS="$SAVE_CPPFLAGS" + AC_HEADER_STDC + + if test "$DRI" != no; then +- AC_CHECK_FILE([${sdkdir}/dri.h], +- [have_dri_h="yes"], [have_dri_h="no"]) +- AC_CHECK_FILE([${sdkdir}/sarea.h], +- [have_sarea_h="yes"], [have_sarea_h="no"]) +- AC_CHECK_FILE([${sdkdir}/dristruct.h], +- [have_dristruct_h="yes"], [have_dristruct_h="no"]) ++ if test "$cross_compiling" = "no" ; then ++ AC_CHECK_FILE([${sdkdir}/dri.h], ++ [have_dri_h="yes"], [have_dri_h="no"]) ++ AC_CHECK_FILE([${sdkdir}/sarea.h], ++ [have_sarea_h="yes"], [have_sarea_h="no"]) ++ AC_CHECK_FILE([${sdkdir}/dristruct.h], ++ [have_dristruct_h="yes"], [have_dristruct_h="no"]) ++ AC_CHECK_FILE([${sdkdir}/damage.h], ++ [have_damage_h="yes"], [have_damage_h="no"]) ++ else ++ have_dri_h="yes" ++ have_sarea_h="yes" ++ have_dristruct_h="yes" ++ fi + fi + + AC_MSG_CHECKING([whether to include DRI support]) diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk index 2e9eaee19..5f37470ea 100644 --- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk +++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk @@ -4,10 +4,10 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.1.1 +XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.2.0 XDRIVER_XF86_VIDEO_GLINT_SOURCE = xf86-video-glint-$(XDRIVER_XF86_VIDEO_GLINT_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_GLINT_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_GLINT_AUTORECONF = NO +XDRIVER_XF86_VIDEO_GLINT_AUTORECONF = YES XDRIVER_XF86_VIDEO_GLINT_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-glint)) diff --git a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk index e1b9b4d7e..29ee8aded 100644 --- a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk +++ b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_I128_VERSION = 1.2.1 +XDRIVER_XF86_VIDEO_I128_VERSION = 1.3.0 XDRIVER_XF86_VIDEO_I128_SOURCE = xf86-video-i128-$(XDRIVER_XF86_VIDEO_I128_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_I128_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_I128_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk b/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk index add8a8842..e4c1105f1 100644 --- a/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk +++ b/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_I740_VERSION = 1.1.0 +XDRIVER_XF86_VIDEO_I740_VERSION = 1.2.0 XDRIVER_XF86_VIDEO_I740_SOURCE = xf86-video-i740-$(XDRIVER_XF86_VIDEO_I740_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_I740_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_I740_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.6.5.patch b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.7.4-cross-compile.patch index 9f0179d59..9f0179d59 100644 --- a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.6.5.patch +++ b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.7.4-cross-compile.patch diff --git a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk index 1e5447aca..5672aed15 100644 --- a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk +++ b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk @@ -4,10 +4,10 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_I810_VERSION = 1.6.5 +XDRIVER_XF86_VIDEO_I810_VERSION = 1.7.4 XDRIVER_XF86_VIDEO_I810_SOURCE = xf86-video-i810-$(XDRIVER_XF86_VIDEO_I810_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_I810_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_I810_AUTORECONF = NO +XDRIVER_XF86_VIDEO_I810_AUTORECONF = YES XDRIVER_XF86_VIDEO_I810_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-i810)) diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.3.2-cross-compile.patch b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.3.2-cross-compile.patch new file mode 100644 index 000000000..0258d7018 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.3.2-cross-compile.patch @@ -0,0 +1,30 @@ +--- xf86-video-i810-1.6.5/configure.ac.orig 2007-06-10 20:59:27.000000000 +0200 ++++ xf86-video-i810-1.6.5/configure.ac 2007-06-10 20:59:50.000000000 +0200 +@@ -92,13 +92,14 @@ AC_HEADER_STDC + + AC_MSG_CHECKING([whether to include DRI support]) + if test x$DRI = xauto; then ++ if test "$cross_compiling" = "no" ; then + AC_CHECK_FILE([${sdkdir}/dri.h], + [have_dri_h="yes"], [have_dri_h="no"]) + AC_CHECK_FILE([${sdkdir}/sarea.h], + [have_sarea_h="yes"], [have_sarea_h="no"]) + AC_CHECK_FILE([${sdkdir}/dristruct.h], + [have_dristruct_h="yes"], [have_dristruct_h="no"]) +- AC_CHECK_FILE([${sdkdir}/damage.h], ++ AC_CHECK_FILE([${sdkdir}/damage.h], + [have_damage_h="yes"], [have_damage_h="no"]) + + if test "$have_dri_h" = yes -a \ +@@ -108,6 +109,12 @@ if test x$DRI = xauto; then + else + DRI="no" + fi ++ else ++ have_dri_h="yes" ++ have_sarea_h="yes" ++ have_dristruct_h="yes" ++ DRI="yes" ++ fi + fi + AC_MSG_RESULT([$DRI]) diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk index 0e0d760cd..48d8b69c4 100644 --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk @@ -4,10 +4,10 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.1.1 +XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.3.2 XDRIVER_XF86_VIDEO_INTEL_SOURCE = xf86-video-intel-$(XDRIVER_XF86_VIDEO_INTEL_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_INTEL_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = NO +XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-intel)) diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.6.1.patch b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.8.patch index 34cc1330c..34cc1330c 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.6.1.patch +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.8.patch diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk index 803715e24..90c8804bd 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk @@ -4,10 +4,10 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_MGA_VERSION = 1.4.6.1 +XDRIVER_XF86_VIDEO_MGA_VERSION = 1.4.8 XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_MGA_AUTORECONF = NO +XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-mga)) diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk index ab3e04552..3abfbbfb1 100644 --- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk +++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.1.1 +XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.2.1 XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_NEOMAGIC_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport-0.2.1-cross-compile.patch b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport-0.2.1-cross-compile.patch new file mode 100644 index 000000000..34c8a7a63 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport-0.2.1-cross-compile.patch @@ -0,0 +1,31 @@ +--- a/configure 2006-10-13 18:36:20.000000000 -0400 ++++ b/configure 2008-06-23 11:38:03.000000000 -0400 +@@ -20191,28 +20191,8 @@ echo "$as_me: Building with package name + as_ac_File=`echo "ac_cv_file_$prefix/share/X11/sgml/defs.ent" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $prefix/share/X11/sgml/defs.ent" >&5 + echo $ECHO_N "checking for $prefix/share/X11/sgml/defs.ent... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_File+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- test "$cross_compiling" = yes && +- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +- { (exit 1); exit 1; }; } +-if test -r "$prefix/share/X11/sgml/defs.ent"; then +- eval "$as_ac_File=yes" +-else +- eval "$as_ac_File=no" +-fi +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +-if test `eval echo '${'$as_ac_File'}'` = yes; then +- DEFS_ENT_PATH=$prefix/share/X11/sgml +-else + DEFS_ENT_PATH= + +-fi +- + + # Extract the first word of "linuxdoc", so it can be a program name with args. + set dummy linuxdoc; ac_word=$2 diff --git a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk index abba1c66f..d598635e3 100644 --- a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk +++ b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_NV_VERSION = 2.1.3 +XDRIVER_XF86_VIDEO_NV_VERSION = 2.1.9 XDRIVER_XF86_VIDEO_NV_SOURCE = xf86-video-nv-$(XDRIVER_XF86_VIDEO_NV_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_NV_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_NV_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk index 209e85bc4..65d37dfd4 100644 --- a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk +++ b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_RENDITION_VERSION = 4.1.3 +XDRIVER_XF86_VIDEO_RENDITION_VERSION = 4.2.0 XDRIVER_XF86_VIDEO_RENDITION_SOURCE = xf86-video-rendition-$(XDRIVER_XF86_VIDEO_RENDITION_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_RENDITION_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_RENDITION_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk b/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk index d1da734c3..52f665e5e 100644 --- a/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk +++ b/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_S3_VERSION = 0.5.0 +XDRIVER_XF86_VIDEO_S3_VERSION = 0.6.0 XDRIVER_XF86_VIDEO_S3_SOURCE = xf86-video-s3-$(XDRIVER_XF86_VIDEO_S3_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_S3_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_S3_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk b/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk index f281c0f9c..88d1ac5d7 100644 --- a/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk +++ b/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_S3VIRGE_VERSION = 1.9.1 +XDRIVER_XF86_VIDEO_S3VIRGE_VERSION = 1.10.1 XDRIVER_XF86_VIDEO_S3VIRGE_SOURCE = xf86-video-s3virge-$(XDRIVER_XF86_VIDEO_S3VIRGE_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_S3VIRGE_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_S3VIRGE_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage-2.2.1-cross-compile.patch b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage-2.2.1-cross-compile.patch new file mode 100644 index 000000000..b9c296b6b --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage-2.2.1-cross-compile.patch @@ -0,0 +1,27 @@ +--- a/configure.ac 2008-05-21 16:04:23.000000000 -0400 ++++ b/configure.ac 2008-06-23 11:41:50.000000000 -0400 +@@ -68,12 +68,18 @@ sdkdir=$(pkg-config --variable=sdkdir xo + AC_HEADER_STDC + + if test "$DRI" != no; then +- AC_CHECK_FILE([${sdkdir}/dri.h], +- [have_dri_h="yes"], [have_dri_h="no"]) +- AC_CHECK_FILE([${sdkdir}/sarea.h], +- [have_sarea_h="yes"], [have_sarea_h="no"]) +- AC_CHECK_FILE([${sdkdir}/dristruct.h], +- [have_dristruct_h="yes"], [have_dristruct_h="no"]) ++ if test "$cross_compiling" = "no" ; then ++ AC_CHECK_FILE([${sdkdir}/dri.h], ++ [have_dri_h="yes"], [have_dri_h="no"]) ++ AC_CHECK_FILE([${sdkdir}/sarea.h], ++ [have_sarea_h="yes"], [have_sarea_h="no"]) ++ AC_CHECK_FILE([${sdkdir}/dristruct.h], ++ [have_dristruct_h="yes"], [have_dristruct_h="no"]) ++ else ++ have_dri_h="yes" ++ have_sarea_h="yes" ++ have_dristruct_h="yes" ++ fi + fi + + AC_MSG_CHECKING([whether to include DRI support]) diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk index 98f6b3b55..0bd5ef396 100644 --- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk +++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk @@ -4,10 +4,10 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_SAVAGE_VERSION = 2.1.3 +XDRIVER_XF86_VIDEO_SAVAGE_VERSION = 2.2.1 XDRIVER_XF86_VIDEO_SAVAGE_SOURCE = xf86-video-savage-$(XDRIVER_XF86_VIDEO_SAVAGE_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_SAVAGE_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = NO +XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-savage)) diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk index f7495fc8f..cfcdf6abc 100644 --- a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk +++ b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION = 1.4.2 +XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION = 1.6.0 XDRIVER_XF86_VIDEO_SILICONMOTION_SOURCE = xf86-video-siliconmotion-$(XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_SILICONMOTION_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_SILICONMOTION_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis-0.9.3.patch b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis-0.10.0.patch index 9e06480d4..9e06480d4 100644 --- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis-0.9.3.patch +++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis-0.10.0.patch diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk index f68d6c4f5..8d468f92f 100644 --- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk +++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk @@ -4,10 +4,10 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_SIS_VERSION = 0.9.3 +XDRIVER_XF86_VIDEO_SIS_VERSION = 0.10.0 XDRIVER_XF86_VIDEO_SIS_SOURCE = xf86-video-sis-$(XDRIVER_XF86_VIDEO_SIS_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_SIS_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_SIS_AUTORECONF = NO +XDRIVER_XF86_VIDEO_SIS_AUTORECONF = YES XDRIVER_XF86_VIDEO_SIS_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-sis)) diff --git a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk index f85a25a5f..b32061c13 100644 --- a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk +++ b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_SISUSB_VERSION = 0.8.1 +XDRIVER_XF86_VIDEO_SISUSB_VERSION = 0.9.0 XDRIVER_XF86_VIDEO_SISUSB_SOURCE = xf86-video-sisusb-$(XDRIVER_XF86_VIDEO_SISUSB_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_SISUSB_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_SISUSB_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk index ef2f3a62a..2f2f4ab03 100644 --- a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk +++ b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk @@ -7,7 +7,7 @@ XDRIVER_XF86_VIDEO_SUNFFB_VERSION = 1.1.0 XDRIVER_XF86_VIDEO_SUNFFB_SOURCE = xf86-video-sunffb-$(XDRIVER_XF86_VIDEO_SUNFFB_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_SUNFFB_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_SUNFFB_AUTORECONF = NO +XDRIVER_XF86_VIDEO_SUNFFB_AUTORECONF = YES XDRIVER_XF86_VIDEO_SUNFFB_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-sunffb)) diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx-1.3.0.patch b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx-1.4.0.patch index e53591bb0..e53591bb0 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx-1.3.0.patch +++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx-1.4.0.patch diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk index 574099319..f485a715f 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk +++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk @@ -4,10 +4,10 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.3.0 +XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.4.0 XDRIVER_XF86_VIDEO_TDFX_SOURCE = xf86-video-tdfx-$(XDRIVER_XF86_VIDEO_TDFX_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_TDFX_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_TDFX_AUTORECONF = NO +XDRIVER_XF86_VIDEO_TDFX_AUTORECONF = YES XDRIVER_XF86_VIDEO_TDFX_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-tdfx)) diff --git a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga-1.1.0-cross-compile.patch b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga-1.1.0-cross-compile.patch new file mode 100644 index 000000000..fac8018aa --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga-1.1.0-cross-compile.patch @@ -0,0 +1,30 @@ +--- a/configure 2006-04-07 17:40:13.000000000 -0400 ++++ b/configure 2008-06-23 11:54:36.000000000 -0400 +@@ -20326,27 +20326,8 @@ echo "$as_me: Building with package name + as_ac_File=`echo "ac_cv_file_$prefix/share/X11/sgml/defs.ent" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $prefix/share/X11/sgml/defs.ent" >&5 + echo $ECHO_N "checking for $prefix/share/X11/sgml/defs.ent... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_File+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- test "$cross_compiling" = yes && +- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +- { (exit 1); exit 1; }; } +-if test -r "$prefix/share/X11/sgml/defs.ent"; then +- eval "$as_ac_File=yes" +-else +- eval "$as_ac_File=no" +-fi +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +-if test `eval echo '${'$as_ac_File'}'` = yes; then +- DEFS_ENT_PATH=$prefix/share/X11/sgml +-else + DEFS_ENT_PATH= + +-fi + + + # Extract the first word of "linuxdoc", so it can be a program name with args. diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk index 89b3d77b7..81edf8e2d 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.2.3 +XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.0 XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_TRIDENT_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk index 61b1bfbf8..144d51285 100644 --- a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk +++ b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_TSENG_VERSION = 1.1.1 +XDRIVER_XF86_VIDEO_TSENG_VERSION = 1.2.0 XDRIVER_XF86_VIDEO_TSENG_SOURCE = xf86-video-tseng-$(XDRIVER_XF86_VIDEO_TSENG_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_TSENG_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_TSENG_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk index 22de4d140..dffcf13e0 100644 --- a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk +++ b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_V4L_VERSION = 0.1.1 +XDRIVER_XF86_VIDEO_V4L_VERSION = 0.2.0 XDRIVER_XF86_VIDEO_V4L_SOURCE = xf86-video-v4l-$(XDRIVER_XF86_VIDEO_V4L_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_V4L_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_V4L_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk b/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk index b4a651e6e..6a6fed7e8 100644 --- a/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk +++ b/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk @@ -7,7 +7,7 @@ XDRIVER_XF86_VIDEO_VIA_VERSION = 0.2.2 XDRIVER_XF86_VIDEO_VIA_SOURCE = xf86-video-via-$(XDRIVER_XF86_VIDEO_VIA_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_VIA_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_VIA_AUTORECONF = NO +XDRIVER_XF86_VIDEO_VIA_AUTORECONF = YES XDRIVER_XF86_VIDEO_VIA_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-via)) diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk index 79a645eaa..319fa39a1 100644 --- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk +++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_VMWARE_VERSION = 10.14.1 +XDRIVER_XF86_VIDEO_VMWARE_VERSION = 10.16.2 XDRIVER_XF86_VIDEO_VMWARE_SOURCE = xf86-video-vmware-$(XDRIVER_XF86_VIDEO_VMWARE_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_VMWARE_AUTORECONF = NO diff --git a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk index bbbfce44b..0e62b6025 100644 --- a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk +++ b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_VOODOO_VERSION = 1.1.1 +XDRIVER_XF86_VIDEO_VOODOO_VERSION = 1.2.0 XDRIVER_XF86_VIDEO_VOODOO_SOURCE = xf86-video-voodoo-$(XDRIVER_XF86_VIDEO_VOODOO_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_VOODOO_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_VOODOO_AUTORECONF = NO diff --git a/package/x11r7/xproto_inputproto/xproto_inputproto.mk b/package/x11r7/xproto_inputproto/xproto_inputproto.mk index 4f10f9d9b..a89f1ec68 100644 --- a/package/x11r7/xproto_inputproto/xproto_inputproto.mk +++ b/package/x11r7/xproto_inputproto/xproto_inputproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -XPROTO_INPUTPROTO_VERSION = 1.4.2.1 +XPROTO_INPUTPROTO_VERSION = 1.4.3 XPROTO_INPUTPROTO_SOURCE = inputproto-$(XPROTO_INPUTPROTO_VERSION).tar.bz2 XPROTO_INPUTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto XPROTO_INPUTPROTO_AUTORECONF = NO diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index a85b152da..994c4059d 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -9,6 +9,21 @@ XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver XSERVER_XORG_SERVER_AUTORECONF = NO XSERVER_XORG_SERVER_INSTALL_STAGING = YES + +ifeq ($(strip $(BR2_PACKAGE_XSERVER_xorg)),y) +XSERVER_XORG_MESA_DEPS:=mesa3d +XSERVER_XORG_MESA_DIR:=--with-mesa-source="$(BUILD_DIR)/Mesa-6.5.3" +XSERVER_XORG_ENABLE_MODULAR:=--enable-xorg +else +XSERVER_XORG_ENABLE_MODULAR:=--disable-xorg +endif + +ifeq ($(strip $(BR2_PACKAGE_XSERVER_tinyx)),y) +XSERVER_XORG_ENABLE_KDRIVE:=--enable-kdrive --enable-xfbdev +else +XSERVER_XORG_ENABLE_KDRIVE:=--disable-kdrive --disable-xfbdev +endif + XSERVER_XORG_SERVER_DEPENDENCIES = freetype xutil_util-macros xlib_libXfont libdrm xlib_libxkbui \ xproto_compositeproto xproto_damageproto xproto_fixesproto \ xproto_glproto xproto_kbproto xproto_randrproto freetype \ @@ -21,11 +36,12 @@ XSERVER_XORG_SERVER_DEPENDENCIES = freetype xutil_util-macros xlib_libXfont lib xproto_resourceproto xproto_trapproto xproto_videoproto xproto_xcmiscproto \ xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto \ xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto \ - pixman dbus mcookie + pixman dbus $(XSERVER_XORG_MESA_DEPS) mcookie -XSERVER_XORG_SERVER_CONF_OPT = --enable-kdrive --enable-xfbdev --enable-freetype --disable-kbd_mode --disable-xorg \ - --disable-config-hal CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1" +XSERVER_XORG_SERVER_CONF_OPT = $(XSERVER_XORG_ENABLE_KDRIVE) --enable-freetype $(XSERVER_XORG_ENABLE_MODULAR) \ + --disable-config-hal $(XSERVER_XORG_MESA_DIR) CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1" +XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data XSERVER_XORG_SERVER_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install # Optional packages diff --git a/package/xorg/Config.in b/package/xorg/Config.in deleted file mode 100644 index c4fb419b3..000000000 --- a/package/xorg/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_XORG - depends on BR2_DEPRECATED - bool "X.org X Window System" - default y if BR2_PACKAGE_XSERVER_xorg - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_FONTCONFIG - select BR2_PACKAGE_PKGCONFIG - help - The official X Window system and server. - -comment "X.org 6.8.2 X Window System disabled" - depends on BR2_PACKAGE_TINYX||BR2_PACKAGE_XORG7 - diff --git a/package/xorg/Xserver b/package/xorg/Xserver deleted file mode 100755 index 426ddaf06..000000000 --- a/package/xorg/Xserver +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/X11/X -br dpms nologo -nolisten tcp diff --git a/package/xorg/Xsession b/package/xorg/Xsession deleted file mode 100755 index 5b63bb38e..000000000 --- a/package/xorg/Xsession +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -export GDK_USE_XFT=1 -export LANG="en_US.UTF-8" -/usr/bin/X11/rxvt -bg black -fg gray90 diff --git a/package/xorg/fontfile.patch b/package/xorg/fontfile.patch deleted file mode 100644 index ed39bf45d..000000000 --- a/package/xorg/fontfile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xc/lib/font/fontfile/Imakefile.old 2005-06-03 20:09:53.000000000 +0100 -+++ xc/lib/font/fontfile/Imakefile 2005-06-03 20:09:57.000000000 +0100 -@@ -14,7 +14,7 @@ - #endif - - INCLUDES = -I$(FONTINCSRC) -I../include -I$(SERVERSRC)/include \ -- -I$(INCLUDESRC) -+ -I$(INCLUDESRC) $(CC_STAGING) - HEADERS = - #ifdef FontFormatDefines - FORMAT_DEFS = FontFormatDefines diff --git a/package/xorg/fonts.alias b/package/xorg/fonts.alias deleted file mode 100644 index 00e987071..000000000 --- a/package/xorg/fonts.alias +++ /dev/null @@ -1,6 +0,0 @@ -fixed -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1 -variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1 -7x14 -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1 -7x14bold -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-1 - --misc-fixed-medium-r-normal--14-110-100-100-c-70-iso8859-1 -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1 diff --git a/package/xorg/fonts.cache-1 b/package/xorg/fonts.cache-1 deleted file mode 100644 index daba0efa1..000000000 --- a/package/xorg/fonts.cache-1 +++ /dev/null @@ -1,12 +0,0 @@ -"DejaVuSans-BoldOblique.ttf" 0 "DejaVu Sans:familylang=en:style=Bold Oblique:stylelang=en:slant=110:weight=200:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!!)$|>^1!|>^1!|>T)%|>^1!|>^1!|>^1!|>^1!!3Vg{!!!.%|>^1!|>^1!4w}6a;wnZM|>[gE|>^0{|>XZQ|>^1!!!!1&|>^1!|>^1!|>^1!|>^1!|>^/Q|>^1!|>XZQ#?>K%!!!4(!!.)!|>J~~{ma}P|>^0~!!!;) !!#$D|97t]!!!V[(1+e+$h6vZyf*@@{{B$~ !!#(E|>^1!|>^1!|>^1!|>^1!(1+e4|>^1!|>^1!#?>K%!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|>^1!|>T.!P0oWQ|<;7s!!&TQ!(LZY !!#3HKWc2J$^09z|<ls#|>^1!|>T)4|>^1!|>^1!|>^1!!!#6I|>^1!9UgxA|>^0~|>^1!|>^1!!)RAf{{D?(|>9/f!!#9J!|?)&!!!;Q /?6HG !!$<j!!&TR !!#>K !!!!1 !!!1% !!#AL |>^1!|>^1!|>^1!|>^1!!!#DM|>^1!|>^1!|>^1!|>^1!/?6HF!!B7) !!#GN|>]fO|>^+~Ow1gH|>^0~{~h@FP0fQP !!!T5!!#JO|>^0~|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!#MP !)n<!!!!?+!!#PQ!!%|B q~Ki^|>^1!$WSXE #xw^)!!#SR!#>r1 !!+Wr&0h?q P0oWR !!+u{!ANVJ !!.%! /?6HG:lang=aa|ab|af|ast|ava|ay|az|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cu|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|hy|ia|ibo|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|sco|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tk|tn|to|tr|ts|tt|tw|tyv|uk|uz|ven|vi|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType" -"DejaVuSans-Bold.ttf" 0 "DejaVu Sans:familylang=en:style=Bold:stylelang=en:slant=0:weight=200:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!!)$|>^1!|>^1!|>T)%|>^1!|>^1!|>^1!|>^1!!3Vg{!!!.%|>^1!|>^1!4xpki;wnZM|>[gE|>^0{|>XZQ|>^1!!!!1&|>^1!|>^1!|>^1!|>^1!|>^/Q|>^1!|>XZQ#?>K%!!!4(!!.)!|>J~~{ma}P|>^0~!!!;) !!!7)Rim;3$WUr)#F+zm{ao04!FFpNQNVtK!!$qe#?3E%!!#$D|97t]!!!V[(1+e+$h6vZyf*@@{{B$~ !!#(E|>^1!|>^1!|>^1!|>^1!(1+e4|>^1!|>^1!#?>K%!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|>^1!|>T.!P0oWQ|<;7s!!&TQ!(LZY !!#3HKWc2J$^09z|<ls#|>^1!|>T)4|>^1!|>^1!|>^1!!!#6I|>^1!9UgxA|>^0~|>^1!|>^1!!)RAf{{D?(|>9/f!!#9J!|?)&!!!;Q /?6HG !!$<j!!&TR !!#>K !!!!1 !!!1% !!#AL |>^1!|>^1!|>^1!|>^1!!!#DM|>^1!|>^1!|>^1!|>^1!/?6HF!!B7) !!#GN|>]fO|>^+~Ow1gH|>^0~{~h@FP0fQP !!!T5!!#JO|>^0~|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!#MP !)n<!!!!?+!!#PQ!!%|B q~Ki^|>^1!$WSXE #xw^)!!#SR!#>r1 !!+Wr&0h?q P0oWR !!+u{!ANVJ |>6r||>^1!gm&i! #xw^)w0TUs!!+~~ |9.n]|>^1!|>^1!|>^1!ZK#{t!!.%! /?6HG:lang=aa|ab|af|ar|ast|ava|ay|az|az-ir|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cu|cv|cy|da|de|el|en|eo|es|et|eu|fa|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|hy|ia|ibo|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|ku-ir|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|sco|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tk|tn|to|tr|ts|tt|tw|tyv|ug|uk|uz|ven|vi|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType" -"DejaVuSans-Oblique.ttf" 0 "DejaVu Sans:familylang=en:style=Oblique:stylelang=en:slant=110:weight=80:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!!)$|>^1!|>^1!|>T)%|>^1!|>^1!|>^1!|>^1!!3Vg{!!!.%|>^1!|>^1!4wUxZ;wnZM|>[gE|>^0{|>XZQ|>^1!!!!1&|>^1!|>^1!|>^1!|>^1!|>^/Q|>^1!|>XZQ#?>K%!!!4(!!.)!|>J~~{ma}P|>^0~!!!;) !!#$D|97t]!!!V[(1+e+$h6vZyf*@@{{B$~ !!#(E|>^1!|>^1!|>^1!|>^1!(1+e4|>^1!|>^1!#?>K%!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|>^1!|>T.!P0oWQ|<;7s!!&TQ!(LZY !!#3HKWc2J$^09z|<ls#|>^1!|>T)4|>^1!|>^1!|>^1!!!#6I|>^1!9UgxA|>^0~|>^1!|>^1!!)RAf{{D?(|>9/f!!#9J!|?)&!!!;Q /?6HG !!$<j!!&TR !!#>K !!!!1 !!!1% !!#AL |>^1!|>^1!|>^1!|>^1!!!#DM|>^1!|>^1!|>^1!|>^1!/?6HF!!B7) !!#GN|>]fO|>^+~Ow1gH|>^0~{~h@FP0fQP !!!T5!!#JO|>^0~|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!#MP !)n<!!!!?+!!#PQ!!%|B q~Ki^|>^1!$WSXE #xw^)!!#SR!#>r1 !!+Wr&0h?q P0oWR !!+u{!ANVJ !!.%! /?6HG:lang=aa|ab|af|ast|ava|ay|az|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cu|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|hy|ia|ibo|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|sco|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tk|tn|to|tr|ts|tt|tw|tyv|uk|uz|ven|vi|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType" -"DejaVuSans.ttf" 0 "DejaVu Sans:familylang=en:style=Book:stylelang=en:slant=0:weight=80:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!!)$|>^1!|>^1!|>T)%|>^1!|>^1!|>^1!|>^1!!3Vg{!!!.%|>^1!|>^1!4xpki;wnZM|>[gE|>^0{|>XZQ|>^1!!!!1&|>^1!|>^1!|>^1!|>^1!|>^/Q|>^1!|>XZQ#?>K%!!!4(!!.)!|>J~~{ma}P|>^0~!!!;) !!!7)Rim;3$WUr)#F+zm{ao04!FFpNQNVtK!!$qe#?3E%!!#$D|97t]!!!V[(1+e+$h6vZyf*@@{{B$~ !!#(E|>^1!|>^1!|>^1!|>^1!(1+e4|>^1!|>^1!#?>K%!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|>^1!|>T.!P0oWQ|<;7s!!&TQ!(LZY !!#3HKWc2J$^09z|<ls#|>^1!|>T)4|>^1!|>^1!|>^1!!!#6I|>^1!9UgxA|>^0~|>^1!|>^1!!)RAf{{D?(|>9/f!!#9J!|?)&!!!;Q /?6HG !!$<j!!&TR !!#>K !!!!1 !!!1% !!#AL |>^1!|>^1!|>^1!|>^1!!!#DM|>^1!|>^1!|>^1!|>^1!/?6HF!!B7) !!#GN|>]fO|>^+~Ow1gH|>^0~{~h@FP0fQP !!!T5!!#JO|>^0~|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!#MP !)n<!!!!?+!!#PQ!!%|B q~Ki^|>^1!$WSXE #xw^)!!#SR!#>r1 !!+Wr&0h?q P0oWR !!+u{!ANVJ |>6r||>^1!gm&i! #xw^)w0TUs!!+~~ |9.n]|>^1!|>^1!|>^1!ZK#{t!!.%! /?6HG:lang=aa|ab|af|ar|ast|ava|ay|az|az-ir|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cu|cv|cy|da|de|el|en|eo|es|et|eu|fa|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|hy|ia|ibo|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|ku-ir|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|sco|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tk|tn|to|tr|ts|tt|tw|tyv|ug|uk|uz|ven|vi|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType" -"DejaVuSansMono-Bold.ttf" 0 "DejaVu Sans Mono:familylang=en:style=Bold:stylelang=en:slant=0:weight=200:width=100:spacing=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1Mgbm{d#%n|^!!!)$&olY4|>S8A|>T)%|>^1!|>^1!p(S.VOwzo@!!!1%!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1! &vR%x%t7&H|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~ !!#(E!#GD|xJenK8LmtDgfW>$!!)o!5H<IZ!!$/f!}93i!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5epCB^iC}!!!/UQIPyG!!!1%!(/|R !!#3H!)rmR!!!Kz|<lWx !!#6ItMN$89;+8L|>^0~|>]1c|;$OI!!!!%z~FrD!!!1%!!#9J!^{K.!!!%& /?6HG !!$<j!!&TR !!#>K !!!!+ !!#AL |>^1!|>^1!|>^1!|>^1!!!#DM|>^1!{{K.!|>^1!|>^1!/?+uU!!!!% !!#GN {}$35|>T(~ !!!!#!!#MP !!!?+!!#SR!#>r1 !!+fv !!!!G !!+u{!!!!) !!.%! /?6HG:lang=aa|af|ast|ava|ay|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|se|sel|sh|sk|sl|sm|sma|smj|smn|so|sq|sr|sv|sw|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType" -"DejaVuSansMono-BoldOblique.ttf" 0 "DejaVu Sans Mono:familylang=en:style=Bold Oblique:stylelang=en:slant=110:weight=200:width=100:spacing=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1Mgbm{d#%n|^!!!)$&olY4|>S8A|>T)%|>^1!|>^1!p(S.VOwzo@!!!1%!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1! &vR%x%t7&H|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~ !!#(E!#GD|xJenK8LmtDgfW>$!!)o!5H<IZ!!$/f!}93i!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5epCB^iC}!!!/UQIPyG!!!1%!(/|R !!#3H!)rmR!!!Kz|<lWx !!#6ItMN$89;+8L|>^0~|>]1c|;$OI!!!!%z~FrD!!!1%!!#9J!^{K.!!!%& /?6HG !!$<j!!&TR !!#>K !!!!+ !!#AL |>^1!|>^1!|>^1!|>^1!!!#DM!!!!#Z+ert!!!%!!!.$~ !!#GN !!!!#!!#MP !!!?+!!#SR!#>r1 !!+fv !!!!G !!+u{!!!!) !!.%! /?6HG:lang=aa|af|ast|ava|ay|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|se|sel|sh|sk|sl|sm|sma|smj|smn|so|sq|sr|sv|sw|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType" -"DejaVuSansMono-Oblique.ttf" 0 "DejaVu Sans Mono:familylang=en:style=Oblique:stylelang=en:slant=110:weight=80:width=100:spacing=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1Mgbm{d#%n|^!!!)$&olY4|>S8A|>T)%|>^1!|>^1!p(S.VOwzo@!!!1%!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1! &vR%x%t7&H|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~ !!#(E!#GD|xJenK8LmtDgfW>$!!)o!5H<IZ!!$/f!}93i!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5epCB^iC}!!!/UQIPyG!!!1%!(/|R !!#3H!)rmR!!!Kz|<lWx !!#6ItMN$89;+8L|>^0~|>]1c|;$OI!!!!%z~FrD!!!1%!!#9J!^{K.!!!%& /?6HG !!$<j!!&TR !!#>K !!!!+ !!#AL|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!#DM!!!!#Z+ert!!!%!!!.$~ !!#GN !!!!#!!#MP !!!?+!!#SR!#>r1 !!+fv !!!!G !!+u{!!!!) !!.%! /?6HG:lang=aa|af|ast|ava|ay|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|se|sel|sh|sk|sl|sm|sma|smj|smn|so|sq|sr|sv|sw|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType" -"DejaVuSansMono.ttf" 0 "DejaVu Sans Mono:familylang=en:style=Book:stylelang=en:slant=0:weight=80:width=100:spacing=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1Mgbm{d#%n|^!!!)$&olY4|>S8A|>T)%|>^1!|>^1!p(S.VOwzo@!!!1%!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1! &vR%x%t7&H|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~ !!#(E!#GD|xJenK8LmtDgfW>$!!)o!5H<IZ!!$/f!}93i!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5epCB^iC}!!!/UQIPyG!!!1%!(/|R !!#3H!)rmR!!!Kz|<lWx !!#6ItMN$89;+8L|>^0~|>]1c|;$OI!!!!%z~FrD!!!1%!!#9J!^{K.!!!%& /?6HG !!$<j!!&TR !!#>K !!!!+ !!#AL|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!|>^1!!!#DM|>^1!{{K.!|>^1!|>^1!/?+uU!!!!% !!#GN {}$35P0fQP !!!!#!!#MP !!!?+!!#SR!#>r1 !!+fv !!!!G !!+u{!!!!) !!.%! /?6HG:lang=aa|af|ast|ava|ay|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|se|sel|sh|sk|sl|sm|sma|smj|smn|so|sq|sr|sv|sw|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType" -"DejaVuSerif-Bold.ttf" 0 "DejaVu Serif:familylang=en:style=Bold:stylelang=en:slant=0:weight=200:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1M|>^1!|.}*Q!!!)$lrC&L|>^0r|>T)%|>^1!|>^1!zDgQyOwyiz!!$Im!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1!!#>r?lZj+i&3p()|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~ !!#(ElrC&L|>VCi|>T^4|>^.4(1+e49WI7i!|(G@#>r3p!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5n[;B^iC}!!!/UQIPyG!!!1%!(4R# !!#3H!)rmR!!!Kz|<lWx !#Z(4 !!#6Is|M]|!!!Ue!!!%2!!!!Z !!#9J!|>T/!!!%K /?6HG !!$<j!!&TR !!#>K !!!!+ !!#AL |>^1!|>^1!|>^1!|>^1!!!#DM!!!!#Z+ert!!!%!!!.$~ !!#GN !!!!#!!#MP !!!?+!!#SR!#>r1 !!+fv !#x>Y !!+u{!!!!) !!.%! /?6HG:lang=aa|af|ast|ava|ay|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType" -"DejaVuSerif-BoldOblique.ttf" 0 "DejaVu Serif:familylang=en:style=Bold Oblique:stylelang=en:slant=110:weight=200:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1M|>^1!|.}*Q!!!)$lrC&L|>^0r|>T)%|>^1!|>^1!zDgQyOwyiz!!$Im!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1!!#>r?lZj+i&3p()|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~ !!#(ElrC&L|>VCi|>T^4|>^.4(1+e49WI7i!|(G@#>r3p!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5n[;B^iC}!!!/UQIPyG!!!1%!(4R# !!#3H!)rmR!!!Kz|<lWx !#Z(4 !!#6Is|M]|!!!Ue!!!%2!!!!Z !!#9J!|>T/!!!%K /?6HG !!$<j!!&TR !!#>K !!!!+ !!#AL |>^1!|>^1!|>^1!|>^1!!!#DM!!!!#Z+ert!!!%!!!.$~ !!#GN !!!!#!!#MP !!!?+!!#SR!#>r1 !!+fv !#x?D !!+u{!!!!) !!.%! /?6HG:lang=aa|af|ast|ava|ay|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType" -"DejaVuSerif-Oblique.ttf" 0 "DejaVu Serif:familylang=en:style=Oblique:stylelang=en:slant=110:weight=80:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1M|>^1!|.}*Q!!!)$lrC&L|>^0r|>T)%|>^1!|>^1!zDgQyOwyiz!!$Im!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1!!#>r?lZj+i&3p()|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~ !!#(ElrC&L|>VCi|>T^4|>^.4(1+e49WI7i!|(G@#>r3p!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5n[;B^iC}!!!/UQIPyG!!!1%!(4R# !!#3H!)rmR!!!Kz|<lWx !#Z(4 !!#6Is|M]|!!!Ue!!!%2!!!!Z !!#9J!|>T/!!!%K /?6HG !!$<j!!&TR !!#>K !!!!+ !!#AL |>^1!|>^1!|>^1!|>^1!!!#DM!!!!#Z+ert!!!%!!!.$~ !!#GN !!!!#!!#MP !!!?+!!#SR!#>r1 !!+fv !#x?D !!+u{!!!!) !!.%! /?6HG:lang=aa|af|ast|ava|ay|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType" -"DejaVuSerif.ttf" 0 "DejaVu Serif:familylang=en:style=Book:stylelang=en:slant=0:weight=80:width=100:foundry=unknown:index=0:outline=True:scalable=True:charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#|>^1!|>^1!|>^1!|>^1!|>^0~NrU1M|>^1!|.}*Q!!!)$lrC&L|>^0r|>T)%|>^1!|>^1!zDgQyOwyiz!!$Im!!!.%|>^1!|>^1!!BB.#;wnZH|>[gE|>^0{|>XZQ|>T)%!!!1&|>^1!|>^1!|>^1!!#>r?lZj+i&3p()|>T}3#?>K%!!#$Dr;]W3 (1+e+$h6vZyf*@@{{B$~ !!#(ElrC&L|>VCi|>T^4|>^.4(1+e49WI7i!|(G@#>r3p!!#+F9Bx6P|>^1!^{M@P9WIli|>^1!|97t]w)J%tP+*+*!!#0G|5n[;B^iC}!!!/UQIPyG!!!1%!(4R# !!#3H!)rmR!!!Kz|<lWx !#Z(4 !!#6Is|M]|!!!Ue!!!%2!!!!Z !!#9J!|>T/!!!%K /?6HG !!$<j!!&TR !!#>K !!!!+ !!#AL |>^1!|>^1!|>^1!|>^1!!!#DM!!!!#Z+ert!!!%!!!.$~ !!#GN !!!!#!!#MP !!!?+!!#SR!#>r1 !!+fv !#x>Y !!+u{!!!!) !!.%! /?6HG:lang=aa|af|ast|ava|ay|ba|bam|be|bg|bi|bin|br|bs|bua|ca|ce|ch|chm|co|cs|cv|cy|da|de|el|en|eo|es|et|eu|fi|fj|fo|fr|ful|fur|fy|ga|gd|gl|gn|gv|ha|haw|ho|hr|hu|ia|id|ie|ik|io|is|it|kaa|ki|kk|kl|ku|kum|kv|kw|ky|la|lb|lez|lt|lv|mg|mh|mi|mk|mo|mt|nb|nds|nl|nn|no|ny|oc|om|os|pl|pt|rm|ro|ru|sah|se|sel|sh|sk|sl|sm|sma|smj|smn|sms|so|sq|sr|sv|sw|tg|tn|to|tr|ts|tw|tyv|uk|uz|ven|vo|vot|wa|wen|wo|xh|yap|yo|zu:fontversion=176947:fontformat=TrueType" diff --git a/package/xorg/freetype.patch b/package/xorg/freetype.patch deleted file mode 100644 index 0ba3dd562..000000000 --- a/package/xorg/freetype.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- xc/lib/font/FreeType/Imakefile.old 2005-06-03 20:18:51.000000000 +0100 -+++ xc/lib/font/FreeType/Imakefile 2005-06-03 20:18:52.000000000 +0100 -@@ -20,7 +20,7 @@ - - INCLUDES = $(FT2INCS) -I. -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/include $(EXTRAINCLUDES) \ -- -I$(INCLUDESRC) -+ -I$(INCLUDESRC) $(CC_STAGING) - - SRCS = xttcap.c ftfuncs.c ftenc.c fttools.c - OBJS = xttcap.o ftfuncs.o ftenc.o fttools.o ---- xc/config/cf/X11.tmpl.old 2005-06-03 20:40:24.000000000 +0100 -+++ xc/config/cf/X11.tmpl 2005-06-03 20:40:40.000000000 +0100 -@@ -3371,7 +3371,7 @@ - - #if BuildFreetype2Library || HasFreetype2 - #if Freetype2IncDirStandard --FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config -+FREETYPE2INCLUDES = `pkg-config --cflags freetype2` - #else - FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config - #endif diff --git a/package/xorg/kbproto.pc b/package/xorg/kbproto.pc deleted file mode 100644 index 7ce28edbb..000000000 --- a/package/xorg/kbproto.pc +++ /dev/null @@ -1,9 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: KBProto -Description: KB extension headers -Version: 1.0.3 -Cflags: -I${includedir} diff --git a/package/xorg/libXfont-1.1.0-noftinternals.patch b/package/xorg/libXfont-1.1.0-noftinternals.patch deleted file mode 100644 index 846410dc7..000000000 --- a/package/xorg/libXfont-1.1.0-noftinternals.patch +++ /dev/null @@ -1,294 +0,0 @@ -diff -urbN libXfont-1.1.0/src/FreeType/ftfuncs.c libXfont-1.1.0.new/src/FreeType/ftfuncs.c ---- xc/lib/font/FreeType/ftfuncs.c 2005-10-24 02:32:05.000000000 +0800 -+++ xc/lib/font/FreeType/ftfuncs.c 2006-06-25 10:56:24.221147322 +0800 -@@ -54,10 +54,7 @@ - #include FT_TYPE1_TABLES_H - #include FT_XFREE86_H - #include FT_BBOX_H --#include FT_INTERNAL_TRUETYPE_TYPES_H - #include FT_TRUETYPE_TAGS_H --#include FT_INTERNAL_SFNT_H --#include FT_INTERNAL_STREAM_H - /* - * If you want to use FT_Outline_Get_CBox instead of - * FT_Outline_Get_BBox, define here. -@@ -123,6 +120,25 @@ - }; - - -+/* read 2-byte value from a SFNT table */ -+static FT_UShort -+sfnt_get_ushort( FT_Face face, -+ FT_ULong table_tag, -+ FT_ULong table_offset ) -+{ -+ FT_Byte buff[2]; -+ FT_ULong len = sizeof(buff); -+ FT_UShort result = 0; -+ -+ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ) ); -+ result = (FT_UShort)( (buff[0] << 8) | buff[1] ); -+ -+ return result; -+} -+ -+#define sfnt_get_short(f,t,o) ((FT_Short)sfnt_get_ushort((f),(t),(o))) -+ -+ - static int ftypeInitP = 0; /* is the engine initialised? */ - FT_Library ftypeLibrary; - -@@ -211,6 +227,10 @@ - if(maxp && maxp->maxContours == 0) - face->bitmap = 1; - } -+ -+ face->num_hmetrics = (FT_UInt) sfnt_get_ushort( face->face, -+ TTAG_hhea, 34 ); -+ - /* Insert face in hashtable and return it */ - face->next = faceTable[bucket]; - faceTable[bucket] = face; -@@ -462,6 +482,34 @@ - } - - if( FT_IS_SFNT( face->face ) ) { -+#if 1 -+ FT_F26Dot6 tt_char_width, tt_char_height, tt_dim_x, tt_dim_y; -+ FT_UInt nn; -+ -+ instance->strike_index=0xFFFFU; -+ -+ tt_char_width = (FT_F26Dot6)(trans->scale*(1<<6) + 0.5); -+ tt_char_height = (FT_F26Dot6)(trans->scale*(1<<6) + 0.5); -+ -+ tt_dim_x = FLOOR64( ( tt_char_width * trans->xres + 36 ) / 72 + 32 ); -+ tt_dim_y = FLOOR64( ( tt_char_height * trans->yres + 36 ) / 72 + 32 ); -+ -+ if ( tt_dim_x && !tt_dim_y ) -+ tt_dim_y = tt_dim_x; -+ else if ( !tt_dim_x && tt_dim_y ) -+ tt_dim_x = tt_dim_y; -+ -+ for ( nn = 0; nn < face->face->num_fixed_sizes; nn++ ) -+ { -+ FT_Bitmap_Size* sz = &face->face->available_sizes[nn]; -+ -+ if ( tt_dim_x == FLOOR64(sz->x_ppem + 32) && tt_dim_y == FLOOR64(sz->y_ppem + 32) ) -+ { -+ instance->strike_index = nn; -+ break; -+ } -+ } -+#else - /* See Set_Char_Sizes() in ttdriver.c */ - FT_Error err; - TT_Face tt_face; -@@ -486,6 +534,7 @@ - sfnt = (SFNT_Service)tt_face->sfnt; - err = sfnt->set_sbit_strike(tt_face,tt_x_ppem,tt_y_ppem,&instance->strike_index); - if ( err ) instance->strike_index=0xFFFFU; -+#endif - } - - /* maintain a linked list of instances */ -@@ -803,31 +852,61 @@ - * parse the htmx field in TrueType font. - */ - --/* from src/truetype/ttgload.c */ - static void --tt_get_metrics( TT_HoriHeader* header, -+tt_get_metrics( FT_Face face, - FT_UInt idx, -+ FT_UInt num_hmetrics, - FT_Short* bearing, - FT_UShort* advance ) --/* Copyright 1996-2001, 2002 by */ --/* David Turner, Robert Wilhelm, and Werner Lemberg. */ - { -- TT_LongMetrics longs_m; -- FT_UShort k = header->number_Of_HMetrics; -+ /* read the metrics directly from the horizontal header, we -+ * parse the SFNT table directly through the standard FreeType API. -+ * this works with any version of the library and doesn't need to -+ * peek at its internals. Maybe a bit less -+ */ -+ FT_UInt count = num_hmetrics; -+ FT_ULong length = 0; -+ FT_ULong offset = 0; -+ FT_Error error; - -- if ( k == 0 ) { -- *bearing = *advance = 0; -- return; -- } -+ error = FT_Load_Sfnt_Table( face, TTAG_hmtx, 0, NULL, &length ); - -- if ( idx < (FT_UInt)k ) { -- longs_m = (TT_LongMetrics )header->long_metrics + idx; -- *bearing = longs_m->bearing; -- *advance = longs_m->advance; -+ if ( count == 0 || error ) -+ { -+ *advance = 0; -+ *bearing = 0; -+ } -+ else if ( idx < count ) -+ { -+ offset = idx * 4L; -+ if ( offset + 4 > length ) -+ { -+ *advance = 0; -+ *bearing = 0; -+ } -+ else -+ { -+ *advance = sfnt_get_ushort( face, TTAG_hmtx, offset ); -+ *bearing = sfnt_get_short ( face, TTAG_hmtx, offset+2 ); -+ } -+ } -+ else -+ { -+ offset = 4L * (count - 1); -+ if ( offset + 4 > length ) -+ { -+ *advance = 0; -+ *bearing = 0; -+ } -+ else -+ { -+ *advance = sfnt_get_ushort ( face, TTAG_hmtx, offset ); -+ offset += 4 + 2 * ( idx - count ); -+ if ( offset + 2 > length) -+ *bearing = 0; -+ else -+ *bearing = sfnt_get_short ( face, TTAG_hmtx, offset ); - } -- else { -- *bearing = ((TT_ShortMetrics*)header->short_metrics)[idx - k]; -- *advance = ((TT_LongMetrics )header->long_metrics)[k - 1].advance; - } - } - -@@ -835,6 +914,7 @@ - ft_get_very_lazy_bbox( FT_UInt index, - FT_Face face, - FT_Size size, -+ FT_UInt num_hmetrics, - double slant, - FT_Matrix *matrix, - FT_BBox *bbox, -@@ -842,15 +922,14 @@ - FT_Long *vertAdvance) - { - if ( FT_IS_SFNT( face ) ) { -- TT_Face ttface = (TT_Face)face; - FT_Size_Metrics *smetrics = &size->metrics; - FT_Short leftBearing = 0; - FT_UShort advance = 0; - FT_Vector p0, p1, p2, p3; - - /* horizontal */ -- tt_get_metrics(&ttface->horizontal, index, -- &leftBearing, &advance); -+ tt_get_metrics( face, index, num_hmetrics, -+ &leftBearing, &advance ); - - #if 0 - fprintf(stderr,"x_scale=%f y_scale=%f\n", -@@ -910,7 +989,27 @@ - FT_UShort glyph_index, FT_Glyph_Metrics *metrics_return, - int *sbitchk_incomplete_but_exist ) - { --#if (FREETYPE_VERSION >= 2001008) -+#if 1 -+ if ( strike_index != 0xFFFFU && ft_face->available_sizes != NULL ) -+ { -+ FT_Error error; -+ FT_Bitmap_Size* sz = &ft_face->available_sizes[strike_index]; -+ -+ error = FT_Set_Pixel_Sizes( ft_face, sz->x_ppem/64, sz->y_ppem/64 ); -+ if ( !error ) -+ { -+ error = FT_Load_Glyph( ft_face, glyph_index, FT_LOAD_SBITS_ONLY ); -+ if ( !error ) -+ { -+ if ( metrics_return != NULL ) -+ *metrics_return = ft_face->glyph->metrics; -+ -+ return 0; -+ } -+ } -+ } -+ return -1; -+#elif (FREETYPE_VERSION >= 2001008) - SFNT_Service sfnt; - TT_Face face; - FT_Error error; -@@ -1043,6 +1142,7 @@ - if( bitmap_metrics == NULL ) { - if ( sbitchk_incomplete_but_exist==0 && (instance->ttcap.flags & TTCAP_IS_VERY_LAZY) ) { - if( ft_get_very_lazy_bbox( idx, face->face, instance->size, -+ face->num_hmetrics, - instance->ttcap.vl_slant, - &instance->transformation.matrix, - &bbox, &outline_hori_advance, -@@ -1207,10 +1307,27 @@ - } - - if( face->face->glyph->format != FT_GLYPH_FORMAT_BITMAP ) { -+#ifdef USE_GET_CBOX -+ FT_Outline_Get_CBox(&face->face->glyph->outline, &bbox); -+ ftrc = 0; -+#else -+ ftrc = FT_Outline_Get_BBox(&face->face->glyph->outline, &bbox); -+#endif -+ if( ftrc != 0 ) return FTtoXReturnCode(ftrc); -+ bbox.yMin = FLOOR64( bbox.yMin ); -+ bbox.yMax = CEIL64 ( bbox.yMax ); -+ ht_actual = ( bbox.yMax - bbox.yMin ) >> 6; -+ /* FreeType think a glyph with 0 height control box is invalid. -+ * So just let X to create a empty bitmap instead. */ -+ if ( ht_actual == 0 ) -+ is_outline = -1; -+ else -+ { - ftrc = FT_Render_Glyph(face->face->glyph,FT_RENDER_MODE_MONO); - if( ftrc != 0 ) return FTtoXReturnCode(ftrc); - is_outline = 1; - } -+ } - else{ - is_outline=0; - } -@@ -1221,6 +1338,7 @@ - if( is_outline == 1 ){ - if( correct ){ - if( ft_get_very_lazy_bbox( idx, face->face, instance->size, -+ face->num_hmetrics, - instance->ttcap.vl_slant, - &instance->transformation.matrix, - &bbox, &outline_hori_advance, -diff -urbN libXfont-1.1.0/src/FreeType/ftfuncs.h libXfont-1.1.0.new/src/FreeType/ftfuncs.h ---- xc/lib/font/FreeType/ftfuncs.h 2005-07-07 22:59:47.000000000 +0800 -+++ xc/lib/font/FreeType/ftfuncs.h 2006-06-21 21:05:28.533849804 +0800 -@@ -47,6 +47,7 @@ - char *filename; - FT_Face face; - int bitmap; -+ FT_UInt num_hmetrics; - struct _FTInstance *instances; - struct _FTInstance *active_instance; - struct _FTFace *next; /* link to next face in bucket */ -diff -urbN libXfont-1.1.0/src/FreeType/ftsystem.c libXfont-1.1.0.new/src/FreeType/ftsystem.c ---- xc/lib/font/FreeType/ftsystem.c 2005-07-09 14:36:10.000000000 +0800 -+++ xc/lib/font/FreeType/ftsystem.c 2006-06-21 21:05:28.534849622 +0800 -@@ -35,7 +35,6 @@ - #endif - #include <ft2build.h> - #include FT_CONFIG_CONFIG_H --#include FT_INTERNAL_DEBUG_H - #include FT_SYSTEM_H - #include FT_ERRORS_H - #include FT_TYPES_H diff --git a/package/xorg/libdir-la.patch b/package/xorg/libdir-la.patch deleted file mode 100644 index 90b0444c6..000000000 --- a/package/xorg/libdir-la.patch +++ /dev/null @@ -1,153 +0,0 @@ ---- xc/lib/Xft/ltmain.sh.orig 2004-04-23 12:43:42.000000000 -0600 -+++ xc/lib/Xft/ltmain.sh 2007-01-13 15:04:20.000000000 -0700 -@@ -548,7 +548,7 @@ - if test -z "$tagname"; then - $echo "$modename: unable to infer tagged configuration" - $echo "$modename: specify a tag with \`--tag'" 1>&2 -- exit 1 -+ #exit 1 - # else - # $echo "$modename: using $tagname tagged configuration" - fi -@@ -1652,7 +1652,7 @@ - if test -z "$tagname"; then - $echo "$modename: unable to infer tagged configuration" - $echo "$modename: specify a tag with \`--tag'" 1>&2 -- exit 1 -+ #exit 1 - # else - # $echo "$modename: using $tagname tagged configuration" - fi -@@ -5362,10 +5362,13 @@ - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. -- if test "$inst_prefix_dir" = "$destdir"; then -- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 -- exit 1 -- fi -+ # -+ # This breaks install into our staging area. -PB -+ # -+ #if test "$inst_prefix_dir" = "$destdir"; then -+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 -+ # exit 1 -+ #fi - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. ---- xc/extras/fontconfig/ltmain.sh.orig 2004-04-23 12:43:42.000000000 -0600 -+++ xc/extras/fontconfig/ltmain.sh 2007-01-13 15:04:20.000000000 -0700 -@@ -548,7 +548,7 @@ - if test -z "$tagname"; then - $echo "$modename: unable to infer tagged configuration" - $echo "$modename: specify a tag with \`--tag'" 1>&2 -- exit 1 -+ #exit 1 - # else - # $echo "$modename: using $tagname tagged configuration" - fi -@@ -1652,7 +1652,7 @@ - if test -z "$tagname"; then - $echo "$modename: unable to infer tagged configuration" - $echo "$modename: specify a tag with \`--tag'" 1>&2 -- exit 1 -+ #exit 1 - # else - # $echo "$modename: using $tagname tagged configuration" - fi -@@ -5362,10 +5362,13 @@ - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. -- if test "$inst_prefix_dir" = "$destdir"; then -- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 -- exit 1 -- fi -+ # -+ # This breaks install into our staging area. -PB -+ # -+ #if test "$inst_prefix_dir" = "$destdir"; then -+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 -+ # exit 1 -+ #fi - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. ---- xc/extras/freetype2/builds/unix/ltmain.sh.orig 2007-01-13 15:05:47.000000000 -0700 -+++ xc/extras/freetype2/builds/unix/ltmain.sh 2007-01-13 15:07:55.000000000 -0700 -@@ -226,8 +226,9 @@ - # line option must be used. - if test -z "$tagname"; then - $echo "$modename: unable to infer tagged configuration" -- $echo "$modename: specify a tag with \`--tag'" 1>&2 -- exit $EXIT_FAILURE -+ $echo "$modename: defaulting to \`CC'" -+ $echo "$modename: if this is not correct, specify a tag with \`--tag'" -+# exit $EXIT_FAILURE - # else - # $echo "$modename: using $tagname tagged configuration" - fi -@@ -2147,8 +2148,14 @@ - absdir="$abs_ladir" - libdir="$abs_ladir" - else -- dir="$libdir" -- absdir="$libdir" -+ # Adding 'libdir' from the .la file to our library search paths -+ # breaks crosscompilation horribly. We cheat here and don't add -+ # it, instead adding the path where we found the .la. -CL -+ dir="$abs_ladir" -+ absdir="$abs_ladir" -+ libdir="$abs_ladir" -+ #dir="$libdir" -+ #absdir="$libdir" - fi - else - dir="$ladir/$objdir" -@@ -2615,6 +2622,16 @@ - esac - if grep "^installed=no" $deplib > /dev/null; then - path="$absdir/$objdir" -+# This interferes with crosscompilation. -CL -+# else -+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+# if test -z "$libdir"; then -+# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 -+# exit 1 -+# fi -+# if test "$absdir" != "$libdir"; then -+# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 -+# fi - else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then -@@ -5165,6 +5182,10 @@ - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do -+ # Replacing uninstalled with installed can easily break crosscompilation, -+ # since the installed path is generally the wrong architecture. -CL -+ newdependency_libs="$newdependency_libs $deplib" -+ continue - case $deplib in - *.la) - name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` -@@ -5483,10 +5504,13 @@ - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. -- if test "$inst_prefix_dir" = "$destdir"; then -- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 -- exit $EXIT_FAILURE -- fi -+ # -+ # This breaks install into our staging area. -PB -+ # -+ # if test "$inst_prefix_dir" = "$destdir"; then -+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 -+ # exit $EXIT_FAILURE -+ # fi - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. diff --git a/package/xorg/x11.pc b/package/xorg/x11.pc deleted file mode 100644 index c086eccc1..000000000 --- a/package/xorg/x11.pc +++ /dev/null @@ -1,15 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -xthreadlib=-lpthread - -Name: X11 -Description: X Library -Version: 1.0.3 -Requires: xproto kbproto -Requires.private: xau xdmcp -Cflags: -I${includedir} -Libs: -L${libdir} -lX11 -Libs.private: -lpthread diff --git a/package/xorg/xau.pc b/package/xorg/xau.pc deleted file mode 100644 index 618581d9d..000000000 --- a/package/xorg/xau.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: Xau -Description: X authorization file management libary -Version: 1.0.1 -Requires: xproto -Cflags: -I${includedir} -Libs: -L${libdir} -lXau diff --git a/package/xorg/xdmcp.pc b/package/xorg/xdmcp.pc deleted file mode 100644 index dbdf2ae09..000000000 --- a/package/xorg/xdmcp.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: Xdmcp -Description: X Display Manager Control Protocol library -Version: 1.0.1 -Requires: xproto -Cflags: -I${includedir} -Libs: -L${libdir} -lXdmcp diff --git a/package/xorg/xext.pc b/package/xorg/xext.pc deleted file mode 100644 index 8b1799c42..000000000 --- a/package/xorg/xext.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: Xext -Description: Misc X Extension Library -Version: 1.0.1 -Requires: xextproto -Requires.private: x11 xau -Cflags: -I${includedir} -Libs: -L${libdir} -lXext diff --git a/package/xorg/xextproto.pc b/package/xorg/xextproto.pc deleted file mode 100644 index adc0cf498..000000000 --- a/package/xorg/xextproto.pc +++ /dev/null @@ -1,9 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: XExtProto -Description: XExt extension headers -Version: 7.0.2 -Cflags: -I${includedir} diff --git a/package/xorg/xinerama.pc b/package/xorg/xinerama.pc deleted file mode 100644 index 8c3af1ab5..000000000 --- a/package/xorg/xinerama.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: Xinerama -Description: The Xinerama Library -Version: 1.0.1 -Requires: xineramaproto -Requires.private: x11 xext -Cflags: -I${includedir} -Libs: -L${libdir} -lXinerama diff --git a/package/xorg/xorg-6.8.2-joystick_h.patch b/package/xorg/xorg-6.8.2-joystick_h.patch deleted file mode 100644 index 10da5189f..000000000 --- a/package/xorg/xorg-6.8.2-joystick_h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c.orig 2007-02-13 21:17:02.000000000 -0800 -+++ xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c 2007-02-13 21:17:32.000000000 -0800 -@@ -1,5 +1,7 @@ - /* $XFree86: xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c,v 1.1tsi Exp $ */ - -+#undef __STRICT_ANSI__ -+ - #include <sys/types.h> - #include <unistd.h> - #include <string.h> diff --git a/package/xorg/xorg-6.8.2-linux_config.patch b/package/xorg/xorg-6.8.2-linux_config.patch deleted file mode 100644 index 25ab16028..000000000 --- a/package/xorg/xorg-6.8.2-linux_config.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- xc/extras/drm/shared/drm.h.orig 2004-09-20 22:25:23.042737520 +0200 -+++ xc/extras/drm/shared/drm.h 2004-09-20 22:25:33.282180888 +0200 -@@ -38,7 +38,6 @@ - #define _DRM_H_ - - #if defined(__linux__) --#include <linux/config.h> - #include <asm/ioctl.h> /* For _IO* macros */ - #define DRM_IOCTL_NR(n) _IOC_NR(n) - #define DRM_IOC_VOID _IOC_NONE diff --git a/package/xorg/xorg-6.8.2-xterm.patch b/package/xorg/xorg-6.8.2-xterm.patch deleted file mode 100644 index 2820b747e..000000000 --- a/package/xorg/xorg-6.8.2-xterm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xc/programs/xterm/Imakefile.orig 2004-08-13 14:57:19.000000000 +0200 -+++ xc/programs/xterm/Imakefile 2004-09-20 22:04:49.505263720 +0200 -@@ -93,7 +93,7 @@ - #endif - - #ifdef UTF8support -- UTF8_OPTION = -DOPT_WIDE_CHARS -DOPT_LUIT_PROG -+ UTF8_OPTION = -DOPT_WIDE_CHARS -DOPT_LUIT_PROG -DOPT_256_COLORS - UTF8SRC = charclass.c precompose.c wcwidth.c xutf8.c - UTF8OBJ = charclass.o precompose.o wcwidth.o xutf8.o - #endif diff --git a/package/xorg/xorg-config.patch b/package/xorg/xorg-config.patch deleted file mode 100644 index 389801e1d..000000000 --- a/package/xorg/xorg-config.patch +++ /dev/null @@ -1,162 +0,0 @@ ---- xc/config/cf/host.def~ Thu May 12 15:28:01 MDT 2005 -+++ xc/config/cf/host.def Thu May 12 15:28:01 MDT 2005 -@@ -0,0 +1,45 @@ -+#define KDriveXServer YES -+#define TinyXServer YES -+#define XfbdevServer YES -+#define CrossCompiling YES -+#define ProjectRoot /usr/X11R6 -+#define NothingOutsideProjectRoot YES -+ -+#define HasFreetype2 YES -+#define Freetype2Dir REPLACE_STAGING_DIR -+#define HasFontconfig YES -+#define FontconfigDir REPLACE_STAGING_DIR -+#define HasLibpng YES -+#define HasZlib YES -+#define HaveLib64 NO -+#define LibDirName lib -+#define SystemUsrLibDir /usr/lib -+#define TkLibDir /usr/lib -+ -+#define HasExpat YES -+#define ExpatDir REPLACE_STAGING_DIR -+#define XprtServer NO -+#define BuildXprintClients NO -+#define TouchScreen NO -+#define HasTsLib NO -+#define BuildDocs NO -+#define BuildXF86DRI NO -+#define BuildGlxExt NO -+#define BuildOSMesaLib NO -+#define BuildLBX NO -+#define BuildLowMem NO -+#define BuildIPv6 NO -+#define HasPam NO -+#define HasPamMisc NO -+#define BuildXterm NO -+#define BuildXFree86ConfigTools NO -+/* -+#define XF86CardDrivers mga glint nv tga s3virge sis rendition \ -+ neomagic i740 tdfx savage \ -+ cirrus vmware tseng trident chips apm \ -+ GlideDriver fbdev i128 \ -+ ati AgpGartDrivers DevelDrivers ark \ -+ cyrix siliconmotion vesa vga \ -+ XF86OSCardDrivers XF86ExtraCardDrivers -+*/ -+ -+#define XInputDrivers mouse keyboard ---- xc/config/cf/cross.def~ Thu May 12 15:28:01 MDT 2005 -+++ xc/config/cf/cross.def Thu May 12 15:28:01 MDT 2005 -@@ -1,45 +1,63 @@ --/* $XFree86: xc/config/cf/cross.def,v 1.1 2000/12/08 22:09:34 keithp Exp $ */ -+/* $XFree86: xc/config/cf/cross.def,v 1.2 2001/03/30 02:15:17 keithp Exp $ */ - /* - * This file contains redefinitions of some symbols to enable - * cross compilation: e.g. paths for include files and paths to - * compiler images. It will have to be edited to reflect these - * given your local configuration. - */ --#if 0 -+/* Undefine any architectures detected */ - #undef i386Architecture --#define Arm32Architecture -+#undef AMD64Architecture -+#undef PpcArchitecture -+#undef SparcArchitecture -+#undef AlphaArchitecture -+#undef Arm32Architecture -+#undef ia64Architecture -+#undef MipsArchitecture -+ -+/* Cross compiling for: */ -+#define REPLACE_XORG_ARCHArchitecture -+ -+/* MTRR detection in linux.cf is exec'ed before cross.def, so redo it here */ -+#undef HasMTRRSupport -+#if defined (i386Architecture) || defined (AMD64Architecture) -+# define HasMTRRSupport YES -+#else -+# define HasMTRRSupport NO /* no for non-ix86 */ -+#endif - - #undef OptimizedCDebugFlags --#define OptimizedCDebugFlags -O2 --#define ServerCDebugFlags -O2 -+#define OptimizedCDebugFlags -Os -+#define ServerCDebugFlags -Os - #undef StandardDefines --#define StandardDefines -Dlinux -D__arm__ -D_POSIX_SOURCE \ -+#define StandardDefines -Dlinux -D__REPLACE_ARCH__ -D_POSIX_SOURCE \ - -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE - #undef CcCmd --#define StdIncDir /skiff/local/arm-linux/include --#define PreIncDir -+#define StdIncDir REPLACE_STAGING_DIR/include -+#define PreIncDir - #undef PostIncDir --#define PostIncDir /skiff/local/lib/gcc-lib/arm-linux/2.95.2/include --#define CcCmd /skiff/local/bin/arm-linux-gcc -+#define PostIncDir REPLACE_GCCINC_DIR -+#define CcCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-gcc - #undef CplusplusCmd --#define HasCplusplus YES --#define CplusplusCmd /skiff/local/bin/arm-linux-g++ -+#define HasCplusplus NO -+#define CplusplusCmd NO - #define DoRanlibCmd YES --#define RanlibCmd /skiff/local/bin/arm-linux-ranlib -+#define RanlibCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-ranlib - #undef ExtraLoadFlags - #define ExtraLoadFlags - #define FbNoPixelAddrCode - #undef TermcapLibrary --#define TermcapLibrary -ltermcap -+#define TermcapLibrary -lncurses - - #undef LdPostLib --#define LdPostLib -L/skiff/local/arm-linux/lib -+#define LdPostLib -LREPLACE_STAGING_DIR/REPLACE_ARCH-linux-uclibc/lib -+#undef LdCmd -+#define LdCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-ld - - #undef ExtensionOSDefines - #define ExtensionOSDefines - - #define ServerXdmcpDefines /**/ - - #define HostCcCmd cc --#endif - #include <cross.rules> ---- xc/include/Xfuncs.h.orig 2006-07-07 17:09:16.000000000 -0600 -+++ xc/include/Xfuncs.h 2006-07-07 17:11:33.000000000 -0600 -@@ -44,18 +44,28 @@ - #if defined(SYSV) && !defined(SCO325) && !defined(sun) - #include <memory.h> - void bcopy(); -+#ifndef bzero - #define bzero(b,len) memset(b, 0, len) -+#endif -+#ifndef bcmp - #define bcmp(b1,b2,len) memcmp(b1, b2, len) -+#endif - #else - #include <string.h> - #if defined(SCO325) || defined(sun) - #include <strings.h> - #endif - #define _XFUNCS_H_INCLUDED_STRING_H -+#ifndef bcopy - #define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len)) -+#endif -+#ifndef bzero - #define bzero(b,len) memset(b, 0, (size_t)(len)) -+#endif -+#ifndef bcmp - #define bcmp(b1,b2,len) memcmp(b1, b2, (size_t)(len)) - #endif -+#endif - #endif /* X_USEBFUNCS */ - - /* the new Xfuncs.h */ diff --git a/package/xorg/xorg-mmx.patch b/package/xorg/xorg-mmx.patch deleted file mode 100644 index 53219523a..000000000 --- a/package/xorg/xorg-mmx.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- xc/programs/Xserver/fb/Imakefile.orig 2006-07-20 11:41:36.000000000 -0600 -+++ xc/programs/Xserver/fb/Imakefile 2006-07-20 11:43:50.000000000 -0600 -@@ -3,16 +3,6 @@ - XCOMM - XCOMM Id: Imakefile,v 1.1 1999/11/02 03:54:44 keithp Exp $ - --#if defined(i386Architecture) && defined(HasGcc34) && HasGcc34 --MMXOPTIONS= -mmmx -Winline --param inline-unit-growth=10000 \ -- --param large-function-growth=10000 -DUSE_GCC34_MMX -- --SpecialCObjectRule(fbmmx,fbmmx.c,$(MMXOPTIONS)) --SpecialCObjectRule(fbpict,fbpict.c,$(MMXOPTIONS)) --SpecialCObjectRule(fbfill,fbfill.c,$(MMXOPTIONS)) -- --#endif -- - #if DoLoadableServer - #if !BuildModuleInSubdir - #define IHaveModules diff --git a/package/xorg/xorg-noxf86cfg.patch b/package/xorg/xorg-noxf86cfg.patch deleted file mode 100644 index 37828e480..000000000 --- a/package/xorg/xorg-noxf86cfg.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- xc/programs/Xserver/hw/xfree86/Imakefile.orig 2006-07-20 12:51:58.000000000 -0600 -+++ xc/programs/Xserver/hw/xfree86/Imakefile 2006-07-20 12:52:04.000000000 -0600 -@@ -84,10 +84,6 @@ - DRIVERSDK = sdk - #endif - --#if !BuildServersOnly || BuildXFree86ConfigTools --XF86CFGDIRS = xf86cfg xf86config --#endif -- - SUBDIRS = os-support common $(I2CDIR) $(XAADIR) $(XF1BPPDIR) $(XF4BPPDIR) \ - $(XF8_32BPPDIR) $(XF8_16BPPDIR) $(XF24_32BPPDIR) $(SHADOWFBDIR) \ - drivers $(LOADERDIR) $(VGAHWDIR) $(FBDEVHWDIR) $(RAMDACDIR) \ diff --git a/package/xorg/xorg-uclibc.patch b/package/xorg/xorg-uclibc.patch deleted file mode 100644 index 23b8b5fc0..000000000 --- a/package/xorg/xorg-uclibc.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- xc/programs/xfs/os/config.c.orig 2005-04-26 03:13:52.000000000 -0600 -+++ xc/programs/xfs/os/config.c 2005-04-26 03:14:09.000000000 -0600 -@@ -665,6 +665,8 @@ - val = config_parse_int (val, &ret, &scan); - if (ret == -1) - return val; -+#ifdef SNFFORMAT - SnfSetFormat (bit, byte, glyph, scan); -+#endif - return val; - } ---- xc/fonts/util/ucs2any.c 2004-03-04 17:46:21.000000000 +0000 -+++ xc/fonts/util/ucs2any.c 2004-09-11 12:49:37.000000000 +0000 -@@ -61,17 +61,6 @@ - /* global variable for argv[0] */ - const char *my_name = NULL; - --#ifdef NEED_BASENAME --static char * --basename(char *pathname) --{ -- char *ptr; -- -- ptr = strrchr(pathname, '/'); -- return ((ptr == NULL) ? pathname : &ptr[1]); --} --#endif -- - /* "CLASS" "z" string and memory manipulation */ - - static void * diff --git a/package/xorg/xorg-x11-6.8.2-gcc4-fix.patch b/package/xorg/xorg-x11-6.8.2-gcc4-fix.patch deleted file mode 100644 index 6062dba7f..000000000 --- a/package/xorg/xorg-x11-6.8.2-gcc4-fix.patch +++ /dev/null @@ -1,148 +0,0 @@ ---- xc/programs/Xserver/fb/fbmmx.c.orig 2005-03-01 19:01:35.401903000 -0500 -+++ xc/programs/Xserver/fb/fbmmx.c 2005-03-01 19:01:39.330305792 -0500 -@@ -29,6 +29,8 @@ - - #ifdef RENDER - -+#include <mmintrin.h> -+ - #include "picturestr.h" - #include "mipict.h" - #include "fbpict.h" -@@ -48,6 +50,10 @@ - #define CHECKPOINT() - #endif - -+#define mmx_and(a,b) ((Vector1x64)_mm_and_si64((__m64)(a),(__m64)(b))) -+#define mmx_or(a,b) ((Vector1x64)_mm_or_si64((__m64)(a),(__m64)(b))) -+#define mmx_xor(a,b) ((Vector1x64)_mm_xor_si64((__m64)(a),(__m64)(b))) -+ - typedef struct - { - ullong mmx_zero; -@@ -102,7 +108,7 @@ - static __inline__ Vector4x16 - negate (Vector4x16 mask) - { -- return (Vector4x16)__builtin_ia32_pxor ( -+ return (Vector4x16)mmx_xor ( - (Vector1x64)mask, - (Vector1x64)c.mmx_4x00ff); - } -@@ -163,9 +169,9 @@ - - t1 = shift ((Vector1x64)pixel, -48); - t2 = shift (t1, 16); -- t1 = __builtin_ia32_por (t1, t2); -+ t1 = mmx_or (t1, t2); - t2 = shift (t1, 32); -- t1 = __builtin_ia32_por (t1, t2); -+ t1 = mmx_or (t1, t2); - - return (Vector4x16)t1; - } -@@ -178,9 +184,9 @@ - t1 = shift ((Vector1x64)pixel, 48); - t1 = shift (t1, -48); - t2 = shift (t1, 16); -- t1 = __builtin_ia32_por (t1, t2); -+ t1 = mmx_or (t1, t2); - t2 = shift (t1, 32); -- t1 = __builtin_ia32_por (t1, t2); -+ t1 = mmx_or (t1, t2); - - return (Vector4x16)t1; - } -@@ -192,15 +198,15 @@ - - x = y = z = (Vector1x64)pixel; - -- x = __builtin_ia32_pand (x, (Vector1x64)c.mmx_ffff0000ffff0000); -- y = __builtin_ia32_pand (y, (Vector1x64)c.mmx_000000000000ffff); -- z = __builtin_ia32_pand (z, (Vector1x64)c.mmx_0000ffff00000000); -+ x = mmx_and (x, (Vector1x64)c.mmx_ffff0000ffff0000); -+ y = mmx_and (y, (Vector1x64)c.mmx_000000000000ffff); -+ z = mmx_and (z, (Vector1x64)c.mmx_0000ffff00000000); - - y = shift (y, 32); - z = shift (z, -32); - -- x = __builtin_ia32_por (x, y); -- x = __builtin_ia32_por (x, z); -+ x = mmx_or (x, y); -+ x = mmx_or (x, z); - - return (Vector4x16)x; - } -@@ -234,7 +240,7 @@ - over_rev_non_pre (Vector4x16 src, Vector4x16 dest) - { - Vector4x16 srca = expand_alpha (src); -- Vector4x16 srcfaaa = (Vector4x16)__builtin_ia32_por((Vector1x64)srca, (Vector1x64)c.mmx_full_alpha); -+ Vector4x16 srcfaaa = (Vector4x16)mmx_or((Vector1x64)srca, (Vector1x64)c.mmx_full_alpha); - - return over(pix_multiply(invert_colors(src), srcfaaa), srca, dest); - } -@@ -300,9 +306,9 @@ - Vector1x64 t1 = shift (p, 36 - 11); - Vector1x64 t2 = shift (p, 16 - 5); - -- p = __builtin_ia32_por (t1, p); -- p = __builtin_ia32_por (t2, p); -- p = __builtin_ia32_pand (p, (Vector1x64)c.mmx_565_rgb); -+ p = mmx_or (t1, p); -+ p = mmx_or (t2, p); -+ p = mmx_and (p, (Vector1x64)c.mmx_565_rgb); - - pixel = __builtin_ia32_pmullw ((Vector4x16)p, (Vector4x16)c.mmx_565_unpack_multiplier); - return __builtin_ia32_psrlw (pixel, 8); -@@ -324,27 +330,27 @@ - Vector1x64 t = (Vector1x64)target; - Vector1x64 r, g, b; - -- r = __builtin_ia32_pand (p, (Vector1x64)c.mmx_565_r); -- g = __builtin_ia32_pand (p, (Vector1x64)c.mmx_565_g); -- b = __builtin_ia32_pand (p, (Vector1x64)c.mmx_565_b); -+ r = mmx_and (p, (Vector1x64)c.mmx_565_r); -+ g = mmx_and (p, (Vector1x64)c.mmx_565_g); -+ b = mmx_and (p, (Vector1x64)c.mmx_565_b); - - r = shift (r, - (32 - 8) + pos * 16); - g = shift (g, - (16 - 3) + pos * 16); - b = shift (b, - (0 + 3) + pos * 16); - - if (pos == 0) -- t = __builtin_ia32_pand (t, (Vector1x64)c.mmx_mask_0); -+ t = mmx_and (t, (Vector1x64)c.mmx_mask_0); - else if (pos == 1) -- t = __builtin_ia32_pand (t, (Vector1x64)c.mmx_mask_1); -+ t = mmx_and (t, (Vector1x64)c.mmx_mask_1); - else if (pos == 2) -- t = __builtin_ia32_pand (t, (Vector1x64)c.mmx_mask_2); -+ t = mmx_and (t, (Vector1x64)c.mmx_mask_2); - else if (pos == 3) -- t = __builtin_ia32_pand (t, (Vector1x64)c.mmx_mask_3); -+ t = mmx_and (t, (Vector1x64)c.mmx_mask_3); - -- p = __builtin_ia32_por (r, t); -- p = __builtin_ia32_por (g, p); -+ p = mmx_or (r, t); -+ p = mmx_or (g, p); - -- return (Vector4x16)__builtin_ia32_por (b, p); -+ return (Vector4x16)mmx_or (b, p); - } - - static __inline__ void ---- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h.orig 2006-07-07 17:38:25.000000000 -0600 -+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h 2006-07-07 17:38:34.000000000 -0600 -@@ -146,9 +146,6 @@ - extern Bool RADEONProbe - FunctionPrototype((DriverPtr, int)); - --extern SymTabRec RADEONChipsets[]; --extern PciChipsets RADEONPciChipsets[]; -- - /* radeon_driver.c */ - extern void RADEONLoaderRefSymLists - FunctionPrototype((void)); diff --git a/package/xorg/xorg.conf b/package/xorg/xorg.conf deleted file mode 100644 index fecf11ca6..000000000 --- a/package/xorg/xorg.conf +++ /dev/null @@ -1,118 +0,0 @@ -# XF86Config-4 (XFree86 server configuration file) generated by dexconf, the -# Debian X Configuration tool, using values from the debconf database. -# -# Edit this file with caution, and see the XF86Config-4 manual page. -# (Type "man XF86Config-4" at the shell prompt.) -# -# If you want your changes to this file preserved by dexconf, only make changes -# before the "### BEGIN DEBCONF SECTION" line above, and/or after the -# "### END DEBCONF SECTION" line below. -# -# To change things within the debconf section, run the command: -# dpkg-reconfigure xserver-xfree86 -# as root. Also see "How do I add custom sections to a dexconf-generated -# XF86Config or XF86Config-4 file?" in /usr/share/doc/xfree86-common/FAQ.gz. - -Section "Files" - FontPath "/usr/X11R6/lib/X11/fonts/100dpi" - FontPath "/usr/X11R6/lib/X11/fonts/75dpi" - FontPath "/usr/X11R6/lib/X11/fonts/misc" -EndSection - -Section "Module" - Load "bitmap" - Load "dbe" - Load "ddc" - Load "extmod" - Load "freetype" - Load "int10" - Load "vbe" -EndSection - -Section "InputDevice" - Identifier "Generic Keyboard" - Driver "kbd" - Option "CoreKeyboard" - Option "XkbLayout" "en_US" -EndSection - -Section "InputDevice" - Identifier "PS2 Mouse" - Driver "mouse" - Option "SendCoreEvents" "true" - Option "Device" "/dev/psaux" - Option "Protocol" "auto" - Option "ZAxisMapping" "4 5" -EndSection - -Section "InputDevice" - Identifier "USB Mouse" - Driver "mouse" - Option "CorePointer" - Option "Device" "/dev/input/mice" - Option "Protocol" "auto" - Option "ZAxisMapping" "4 5" -EndSection - -Section "Device" - Identifier "Generic VGA Card" - #Driver "vesa" - #Driver "vga" - Driver "fbdev" - Option "UseFBDev" "True" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - #HorizSync 30 - 82 - #VertRefresh 50 - 85 - Option "DPMS" -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Generic VGA Card" - Monitor "Generic Monitor" - #DefaultDepth 8 - SubSection "Display" - Viewport 0 0 - Depth 4 - #Modes "640x480" - EndSubSection - SubSection "Display" - Viewport 0 0 - Depth 8 - #Modes "640x480" - EndSubSection - SubSection "Display" - Viewport 0 0 - Depth 16 - #Modes "640x480" - EndSubSection - SubSection "Display" - Viewport 0 0 - Depth 24 - #Modes "640x480" - EndSubSection -EndSection - -Section "ServerFlags" - Option "BlankTime" "10" - Option "StandbyTime" "15" - Option "SuspendTime" "20" - Option "OffTime" "30" - Option "AllowMouseOpenFail" "true" -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - InputDevice "Generic Keyboard" "CoreKeyboard" - InputDevice "USB Mouse" "CorePointer" - InputDevice "PS2 Mouse" -EndSection - -Section "DRI" - Mode 0666 -EndSection - diff --git a/package/xorg/xorg.mk b/package/xorg/xorg.mk deleted file mode 100644 index ae258989b..000000000 --- a/package/xorg/xorg.mk +++ /dev/null @@ -1,228 +0,0 @@ -############################################################# -# -# xorg X Window System -# -############################################################# - -ifneq ($(strip $(BR2_PACKAGE_TINYX)),y) -ifeq ($(strip $(BR2_PACKAGE_XORG)),y) - -XORG_APPS:=xlsfonts/xlsfonts xmodmap/xmodmap xinit/startx \ - xauth/xauth xinit/xinit xsetroot/xsetroot xset/xset \ - mkfontscale/mkfontscale mkfontdir/mkfontdir \ - setxkbmap/setxkbmap #xterm/xterm - -XORG_LIBS:= Xft Xrender Xaw Xmu Xt Xcursor Xrandr Xi Xinerama Xfixes \ - SM ICE Xpm Xp Xext X11 Xmuu Xxf86misc fontenc xkbfile - - -############################################################# -# Stuff below this line shouldn't need changes. -# if you do change, look in rxvt & matchbox for the impact! -############################################################# -# -# Where resources are found. -# -XORG_SOURCE:=X11R6.8.2-src.tar.bz2 -XORG_SITE:=http://xorg.freedesktop.org/X11R6.8.2/src-single/ -XORG_CAT:=$(BZCAT) -XORG_DIR:=$(BUILD_DIR)/xc -XORG_LDIR:=$(XORG_DIR)/lib -XORG_PROGS:=$(XORG_DIR)/programs -TARGET_BINX:=/usr/X11R6/bin -TARGET_LIBX:=/usr/X11R6/lib -XORG_BINX:=$(TARGET_DIR)$(TARGET_BINX) -XORG_LIBX:=$(TARGET_DIR)$(TARGET_LIBX) -XORG_CF:=$(XORG_DIR)/config/cf/cross.def -XORG_HOST_DEF:=$(XORG_DIR)/config/cf/host.def - - -DEJAVU_VERSION=2.14 -DEJAVU_SOURCE=dejavu-ttf-$(DEJAVU_VERSION).tar.bz2 -DEJAVU_CAT:=$(BZCAT) -DEJAVU_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/dejavu -DEJAVU_DIR:=$(BUILD_DIR)/dejavu-ttf-$(DEJAVU_VERSION) - -# Install Xorg xserver -XSERVER_BINARY:=Xorg -XORG_XSERVER:=$(XORG_DIR)/programs/Xserver/$(XSERVER_BINARY) -TARGET_XSERVER:=$(XORG_BINX)/$(XSERVER_BINARY) - -# figure out Xorg's idea of corresponding architecture name -ifeq ($(BR2_alpha),y) -XARCH=Alpha -endif -ifeq ($(BR2_arm),y) -XARCH=Arm32 -endif -ifeq ($(BR2_armeb),y) -XARCH=Arm32 -endif -ifeq ($(BR2_i386),y) -XARCH=i386 -endif -ifeq ($(BR2_mips),y) -XARCH=Mips -endif -ifeq ($(BR2_mipsel),y) -XARCH=Mips -endif -ifeq ($(BR2_powerpc),y) -XARCH=Ppc -endif -ifeq ($(BR2_sparc),y) -XARCH=Sparc -endif -ifeq ($(BR2_x86_64),y) -XARCH=AMD64 -endif - -$(DL_DIR)/$(XORG_SOURCE): - $(WGET) -P $(DL_DIR) $(XORG_SITE)/$(XORG_SOURCE) - -$(XORG_DIR)/.unpacked: $(DL_DIR)/$(XORG_SOURCE) - $(XORG_CAT) $(DL_DIR)/$(XORG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(XORG_DIR) package/xorg/ \*.patch - touch $(XORG_DIR)/.unpacked - -$(XORG_DIR)/.configured: $(XORG_DIR)/.unpacked - $(SED) 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' $(XORG_HOST_DEF) - $(SED) 's:REPLACE_GCCINC_DIR:$(shell $(TARGET_CROSS)gcc -print-file-name=include):g' $(XORG_CF) - $(SED) 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' $(XORG_CF) - $(SED) 's:REPLACE_ARCH:$(ARCH):g' $(XORG_CF) - $(SED) 's:#define StdIncDir.*:#define StdIncDir $(STAGING_DIR)/usr/include:g' $(XORG_CF) - $(SED) 's:#define CcCmd.*:#define CcCmd $(TARGET_CROSS)gcc:g' $(XORG_CF) - $(SED) 's:#define RanlibCmd.*:#define RanlibCmd $(TARGET_CROSS)ranlib:g' $(XORG_CF) - $(SED) 's:#define LdCmd.*:#define LdCmd $(TARGET_CROSS)ld:g' $(XORG_CF) - $(SED) 's:#.*define.*HasPam.*YES::g' $(XORG_DIR)/config/cf/linux.cf - $(SED) 's:#.*define.*CrossCompiling.*NO:#define CrossCompiling YES:g' $(XORG_DIR)/config/cf/Imake.tmpl - $(SED) 's:#.*undef.*CrossCompileDir.*:#define CrossCompileDir $(STAGING_DIR)/bin:g' $(XORG_DIR)/config/cf/Imake.tmpl - $(SED) 's:REPLACE_XORG_ARCH:$(XARCH):g' $(XORG_DIR)/config/cf/cross.def - touch $(XORG_DIR)/.configured - -$(XORG_XSERVER): $(XORG_DIR)/.configured - rm -f $(TARGET_XSERVER) $(XORG_XSERVER) - ( cd $(XORG_DIR); $(MAKE) \ - PKG_CONFIG=$(STAGING_DIR)/$(PKGCONFIG_TARGET_BINARY) \ - World XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale ) - touch -c $(XORG_XSERVER) - -$(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2: $(XORG_XSERVER) - mkdir -p $(STAGING_DIR)/usr/X11R6 - ln -fs ../../include $(STAGING_DIR)/usr/X11R6/include - ln -fs ../../lib $(STAGING_DIR)$(TARGET_LIBX) - ( cd $(XORG_DIR); $(MAKE) \ - DESTDIR=$(STAGING_DIR) install XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale ) - cp package/xorg/x11.pc package/xorg/xext.pc \ - package/xorg/xproto.pc package/xorg/kbproto.pc \ - package/xorg/xau.pc package/xorg/xdmcp.pc \ - package/xorg/xextproto.pc package/xorg/xrandr.pc \ - package/xorg/xinerama.pc $(STAGING_DIR)/lib/pkgconfig - touch -c $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 - -$(TARGET_XSERVER): $(XORG_XSERVER) - mkdir -p $(XORG_BINX) - for file in $(XORG_APPS); do \ - cp -f $(XORG_DIR)/programs/$$file $(XORG_BINX); \ - chmod a+x $(XORG_PROGS)/$$file; \ - $(STRIPCMD) $(XORG_PROGS)/$$file || /bin/true; \ - done - cp $(XORG_XSERVER) $(TARGET_XSERVER) - (cd $(XORG_BINX); ln -snf $(XSERVER_BINARY) X) - $(STRIPCMD) $(TARGET_XSERVER) - mkdir -p $(XORG_LIBX)/modules - cp -LRf $(XORG_DIR)/exports/lib/modules/ $(XORG_LIBX)/ - ( cd $(XORG_DIR)/fonts; $(MAKE) \ - DESTDIR=$(TARGET_DIR) install XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale ) - cp -LRf $(XORG_DIR)/fonts/bdf/misc/7x14.bdf $(XORG_LIBX)/X11/fonts/misc/ - cp -LRf $(XORG_DIR)/fonts/bdf/misc/7x14-L1.bdf $(XORG_LIBX)/X11/fonts/misc/ - cp -LRf $(XORG_DIR)/fonts/bdf/misc/7x14B.bdf $(XORG_LIBX)/X11/fonts/misc/ - cp -LRf $(XORG_DIR)/fonts/bdf/misc/7x14B-L1.bdf $(XORG_LIBX)/X11/fonts/misc/ - cp -LRf $(XORG_DIR)/fonts/bdf/misc/cursor.bdf $(XORG_LIBX)/X11/fonts/misc/ - cp -f package/xorg/fonts.alias $(XORG_LIBX)/X11/fonts/misc/ - ( cd $(XORG_LIBX)/X11/fonts/misc/; mkfontdir ) - rm -rf $(XORG_LIBX)/X11/fonts/100dpi - rm -rf $(XORG_LIBX)/X11/fonts/75dpi - rm -rf $(XORG_LIBX)/X11/fonts/cyrillic - rm -rf $(XORG_LIBX)/X11/fonts/local - (cd $(TARGET_DIR)/usr/bin; ln -snf $(TARGET_BINX) X11) - cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/xkb $(XORG_LIBX)/X11/ - mv $(XORG_LIBX)/X11/xkb/xkbcomp $(XORG_BINX)/ - (cd $(XORG_LIBX)/X11/xkb; ln -s ../../../bin/xkbcomp) - rm -rf $(XORG_LIBX)/X11/xkb/compiled - (cd $(XORG_LIBX)/X11/xkb; ln -s /tmp compiled) - cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/icons $(XORG_LIBX)/X11/ - -cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/locale $(XORG_LIBX)/X11/ - cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/rgb.txt $(XORG_LIBX)/X11/ - cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/XKeysymDB $(XORG_LIBX)/X11/ - cp -LRf $(STAGING_DIR)$(TARGET_LIBX)/X11/XErrorDB $(XORG_LIBX)/X11/ - mkdir -p $(TARGET_DIR)/etc/X11/ - $(SED) "s,^sysclientrc=.*,sysclientrc=/etc/X11/Xsession,g" $(XORG_BINX)/startx - $(SED) "s,^sysserverrc=.*,sysserverrc=/etc/X11/Xserver,g" $(XORG_BINX)/startx - cp -LRf package/xorg/xorg.conf $(TARGET_DIR)/etc/X11/ - cp -LRf package/xorg/Xsession $(TARGET_DIR)/etc/X11/ - cp -LRf package/xorg/Xserver $(TARGET_DIR)/etc/X11/ - touch -c $(TARGET_XSERVER) - -$(DL_DIR)/$(DEJAVU_SOURCE): - $(WGET) -P $(DL_DIR) $(DEJAVU_SITE)/$(DEJAVU_SOURCE) - -$(DEJAVU_DIR)/.unpacked: $(DL_DIR)/$(DEJAVU_SOURCE) - $(DEJAVU_CAT) $(DL_DIR)/$(DEJAVU_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - touch $(DEJAVU_DIR)/.unpacked - -$(XORG_LIBX)/X11/fonts/ttf-dejavu/DejaVuSansMono.ttf: $(DEJAVU_DIR)/.unpacked - mkdir -p $(XORG_LIBX)/X11/fonts/ttf-dejavu - rm -f $(DEJAVU_DIR)/*Condensed*.ttf - rm -f $(DEJAVU_DIR)/*ExtraLight*.ttf - cp -LRf $(DEJAVU_DIR)/DejaVu*-Bold.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/ - cp -LRf $(DEJAVU_DIR)/DejaVu*-BoldOblique.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/ - cp -LRf $(DEJAVU_DIR)/DejaVu*-Oblique.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/ - cp -LRf $(DEJAVU_DIR)/DejaVuSans.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/ - cp -LRf $(DEJAVU_DIR)/DejaVuSansMono.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/ - cp -LRf $(DEJAVU_DIR)/DejaVuSerif.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/ - cp -LRf $(DEJAVU_DIR)/DejaVuSerif.ttf $(XORG_LIBX)/X11/fonts/ttf-dejavu/ - cp package/xorg/fonts.cache-1 $(XORG_LIBX)/X11/fonts/ttf-dejavu/ - ( cd $(XORG_LIBX)/X11/fonts/ttf-dejavu/; mkfontdir ) - touch -c $(XORG_LIBX)/X11/fonts/ttf-dejavu/DejaVuSansMono.ttf - -$(XORG_LIBX)/libX11.so.6.2: $(TARGET_XSERVER) $(XORG_LIBX)/X11/fonts/ttf-dejavu/DejaVuSansMono.ttf - mkdir -p $(XORG_LIBX) - set -e; for dirs in $(XORG_LIBS); do \ - file=`find $(XORG_LDIR)/$$dirs -type f -iname "*$$dirs.so*"`; \ - $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $$file; \ - cp -f $$file $(XORG_LIBX); \ - file=`find $(XORG_LDIR)/$$dirs -type l -iname "*$$dirs.so*"`; \ - cp -pRf $$file $(XORG_LIBX); \ - done - (cd $(TARGET_DIR)/usr/lib; ln -snf $(TARGET_LIBX) X11) - touch $(TARGET_DIR)/etc/ld.so.conf - if [ "`grep -c '$(TARGET_LIBX)' $(TARGET_DIR)/etc/ld.so.conf`" = "0" ]; then \ - echo "$(TARGET_LIBX)" >> $(TARGET_DIR)/etc/ld.so.conf; \ - fi - touch -c $(XORG_LIBX)/libX11.so.6.2 - -$(TARGET_DIR)/usr/bin/mcookie: package/xorg/mcookie.c - $(TARGET_CROSS)gcc -Wall -Os -s package/xorg/mcookie.c -o $(TARGET_DIR)/usr/bin/mcookie - -xorg: zlib png pkgconfig expat fontconfig libdrm $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 \ - $(XORG_LIBX)/libX11.so.6.2 $(TARGET_DIR)/usr/bin/mcookie - -xorg-source: $(DL_DIR)/$(XORG_SOURCE) $(DL_DIR)/$(DEJAVU_SOURCE) - -xorg-clean: - -rm -rf $(TARGET_DIR)/usr/X11R6 - -$(MAKE) -C $(XORG_DIR) clean - -xorg-dirclean: - -rm -rf $(XORG_DIR) - -rm -rf $(TARGET_DIR)/usr/X11R6 - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -TARGETS+=xorg -endif -endif diff --git a/package/xorg/xproto.pc b/package/xorg/xproto.pc deleted file mode 100644 index 25459272c..000000000 --- a/package/xorg/xproto.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include -includex11dir=${prefix}/include/X11 - -Name: Xproto -Description: Xproto headers -Version: 7.0.7 -Cflags: -I${includedir} diff --git a/package/xorg/xrandr.pc b/package/xorg/xrandr.pc deleted file mode 100644 index db9809883..000000000 --- a/package/xorg/xrandr.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: Xrandr -Description: X RandR Library -Version: 1.1.1 -Requires: xproto randrproto >= 1.1 -Requires.private: x11 xext xrender -Cflags: -I${includedir} -Libs: -L${libdir} -lXrandr |