From 30d3a67bb2d19e19fbb0302f412f2a8390f8a8b2 Mon Sep 17 00:00:00 2001
From: Taner Tas <taner76@gmail.com>
Date: Sun, 2 Sep 2018 22:57:56 +0300
Subject: main/mesa: Upgrade to 18.1.7, some cosmetic changes

* Re-arrange depends_dev, makedepends, subpackages, sources
* Use https for url
---
 main/mesa/APKBUILD | 65 +++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 50 insertions(+), 15 deletions(-)

(limited to 'main/mesa')

diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index e668b1444a..6830128763 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -1,12 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mesa
-pkgver=18.1.4
-pkgrel=1
+pkgver=18.1.7
+pkgrel=0
 pkgdesc="Mesa DRI OpenGL library"
-url="http://www.mesa3d.org"
+url="https://www.mesa3d.org"
 arch="all"
 license="MIT SGI-B-2.0 BSL-1.0"
-subpackages="$pkgname-dev
+subpackages="
+	$pkgname-dev
 	$pkgname-dri-ati:_dri
 	$pkgname-dri-nouveau:_dri
 	$pkgname-dri-freedreno:_dri
@@ -17,13 +18,44 @@ subpackages="$pkgname-dev
 	$pkgname-vulkan-ati:_vulkan
 	"
 _llvmver=5
-depends_dev="libdrm-dev  libxext-dev libxdamage-dev libxcb-dev libxshmfence-dev"
-makedepends="$depends_dev xorgproto expat-dev  python3 libxt-dev makedepend
-	talloc-dev py3-libxml2 flex bison llvm$_llvmver-dev eudev-dev libvdpau-dev
-	libxvmc-dev gettext zlib-dev libelf-dev py-mako libva-dev
-	autoconf automake libtool libxxf86vm-dev libx11-dev libxfixes-dev
-	wayland-dev wayland-protocols"
-source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz
+depends_dev="
+	libdrm-dev
+	libxext-dev
+	libxdamage-dev
+	libxcb-dev
+	libxshmfence-dev
+	"
+makedepends="
+	$depends_dev
+	autoconf
+	automake
+	bison
+	eudev-dev
+	expat-dev
+	flex
+	gettext
+	libelf-dev
+	libtool
+	libxfixes-dev
+	libva-dev
+	libvdpau-dev
+	libx11-dev
+	libxxf86vm-dev
+	libxt-dev
+	libxvmc-dev
+	llvm$_llvmver-dev
+	makedepend
+	py-mako
+	py3-libxml2
+	python3
+	talloc-dev
+	wayland-dev
+	wayland-protocols
+	xorgproto
+	zlib-dev
+	"
+source="
+	https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz
 	glx_ro_text_segm.patch
 	musl-fix-includes.patch
 	drmdeps.patch
@@ -34,7 +66,6 @@ _dri_driverdir=/usr/lib/xorg/modules/dri
 _dri_drivers="r200,radeon,nouveau,swrast"
 _gallium_drivers="r300,r600,radeonsi,nouveau,freedreno,swrast,virgl"
 _vulkan_drivers="radeon"
-
 _arch_opts=
 
 case "$CARCH" in
@@ -42,10 +73,14 @@ x86*)
 	_dri_drivers="${_dri_drivers},i915,i965"
 	_gallium_drivers="${_gallium_drivers},svga"
 	_vulkan_drivers="$_vulkan_drivers,intel"
-	subpackages="$subpackages $pkgname-dri-intel:_dri $pkgname-dri-vmwgfx:_dri $pkgname-vulkan-intel:_vulkan"
+	subpackages="$subpackages \
+			$pkgname-dri-intel:_dri \
+			$pkgname-dri-vmwgfx:_dri \
+			$pkgname-vulkan-intel:_vulkan"
 	_arch_opts="--enable-dri3"
 	case "$CARCH" in
-	x86) _arch_opts="$_arch_opts --enable-glx-rts --disable-asm";;
+	x86)
+		_arch_opts="$_arch_opts --enable-glx-rts --disable-asm";;
 	esac
 	;;
 armhf|aarch64)
@@ -261,7 +296,7 @@ _vulkan() {
 		_mv_vulkan intel ;;
 	esac
 }
-sha512sums="04b8e5bbfa640f2303c388ab701fc2aca7f6d5d127ca5a9f9409975556813ba8e94305d27c9cea236a0e6d44a38b97e2877509268a96d9ed2a6762ab385aa3dc  mesa-18.1.4.tar.xz
+sha512sums="697c4f441ae52bc867d9d73b103094a29102168c248a502c4ea0fc48f51bcb86b2e741da39e882f24131326d460cdb1416415604c6994d1b8c09fb8a153a5c77  mesa-18.1.7.tar.xz
 8a434ffefdc6ce924d613727a8649b9a77ad9f0ed0674c9cfb8f6ff0fec483f9318e681254535b62c957db1d0432f96427f917e2f139f4c65ef761bffb528255  glx_ro_text_segm.patch
 2c9cb0fa890d29e4140d956ee52a74b4522e29e44fadfc2dd144e581c2701a1d8842ab5c8ff0b68e14b2242e2812a9d4ac0aed1c3314a2143333bc37f2323b58  musl-fix-includes.patch
 3409483217dbec732286e628e268e1e8cd392b7e8efb13c7651b38e6563aa5a4988279efb029096dcd092ebe7a92eece103014ed420d2b242eab8d0237f056fd  drmdeps.patch"
-- 
cgit v1.2.3