bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[package] Update xservers to Xorg 7.5

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@18238 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
lars 2009-10-31 00:21:38 +00:00
parent 2c8bdd365f
commit 7182d91775
6 changed files with 94 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
Xorg/xorg/xserver/xorg-kdrive/Makefile
View File

@ -8,11 +8,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=xserver-kdrive
PKG_RELEASE:=2
PKG_VERSION:=1.5.1
PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/xserver/
PKG_RELEASE:=1
PKG_VERSION:=1.7.1
PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/xserver/
PKG_SOURCE:=xorg-server-$(PKG_VERSION).tar.bz2
PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/xserver/$(PKG_NAME)/xorg-server-$(PKG_VERSION)/
PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/xserver/$(PKG_NAME)/xorg-server-$(PKG_VERSION)/
PKG_BUILD_DEPENDS:=randrproto renderproto fixesproto damageproto xcmiscproto \
xextproto xproto bigreqsproto resourceproto \
fontsproto inputproto kbproto videoproto resourceproto \
@ -42,9 +42,9 @@ define Package/xserver-kdrive/Default
+libfontenc \
+pixman \
+libopenssl \
+libdrm \
@DISPLAY_SUPPORT \
+X_TSLIB:tslib \
+X_DRI:libdrm
endef
define Package/xserver-kdrive-xvesa
@ -84,39 +84,50 @@ define Build/Configure
$(if $(CONFIG_X_COMPOSITE),--enable-composite,--disable-composite) \
$(if $(CONFIG_X_XINERAMA),--enable-xinerama,--disable-xinerama) \
$(if $(CONFIG_X_XCALIBRATE),--enable-xcalibrate,--disable-xcalibrate) \
--disable-xorg \
--disable-aiglx \
--disable-dependency-tracking \
--disable-debug \
--disable-unit-tests \
--disable-builddocs \
--disable-glx-tls \
--disable-shm \
--disable-xres \
--disable-record \
--enable-xv \
--enable-xvmc \
--disable-dga \
--disable-screensaver \
--disable-xdmcp \
--disable-xdm-auth-1 \
--disable-config-hal \
--disable-xf86misc \
--disable-glx \
--enable-dri \
--disable-dri2 \
--disable-xf86vidmode \
--disable-xace \
--disable-xselinux \
--disable-xsecurity \
--disable-multibuffer \
--disable-dbe \
--disable-xf86bigfont \
--disable-xorgcfg \
--disable-xkb \
--enable-dpms \
--disable-config-dbus \
--disable-config-hal \
--disable-xfree86-utils \
--disable-xaa \
--enable-vgahw \
--disable-vbe \
--enable-int10-module \
--disable-xorg \
--disable-dmx \
--disable-xvfb \
--disable-xnest \
--disable-xquartz \
--disable-standalone-xpbproxy \
--disable-xwin \
--disable-x11app \
--disable-xsdl \
--disable-xfake \
--disable-install-setuid \
--disable-kbd_mode \
--disable-xvfb \
--disable-xevie \
--disable-xprint \
--disable-xtrap \
--disable-dmx \
--disable-glx \
--disable-xinerama \
--disable-xfree86-utils \
--disable-cup \
--disable-xevie \
--disable-evi \
--disable-screensaver \
--enable-builtin-fonts \
--disable-installsetuid \
--disable-secure-rpc \
--enable-silent-rules \
--disable-shave \
)
endef

16
Xorg/xorg/xserver/xorg-kdrive/patches/003-vm86-IFMASK.patch
View File

@ -1,16 +0,0 @@
--- xorg-server-1.5.1.orig/hw/kdrive/vesa/vm86.h 2008-09-09 17:24:59.000000000 +0200
+++ xorg-server-1.5.1/hw/kdrive/vesa/vm86.h 2008-09-09 18:01:53.000000000 +0200
@@ -67,6 +67,13 @@
#include "os.h"
#endif
+#ifndef IF_MASK
+#define IF_MASK X86_EFLAGS_IF
+#endif
+#ifndef IOPL_MASK
+#define IOPL_MASK X86_EFLAGS_IOPL
+#endif
+
typedef unsigned char U8;
typedef unsigned short U16;
typedef unsigned int U32;

84
Xorg/xorg/xserver/xorg-server/Makefile
View File

@ -8,17 +8,18 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=xorg-server
PKG_RELEASE:=2
PKG_VERSION:=1.5.1
PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/xserver/
PKG_RELEASE:=1
PKG_VERSION:=1.7.1
PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/xserver/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/xserver/$(PKG_NAME)-$(PKG_VERSION)/
PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/xserver/$(PKG_NAME)-$(PKG_VERSION)/
PKG_BUILD_DEPENDS:=randrproto renderproto fixesproto damageproto xcmiscproto \
xextproto xproto scrnsaverproto bigreqsproto resourceproto \
fontsproto inputproto kbproto videoproto resourceproto \
compositeproto xf86dgaproto xtrans xf86driproto
compositeproto xf86dgaproto xtrans xf86driproto dri2proto
PKG_INSTALL:=1
PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk
@ -70,43 +71,56 @@ endef
define Build/Configure
$(call Build/Configure/Default, \
--enable-xorg \
--enable-dri \
--disable-kdrive \
--disable-cfb \
--disable-afb \
--disable-mfb \
--disable-aiglx \
--disable-dependency-tracking \
--disable-debug \
--disable-unit-tests \
--disable-builddocs \
--disable-glx-tls \
--disable-composite \
--disable-shm \
--disable-xres \
--disable-record \
--enable-xv \
--enable-xvmc \
--disable-dga \
--disable-screensaver \
--disable-xdmcp \
--disable-xdm-auth-1 \
--disable-config-hal \
--disable-xf86misc \
--disable-glx \
--enable-dri \
--enable-dri2 \
--disable-xinerama \
--disable-xf86vidmode \
--disable-xace \
--disable-xselinux \
--disable-xsecurity \
--disable-xcalibrate \
--disable-tslib \
--disable-multibuffer \
--disable-dbe \
--disable-xf86bigfont \
--disable-xorgcfg \
--disable-xkb \
--enable-dpms \
--disable-config-dbus \
--disable-config-hal \
--disable-xfree86-utils \
--disable-xaa \
--enable-vgahw \
--disable-vbe \
--enable-int10-module \
--enable-xorg \
--disable-dmx \
--disable-xvfb \
--disable-xnest \
--disable-xquartz \
--disable-standalone-xpbproxy \
--disable-xwin \
--disable-x11app \
--disable-xsdl \
--disable-kdrive \
--disable-xfake \
--disable-install-setuid \
--disable-kbd_mode \
--disable-xvfb \
--disable-xprint \
--disable-xtrap \
--disable-dmx \
--disable-glx \
--disable-xinerama \
--disable-xfree86-utils \
--disable-cup \
--disable-xevie \
--disable-evi \
--disable-screensaver \
--enable-builtin-fonts \
--disable-xfbdev \
--disable-installsetuid \
--disable-secure-rpc \
--enable-silent-rules \
--disable-shave \
)
endef
@ -155,12 +169,18 @@ define Build/InstallDev
$(INSTALL_DATA) \
$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
$(1)/usr/lib/pkgconfig/
$(if $(CONFIG_PACKAGE_xserver-xorg), \
$(INSTALL_DIR) $(1)/usr/include/xorg; \
$(INSTALL_DATA) \
$(PKG_INSTALL_DIR)/usr/include/xorg/*.h \
$(1)/usr/include/xorg/; \
)
$(INSTALL_DIR) $(1)/mk
$(INSTALL_DATA) \
./files/xorg-driver.mk \
$(1)/mk/
$(SED) 's,@VERSION@,$(PKG_VERSION),' $(1)/mk/xorg-driver.mk
endef
$(eval $(call BuildPackage,xserver-common))

3
Xorg/xorg/xserver/xorg-server/files/xorg-driver.mk Normal file
View File

@ -0,0 +1,3 @@
XORG_VERSION:=@VERSION@
STAMP_CONFIGURED+=$(XORG_VERSION)

13
Xorg/xorg/xserver/xorg-server/patches/010-sync-dev-mem.patch
View File

@ -1,13 +0,0 @@
diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
index 1bd2d57..0ac829c 100644
--- a/hw/xfree86/os-support/linux/lnx_video.c
+++ b/hw/xfree86/os-support/linux/lnx_video.c
@@ -468,7 +468,7 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
mapflags |= MAP_NONCACHED;
#endif
-#if 0
+#ifndef HAVE_MTRR
/* this will disappear when people upgrade their kernels */
fd = open(DEV_MEM,
((flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR) | O_SYNC);

44
Xorg/xorg/xserver/xorg-server/patches/020-fix-dri-build-without-xinerama.patch
View File

@ -1,44 +0,0 @@
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index b736c6a..3f14705 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -73,7 +73,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu)
-#if !defined(PANORAMIX)
+#ifdef PANORAMIX
extern Bool noPanoramiXExtension;
#endif
@@ -307,7 +307,6 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
drm_context_t * reserved;
int reserved_count;
int i;
- Bool xineramaInCore = FALSE;
DRIEntPrivPtr pDRIEntPriv;
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
DRIContextFlags flags = 0;
@@ -320,20 +319,18 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
return FALSE;
}
+#ifdef PANORAMIX
/*
* If Xinerama is on, don't allow DRI to initialise. It won't be usable
* anyway.
*/
- if (xf86LoaderCheckSymbol("noPanoramiXExtension"))
- xineramaInCore = TRUE;
- if (xineramaInCore) {
if (!noPanoramiXExtension) {
DRIDrvMsg(pScreen->myNum, X_WARNING,
"Direct rendering is not supported when Xinerama is enabled\n");
return FALSE;
}
- }
+#endif
if (!DRIOpenDRMMaster(pScrn, pDRIInfo->SAREASize,
pDRIInfo->busIdString,