diff --git a/hybris/xf86-video-hwcomposer/APKBUILD b/hybris/xf86-video-hwcomposer/APKBUILD
index 98df5d907..3fa5eaa4e 100644
--- a/hybris/xf86-video-hwcomposer/APKBUILD
+++ b/hybris/xf86-video-hwcomposer/APKBUILD
@@ -1,11 +1,14 @@
+# Contributor: TheKit <nekit1000@gmail.com>
+# Contributor: Danct12 <danct12@disroot.org>
+# Maintainer: TheKit <nekit1000@gmail.com>
 pkgname=xf86-video-hwcomposer
 pkgver=1.0_git20190925
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org driver for Android devices rendering through HWComposer API"
 url="https://github.com/NotKit/xf86-video-hwcomposer"
-arch="armhf armv7 aarch64 !x86 !x86_64"
+arch="armhf armv7 aarch64"
 license="MIT"
-depends="drihybris glamor-hybris"
+depends="drihybris glamor-hybris libepoxy libhybris"
 makedepends="autoconf automake util-macros libtool
 	xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto xf86dgaproto glamor-hybris-dev drihybris-dev
@@ -14,8 +17,10 @@ makedepends="autoconf automake util-macros libtool
 	libhybris-dev libhybris libhybris-9.0"
 _commit="b33e119005158ddc1988b495121591496bddb915"
 source="$pkgname-$_commit.tar.gz::https://github.com/NotKit/xf86-video-hwcomposer/archive/$_commit.tar.gz
+	fix-hwcomposer.patch
 	30-modules-hybris.conf"
 
+options="!tracedeps"
 subpackages="$pkgname-doc"
 
 if [ "$CARCH" == "armhf" -o "$CARCH" == "armv7" ]; then
@@ -64,10 +69,13 @@ package() {
 }
 
 _specific() {
+	_hybrisver="$(echo $subpkgname | cut -d '-' -f4)"
+	depends="$depends libhybris-$_hybrisver"
 	_lib="xorg/modules/drivers/hwcomposer_drv.so"
 	install -Dm644 "$_tmppkgdir/$subpkgname/usr/lib/$_lib" \
 			"$subpkgdir/usr/lib/$_lib"
 }
 
 sha512sums="61c7f528c0f8848edc72b4f926095a610abf9b7ea1512cce518d6dae359e76a6eb50fc18558238fc3dc6a31ce3cc3237e4663198a05744400282db2825ee6ddb  xf86-video-hwcomposer-b33e119005158ddc1988b495121591496bddb915.tar.gz
+b76bceba0e784e079b4093f6e4405763f17c4d817ca977e9f8f8878294d37a3876efbbb0dc6ef7f4ce466ccd77bce7e72362c0e3b5ac6dfdb0144ccaac503876  fix-hwcomposer.patch
 e8f9f6ec337e88ec440c4bdc3f3441a8252031d1a4265a251b500a087a2c88336861c7e3f81972019f6a492324e94253726ce031fedad60ff582dd8db73efac6  30-modules-hybris.conf"
diff --git a/hybris/xf86-video-hwcomposer/fix-hwcomposer.patch b/hybris/xf86-video-hwcomposer/fix-hwcomposer.patch
new file mode 100644
index 000000000..9439b3679
--- /dev/null
+++ b/hybris/xf86-video-hwcomposer/fix-hwcomposer.patch
@@ -0,0 +1,13 @@
+diff --git a/src/hwcomposer.c b/src/hwcomposer.c
+index bb6d204..52e06df 100644
+--- a/src/hwcomposer.c
++++ b/src/hwcomposer.c
+@@ -123,7 +123,7 @@ Bool hwc_hwcomposer_init(ScrnInfoPtr pScrn)
+ 		return hwc_hwcomposer2_init(pScrn);
+ #endif
+ 	
+-	hwc_composer_device_1_t *hwcDevicePtr = (hwc_composer_device_1_t*) hwcDevice;
++	hwc_composer_device_1_t *hwcDevicePtr = hwc->hwcDevicePtr = (hwc_composer_device_1_t*) hwcDevice;
+ 	hwc_set_power_mode(pScrn, HWC_DISPLAY_PRIMARY, 1);
+ 
+ 	uint32_t configs[5];