aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2017-03-28 05:31:59 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2017-03-28 05:32:52 +0000
commit8dc250b7cf59e3019d55d963ebe589f6ca71ba79 (patch)
tree8db86517da427dff7e1c0f7ec16c8cdd1dee67f2 /main
parentecff4dad4aeac6cec74666dd39adc3001f6e82dd (diff)
downloadaports-8dc250b7cf59e3019d55d963ebe589f6ca71ba79.tar.bz2
aports-8dc250b7cf59e3019d55d963ebe589f6ca71ba79.tar.xz
main/mesa: dricore is no longer a built library of mesa, move /etc/drirc back to main package.
this fixes rebuilding the package under set -e
Diffstat (limited to 'main')
-rw-r--r--main/mesa/APKBUILD14
1 files changed, 4 insertions, 10 deletions
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index 565d207d2c..1a2b0ea11c 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mesa
pkgver=12.0.6
-pkgrel=0
+pkgrel=1
pkgdesc="Mesa DRI OpenGL library"
url="http://www.mesa3d.org"
arch="all"
@@ -12,7 +12,7 @@ subpackages="$pkgname-dev
$pkgname-dri-nouveau:nouveau
$pkgname-dri-swrast:swrast
$pkgname-dri-vmwgfx:vmwgfx
- $pkgname-dricore $pkgname-glapi $pkgname-egl $pkgname-gl $pkgname-gles
+ $pkgname-glapi $pkgname-egl $pkgname-gl $pkgname-gles
$pkgname-xatracker $pkgname-osmesa $pkgname-gbm
$pkgname-libwayland-egl:_wayland
"
@@ -29,6 +29,8 @@ source="ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/mesa-$pkgver.tar.xz
musl-fixes.patch
"
+replaces="mesa-dricore"
+
_dri_driverdir=/usr/lib/xorg/modules/dri
_dri_drivers="r200,radeon,nouveau,swrast"
_gallium_drivers="r300,r600,radeonsi,nouveau,svga,swrast"
@@ -99,14 +101,6 @@ package() {
make -j1 DESTDIR="$pkgdir" install || return 1
}
-dricore() {
- pkgdesc="Mesa dricore runtime libraries"
- install -d "$subpkgdir"/usr/lib "$subpkgdir"/etc
- mv "$pkgdir"/usr/lib/libdricore*.so.* \
- "$subpkgdir"/usr/lib/
- mv "$pkgdir"/etc/drirc "$subpkgdir"/etc/drirc
-}
-
egl() {
replaces="mesa"
pkgdesc="Mesa libEGL runtime libraries"