diff options
| author | fanch <fanchyannmaria at orange dot fr> | 2010-06-25 23:21:12 +0200 |
|---|---|---|
| committer | fanch <fanchyannmaria at orange dot fr> | 2010-06-25 23:21:12 +0200 |
| commit | 310f8b7fafebd328cfeb3bc6ac5454786010c866 (patch) | |
| tree | 88b4c1935bb18fded6f7ea869e2028cc0c771657 /xorg | |
| parent | 7b6fa09248f85ebe415e84e54d30b8145442a3d3 (diff) | |
| parent | 2e119531564ecac7a8196d9384fc46f3e856f6ba (diff) | |
| download | nutyx-extra-310f8b7fafebd328cfeb3bc6ac5454786010c866.tar.gz nutyx-extra-310f8b7fafebd328cfeb3bc6ac5454786010c866.tar.bz2 nutyx-extra-310f8b7fafebd328cfeb3bc6ac5454786010c866.tar.xz nutyx-extra-310f8b7fafebd328cfeb3bc6ac5454786010c866.zip | |
Merge remote branch 'nutyx-attapu/master'
Diffstat (limited to 'xorg')
| -rw-r--r-- | xorg/libgl/.footprint | 6 | ||||
| -rw-r--r-- | xorg/libgl/.md5sum | 1 | ||||
| -rw-r--r-- | xorg/libgl/Pkgfile | 25 | ||||
| -rw-r--r-- | xorg/libgl/pre-install | 7 | ||||
| -rw-r--r-- | xorg/mesa3d/.footprint | 7 | ||||
| -rw-r--r-- | xorg/mesa3d/.md5sum | 4 | ||||
| -rwxr-xr-x | xorg/mesa3d/Pkgfile | 5 | ||||
| -rw-r--r-- | xorg/xorg-server/.footprint | 2 | ||||
| -rwxr-xr-x | xorg/xorg-server/Pkgfile | 3 | ||||
| -rw-r--r-- | xorg/xorg-xf86-video-intel/.md5sum | 2 | ||||
| -rw-r--r-- | xorg/xorg-xf86-video-intel/Pkgfile | 2 | ||||
| -rw-r--r-- | xorg/xorg-xproto/.md5sum | 2 | ||||
| -rw-r--r-- | xorg/xorg-xproto/Pkgfile | 2 |
13 files changed, 53 insertions, 15 deletions
diff --git a/xorg/libgl/.footprint b/xorg/libgl/.footprint new file mode 100644 index 000000000..d24e0a03b --- /dev/null +++ b/xorg/libgl/.footprint @@ -0,0 +1,6 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/lib/ +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/ +lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libglx.so -> libglx.xorg diff --git a/xorg/libgl/.md5sum b/xorg/libgl/.md5sum new file mode 100644 index 000000000..60d3bb9b9 --- /dev/null +++ b/xorg/libgl/.md5sum @@ -0,0 +1 @@ +6be2d343a0089bfd395ce02aaf8adb57 MesaLib-7.8.2.tar.bz2 diff --git a/xorg/libgl/Pkgfile b/xorg/libgl/Pkgfile new file mode 100644 index 000000000..dc9468b7e --- /dev/null +++ b/xorg/libgl/Pkgfile @@ -0,0 +1,25 @@ +# Description: Librairie libre 3D de Mesa +# URL: http://mesa3d.sourceforge.net +# Maintainer: NuTyX core team +# Packager: thierryn1 at hispeed dot ch +# Depends on: expat, libdrm, xorg-makedepend, xorg-libx11, xorg-libxext, xorg-libxxf86vm, xorg-libxt, xorg-libxdamage +name=libgl +version=7.8.2 +release=1 +source=(ftp://ftp.freedesktop.org/pub/mesa/$version/MesaLib-$version.tar.bz2) +build() +{ + cd Mesa-$version + ./configure --prefix=/usr \ + --with-driver=xlib \ + --disable-egl \ + --disable-gallium \ + --disable-glu \ + --disable-glw \ + --without-demos + make + bin/minstall lib/libGL.so* /usr/lib/ + install -m755 -d $PKG/usr/lib{,/xorg/modules/extensions} + ln -s libglx.xorg \ + $PKG/usr/lib/xorg/modules/extensions/libglx.so +} diff --git a/xorg/libgl/pre-install b/xorg/libgl/pre-install new file mode 100644 index 000000000..098d7a18f --- /dev/null +++ b/xorg/libgl/pre-install @@ -0,0 +1,7 @@ +if ( pkginfo -i | grep nvidia > /dev/null ) ; then + pkgrm nvidia +fi +if ( pkginfo -i | grep nvidia-96xx > /dev/null ) ; then + pkgrm nvidia-96xx +fi + diff --git a/xorg/mesa3d/.footprint b/xorg/mesa3d/.footprint index 2971f5081..709686bc1 100644 --- a/xorg/mesa3d/.footprint +++ b/xorg/mesa3d/.footprint @@ -53,12 +53,9 @@ drwxr-xr-x root/root usr/lib/egl/ lrwxrwxrwx root/root usr/lib/libEGL.so -> libEGL.so.1 lrwxrwxrwx root/root usr/lib/libEGL.so.1 -> libEGL.so.1.0 -rwxr-xr-x root/root usr/lib/libEGL.so.1.0 -lrwxrwxrwx root/root usr/lib/libGL.so -> libGL.so.1 -lrwxrwxrwx root/root usr/lib/libGL.so.1 -> libGL.so.1.2 --rwxr-xr-x root/root usr/lib/libGL.so.1.2 lrwxrwxrwx root/root usr/lib/libGLU.so -> libGLU.so.1 -lrwxrwxrwx root/root usr/lib/libGLU.so.1 -> libGLU.so.1.3.070801 --rwxr-xr-x root/root usr/lib/libGLU.so.1.3.070801 +lrwxrwxrwx root/root usr/lib/libGLU.so.1 -> libGLU.so.1.3.070802 +-rwxr-xr-x root/root usr/lib/libGLU.so.1.3.070802 lrwxrwxrwx root/root usr/lib/libGLw.so -> libGLw.so.1 lrwxrwxrwx root/root usr/lib/libGLw.so.1 -> libGLw.so.1.0.0 -rwxr-xr-x root/root usr/lib/libGLw.so.1.0.0 diff --git a/xorg/mesa3d/.md5sum b/xorg/mesa3d/.md5sum index 2401aeabe..794ce5ac2 100644 --- a/xorg/mesa3d/.md5sum +++ b/xorg/mesa3d/.md5sum @@ -1,2 +1,2 @@ -9ef47f911869657c6bf2f43ebce86b61 MesaDemos-7.8.1.tar.bz2 -25ec15f8e41fde6d206118cc786dbac4 MesaLib-7.8.1.tar.bz2 +757d9e2e06f48b1a52848be9b0307ced MesaDemos-7.8.2.tar.bz2 +6be2d343a0089bfd395ce02aaf8adb57 MesaLib-7.8.2.tar.bz2 diff --git a/xorg/mesa3d/Pkgfile b/xorg/mesa3d/Pkgfile index 3fadf6f0e..bfc62d2ad 100755 --- a/xorg/mesa3d/Pkgfile +++ b/xorg/mesa3d/Pkgfile @@ -2,10 +2,10 @@ # URL: http://www.mesa3d.org # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on: expat, libdrm, xorg-makedepend, xorg-libx11, xorg-libxext, xorg-libxxf86vm, xorg-libxt, xorg-libxdamage +# Depends on: expat, libdrm, xorg-makedepend, xorg-libx11, xorg-libxext, xorg-libxxf86vm, xorg-libxt, xorg-libxdamage, libgl name=mesa3d -version=7.8.1 +version=7.8.2 release=1 source=(ftp://ftp.freedesktop.org/pub/mesa/$version/Mesa{Lib,Demos}-$version.tar.bz2) @@ -23,6 +23,7 @@ build() { do rm $PKG/usr/include/GL/$i done + rm $PKG/usr/lib/libGL.* install -d $PKG/usr/bin install -m 755 progs/xdemos/glx{gears,info} $PKG/usr/bin } diff --git a/xorg/xorg-server/.footprint b/xorg/xorg-server/.footprint index 3cd7f3251..4bde8d03c 100644 --- a/xorg/xorg-server/.footprint +++ b/xorg/xorg-server/.footprint @@ -203,7 +203,7 @@ drwxr-xr-x root/root usr/lib/xorg/modules/extensions/ -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/extensions/libglx.la --rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so +-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.xorg -rwxr-xr-x root/root usr/lib/xorg/modules/extensions/librecord.la -rwxr-xr-x root/root usr/lib/xorg/modules/extensions/librecord.so -rwxr-xr-x root/root usr/lib/xorg/modules/libexa.la diff --git a/xorg/xorg-server/Pkgfile b/xorg/xorg-server/Pkgfile index 0eb170565..035649c32 100755 --- a/xorg/xorg-server/Pkgfile +++ b/xorg/xorg-server/Pkgfile @@ -6,7 +6,7 @@ name=xorg-server version=1.8.1 -release=1 +release=2 source=(http://xorg.freedesktop.org/releases/individual/xserver/$name-$version.tar.bz2) build() { @@ -21,4 +21,5 @@ build() { make make DESTDIR=$PKG install rmdir $PKG/var/log + mv $PKG/usr/lib/xorg/modules/extensions/libglx.{so,xorg} } diff --git a/xorg/xorg-xf86-video-intel/.md5sum b/xorg/xorg-xf86-video-intel/.md5sum index f453a4326..725657672 100644 --- a/xorg/xorg-xf86-video-intel/.md5sum +++ b/xorg/xorg-xf86-video-intel/.md5sum @@ -1 +1 @@ -91a8baa97c4c8c85d35291fea547dd15 xf86-video-intel-2.11.0.tar.bz2 +03b989f0a910c3a5966cbcf7c059a8ef xf86-video-intel-2.11.901.tar.bz2 diff --git a/xorg/xorg-xf86-video-intel/Pkgfile b/xorg/xorg-xf86-video-intel/Pkgfile index d1404e2aa..9061fe9ed 100644 --- a/xorg/xorg-xf86-video-intel/Pkgfile +++ b/xorg/xorg-xf86-video-intel/Pkgfile @@ -5,7 +5,7 @@ # Depends on: xorg-server, libdrm name=xorg-xf86-video-intel -version=2.11.0 +version=2.11.901 release=1 source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-$version.tar.bz2) diff --git a/xorg/xorg-xproto/.md5sum b/xorg/xorg-xproto/.md5sum index def7357fd..d79245026 100644 --- a/xorg/xorg-xproto/.md5sum +++ b/xorg/xorg-xproto/.md5sum @@ -1 +1 @@ -1a2b31430d04340be2e49e8b6445e076 xproto-7.0.15.tar.bz2 +74abb8fb91af66f35873b1f444731220 xproto-7.0.17.tar.bz2 diff --git a/xorg/xorg-xproto/Pkgfile b/xorg/xorg-xproto/Pkgfile index 3b62a13ee..0cfdcd8e4 100644 --- a/xorg/xorg-xproto/Pkgfile +++ b/xorg/xorg-xproto/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Tilman Sauerbeck, tilman at crux dot nu name=xorg-xproto -version=7.0.15 +version=7.0.17 release=1 source=(http://xorg.freedesktop.org/releases/individual/proto/xproto-$version.tar.bz2) |