From fb784b6236899039f555a92810ccc14583164c8f Mon Sep 17 00:00:00 2001
From: Alexey Min <alexey.min@gmail.com>
Date: Thu, 4 Apr 2019 10:25:53 +0300
Subject: [PATCH] hybris/*: enable building for armv7 (!297)

[ci:skip-build]: simple arch change, building will probably take too
                 long
---
 hybris/drihybris/APKBUILD             | 4 ++--
 hybris/glamor-hybris/APKBUILD         | 4 ++--
 hybris/libhybris/APKBUILD             | 6 +++---
 hybris/xf86-video-hwcomposer/APKBUILD | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/hybris/drihybris/APKBUILD b/hybris/drihybris/APKBUILD
index 6254730f6..bf158ec12 100644
--- a/hybris/drihybris/APKBUILD
+++ b/hybris/drihybris/APKBUILD
@@ -1,10 +1,10 @@
 pkgname=drihybris
 pkgver=1.0_git20171130
-pkgrel=0
+pkgrel=1
 _commit="fbaf21e7cb343e0b7cd29f256ec28c46c01c07b8"
 pkgdesc="custom DRI3-based Xorg extension for use with libhybris"
 url="https://github.com/NotKit/drihybris"
-arch="armhf aarch64"
+arch="armhf armv7 aarch64"
 license="MIT"
 subpackages="$pkgname-doc $pkgname-dev"
 depends_dev="drihybrisproto"
diff --git a/hybris/glamor-hybris/APKBUILD b/hybris/glamor-hybris/APKBUILD
index 82876916e..96656b81e 100644
--- a/hybris/glamor-hybris/APKBUILD
+++ b/hybris/glamor-hybris/APKBUILD
@@ -1,10 +1,10 @@
 pkgname=glamor-hybris
 pkgver=1.0_git20180114
-pkgrel=0
+pkgrel=1
 _commit="d15da5304b6b15bc12864041267880abb5565d0c"
 pkgdesc="glamor Xserver 2D acceleration modified to work with libhybris drivers"
 url="https://github.com/NotKit/glamor-hybris"
-arch="armhf aarch64"
+arch="armhf armv7 aarch64"
 license="MIT"
 subpackages="$pkgname-doc $pkgname-dev"
 depends=
diff --git a/hybris/libhybris/APKBUILD b/hybris/libhybris/APKBUILD
index 5bad4e1f2..3bb64e4e3 100644
--- a/hybris/libhybris/APKBUILD
+++ b/hybris/libhybris/APKBUILD
@@ -1,7 +1,7 @@
 pkgname=libhybris
 pkgver=1.0_git20180212
-pkgrel=4
-arch="x86 armhf aarch64"
+pkgrel=5
+arch="x86 armhf armv7 aarch64"
 url="https://github.com/libhybris/libhybris"
 license="Apache"
 makedepends="autoconf automake libtool wayland-dev linux-headers bsd-compat-headers
@@ -52,7 +52,7 @@ build() {
 
 	NOCONFIGURE=1 ./autogen.sh
 
-	if [ "$CARCH" == "armhf" ]; then
+	if [ "$CARCH" == "armhf" -o "$CARCH" == "armv7" ]; then
 		_vers="7.1 4.4"
 		_ldpath="/usr/libexec/droid-hybris/system/lib:/vendor/lib:/system/lib"
 		_arch="arm"
diff --git a/hybris/xf86-video-hwcomposer/APKBUILD b/hybris/xf86-video-hwcomposer/APKBUILD
index 7b193798a..2e515dd95 100644
--- a/hybris/xf86-video-hwcomposer/APKBUILD
+++ b/hybris/xf86-video-hwcomposer/APKBUILD
@@ -1,9 +1,9 @@
 pkgname=xf86-video-hwcomposer
 pkgver=1.0_git20180921
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org driver for Android devices rendering through HWComposer API"
 url="https://github.com/NotKit/xf86-video-hwcomposer"
-arch="armhf aarch64"
+arch="armhf armv7 aarch64"
 license="MIT"
 depends="drihybris glamor-hybris"
 makedepends="autoconf automake util-macros libtool
@@ -18,7 +18,7 @@ source="$pkgname-$_commit.tar.gz::https://github.com/NotKit/$pkgname/archive/$_c
 
 subpackages="$pkgname-doc"
 
-if [ "$CARCH" == "armhf" ]; then
+if [ "$CARCH" == "armhf" -o "$CARCH" == "armv7" ]; then
 	_vers="7.1 7.1-caf 4.4"
 elif [ "$CARCH" == "aarch64" ]; then
 	_vers="7.1 7.1-caf"