Subject: [alpine-aports] [PATCH] main/glfw: claim maintainership

From: Daniel Sabogal <[email-masked]>
Date: Tue, 8 Nov 2016 12:54:31 -0500

---
 main/glfw/APKBUILD | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/main/glfw/APKBUILD b/main/glfw/APKBUILD
index e6856d3..0fded92 100644
--- a/main/glfw/APKBUILD
+++ b/main/glfw/APKBUILD
@@ -1,8 +1,7 @@
-# Contributor: Daniel Sabogal <[email-masked]>
-# Maintainer:
+# Maintainer: Daniel Sabogal <[email-masked]>
 pkgname=glfw
 pkgver=3.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Multi-platform library for OpenGL and Vulkan application development"
 url="http://www.glfw.org/"
 arch="all"
-- 
2.10.2

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

---

From: Daniel Sabogal <[email-masked]>
Date: Tue, 8 Nov 2016 12:54:32 -0500

---
(with approval from previous maintainer)

 main/mupdf/APKBUILD | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/main/mupdf/APKBUILD b/main/mupdf/APKBUILD
index 725d305..a7dc678 100644
--- a/main/mupdf/APKBUILD
+++ b/main/mupdf/APKBUILD
@@ -1,8 +1,9 @@
 # Contributor: Sören Tempel <[email-masked]>
-# Maintainer: Michael Zhou <[email-masked]>
+# Contributor: Michael Zhou <[email-masked]>
+# Maintainer: Daniel Sabogal <[email-masked]>
 pkgname=mupdf
 pkgver=1.9a
-pkgrel=7
+pkgrel=8
 pkgdesc="A lightweight PDF and XPS viewer"
 url="http://mupdf.com"
 arch="all"
@@ -33,7 +34,7 @@ prepare() {
 }
 
 build() {
-	make HAVE_GLFW=yes SYS_GLFW_LIBS="-lglfw -lGL" \
+	make HAVE_GLFW=yes SYS_GLFW_LIBS="$(pkgconf --libs glfw3 gl)" \
 		prefix=/usr -C "$builddir" || return 1
 }
 
@@ -48,7 +49,8 @@ package() {
 
 _x11() {
 	pkgdesc="A lightweight PDF and XPS viewer with X11 backend"
-	depends="mupdf"
+	depends=""
+
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/mupdf-x11 \
 		"$subpkgdir"/usr/bin/ || return 1
@@ -57,7 +59,8 @@ _x11() {
 
 _gl() {
 	pkgdesc="A lightweight PDF and XPS viewer with OpenGL backend"
-	depends="mupdf"
+	depends=""
+
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/mupdf-gl \
 		"$subpkgdir"/usr/bin/ || return 1
@@ -65,7 +68,8 @@ _gl() {
 
 _tools() {
 	pkgdesc="Tools for a lightweight PDF and XPS viewer"
-	depends="mupdf"
+	depends=""
+
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/mutool \
 		"$pkgdir"/usr/bin/mujstest \
-- 
2.10.2

---

---

From: Daniel Sabogal <[email-masked]>
Date: Tue, 8 Nov 2016 12:54:33 -0500

---
 main/sdl2/APKBUILD | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/main/sdl2/APKBUILD b/main/sdl2/APKBUILD
index e76621b..65ed635 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.4
+pkgver=2.0.5
 pkgrel=0
 _pkgname=SDL2
 pkgdesc="A development library designed to provide low level access to audio, keyboard, mouse, joystick and graphics"
@@ -11,42 +11,32 @@ license="zlib"
 depends=""
 depends_dev="alsa-lib-dev libxcursor-dev libxrandr-dev libxrender-dev mesa-dev"
 makedepends="$depends_dev"
-install=""
 subpackages="$pkgname-dev"
 source="https://www.libsdl.org/release/$_pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir"/$_pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--enable-alsa \
+		--enable-clock_gettime \
 		--disable-arts \
 		--disable-esd \
 		--disable-nas \
-		--with-x \
 		--disable-rpath \
+		--with-x \
 		|| return 1
 	make || return 1
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="44fc4a023349933e7f5d7a582f7b886e  SDL2-2.0.4.tar.gz"
-sha256sums="da55e540bf6331824153805d58b590a29c39d2d506c6d02fa409aedeab21174b  SDL2-2.0.4.tar.gz"
-sha512sums="dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6  SDL2-2.0.4.tar.gz"
+md5sums="d4055424d556b4a908aa76fad63abd3c  SDL2-2.0.5.tar.gz"
+sha256sums="442038cf55965969f2ff06d976031813de643af9c9edc9e331bd761c242e8785  SDL2-2.0.5.tar.gz"
+sha512sums="6401f5df08c08316c09bc6ac5b28345c5184bb25770baa5c94c0a582ae130ddf73bb736e44bb31f4e427c1ddbbeec4755a6a5f530b6b4c3d0f13ebc78ddc1750  SDL2-2.0.5.tar.gz"
-- 
2.10.2

---

---

From: Daniel Sabogal <[email-masked]>
Date: Tue, 8 Nov 2016 12:54:34 -0500

---
 main/sdl2_image/APKBUILD | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/main/sdl2_image/APKBUILD b/main/sdl2_image/APKBUILD
index 717887c..713b8dc 100644
--- a/main/sdl2_image/APKBUILD
+++ b/main/sdl2_image/APKBUILD
@@ -2,30 +2,21 @@
 # Maintainer: Francesco Colista <[email-masked]>
 pkgname=sdl2_image
 pkgver=2.0.1
-pkgrel=0
+pkgrel=1
+_pkgname=SDL2_image
 pkgdesc="A simple library to load images of various formats as SDL surfaces"
 url="http://www.libsdl.org/projects/SDL_image/"
 arch="all"
-license="LGPL2+"
+license="zlib"
 depends=""
 makedepends="sdl2-dev libpng-dev libjpeg-turbo-dev 
-			libwebp-dev tiff-dev zlib-dev"
+	libwebp-dev tiff-dev zlib-dev"
 subpackages="$pkgname-dev"
-source="http://www.libsdl.org/projects/SDL_image/release/SDL2_image-${pkgver}.tar.gz"
-
-_builddir="$srcdir"/SDL2_image-$pkgver
-prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+source="http://www.libsdl.org/projects/SDL_image/release/$_pkgname-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -38,7 +29,7 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 
-- 
2.10.2

---

---

From: Daniel Sabogal <[email-masked]>
Date: Tue, 8 Nov 2016 12:54:35 -0500

---
 main/sdl2_mixer/APKBUILD | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/main/sdl2_mixer/APKBUILD b/main/sdl2_mixer/APKBUILD
index fcd9ca0..f2ed0d8 100644
--- a/main/sdl2_mixer/APKBUILD
+++ b/main/sdl2_mixer/APKBUILD
@@ -2,22 +2,23 @@
 # Maintainer: Francesco Colista <[email-masked]>
 pkgname=sdl2_mixer
 pkgver=2.0.1
-pkgrel=1
+pkgrel=2
+_pkgname=SDL2_mixer
 pkgdesc="A simple multi-channel audio mixer"
 url="http://www.libsdl.org/projects/SDL_mixer/"
 arch="all"
-license="GPL"
-depends=
+license="zlib"
+depends=""
 makedepends="sdl2-dev libvorbis-dev libmikmod-dev 
-			libmodplug-dev flac-dev linux-headers"
+	libmodplug-dev flac-dev linux-headers"
 subpackages="$pkgname-dev"
-source="http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${pkgver}.tar.gz"
-
-_builddir="$srcdir"/SDL2_mixer-$pkgver
+source="http://www.libsdl.org/projects/SDL_mixer/release/$_pkgname-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-$pkgver"
 
 prepare() {
-	cd "$_builddir"
+	cd "$builddir"
 	update_config_sub || return 1
+
 	sed -e "/CONFIG_FILE_ETC/s/\/etc\/timidity.cfg/\/etc\/timidity++\/timidity.cfg/" \
 		-e "/DEFAULT_PATH/s/\/etc\/timidity/\/etc\/timidity++/" \
 		-e "/DEFAULT_PATH2/s/\/usr\/local\/lib\/timidity/\/usr\/lib\/timidity/" \
@@ -25,7 +26,7 @@ prepare() {
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -39,7 +40,7 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 
-- 
2.10.2

---

---

From: Daniel Sabogal <[email-masked]>
Date: Tue, 8 Nov 2016 12:54:36 -0500

---
 {testing => main}/sdl2_ttf/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => main}/sdl2_ttf/APKBUILD (100%)

diff --git a/testing/sdl2_ttf/APKBUILD b/main/sdl2_ttf/APKBUILD
similarity index 100%
rename from testing/sdl2_ttf/APKBUILD
rename to main/sdl2_ttf/APKBUILD
-- 
2.10.2

---