summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2013-11-06 08:38:11 -0200
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2013-11-06 08:38:11 -0200
commitfd1b10bd34fb8b5042eb5b68984ba078984dc1df (patch)
treeeba1a91b5c71f4533414956aca9bad3809c198ae
parent502c26be5e5648decd6a4bbb0340dd483fbc41dc (diff)
parent4dd9fae4d65bbd59b55549c1d778d06f42beb4dd (diff)
downloadabslibre-fd1b10bd34fb8b5042eb5b68984ba078984dc1df.tar.gz
abslibre-fd1b10bd34fb8b5042eb5b68984ba078984dc1df.tar.bz2
abslibre-fd1b10bd34fb8b5042eb5b68984ba078984dc1df.zip
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r--pcr/libdrm-nvfx/PKGBUILD4
-rw-r--r--pcr/mesa-nvfx/PKGBUILD13
2 files changed, 10 insertions, 7 deletions
diff --git a/pcr/libdrm-nvfx/PKGBUILD b/pcr/libdrm-nvfx/PKGBUILD
index 81a39573e..c8a08bea4 100644
--- a/pcr/libdrm-nvfx/PKGBUILD
+++ b/pcr/libdrm-nvfx/PKGBUILD
@@ -5,8 +5,8 @@
_pkgname=libdrm
pkgname=libdrm-nvfx
pkgver=2.4.33
-pkgrel=3
-pkgdesc="Userspace interface to kernel DRM services, Nouveau NVFX for NV30 and NV40 (GeForce FX - 7000 series card) video card family"
+pkgrel=4
+pkgdesc="Userspace interface to kernel DRM services for Nouveau NVFX [NV30 and NV40] (GeForce FX - 7000 series card) video card family"
arch=(i686 x86_64 mips64el)
license=('custom')
depends=('glibc' 'libpciaccess')
diff --git a/pcr/mesa-nvfx/PKGBUILD b/pcr/mesa-nvfx/PKGBUILD
index 98338379b..4caacabf8 100644
--- a/pcr/mesa-nvfx/PKGBUILD
+++ b/pcr/mesa-nvfx/PKGBUILD
@@ -6,7 +6,7 @@
pkgbase=mesa-nvfx
pkgname=('nouveau-nvfx-dri' 'svga-nvfx-dri' 'mesa-nvfx' 'mesa-nvfx-libgl')
pkgver=8.0.5
-pkgrel=1
+pkgrel=3
arch=('i686' 'x86_64' 'mips64el')
makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm-nvfx' 'dri2proto' 'libxxf86vm' 'libxdamage'
'libvdpau' 'elfutils' 'systemd' 'imake')
@@ -96,14 +96,17 @@ package_mesa-nvfx() {
pkgdesc="an free implementation of the OpenGL specification for Nouveau NVFX [NV30 and NV40] (GeForce FX - 7000 series card) video card family (without wayland and support)"
depends=('libdrm-nvfx' 'libvdpau' 'libxxf86vm' 'libxdamage' 'systemd' 'elfutils')
optdepends=('opengl-man-pages: for the OpenGL API man pages')
- provides=('mesa')
- conflicts=('mesa')
+ provides=('mesa' 'libegl' 'libgbm' 'libgles')
+ conflicts=('mesa' 'libegl' 'libgbm' 'libgles')
mv -v ${srcdir}/fakeinstall/* ${pkgdir}
# rename libgl.so
mv ${pkgdir}/usr/lib/libGL.so.1.2 ${pkgdir}/usr/lib/mesa-libGL.so.1.2.0
rm ${pkgdir}/usr/lib/libGL.so{,.1}
+ # removing glu headers files
+ rm -v "${pkgdir}/usr/include/GL/glu"{,_mangle}".h"
+
install -m755 -d "${pkgdir}/usr/share/licenses/mesa-nvfx"
install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-nvfx/"
}
@@ -111,8 +114,8 @@ package_mesa-nvfx() {
package_mesa-nvfx-libgl() {
pkgdesc="Mesa 3-D graphics library for Nouveau NVFX [NV30 and NV40] (GeForce FX - 7000 series card) video card family (without wayland support)"
depends=("mesa-nvfx=${pkgver}")
- provides=('mesa-libgl')
- conflicts=('mesa-libgl')
+ provides=('mesa-libgl' 'libgl')
+ conflicts=('mesa-libgl' 'libgl')
install -m755 -d "${pkgdir}/usr/lib"