summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 3 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index aa8896bcf07..9ff0eef5c06 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = libhybris-ext-git
pkgver = 1245.a1f2e5d
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/mickybart/libhybris_ext
arch = armv7h
license = Apache
@@ -22,7 +22,6 @@ pkgname = libhybris-ext-libgl-git
depends = mesa-hybris
provides = libgl
conflicts = libgl
- conflicts = libglvnd
replaces = libgl
pkgname = libhybris-ext-wayland-egl-git
diff --git a/PKGBUILD b/PKGBUILD
index 2a8eba50450..7ae619a1d1d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgbase=libhybris-ext-git
pkgname=('libhybris-ext-git' 'libhybris-ext-libgl-git' 'libhybris-ext-wayland-egl-git')
_pkgbase=libhybris
pkgver=1245.a1f2e5d
-pkgrel=1
+pkgrel=2
arch=('armv7h')
url="https://github.com/mickybart/libhybris_ext"
license=('Apache')
@@ -67,7 +67,7 @@ package_libhybris-ext-libgl-git() {
depends=('libhybris' 'libhybris-ext-wayland-egl-git' 'mesa-hybris')
provides=('libgl')
replaces=('libgl')
- conflicts=('libgl' 'libglvnd')
+ conflicts=('libgl')
install -m755 -d ${pkgdir}/usr/lib/pkgconfig
cp -av ${srcdir}/fakeinstall/opt/android/hybris/lib/pkgconfig/{egl,glesv1_cm,glesv2}.pc ${pkgdir}/usr/lib/pkgconfig/