Subject: [alpine-aports] [PATCH] main/sdl2: Update to 2.0.6

From: Clayton Craft <[email-masked]>
Date: Tue, 26 Sep 2017 21:09:41 -0700

Update sdl2 to 2.0.6, and remove patch that is no longer needed
---
 main/sdl2/APKBUILD            |  8 +++-----
 main/sdl2/altivec-fixes.patch | 36 ------------------------------------
 2 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 main/sdl2/altivec-fixes.patch

diff --git a/main/sdl2/APKBUILD b/main/sdl2/APKBUILD
index e7f2b9820d..830b44e376 100644
--- a/main/sdl2/APKBUILD
+++ b/main/sdl2/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: August Klein <[email-masked]>
 # Maintainer: August Klein <[email-masked]>
 pkgname=sdl2
-pkgver=2.0.5
+pkgver=2.0.6
 pkgrel=0
 _pkgname=SDL2
 pkgdesc="A development library designed to provide low level access to audio, keyboard, mouse, joystick and graphics"
@@ -12,8 +12,7 @@ depends=""
 depends_dev="alsa-lib-dev libxcursor-dev libxrandr-dev libxrender-dev mesa-dev"
 makedepends="$depends_dev"
 subpackages="$pkgname-dev"
-source="https://www.libsdl.org/release/$_pkgname-$pkgver.tar.gz
-	altivec-fixes.patch"
+source="https://www.libsdl.org/release/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
@@ -38,5 +37,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-sha512sums="6401f5df08c08316c09bc6ac5b28345c5184bb25770baa5c94c0a582ae130ddf73bb736e44bb31f4e427c1ddbbeec4755a6a5f530b6b4c3d0f13ebc78ddc1750  SDL2-2.0.5.tar.gz
-aad37129e8d1259fcceea087794aa45f7d94a5b0b09275a72e20ae53809a587f8a59dba05c9bd763012e6471d6d9d87739e282bcbb7df4de5c66d06d9e23d8d3  altivec-fixes.patch"
+sha512sums="ad4dad5663834ee0ffbdca1b531d753449b260c9256df2c48da7261aacd9795d91eef1286525cf914f6b92ba5985de7798f041557574b5d978b8224f10041830  SDL2-2.0.6.tar.gz"
diff --git a/main/sdl2/altivec-fixes.patch b/main/sdl2/altivec-fixes.patch
deleted file mode 100644
index 7617e63367..0000000000
--- a/main/sdl2/altivec-fixes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- SDL2-2.0.5.orig/src/video/SDL_blit_N.c
-+++ SDL2-2.0.5/src/video/SDL_blit_N.c
-@@ -118,12 +118,6 @@
-         16, 8, 0, 24,
-         0, NULL
-     };
--    if (!srcfmt) {
--        srcfmt = &default_pixel_format;
--    }
--    if (!dstfmt) {
--        dstfmt = &default_pixel_format;
--    }
-     const vector unsigned char plus = VECUINT8_LITERAL(0x00, 0x00, 0x00, 0x00,
-                                                        0x04, 0x04, 0x04, 0x04,
-                                                        0x08, 0x08, 0x08, 0x08,
-@@ -132,10 +126,16 @@
-     vector unsigned char vswiz;
-     vector unsigned int srcvec;
- #define RESHIFT(X) (3 - ((X) >> 3))
--    Uint32 rmask = RESHIFT(srcfmt->Rshift) << (dstfmt->Rshift);
--    Uint32 gmask = RESHIFT(srcfmt->Gshift) << (dstfmt->Gshift);
--    Uint32 bmask = RESHIFT(srcfmt->Bshift) << (dstfmt->Bshift);
--    Uint32 amask;
-+    Uint32 rmask, gmask, bmask, amask;
-+    if (!srcfmt) {
-+        srcfmt = &default_pixel_format;
-+    }
-+    if (!dstfmt) {
-+        dstfmt = &default_pixel_format;
-+    }
-+    rmask = RESHIFT(srcfmt->Rshift) << (dstfmt->Rshift);
-+    gmask = RESHIFT(srcfmt->Gshift) << (dstfmt->Gshift);
-+    bmask = RESHIFT(srcfmt->Bshift) << (dstfmt->Bshift);
-     /* Use zero for alpha if either surface doesn't have alpha */
-     if (dstfmt->Amask) {
-         amask =
-- 
2.14.1

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---