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

Seperate xserver-xorg and xserver-kdrive-*.

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@14336 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
lars 2009-02-01 02:09:48 +00:00
parent 2f7a3d7028
commit 0e09d54220
6 changed files with 271 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Xorg/xorg/xserver/xorg-kdrive/Config.in Normal file
View File

@ -0,0 +1,28 @@
menu "kdrive library support"
depends on PACKAGE_xserver-kdrive-xvesa || PACKAGE_xserver-kdrive-xfbdev || PACKAGE_xserver-kdrive-xglamo || PACKAGE_xserver-kdrive-xephyr
config X_TSLIB
bool
prompt "enable support for tslib"
# config X_XCALIBRATE
# bool
# prompt "enable support for xcalibrate"
# config X_DRI
# bool
# prompt "enable support for DRI"
config X_COMPOSITE
bool
prompt "enable support for composite"
config X_XINERAMA
bool
prompt "enable support for xinerama"
# config X_GLX
# bool
# prompt "enable support for GLX"
endmenu

147
Xorg/xorg/xserver/xorg-kdrive/Makefile Normal file
View File

@ -0,0 +1,147 @@
#
# Copyright (C) 2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# $Id$
include $(TOPDIR)/rules.mk
PKG_NAME:=xserver-kdrive
PKG_RELEASE:=1
PKG_VERSION:=1.5.1
PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/xserver/
PKG_SOURCE:=xorg-server-$(PKG_VERSION).tar.bz2
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 \
xf86dgaproto xtrans xf86driproto calibrateproto \
compositeproto xineramaproto
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
define Package/xserver-kdrive-xvesa/config
source "$(SOURCE)/Config.in"
endef
define Package/xserver-kdrive/Default
PROVIDES:=xserver
SECTION:=xorg-server
CATEGORY:=Xorg
SUBMENU:=server
URL:=http://xorg.freedesktop.org/
DEPENDS:=@!avr32 \
+xserver-common \
+libpthread \
+libxkbfile \
+libXfont \
+libXau \
+libXv \
+libfontenc \
+pixman \
+libopenssl \
@DISPLAY_SUPPORT \
+X_TSLIB:tslib \
+X_DRI:libdrm
endef
define Package/xserver-kdrive-xvesa
$(call Package/xserver-kdrive/Default)
TITLE:=Kdrive vesa xserver
DEPENDS+= @TARGET_x86
endef
define Package/xserver-kdrive-xfbdev
$(call Package/xserver-kdrive/Default)
TITLE:=Kdrive framebuffer xserver
endef
define Package/xserver-kdrive-xephyr
$(call Package/xserver-kdrive/Default)
TITLE:=Kdrive ephyr xserver
endef
STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar, \
CONFIG_PACKAGE_xserver-kdrive-xvesa CONFIG_PACKAGE-xserver-kdrive-fbdev \
CONFIG_PACKAGE_xserver-kdrive-xephyr CONFIG_X_TSLIB CONFIG_X_COMPOSITE \
CONFIG_X_XINERAMA CONFIG_X_XCALIBRATE)
define Build/Configure
$(call Build/Configure/Default, \
--enable-kdrive \
$(if $(CONFIG_PACKAGE_xserver-kdrive-xvesa), \
--enable-kdrive-vesa, \
--disable-kdrive-vesa) \
$(if $(CONFIG_PACKAGE_xserver-kdrive-xfbdev), \
--enable-xfbdev, \
--disable-xfbdev) \
$(if $(CONFIG_PACKAGE_xserver-kdrive-xephyr), \
--enable-xephyr, \
--disable-xephyr) \
$(if $(CONFIG_X_TSLIB),--enable-tslib,--disable-tslib) \
$(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-glx-tls \
--disable-dga \
--disable-xdmcp \
--disable-xdm-auth-1 \
--disable-config-hal \
--disable-xf86misc \
--disable-xf86vidmode \
--disable-xf86bigfont \
--disable-xorgcfg \
--disable-xkb \
--disable-xnest \
--disable-xquartz \
--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 \
)
endef
define Package/xserver-kdrive-xfbdev/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) \
$(PKG_INSTALL_DIR)/usr/bin/Xfbdev \
$(1)/usr/bin/
endef
define Package/xserver-kdrive-xvesa/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) \
$(PKG_INSTALL_DIR)/usr/bin/Xvesa \
$(1)/usr/bin/
endef
define Package/xserver-kdrive-xephyr/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) \
$(PKG_INSTALL_DIR)/usr/bin/Xephyr \
$(1)/usr/bin/
endef
$(eval $(call BuildPackage,xserver-kdrive-xvesa))
$(eval $(call BuildPackage,xserver-kdrive-xfbdev))
$(eval $(call BuildPackage,xserver-kdrive-xephyr))

0
Xorg/xorg/xserver/xorg-server/patches/001-tslib.patch → Xorg/xorg/xserver/xorg-kdrive/patches/001-tslib.patch
View File

0
Xorg/xorg/xserver/xorg-server/patches/002-480x640-support.patch → Xorg/xorg/xserver/xorg-kdrive/patches/002-480x640-support.patch
View File

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

@ -1,10 +1,10 @@
#
# Copyright (C) 2006 OpenWrt.org
# Copyright (C) 2006-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# blogic@openwrt.org
# $Id$
include $(TOPDIR)/rules.mk
@ -13,102 +13,16 @@ PKG_RELEASE:=1
PKG_VERSION:=1.5.1
PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/xserver/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/xserver/xorg-server-$(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 \
xf86dgaproto
xextproto xproto scrnsaverproto bigreqsproto resourceproto \
fontsproto inputproto kbproto videoproto resourceproto \
xf86dgaproto xtrans xf86driproto
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
EXTRA_CFLAGS+= \
-I$(STAGING_DIR)/usr/include/X11/GL \
-I$(STAGING_DIR)/usr/include/X11/dri/ \
-I$(STAGING_DIR)/usr/include/X11/ \
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
CONFIGURE_ARGS+= \
--disable-aiglx \
--disable-glx-tls \
--disable-dga \
--disable-xdmcp \
--disable-xdm-auth-1 \
--disable-config-hal \
--disable-xf86misc \
--disable-xf86vidmode \
--disable-xf86bigfont \
--disable-xorgcfg \
--disable-xkb \
--disable-xnest \
--disable-xquartz \
--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 \
--enable-builtin-fonts \
--with-default-font-path=built-ins \
CONFIGURE_VARS+=ac_cv_file__usr_share_sgml_X11_defs_ent=yes
#FIXME: make full blowed xorg-xserver work
#DEPENDS_SERVER:=+calibrateproto \
# +compositeproto \
# +damageproto \
# +fixesproto \
# +recordproto \
# +resourceproto \
# +scrnsaverproto \
# +videoproto \
# +xextproto \
# +xproto \
# +libXext \
# +libXdmcp \
# +libXfont \
# +libXrandr \
# +xtrans \
# +libX11 \
# +glproto \
# +xf86driproto \
# +applewmproto \
# +dmxproto \
# +printproto \
# +windowswmproto \
# +xf86rushproto \
# +xproxymanagementprotocol \
# +libdrm \
# +xf86miscproto \
# +xf86vidmodeproto \
# +xf86dgaproto \
# +trapproto \
# +xineramaproto \
# +evieext \
# +libxkbfile \
# +libXt \
# +libSM \
# +libxkbui \
# +libXxf86misc \
# +libXxf86vm \
# +libXaw \
# +libXmu \
# +libXpm \
# +libnotimpl \
# +Mesa \
# +pixman \
# @DISPLAY_SUPPORT
define Package/xserver-common/config
source "$(SOURCE)/Config.in"
endef
X_CONFIG=generic
ifeq ($(CONFIG_TARGET_olpc),y)
X_CONFIG=olpc
@ -118,7 +32,6 @@ ifeq ($(CONFIG_TARGET_om_gta02),y)
endif
define Package/xorg/Default
PROVIDES:=xserver
SECTION:=xorg-server
CATEGORY:=Xorg
SUBMENU:=server
@ -126,11 +39,12 @@ define Package/xorg/Default
URL:=http://xorg.freedesktop.org/
endef
define Package/xserver/Default
define Package/xserver-xorg
$(call Package/xorg/Default)
PROVIDES:=xserver
TITLE:=Xorg xserver
DEPENDS:=+xserver-common \
+libpthread \
+xtrans \
+libxkbfile \
+libXfont \
+libXau \
@ -139,43 +53,9 @@ $(call Package/xorg/Default)
+pixman \
+libopenssl \
+libpciaccess \
@DISPLAY_SUPPORT
endef
define Package/xserver-xorg
$(call Package/xserver/Default)
PROVIDES:=xserver
TITLE:=Xorg xserver
DEPENDS+=+libdrm \
+xf86driproto \
+libdrm \
+libgl-mesa \
+xineramaproto
endef
define Package/xserver-kdrive/Default
$(call Package/xserver/Default)
DEPENDS+=+X_TSLIB:tslib \
+X_DRI:xf86driproto \
+X_DRI:libdrm \
+X_XCALIBRATE:calibrateproto \
+X_COMPOSITE:compositeproto \
+X_XINERAMA:xineramaproto
endef
define Package/xserver-kdrive-xvesa
$(call Package/xserver-kdrive/Default)
TITLE:=Kdrive vesa xserver
DEPENDS+=@TARGET_x86
endef
define Package/xserver-kdrive-xfbdev
$(call Package/xserver-kdrive/Default)
TITLE:=Kdrive framebuffer xserver
endef
define Package/xserver-kdrive-xephyr
$(call Package/xserver-kdrive/Default)
TITLE:=Kdrive ephyr xserver
@DISPLAY_SUPPORT
endef
define Package/xserver-xorg-config
@ -191,30 +71,46 @@ endef
define Build/Configure
$(call Build/Configure/Default, \
$(if $(CONFIG_PACKAGE_xserver-xorg),--enable-xorg --enable-dri,--disable-xorg --disable-dri) \
$(if $(CONFIG_PACKAGE_xserver-kdrive-xvesa), \
--enable-kdrive \
--enable-kdrive-vesa, \
--disable-kdrive-vesa) \
$(if $(CONFIG_PACKAGE_xserver-kdrive-xfbdev), \
--enable-kdrive \
--enable-xfbdev, \
--disable-xfbdev) \
$(if $(CONFIG_PACKAGE_xserver-kdrive-xephyr), \
--enable-kdrive \
--enable-xephyr, \
--disable-xephyr) \
$(if $(CONFIG_X_TSLIB),--enable-tslib,--disable-tslib) \
$(if $(CONFIG_X_COMPOSITE),--enable-composite,--disable-composite) \
$(if $(CONFIG_X_XINERAMA),--enable-xinerama,--disable-xinerama) \
$(if $(CONFIG_X_XCALIBRATE),--enable-xcalibrate,--disable-xcalibrate) \
--enable-xorg \
--enable-dri \
--disable-kdrive \
--disable-cfb \
--disable-afb \
--disable-mfb \
--disable-aiglx \
--disable-glx-tls \
--disable-dga \
--disable-xdmcp \
--disable-xdm-auth-1 \
--disable-config-hal \
--disable-xf86misc \
--disable-xf86vidmode \
--disable-xf86bigfont \
--disable-xorgcfg \
--disable-xkb \
--disable-xnest \
--disable-xquartz \
--disable-xwin \
--disable-x11app \
--disable-xsdl \
--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 \
)
endef
define Build/Compile
DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) install
endef
define Package/xserver-common/install
$(INSTALL_DIR) $(1)/etc/{init.d,config}
$(INSTALL_BIN) \
@ -225,32 +121,6 @@ define Package/xserver-common/install
./files/config/$(X_CONFIG) \
$(1)/etc/config/x11 \
)
$(INSTALL_DIR) $(1)/usr/lib/xorg
$(INSTALL_DATA) \
$(PKG_INSTALL_DIR)/usr/lib/xorg/protocol.txt \
$(1)/usr/lib/xorg/
endef
define Package/xserver-kdrive-xfbdev/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) \
$(PKG_INSTALL_DIR)/usr/bin/Xfbdev \
$(1)/usr/bin/
endef
define Package/xserver-kdrive-xvesa/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) \
$(PKG_INSTALL_DIR)/usr/bin/Xvesa \
$(1)/usr/bin/
endef
define Package/xserver-kdrive-xephyr/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) \
$(PKG_INSTALL_DIR)/usr/bin/Xephyr \
$(1)/usr/bin/
endef
define Package/xserver-xorg/install
@ -259,28 +129,18 @@ define Package/xserver-xorg/install
$(PKG_INSTALL_DIR)/usr/bin/Xorg \
$(1)/usr/bin/
$(INSTALL_DIR) $(1)/usr/lib/X11
$(INSTALL_DATA) \
$(PKG_INSTALL_DIR)/usr/lib/X11/* \
$(1)/usr/lib/X11/
$(INSTALL_DIR) $(1)/usr/lib/xorg/modules/{extensions,fonts,linux,multimedia}
$(INSTALL_DATA) \
$(PKG_INSTALL_DIR)/usr/lib/xorg/modules/*.so \
$(1)/usr/lib/xorg/modules/
$(for dir,extensions fonts linux multimedia, \
$(foreach d,extensions fonts linux multimedia, \
$(INSTALL_DATA) \
$(PKG_INSTALL_DIR)/usr/lib/xorg/modules/$(d)/*.so \
$(1)/usr/lib/xorg/modules/$(d) \
$(1)/usr/lib/xorg/modules/$(d)/; \
)
endef
define Packages/xorg-server-config/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xorgconfig $(1)/usr/bin/
endef
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/share/aclocal/
$(INSTALL_DATA) \
@ -301,7 +161,3 @@ endef
$(eval $(call BuildPackage,xserver-common))
$(eval $(call BuildPackage,xserver-xorg))
$(eval $(call BuildPackage,xserver-kdrive-xvesa))
$(eval $(call BuildPackage,xserver-kdrive-xfbdev))
$(eval $(call BuildPackage,xserver-kdrive-xephyr))
$(eval $(call BuildPackage,xserver-xorg-config))

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

@ -0,0 +1,44 @@
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,