Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=4ef23e393301e0806b4ed300c940b79769d08a66
commit 4ef23e393301e0806b4ed300c940b79769d08a66 Author: Miklos Vajna <vmik...@frugalware.org> Date: Fri Mar 19 23:24:40 2010 +0100 xgl-20071010-2-i686 - bin, replaced by aiglx diff --git a/source/x11-extra/xgl/FrugalBuild b/source/x11-extra/xgl/FrugalBuild deleted file mode 100644 index bd7c579..0000000 --- a/source/x11-extra/xgl/FrugalBuild +++ /dev/null @@ -1,73 +0,0 @@ -# Compiling Time: 1.22 SBU -# Maintainer: Priyank Gosalia <priyan...@gmail.com> - -pkgname=xgl -pkgver=20071010 -mesaname=Mesa-cvs-$pkgver -pkgrel=2 -pkgdesc="OpenGL accelerated X server" -url="http://www.freedesktop.org/Software/Xgl"; -groups=('x11-extra') -archs=('x86_64' 'i686') -depends=('glitz>=0.5.6' 'libglx' 'libxfont' 'libxdmcp' 'libxau' 'mesa' 'libxrandr' 'libxrender' 'libxinerama') -makedepends=('randrproto' 'renderproto' 'fixesproto>=4.0' 'damageproto' 'xextproto' 'xproto' \ - 'xf86dgaproto' 'xf86miscproto' 'xf86rushproto' 'xf86vidmodeproto' 'xf86bigfontproto' \ - 'compositeproto' 'recordproto' 'resourceproto' 'videoproto' 'scrnsaverproto>=1.1.0' \ - 'evieext' 'trapproto' 'xineramaproto' 'fontsproto' 'kbproto' 'inputproto' 'bigreqsproto' \ - 'xcmiscproto' 'xf86driproto' 'libdrm' 'printproto' 'mkfontdir' 'mkfontscale' 'fontcacheproto' \ - 'sgml-common' 'util-macros' 'glproto' 'libxkbfile' 'xorg-cf-files' 'libxxf86misc' 'libxkbui' 'libxaw' 'libxpm') -up2date=$pkgver -source=(http://ftp.frugalware.org/pub/other/sources/xgl/$pkgname-$pkgver.tar.bz2 \ - http://ftp.frugalware.org/pub/other/sources/xgl/$mesaname.tar.bz2 \ - autogen-no-run-configure.patch \ - xgl-compalloc.patch \ - README.Frugalware fw-xgl-control) -sha1sums=('80ebf2e7896cb79665f042100ec3edfc68c6c910' \ - 'a69b05111872d98e9408409523ee969618d30d94' \ - '9080a863743aa22710edb4ca5e5552b48db00e6f' \ - '73f4b837e2b39774e909818bdc380a0523c5ca92' \ - 'e85986879bd4e47f2e59e3bef6816f159db4c401' \ - '6efd93510083337d4f58e427fae26bace535bb91') - -build() { - Fcd xserver - Fpatchall - - ./autogen.sh || Fdie - - Fmake --disable-static \ - --enable-ipv6 \ - --prefix=/usr \ - --sysconfdir=/etc/X11 \ - --localstatedir=/var \ - --with-xkb-output=/var/lib/xkb \ - --enable-multibuffer \ - --with-mesa-source=$Fsrcdir/$mesaname \ - --with-vendor-web="http://www.frugalware.org"; \ - --with-os-name="Linux" \ - --with-os-vendor="Frugalware" \ - --enable-glx \ - --enable-dri \ - --enable-xgl \ - --enable-xglx \ - --enable-xkb \ - --disable-xprint \ - --disable-xorg \ - --disable-xvfb \ - --disable-xnest \ - --disable-dmx - Fmakeinstall - - # conflicts with xorg-server - Frm usr/share/aclocal/xorg-server.m4 - Frm usr/lib/xserver/SecurityPolicy - Frm usr/lib/pkgconfig/xorg-server.pc - Frm usr/share/man - Frm var/lib/xkb/README.compiled - - Fmkdir /usr/sbin - Fexe fw-xgl-control /usr/sbin/ - Fdoc README.Frugalware -} - -# optimization OK diff --git a/source/x11-extra/xgl/README.Frugalware b/source/x11-extra/xgl/README.Frugalware deleted file mode 100644 index f1fb7c2..0000000 --- a/source/x11-extra/xgl/README.Frugalware +++ /dev/null @@ -1,232 +0,0 @@ -1. *Xgl server* -+ -Xgl is a hardware accelerated X server. It renders everything that gets drawn -to the screen with OpenGL to allow for fancy effects like wobbly windows, -translucency, etc. The disadvantage to Xgl is that programs that already use -OpenGL will not work on it. Xgl is only recommended if you do not have a -graphics card that supports GLX_EXT_texture_from_pixmap. - -2. *AIGLX* -+ -Accelerated Indirect GLX ("AIGLX") is an open source project founded by Red Hat -and the Fedora Linux community to allow accelerated indirect GLX rendering -capabilities to X.Org and DRI drivers. This allows remote X clients to get fully -hardware accelerated rendering over the GLX protocol; coincidentally, this development -was required for OpenGL compositing window managers (such as Compiz) to function with -hardware acceleration. - -3. *Compiz Fusion* -+ -Compiz Fusion is the result of a merge between the well-known Beryl composite window -manager and Compiz Extras, a community set of improvements to the Compiz composite window -manager. Compiz Fusion aims to provide an easy and fun-to-use windowed environment, -allowing use of the graphics hardware to render each individual window and the entire -screen, to provide some impressive effects, speed and usefulness. - -NOTE: Before starting with installing compiz fusion, make sure you remove all -beryl packages installed on your system. Beryl is now merged with compiz-fusion -and is no longer supported on frugalware. - -=== Setting it up - -This section describes how to setup Xgl or AIGLX depending on which graphics card you have. - -==== Intel Graphics Cards (i810) - -This section describes how to setup Xgl/AIGLX on computers having Intel Graphics Cards. -First, make sure that the Intel Xorg drivers are installed. You can install it using: - ---------------------------- -# pacman-g2 -S xf86-video-i810 ---------------------------- - -I would recommend using AIGLX and NOT xgl for intel users. This is because Xgl works extremely slow on -such cards. On the other hand, AIGLX is much faster than Xgl and is easier to setup. This section -describes how to setup AIGLX for Intel GMA series cards. - -You have to edit the '/etc/X11/xorg.conf' as root. - -Look for Section "Module" and make sure that the following lines exist in that section - ----------------- - Load "dri" - Load "glx" - Load "dbe" ----------------- - -Now, look for Section "Device" and add the following lines to it - ---------------------------------------------- - Option "XAANoOffscreenPixmaps" "true" - Option "DRI" "true" ---------------------------------------------- - -And add this to Section "ServerLayout" - ------------------------------ - Option "AIGLX" "true" ------------------------------ - -Now look for Section "DRI". Create it if it doesn't exist and make sure it looks like the following - ---------------------- - Section "DRI" - Group "video" - Mode 0660 - EndSection ---------------------- - -NOTE: Also please make sure you are in the `video` group. - -Finally, add this line to Section "Extensions" - --------------------------------- - "Option" "Composite" "Enable" --------------------------------- - -Save the file and exit the editor. Reboot your system. Your system should now be set up to use Compiz Fusion. -Now read on to the Window Manager setup section! - -==== NVIDIA Graphics Cards - -If you have an nVidia card, you're in luck - you can use all the fancy effects without the need for Xgl. -This means you'll get much better performance. First of all, you'll need the latest nVidia drivers (100.14.11-6). -Install them if you haven't already done it. - ------------------- -# pacman-g2 -Sy nvidia ------------------- - -Now, as i stated earlier, you can use it with or without Xgl. Both the ways are described below. - -===== Without XGL - -You have to edit the '/etc/X11/xorg.conf' as root. - -First find the Device section for your nVidia card. Add the following line to it: - --------------------------------------------- - Option "XAANoOffscreenPixmaps" "false" --------------------------------------------- - -Now go to the Screen section. Make sure the following lines are there: - -------------------------------------------- - Option "AddARGBGLXVisuals" "True" - Option "RenderAccel" "true" - Option "Coolbits" "1" - Option "TripleBuffer" "true" - Option "AllowGLXWithComposite" "True" -------------------------------------------- - -Finally, make sure the Composite extension is enabled. If it's not, add these lines to the bottom of the file: - ---------------------------------------- - Section "Extensions" - Option "Composite" "Enable" - EndSection ---------------------------------------- - -Save the file, and then reboot. Your system should now be set up to use Compiz Fusion. - -===== With XGL - -This section describes how to use Xgl on a system with an Nvidia card. -First of all, you'll need to install Xgl. This can be done by running: - ------------------ -# pacman-g2 -Sy xgl ------------------ - -Once installed, xgl can be enabled by initiating the following command (as root) : - --------------------------- -# fw-xgl-control --enable --------------------------- - -To disable Xgl, run the following command (as root) : - ---------------------------- -# fw-xgl-control --disable ---------------------------- - -Every time xgl is enabled or disabled, you need to restart GDM. This can be -done by running the following command (as root) : - --------------- -# gdm-restart --------------- - -Now read on to the Window Manager setup section! - -=== Window Manager Setup - -Now you need to install a window manager to be able to get all these fancy effects. Frugalware currently has -compiz-fusion window manager that can be used with XGL or AIGLX. -Note that Frugalware no longer supports Beryl. - -==== Compiz Fusion - -This section describes how to setup / use Compiz Fusion as the window manager with XGL / AIGLX depending -on your Desktop environment. - -===== XFCE - -Run the following command (as root) to install the necessary packages: - -------------------------------------------------------------------------- -# pacman-g2 -Sy compiz compiz-emerald compiz-emerald-themes fusion-icon ccsm -------------------------------------------------------------------------- - -Now you can simply fire up Fusion Icon from your Xfce menu. An icon should appear in your system tray. -Right click it and go to Select Window Manager. Choose "Compiz" from the list. If at any time you wish to -return to your normal window manager, just select it from the fusion icon. - -If it works, you should add fusion-icon to the startup programs in your desktop environment. This can be -done by going to *Settings -> Autostarted Applications* in your Xfce menu. - -===== GNOME - -Run the following command (as root) to install the necessary packages: - ------------------------------------------- -# pacman-g2 -Sy compiz-gnome fusion-icon ccsm ------------------------------------------- - -Now you can simply fire up Fusion Icon from your GNOME menu. An icon should appear in your system tray. -Right click it and go to Select Window Manager. Choose "Compiz" from the list. If at any time you wish to -return to your normal window manager, just select it from the fusion icon. - -If it works, you should add fusion-icon to the startup programs so that it automatically starts everytime -you login into GNOME. This can be done by going to *System -> Preferences -> Sessions -> Startup Programs* -in your Gnome menu. - -By default, compiz-gnome is shipped with gtk-window-decorator. Gnome users can also use Emerald as -a window decorator with compiz. To install emerald, run (as root): - --------------------------------------------------- -# pacman-g2 -Sy compiz-emerald compiz-emerald-themes --------------------------------------------------- - -Once installed, you can switch to emerald as the window decorator. To do this, just right click the Fusion icon, -navigate to "Select Window Decorator" and select "emerald" from the list. - -===== KDE - -Run the following command (as root) to install the necessary packages: - ----------------------------------------------------------------------- -# pacman-g2 -Sy compiz-kde fusion-icon ccsm taskbar-compiz kicker-compiz ----------------------------------------------------------------------- - -You can now use compiz by starting Fusion Icon from the KDE menu. - -By default, compiz-kde is shipped with kde-window-decorator. Kde users can also use Emerald as -a window decorator with compiz. To install emerald, run (as root): - --------------------------------------------------- -# pacman-g2 -Sy compiz-emerald compiz-emerald-themes --------------------------------------------------- - -Once installed, you can switch to emerald as the window decorator. To do this, just right click the Fusion icon, -navigate to "Select Window Decorator" and select "emerald" from the list. diff --git a/source/x11-extra/xgl/autogen-no-run-configure.patch b/source/x11-extra/xgl/autogen-no-run-configure.patch deleted file mode 100644 index fcab18d..0000000 --- a/source/x11-extra/xgl/autogen-no-run-configure.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -Naur xgl-20060220.orig/autogen.sh xgl-20060220/autogen.sh ---- xgl-20060220.orig/autogen.sh 2006-02-20 19:35:16.601625112 +0100 -+++ xgl-20060220/autogen.sh 2006-02-20 19:35:39.582131544 +0100 -@@ -9,4 +9,4 @@ - autoreconf -v --install || exit 1 - cd $ORIGDIR || exit $? - --$srcdir/configure --enable-maintainer-mode "$@" -+#$srcdir/configure --enable-maintainer-mode "$@" diff --git a/source/x11-extra/xgl/fw-xgl-control b/source/x11-extra/xgl/fw-xgl-control deleted file mode 100644 index 71e80a0..0000000 --- a/source/x11-extra/xgl/fw-xgl-control +++ /dev/null @@ -1,237 +0,0 @@ -#!/bin/bash - -# Frugalware Xgl Control script. -# Copyright (C) 2007 Alex Smith - -PACMAN="/usr/bin/pacman-g2" -USE_COLOR="Y" -CARD="" -OPTS="" - -# Subroutines borrowed from makepkg -# These are Copyright (C) 2002-2005 Judd Vinet <jvi...@zeroflux.org> - -plain() { - if [ "$USE_COLOR" = "Y" -o "$USE_COLOR" = "y" ]; then - echo -e " \033[1;1m$1\033[1;0m" >&2 - else - echo " $1" >&2 - fi -} - -msg() { - if [ "$USE_COLOR" = "Y" -o "$USE_COLOR" = "y" ]; then - if [ "$1" = "-n" ]; then - shift - echo -en "\033[1;32m==>\033[1;0m \033[1;1m$1\033[1;0m" >&2 - else - echo -e "\033[1;32m==>\033[1;0m \033[1;1m$1\033[1;0m" >&2 - fi - else - if [ "$1" = "-n" ]; then - shift - echo -n "==> $1" >&2 - else - echo "==> $1" >&2 - fi - fi -} - -msg2() { - if [ "$USE_COLOR" = "Y" -o "$USE_COLOR" = "y" ]; then - if [ "$1" = "-n" ]; then - shift - echo -en " \033[1;34m->\033[1;0m \033[1;1m$1\033[1;0m" >&2 - else - echo -e " \033[1;34m->\033[1;0m \033[1;1m$1\033[1;0m" >&2 - fi - else - if [ "$1" = "-n" ]; then - shift - echo -n " -> $1" >&2 - else - echo " -> $1" >&2 - fi - fi -} - -warning() { - if [ "$USE_COLOR" = "Y" -o "$USE_COLOR" = "y" ]; then - echo -e "\033[1;33m==> WARNING:\033[1;0m \033[1;1m$1\033[1;0m" >&2 - else - echo "==> WARNING: $1" >&2 - fi -} - -error() { - if [ "$USE_COLOR" = "Y" -o "$USE_COLOR" = "y" ]; then - echo -e "\033[1;31m==> ERROR:\033[1;0m \033[1;1m$1\033[1;0m" >&2 - else - echo "==> ERROR: $1" >&2 - fi - exit 1 -} - -# End alternate copyright - -checkpkg() { - msg2 "Checking for $1 installation..." - $PACMAN -Qi $1 >> /dev/null 2>&1 - if [ $? -ne 0 ]; then - msg2 -n "$1 is not installed. Would you like to install it? [Y/n] " - read INSTALL - if [ "$INSTALL" = "n" ]; then - error "$1 is not installed. Install it with pacman-g2 -S $1" - else - $PACMAN -Sy - [ $? -ne 0 ] && error "Failed to sync package database, exiting..." - $PACMAN -S $1 --noconfirm - [ $? -ne 0 ] && error "Failed to install $1, exiting..." - fi - fi -} - -detectcard() { - msg2 -n "Checking for nVidia card... " - nvidia=`grep -c Driver.*nvidia /etc/X11/xorg.conf` - nv=`cat /etc/X11/xorg.conf | grep Driver | grep "\"nv\"" | wc -l` - if [ $nvidia -gt 0 ]; then - echo "found" - CARD="nvidia" - OPTS="-accel xv -accel glx:pbuffer -accel xv:fbo -ac -kb -audit 0 -br -dpms -dpi 72" - return 0 - fi - if [ $nv -gt 0 ]; then - echo "failed" - error "nVidia card found but using open source drivers. Xgl requires that you use the binary drivers for proper 3d accel" - fi - echo - msg2 -n "Checking for i810 card... " - i810=`grep -c Driver.*i810 /etc/X11/xorg.conf` - if [ $i810 -gt 0 ]; then - echo "found" - CARD="i810" - OPTS="-accel xv -accel glx:pbuffer -accel xv:pbuffer -ac -kb -audit 0 -br -dpms -dpi 72" - return 0 - fi - echo - msg2 -n "Checking for an ATI card... " - fglrx=`grep -c Driver.*fglrx /etc/X11/xorg.conf` - ati=`grep -c Driver.*ati /etc/X11/xorg.conf` - if [ $fglrx -gt 0 ]; then - echo "found" - CARD="ati" - OPTS="-accel xv -accel glx:pbuffer -accel xv:pbuffer -ac -kb -audit 0 -br -dpms -dpi 72" - return 0 - fi - if [ $ati -gt 0 ]; then - echo "failed" - error "ATI card found but using open source drivers. Xgl requires that you use the fglrx driver for proper 3d accel" - fi - echo - # Should only get here if card isn't detected - error "Sorry, I cannot find a supported card in your system. If you would like support for your card, please post details of it to http://bugs.frugalware.org"; -} - -case `id -u` in - 0) - ;; - *) - error "fw-xgl-control must be run as root" - ;; -esac - -if [ "`type -p gdm`" ]; then - GDM="y" -fi -if [ "`type -p kdm`" ]; then - KDM="y" -fi - -case $1 in - -e|--enable|--enable-xgl) - if [ "$GDM" ]; then - if grep -q '0=Xgl' /etc/gdm/custom.conf; then - error "Xgl is already enabled..." - fi - fi - if [ "$KDM" ]; then - if grep -q ServerCmd=/usr/bin/Xgl /usr/share/config/kdm/kdmrc; then - error "Xgl is already enabled..." - fi - fi - msg "Searching for required packages..." - if [ -z "$GDM" -a -z "$KDM" ]; then - checkpkg "gdm" - fi - checkpkg "xgl" - if [ "$GDM" ]; then - checkpkg "gnome-session" - fi - if [ "$KDM" ]; then - checkpkg "kdebase" - fi - msg "Detecting cards..." - detectcard - if [ "$GDM" ]; then - msg "Checking if compiz is available..." - fi - if [ "$GDM" -a "`type -p compiz`" ]; then - msg "Compiz detected. You probably want to install desktop-effects. Do this afterwards with pacman" - fi - if [ "`type -p beryl-manager`" ]; then - ENABLE_BERYL=1 - else - ENABLE_BERYL=0 - fi - if [ "$GDM" ]; then - msg "Performing modifications to GDM configuration..." - echo "0=Xgl #xgl" >> /etc/gdm/custom.conf - echo "[server-Xgl] #xgl" >> /etc/gdm/custom.conf - echo "name=Xgl server #xgl" >> /etc/gdm/custom.conf - echo "command=/usr/bin/Xgl $OPTS #xgl" >> /etc/gdm/custom.conf - echo "flexible=true #xgl" >> /etc/gdm/custom.conf - fi - if [ "$KDM" ]; then - sed -i "s|^ServerArgsLocal=.*|ServerArgsLocal=$OPTS|" /usr/share/config/kdm/kdmrc - sed -i "s|^ServerCmd=.*|ServerCmd=/usr/bin/Xgl|" /usr/share/config/kdm/kdmrc - fi - if [ "$KDM" -a -x /usr/env/beryl.sh ]; then - msg "Configuring Beryl..." - echo "# Should beryl be run when KDE starts?" > /etc/sysconfig/beryl - echo "ENABLE_BERYL=${ENABLE_BERYL}" >> /etc/sysconfig/beryl - fi - if [ "$GDM" ]; then - msg "Modifications complete! Save your work and run gdm-restart as root." - else - msg "Modifications complete! Save your work and restart KDM." - fi - ;; - -d|--disable|--disable-xgl) - if [ "$KDM" -a -x /usr/env/beryl.sh ]; then - msg "Disabling Beryl..." - echo "# Should beryl be run when KDE starts?" > /etc/sysconfig/beryl - echo "ENABLE_BERYL=0" >> /etc/sysconfig/beryl - fi - if [ "$GDM" ]; then - msg "Reverting GDM configuration changes..." - sed -i '/\#xgl/d' /etc/gdm/custom.conf - fi - if [ "$KDM" ]; then - msg "Reverting KDM configuration changes..." - sed -i "s|^ServerArgsLocal=.*|ServerArgsLocal=-br -nolisten tcp -dpi 72 dpms|" /usr/share/config/kdm/kdmrc - sed -i "s|^ServerCmd=.*|ServerCmd=/usr/bin/X|" /usr/share/config/kdm/kdmrc - fi - if [ "$GDM" ]; then - msg "Xgl is now disabled. Save your work and run gdm-restart as root." - else - msg "Xgl is now disabled. Save your work and restart KDM." - fi - ;; - *) - msg "Frugalware Xgl Control 0.2.0 Copyright (C) 2007 Alex Smith" - msg2 "Usage: $0 --enable-xgl" - msg2 " $0 --disable-xgl" - exit 1 - ;; -esac diff --git a/source/x11-extra/xgl/xgl-compalloc.patch b/source/x11-extra/xgl/xgl-compalloc.patch deleted file mode 100644 index 7cf3721..0000000 --- a/source/x11-extra/xgl/xgl-compalloc.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/composite/compalloc.c -+++ b/composite/compalloc.c -@@ -486,12 +486,24 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h) - - ValidateGC(&pPixmap->drawable, pGC); - dixChangeGC (serverClient, pGC, GCSubwindowMode, &val, NULL); -+ -+#if 1 /* ugly hack to avoid frame buffer reads */ -+ val = 0; -+ dixChangeGC (serverClient, pGC, GCForeground, &val, NULL); -+ -+ { -+ xRectangle rect = { 0, 0, w, h }; -+ (*pGC->ops->PolyFillRect) (&pPixmap->drawable, pGC, 1, &rect); -+ } -+#else - (*pGC->ops->CopyArea) (&pParent->drawable, - &pPixmap->drawable, - pGC, - x - pParent->drawable.x, - y - pParent->drawable.y, - w, h, 0, 0); -+#endif -+ - FreeScratchGC (pGC); - } - return pPixmap; _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
