forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

temp/mesa-*: remove suffix in pkgconfig version (!744)

Browse source 
Fix build with current abuild version by removing the "-devel" suffix
in /usr/lib/pkgconfig/*.pc. Set "pcprefix" instead, so abuild doesn't
confuse these packages with the regular mesa.

[ci:skip-build]: already built successfully in CI
Fixes: #386
This commit is contained in:
Oliver Smith 2019-11-17 18:20:13 +01:00
parent 66512d690e
commit 51807847ea
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
temp/mesa-git/APKBUILD
View file

@ -9,7 +9,7 @@
# conflicts # conflicts
pkgname=mesa-git pkgname=mesa-git
pkgver=0_git20191101 pkgver=0_git20191101
pkgrel=0 pkgrel=1
_commit="c236e6c1e3224dd324b9ee3d3b501bd02ba2f177" _commit="c236e6c1e3224dd324b9ee3d3b501bd02ba2f177"
pkgdesc="(Git) Mesa DRI OpenGL library" pkgdesc="(Git) Mesa DRI OpenGL library"
url="https://www.mesa3d.org" url="https://www.mesa3d.org"
@ -72,6 +72,7 @@ provides="mesa"
replaces="mesa-dricore mesa" replaces="mesa-dricore mesa"
options="!check" # to follow alpine's standards options="!check" # to follow alpine's standards
builddir="$srcdir/mesa-$_commit" builddir="$srcdir/mesa-$_commit"
pcprefix="mesa-git"
_dri_driverdir=/usr/lib/xorg/modules/dri _dri_driverdir=/usr/lib/xorg/modules/dri
_dri_drivers="r100,r200,nouveau" _dri_drivers="r100,r200,nouveau"
@ -149,6 +150,9 @@ build() {
package() { package() {
cd "$builddir" cd "$builddir"
DESTDIR="$pkgdir" ninja -C output install DESTDIR="$pkgdir" ninja -C output install
# Make abuild's version check happy (#386)
sed -i s/-devel//g "$pkgdir"/usr/lib/pkgconfig/*.pc
} }
egl() { egl() {

6
temp/mesa-purism-gc7000/APKBUILD
View file

@ -2,7 +2,7 @@
pkgname=mesa-purism-gc7000 pkgname=mesa-purism-gc7000
provides=mesa provides=mesa
pkgver=19.1.0_git20190919 pkgver=19.1.0_git20190919
pkgrel=0 pkgrel=1
_commit="995037366d5130b36e23363e25afef5b10208771" _commit="995037366d5130b36e23363e25afef5b10208771"
pkgdesc="Mesa DRI OpenGL library" pkgdesc="Mesa DRI OpenGL library"
url="https://www.mesa3d.org" url="https://www.mesa3d.org"
@ -58,6 +58,7 @@ source="
meson-add-toggle-for-TLS-support-in-GLX.patch meson-add-toggle-for-TLS-support-in-GLX.patch
" "
replaces="mesa-dricore" replaces="mesa-dricore"
pcprefix="mesa-purism-gc7000"
_dri_driverdir=/usr/lib/dri _dri_driverdir=/usr/lib/dri
_dri_driverdir_x11=/usr/lib/xorg/modules/dri _dri_driverdir_x11=/usr/lib/xorg/modules/dri
@ -95,6 +96,9 @@ build() {
package() { package() {
cd "$builddir" cd "$builddir"
ninja -C "$builddir"/build install ninja -C "$builddir"/build install
# Make abuild's version check happy (#386)
sed -i s/-devel//g "$pkgdir"/usr/lib/pkgconfig/*.pc
} }
egl() { egl() {