temp/mesa-freedreno: fix mesa-freedreno-gl conflict (!520)

This commit is contained in:
Luca Weiss 2019-07-23 15:05:37 +02:00 committed by Martijn Braam
parent 33b8a219f5
commit be9615a763
No known key found for this signature in database
GPG key ID: C4280ACB000B060F
2 changed files with 4 additions and 3 deletions

View file

@ -1,11 +1,11 @@
pkgname=device-lg-hammerhead pkgname=device-lg-hammerhead
pkgver=2 pkgver=2
pkgrel=5 pkgrel=6
pkgdesc="Google Nexus 5" pkgdesc="Google Nexus 5"
url="https://postmarketos.org" url="https://postmarketos.org"
arch="armv7" arch="armv7"
license="MIT" license="MIT"
depends="postmarketos-base linux-postmarketos-qcom mkbootimg mesa-freedreno mesa-freedreno-dri-freedreno ofono" depends="postmarketos-base linux-postmarketos-qcom mkbootimg mesa-freedreno mesa-freedreno-glapi mesa-freedreno-gl mesa-freedreno-dri-freedreno ofono"
makedepends="" makedepends=""
install="$pkgname.post-install" install="$pkgname.post-install"
subpackages="$pkgname-weston $pkgname-x11 $pkgname-nonfree-firmware:nonfree_firmware" subpackages="$pkgname-weston $pkgname-x11 $pkgname-nonfree-firmware:nonfree_firmware"

View file

@ -3,7 +3,7 @@ pkgname=mesa-freedreno
provides=mesa provides=mesa
pkgver=19.1.0_git20190620 pkgver=19.1.0_git20190620
_commit="f179febde0c6e85911365e845a737be3f346da4a" _commit="f179febde0c6e85911365e845a737be3f346da4a"
pkgrel=8 pkgrel=9
pkgdesc="[${_commit}] Mesa DRI OpenGL library" pkgdesc="[${_commit}] Mesa DRI OpenGL library"
url="https://www.mesa3d.org" url="https://www.mesa3d.org"
arch="armhf armv7 aarch64" arch="armhf armv7 aarch64"
@ -125,6 +125,7 @@ egl() {
gl() { gl() {
pkgdesc="[${_commit}] Mesa libGL runtime libraries" pkgdesc="[${_commit}] Mesa libGL runtime libraries"
replaces="mesa" replaces="mesa"
provides="mesa-gl"
install -d "$subpkgdir"/usr/lib install -d "$subpkgdir"/usr/lib
mv "$pkgdir"/usr/lib/libGL.so* "$subpkgdir"/usr/lib/ mv "$pkgdir"/usr/lib/libGL.so* "$subpkgdir"/usr/lib/