From afd0ee0216d526b5950f8a80115389f7187b296a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 4 Aug 2020 22:16:07 -0300
Subject: [PATCH] sunxi-mali: clean up, mark as nonfree.

---
 srcpkgs/sunxi-mali/patches/make-tabs.patch | 29 ----------------------
 srcpkgs/sunxi-mali/template                | 27 +++++++++++++-------
 2 files changed, 18 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/sunxi-mali/patches/make-tabs.patch

diff --git a/srcpkgs/sunxi-mali/patches/make-tabs.patch b/srcpkgs/sunxi-mali/patches/make-tabs.patch
deleted file mode 100644
index 796dd3ae620..00000000000
--- a/srcpkgs/sunxi-mali/patches/make-tabs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- lib/mali/Makefile.split.orig	2014-01-29 13:32:24.446817426 +0100
-+++ lib/mali/Makefile.split	2014-01-29 13:33:03.822133629 +0100
-@@ -1,16 +1,16 @@
- # Makefile for when everything is split up nicely.
- 
- install: libMali.so libEGL.so.1.4 libGLESv1_CM.so.1.1 libGLESv2.so.2.0
--        $(INSTALL_DATA) $^ $(libdir)
-+	$(INSTALL_DATA) $^ $(libdir)
- 
--        $(RM) $(libdir)libEGL.so.1 $(libdir)libEGL.so
--        $(LN) libEGL.so.1.4 $(libdir)libEGL.so.1
--        $(LN) libEGL.so.1 $(libdir)libEGL.so
-+	$(RM) $(libdir)libEGL.so.1 $(libdir)libEGL.so
-+	$(LN) libEGL.so.1.4 $(libdir)libEGL.so.1
-+	$(LN) libEGL.so.1 $(libdir)libEGL.so
- 
--        $(RM) $(libdir)libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
--        $(LN) libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1
--        $(LN) libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-+	$(RM) $(libdir)libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
-+	$(LN) libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1
-+	$(LN) libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
- 
--        $(RM) $(libdir)libGLESv2.so.2 $(libdir)libGLESv2.so
--        $(LN) libGLESv2.so.2.0 $(libdir)libGLESv2.so.2
--        $(LN) libGLESv2.so.2 $(libdir)libGLESv2.so
-+	$(RM) $(libdir)libGLESv2.so.2 $(libdir)libGLESv2.so
-+	$(LN) libGLESv2.so.2.0 $(libdir)libGLESv2.so.2
-+	$(LN) libGLESv2.so.2 $(libdir)libGLESv2.so
diff --git a/srcpkgs/sunxi-mali/template b/srcpkgs/sunxi-mali/template
index 42b20a453a8..a3a234a132a 100644
--- a/srcpkgs/sunxi-mali/template
+++ b/srcpkgs/sunxi-mali/template
@@ -1,34 +1,43 @@
 # Template file for 'sunxi-mali'
 pkgname=sunxi-mali
 version=20181122
-revision=1
+revision=2
+_commit=d343311efc8db166d8371b28494f0f27b6a58724
+_lib_commit=1c5063f43cdc9de341c0d63b2e3921cab86c7742
+archs="armv7l"
+create_wrksrc=yes
+build_wrksrc=${pkgname}-${_commit}
 build_style=gnu-makefile
-hostmakedepends="git pkg-config perl"
+hostmakedepends="pkg-config perl"
 makedepends="libXfixes-devel libump-git-devel libdri2-devel-git libdrm-devel"
 short_desc="Linux sunxi MALI userpace propietary libraries"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/linux-sunxi/sunxi-mali"
-nostrip=yes
-archs="armv7l"
+distfiles="${homepage}/archive/${_commit}.tar.gz
+ https://github.com/linux-sunxi/sunxi-mali-proprietary/archive/${_lib_commit}.tar.gz"
+checksum="5ae27be532928667aa820a0aa9813dde545c224294b9402b27b6ca68f4d69ee4
+ f87d93629072dd0306ffe1200425188129e5f7f97750126dff38464ea707f673"
 provides="libEGL-1.0_1 libGLES-1.0_1"
 replaces="libEGL>=0 libGLES>=0"
+repository=nonfree
+nostrip=yes
 
-do_fetch() {
-	git clone https://github.com/linux-sunxi/sunxi-mali.git ${wrksrc}
-	cd ${wrksrc}
-	git submodule init
-	git submodule update
+post_extract() {
+	cp -r sunxi-mali-proprietary-${_lib_commit}/* ${pkgname}-${_commit}/lib/mali/
 }
 
 do_build() {
 	VERSION=r3p0 ABI=armhf EGL_TYPE=x11 make config
 	make ${makejobs}
+
+	sed -n '1,22p' version/version.c > LICENSE
 }
 
 do_install() {
 	vmkdir usr/lib
 	make DESTDIR=${DESTDIR} install
+	vlicense LICENSE
 }
 
 sunxi-mali-devel_package() {