xorg-server: added support for xf86bigfontproto, fixed some minor issues and cleaned up

diff --git a/xorg-server/.footprint b/xorg-server/.footprint
index 77430ece9d1628a4634161cc611fedd2e47f226f..b42eea42edabd56320776ab5b5d7ec0b3c58428c 100644 (file)
--- a/xorg-server/.footprint
+++ b/xorg-server/.footprint
@@ -24,6 +24,7 @@ drwxr-xr-x    root/root       usr/include/xorg/
 -rw-r--r--     root/root       usr/include/xorg/cursorstr.h
 -rw-r--r--     root/root       usr/include/xorg/damage.h
 -rw-r--r--     root/root       usr/include/xorg/damagestr.h
+-rw-r--r--     root/root       usr/include/xorg/dbestruct.h
 -rw-r--r--     root/root       usr/include/xorg/dgaproc.h
 -rw-r--r--     root/root       usr/include/xorg/dix.h
 -rw-r--r--     root/root       usr/include/xorg/dixaccess.h
@@ -113,6 +114,8 @@ drwxr-xr-x  root/root       usr/include/xorg/
 -rw-r--r--     root/root       usr/include/xorg/wfbrename.h
 -rw-r--r--     root/root       usr/include/xorg/window.h
 -rw-r--r--     root/root       usr/include/xorg/windowstr.h
+-rw-r--r--     root/root       usr/include/xorg/xace.h
+-rw-r--r--     root/root       usr/include/xorg/xacestr.h
 -rw-r--r--     root/root       usr/include/xorg/xf86.h
 -rw-r--r--     root/root       usr/include/xorg/xf86Crtc.h
 -rw-r--r--     root/root       usr/include/xorg/xf86Cursor.h
@@ -158,6 +161,8 @@ drwxr-xr-x  root/root       usr/lib/pkgconfig/
 drwxr-xr-x     root/root       usr/lib/xorg/
 drwxr-xr-x     root/root       usr/lib/xorg/modules/
 drwxr-xr-x     root/root       usr/lib/xorg/modules/extensions/
+-rwxr-xr-x     root/root       usr/lib/xorg/modules/extensions/libdbe.la
+-rwxr-xr-x     root/root       usr/lib/xorg/modules/extensions/libdbe.so
 -rwxr-xr-x     root/root       usr/lib/xorg/modules/extensions/libextmod.la
 -rwxr-xr-x     root/root       usr/lib/xorg/modules/extensions/libextmod.so
 -rwxr-xr-x     root/root       usr/lib/xorg/modules/libexa.la

diff --git a/xorg-server/Pkgfile b/xorg-server/Pkgfile
index 46362fa73b2734455fe25299f98c14caf3c7f664..6f1f89b904b58c2b1b86a3c55e228e00e28d387e 100644 (file)
--- a/xorg-server/Pkgfile
+++ b/xorg-server/Pkgfile
@@ -2,42 +2,45 @@
 # URL: http://xorg.freedesktop.org
 # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
 # Arch Maintainer: CRUX-ARM System Team, crux-arm at mikeux dyndns dot org
-# Depends on: xorg-bdftopcf xorg-xcmiscproto xorg-scrnsaverproto xorg-bigreqsproto xorg-libxtst xorg-libxxf86misc xorg-libxi xorg-libxres xorg-libxrandr xorg-libxft xorg-libxxf86dga xorg-libpixman xorg-libpciaccess xorg-libxkbui
+# Depends on: xorg-bdftopcf xorg-mkfontdir xorg-mkfontscale xorg-libxkbui xorg-xcmiscproto xorg-scrnsaverproto xorg-bigreqsproto xorg-libxtst xorg-libxxf86misc xorg-libxaw xorg-libxi xorg-libxres xorg-libxrandr xorg-libxft xorg-libxcursor xorg-libxxf86dga xorg-libpixman xorg-libpciaccess
 
 name=xorg-server
 version=1.7.3
-release=2
+release=3
 source=(http://xorg.freedesktop.org/releases/individual/xserver/$name-$version.tar.bz2)
 
 build() {
   cd $name-$version
 
-  export DEFAULT_LIBS="-L$CLFS/lib -L$CLFS/usr/lib -L$CLFS/usr/lib/xorg -L$CLFS/usr/lib/xorg/modules"
+  export DEFAULT_LIBS="-L$CLFS/usr/lib"
   export DEFAULT_CFLAGS="-I$CLFS/usr/include -I$CLFS/usr/include/X11 -I$CLFS/usr/include/X11/extensions"
-
   export XDMCP_LIBS="$DEFAULT_LIBS -lXdmcp"
   export XDMCP_CFLAGS="$DEFAULT_CFLAGS"
-  export DGA_LIBS="$DEAULT_LIBS"
-  export DGA_CFLAGS="$DEFAULT_CFLAGS"
-  export SHA1_LIBS="$DEFAULT_LIBS"
+  export SHA1_LIBS="$DEFAULT_LIBS -lssl -lcrypto -ldl"
   export SHA1_CFLAGS="$DEFAULT_CFLAGS"
-  export XSERVERCFLAGS_LIBS="$DEFAULT_LIBS -lXfont -lXau -lpixman-1 -lXdmcp -lXv"
+  export XSERVERCFLAGS_LIBS="$DEFAULT_LIBS -lxkbfile -lXfont -lXau -lpixman-1 -lXdmcp -lssl -lcrypto -ldl"
   export XSERVERCFLAGS_CFLAGS="$DEFAULT_CFLAGS -D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT -I$CLFS/usr/include/freetype2 -I$CLFS/usr/include/pixman-1"
-  export XSERVERLIBS_LIBS="$DEFAULT_LIBS -lXrandr -lXfont -lXau -lpixman-1 -lXdmcp -lXv -lcrypt -lssl"
-  export XSERVERLIBS_CFLAGS="$DEFAULT_CFLAGS -I$CLFS/usr/include/freetype2 -I$CLFS/usr/include/pixman-1"
+  export XSERVERLIBS_LIBS="$DEFAULT_LIBS -lXfont -lXau -lpixman-1 -lXdmcp -lssl -lcrypto -ldl"
+  export XSERVERLIBS_CFLAGS="$DEFAULT_CFLAGS -I/usr/include/freetype2 -I/usr/include/pixman-1"
   export PCIACCESS_LIBS="$DEFAULT_LIBS -lpciaccess"
   export PCIACCESS_CFLAGS="$DEFAULT_CFLAGS"
+  export DGA_LIBS="$DEFAULT_LIBS"
+  export DGA_CFLAGS="$DEFAULT_CFLAGS"
   export XF86VIDMODE_LIBS="$DEFAULT_LIBS"
   export XF86VIDMODE_CFLAGS="$DEFAULT_CFLAGS"
-  export XORG_MODULES_LIBS="$DEFAULT_LIBS -lXrandr"
+  export XORG_MODULES_LIBS="$DEFAULT_LIBS"
   export XORG_MODULES_CFLAGS="$DEFAULT_CFLAGS"
- 
+
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
               --localstatedir=/var \
               --mandir=/usr/man \
               --enable-xdmcp \
+              --enable-dga \
+              --enable-xf86vidmode \
+              --enable-tslib \
+              --enable-xf86bigfont \
               --disable-dri \
               --disable-dri2 \
               --disable-glx \
@@ -46,13 +49,9 @@ build() {
               --disable-vbe \
               --disable-xinerama \
               --disable-composite \
-              --disable-xf86bigfont \
               --disable-xvmc \
               --disable-shave \
-              --disable-xace \
-              --disable-dbe \
               --disable-int10-module \
-              --disable-ipv6 \
               --with-xkb-output=/var/lib/xkb
 
   make