summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-11-06 03:34:51 -0800
committerroot <root@rshg054.dnsready.net>2013-11-06 03:34:51 -0800
commitfbe5d27eadf86b85244a5ffff62c132cb9a4a158 (patch)
tree153f95fed7d777dbc9cb324307c55dba4d93487b
parenta52da684729842a87ef2e9faea91db09f2582588 (diff)
Wed Nov 6 03:34:48 PST 2013
-rw-r--r--libre/kdebase-konqueror-libre/PKGBUILD1
-rw-r--r--pcr/mesa-nvfx/PKGBUILD13
2 files changed, 9 insertions, 5 deletions
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 226664268..880197912 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -28,6 +28,7 @@ provides=("kdebase-konqueror=$pkgver")
prepare() {
mkdir build
+ cd kde-baseapps-${pkgver}
# Don't recommend nonfree software or Google.
patch -Np1 -i "${srcdir}/konq-about-fsdg.diff"
}
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"