From 8427fa2fd40c88d672b5657f3c113167faa7ace6 Mon Sep 17 00:00:00 2001 From: mirko Date: Sun, 7 Dec 2008 13:39:02 +0000 Subject: [PATCH] added modified Xfbdev kdrive server with acceleration support for the glamo graphics chip git-svn-id: svn://svn.openwrt.org/openwrt/packages@13539 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- Xorg/xserver/xglamo/Makefile | 132 ++++++++++++++++++++++ Xorg/xserver/xglamo/files/config/om_gta02 | 5 + Xorg/xserver/xglamo/files/x.init | 20 ++++ Xorg/xserver/xglamo/patches/001-fix-aclocal.patch | 14 +++ 4 files changed, 171 insertions(+) create mode 100644 Xorg/xserver/xglamo/Makefile create mode 100644 Xorg/xserver/xglamo/files/config/om_gta02 create mode 100755 Xorg/xserver/xglamo/files/x.init create mode 100644 Xorg/xserver/xglamo/patches/001-fix-aclocal.patch diff --git a/Xorg/xserver/xglamo/Makefile b/Xorg/xserver/xglamo/Makefile new file mode 100644 index 000000000..5e4c50361 --- /dev/null +++ b/Xorg/xserver/xglamo/Makefile @@ -0,0 +1,132 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xglamo +PKG_VERSION:=20081205 +PKG_REV:=3f113f5f4dbaf14dee439eac8d510313fff3aafc +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=git://git.openmoko.org/git/xglamo.git +PKG_SOURCE_PROTO:=git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/xserver/$(PKG_NAME)-$(PKG_VERSION)/ + +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-dga \ + --disable-xinerama \ + --disable-xf86misc \ + --disable-xf86vidmode \ + --disable-xf86bigfont \ + --disable-xorgcfg \ + --disable-xkb \ + --disable-xnest \ + --disable-xvfb \ + --disable-xevie \ + --disable-xprint \ + --disable-xtrap \ + --disable-dmx \ + --disable-w100 \ + --disable-glx \ + --disable-xv \ + --disable-record \ + --disable-xephyr \ + --disable-xorg \ + --enable-kdrive \ + --enable-tslib \ + --enable-dri \ + --enable-drm \ + --enable-builtin-fonts \ + --with-default-font-path=built-ins \ + +CONFIGURE_VARS+=ac_cv_file__usr_share_sgml_X11_defs_ent=yes + +ifeq ($(CONFIG_TARGET_om_gta02),y) + X_CONFIG=om_gta02 +endif + +define Package/xglamo + # xineramaproto necessary even when xinerama is disabled due to buggy xglamo + TITLE:=xglamo + SECTION:=xorg-server + SUBMENU:=server + CATEGORY:=Xorg + URL:=http://git.openmoko.org/?p=xglamo.git + DEPENDS:=+tslib \ + +recordproto \ + +glproto \ + +libdrm \ + +xf86driproto \ + +xineramaproto \ + +calibrateproto \ + +compositeproto \ + +libpthread \ + +randrproto \ + +renderproto \ + +fixesproto \ + +damageproto \ + +xcmiscproto \ + +xextproto \ + +xproto \ + +scrnsaverproto \ + +bigreqsproto \ + +resourceproto \ + +fontsproto \ + +inputproto \ + +kbproto \ + +videoproto \ + +resourceproto \ + +xtrans \ + +libxkbfile \ + +libXfont \ + +libXau \ + +libfontenc \ + +pixman \ + +libopenssl \ + +util-macros \ + @DISPLAY_SUPPORT +endef + +define Package/xglamo/description + kdrive server with acceleration support for the graphics chip by smedia +endef + +define Build/Configure + (cd $(PKG_BUILD_DIR) && \ + $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ + $(CONFIGURE_VARS) \ + ./autogen.sh \ + $(CONFIGURE_ARGS_XTRA) \ + $(CONFIGURE_ARGS) \ + ); +endef + +define Build/Compile + DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) install +endef + +define Package/xglamo/install + $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib $(1)/etc/init.d $(1)/etc/config + $(CP) $(PKG_INSTALL_DIR)/usr/bin/Xglamo $(1)/usr/bin/ + $(CP) ./files/x.init $(1)/etc/init.d/x11 + $(if $(X_CONFIG),$(CP) ./files/config/$(X_CONFIG) $(1)/etc/config/x11) + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ +endef + +$(eval $(call BuildPackage,xglamo)) diff --git a/Xorg/xserver/xglamo/files/config/om_gta02 b/Xorg/xserver/xglamo/files/config/om_gta02 new file mode 100644 index 000000000..f265cc739 --- /dev/null +++ b/Xorg/xserver/xglamo/files/config/om_gta02 @@ -0,0 +1,5 @@ +# Copyright (C) 2006 OpenWrt.org + +config screen + option resolution 480x640 + option dpi 285 diff --git a/Xorg/xserver/xglamo/files/x.init b/Xorg/xserver/xglamo/files/x.init new file mode 100755 index 000000000..78ce6c4e7 --- /dev/null +++ b/Xorg/xserver/xglamo/files/x.init @@ -0,0 +1,20 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2006 OpenWrt.org +START=99 + +ARGS="" + +screen() { + local cfg="$1" + config_get resolution $cfg resolution + config_get dpi $cfg dpi + [ -n "$resolution" ] && ARGS="$ARGS -screen $resolution" + [ -n "$dpi" ] && ARGS="$ARGS -dpi $dpi" +} + +start() { + config_load x11 + config_foreach screen screen + TSLIB_TSDEVICE="/dev/event1" Xglamo $ARGS & + DISPLAY=":0" WM & # workaround +} diff --git a/Xorg/xserver/xglamo/patches/001-fix-aclocal.patch b/Xorg/xserver/xglamo/patches/001-fix-aclocal.patch new file mode 100644 index 000000000..8af158fda --- /dev/null +++ b/Xorg/xserver/xglamo/patches/001-fix-aclocal.patch @@ -0,0 +1,14 @@ +diff -ruN git/configure.ac xglamo/git/configure.ac +--- git.orig/configure.ac 2008-11-18 23:42:32.000000000 +0100 ++++ git/configure.ac 2008-11-18 23:51:31.000000000 +0100 +@@ -1688,7 +1688,9 @@ + DIX_CFLAGS="-DHAVE_DIX_CONFIG_H" + AC_SUBST([DIX_CFLAGS]) + +-AC_SUBST([libdir exec_prefix prefix]) ++AC_SUBST([libdir]) ++AC_SUBST([exec_prefix]) ++AC_SUBST([prefix]) + + # Man page sections - used in config utils & generating man pages + XORG_MANPAGE_SECTIONS -- 2.11.0