From 0a97f6d736f8b5b44865f30ed0693dc0d7fd900b Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Thu, 6 Sep 2007 18:26:50 +0200 Subject: [PATCH] xorg-server: updated to 1.4. --- xorg-server/.footprint | 35 +++++++---------------------------- xorg-server/.md5sum | 5 ++--- xorg-server/Pkgfile | 20 +++++++------------- 3 files changed, 16 insertions(+), 44 deletions(-) diff --git a/xorg-server/.footprint b/xorg-server/.footprint index 4f68a7c3..a517da63 100644 --- a/xorg-server/.footprint +++ b/xorg-server/.footprint @@ -28,33 +28,12 @@ lrwxrwxrwx root/root usr/bin/outw -> ioport -rwxr-xr-x root/root usr/bin/vdltodmx -rwxr-xr-x root/root usr/bin/xdmx -rwxr-xr-x root/root usr/bin/xdmxconfig --rwxr-xr-x root/root usr/bin/xorgcfg -rwxr-xr-x root/root usr/bin/xorgconfig drwxr-xr-x root/root usr/etc/ drwxr-xr-x root/root usr/etc/X11/ drwxr-xr-x root/root usr/etc/X11/Xsession.d/ -rw-r--r-- root/root usr/etc/X11/Xsession.d/92xprint-xpserverlist drwxr-xr-x root/root usr/include/ -drwxr-xr-x root/root usr/include/X11/ -drwxr-xr-x root/root usr/include/X11/bitmaps/ --rw-r--r-- root/root usr/include/X11/bitmaps/card.xbm --rw-r--r-- root/root usr/include/X11/bitmaps/down.xbm --rw-r--r-- root/root usr/include/X11/bitmaps/keyboard.xbm --rw-r--r-- root/root usr/include/X11/bitmaps/left.xbm --rw-r--r-- root/root usr/include/X11/bitmaps/monitor.xbm --rw-r--r-- root/root usr/include/X11/bitmaps/mouse.xbm --rw-r--r-- root/root usr/include/X11/bitmaps/narrower.xbm --rw-r--r-- root/root usr/include/X11/bitmaps/right.xbm --rw-r--r-- root/root usr/include/X11/bitmaps/shorter.xbm --rw-r--r-- root/root usr/include/X11/bitmaps/taller.xbm --rw-r--r-- root/root usr/include/X11/bitmaps/up.xbm --rw-r--r-- root/root usr/include/X11/bitmaps/wider.xbm -drwxr-xr-x root/root usr/include/X11/pixmaps/ --rw-r--r-- root/root usr/include/X11/pixmaps/card.xpm --rw-r--r-- root/root usr/include/X11/pixmaps/computer.xpm --rw-r--r-- root/root usr/include/X11/pixmaps/keyboard.xpm --rw-r--r-- root/root usr/include/X11/pixmaps/monitor.xpm --rw-r--r-- root/root usr/include/X11/pixmaps/mouse.xpm drwxr-xr-x root/root usr/include/xorg/ -rw-r--r-- root/root usr/include/xorg/BT.h -rw-r--r-- root/root usr/include/xorg/IBM.h @@ -110,6 +89,7 @@ drwxr-xr-x root/root usr/include/xorg/ -rw-r--r-- root/root usr/include/xorg/gcstruct.h -rw-r--r-- root/root usr/include/xorg/globals.h -rw-r--r-- root/root usr/include/xorg/glyphstr.h +-rw-r--r-- root/root usr/include/xorg/hotplug.h -rw-r--r-- root/root usr/include/xorg/i2c_def.h -rw-r--r-- root/root usr/include/xorg/input.h -rw-r--r-- root/root usr/include/xorg/inputstr.h @@ -166,8 +146,8 @@ drwxr-xr-x root/root usr/include/xorg/ -rw-r--r-- root/root usr/include/xorg/validate.h -rw-r--r-- root/root usr/include/xorg/vbe.h -rw-r--r-- root/root usr/include/xorg/vbeModes.h --rw-r--r-- root/root usr/include/xorg/vdif.h -rw-r--r-- root/root usr/include/xorg/vgaHW.h +-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/xaa.h @@ -180,10 +160,8 @@ drwxr-xr-x root/root usr/include/xorg/ -rw-r--r-- root/root usr/include/xorg/xf86Crtc.h -rw-r--r-- root/root usr/include/xorg/xf86Cursor.h -rw-r--r-- root/root usr/include/xorg/xf86DDC.h --rw-r--r-- root/root usr/include/xorg/xf86Keymap.h -rw-r--r-- root/root usr/include/xorg/xf86Modes.h -rw-r--r-- root/root usr/include/xorg/xf86Module.h --rw-r--r-- root/root usr/include/xorg/xf86OSKbd.h -rw-r--r-- root/root usr/include/xorg/xf86OSmouse.h -rw-r--r-- root/root usr/include/xorg/xf86Opt.h -rw-r--r-- root/root usr/include/xorg/xf86Optrec.h @@ -213,6 +191,7 @@ drwxr-xr-x root/root usr/include/xorg/ -rw-r--r-- root/root usr/include/xorg/xf86xvmc.h -rw-r--r-- root/root usr/include/xorg/xf86xvpriv.h -rw-r--r-- root/root usr/include/xorg/xisb.h +-rw-r--r-- root/root usr/include/xorg/xkbsrv.h -rw-r--r-- root/root usr/include/xorg/xorg-server.h -rw-r--r-- root/root usr/include/xorg/xorgVersion.h -rw-r--r-- root/root usr/include/xorg/xvdix.h @@ -465,6 +444,7 @@ lrwxrwxrwx root/root usr/lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Rom -rw-r--r-- root/root usr/lib/X11/xserver/C/print/models/SPSPARC2/fonts/fonts.dir -rw-r--r-- root/root usr/lib/X11/xserver/C/print/models/SPSPARC2/model-config lrwxrwxrwx root/root usr/lib/X11/xserver/POSIX -> C +-rw-r--r-- root/root usr/lib/X11/xserver/README lrwxrwxrwx root/root usr/lib/X11/xserver/af_ZA -> C lrwxrwxrwx root/root usr/lib/X11/xserver/af_ZA.iso88591 -> C lrwxrwxrwx root/root usr/lib/X11/xserver/ar -> C @@ -1184,6 +1164,8 @@ drwxr-xr-x root/root usr/lib/xorg/modules/fonts/ -rwxr-xr-x root/root usr/lib/xorg/modules/libvbe.so -rwxr-xr-x root/root usr/lib/xorg/modules/libvgahw.la -rwxr-xr-x root/root usr/lib/xorg/modules/libvgahw.so +-rwxr-xr-x root/root usr/lib/xorg/modules/libwfb.la +-rwxr-xr-x root/root usr/lib/xorg/modules/libwfb.so -rwxr-xr-x root/root usr/lib/xorg/modules/libxaa.la -rwxr-xr-x root/root usr/lib/xorg/modules/libxaa.so -rwxr-xr-x root/root usr/lib/xorg/modules/libxf1bpp.la @@ -1229,17 +1211,14 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/scanpci.1.gz -rw-r--r-- root/root usr/man/man1/vdltodmx.1.gz -rw-r--r-- root/root usr/man/man1/xdmxconfig.1.gz --rw-r--r-- root/root usr/man/man1/xorgcfg.1.gz -rw-r--r-- root/root usr/man/man1/xorgconfig.1.gz drwxr-xr-x root/root usr/man/man4/ -rw-r--r-- root/root usr/man/man4/exa.4.gz -rw-r--r-- root/root usr/man/man4/fbdevhw.4.gz drwxr-xr-x root/root usr/man/man5/ +-rw-r--r-- root/root usr/man/man5/SecurityPolicy.5.gz -rw-r--r-- root/root usr/man/man5/xorg.conf.5.gz drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/X11/ -drwxr-xr-x root/root usr/share/X11/app-defaults/ --rw-r--r-- root/root usr/share/X11/app-defaults/XOrgCfg drwxr-xr-x root/root usr/share/aclocal/ -rw-r--r-- root/root usr/share/aclocal/xorg-server.m4 drwxr-xr-x root/root var/ diff --git a/xorg-server/.md5sum b/xorg-server/.md5sum index 29d2c88b..51b3e72f 100644 --- a/xorg-server/.md5sum +++ b/xorg-server/.md5sum @@ -1,3 +1,2 @@ -e4d894181f1859651658b3704633e10d MesaLib-6.5.2.tar.bz2 -a51a7d482e3c689394755bb17bda8526 xorg-server-1.3.0.0.tar.bz2 -c1b4d235d5eb77afc005cbcee404a729 xorg-server.diff +c056abd763e899114bf745c9eedbf9ad MesaLib-7.0.1.tar.bz2 +a06d9fe4f9f1d459ae02657f9ce64220 xorg-server-1.4.tar.bz2 diff --git a/xorg-server/Pkgfile b/xorg-server/Pkgfile index 8accda24..84d32aaf 100644 --- a/xorg-server/Pkgfile +++ b/xorg-server/Pkgfile @@ -1,32 +1,26 @@ # Description: X Window System server # URL: http://xorg.freedesktop.org # Maintainer: Tilman Sauerbeck, tilman at crux dot nu -# Depends on: mesa3d, xorg-bdftopcf, xorg-mkfontdir, xorg-mkfontscale, xorg-xf86driproto, xorg-libxkbui, xorg-xcmiscproto, xorg-scrnsaverproto, xorg-bigreqsproto, xorg-libxevie, xorg-libxtst, xorg-libdmx, xorg-libxxf86misc, xorg-libxaw, xorg-libxvmc, xorg-libxi, xorg-libxres, xorg-libxcomposite, xorg-libxinerama, xorg-libxrandr, xorg-libxtrap, xorg-libxft, xorg-libxcursor, xorg-libxxf86dga +# Depends on: mesa3d, xorg-bdftopcf, xorg-mkfontdir, xorg-mkfontscale, xorg-xf86driproto, xorg-libxkbui, xorg-xcmiscproto, xorg-scrnsaverproto, xorg-bigreqsproto, xorg-libxevie, xorg-libxtst, xorg-libdmx, xorg-libxxf86misc, xorg-libxaw, xorg-libxvmc, xorg-libxi, xorg-libxres, xorg-libxcomposite, xorg-libxinerama, xorg-libxrandr, xorg-libxtrap, xorg-libxft, xorg-libxcursor, xorg-libxxf86dga, xorg-libpixman name=xorg-server -version=1.3.0.0 -release=3 +version=1.4 +release=1 source=(http://xorg.freedesktop.org/releases/individual/xserver/$name-$version.tar.bz2 \ - http://dl.sourceforge.net/mesa3d/MesaLib-6.5.2.tar.bz2 \ - $name.diff) + http://dl.sourceforge.net/mesa3d/MesaLib-7.0.1.tar.bz2) build() { cd $name-$version - patch -Np1 -i $SRC/$name.diff - - # fix man page suffixes - sed -i -e '33891d' -e '33917d' configure - ./configure --prefix=/usr --enable-dri \ - --with-mesa-source=$SRC/Mesa-6.5.2 \ + --with-mesa-source=$SRC/Mesa-7.0.1 \ --localstatedir=/var --mandir=/usr/man \ - --with-xkb-output=/var/lib/xkb + --with-xkb-output=/var/lib/xkb \ + --enable-xprint --enable-dmx make make DESTDIR=$PKG install - rm $PKG/usr/lib/X11/xserver/README rmdir $PKG/var/log }