From 78a3bf184c2fee330b01814bdb76b7b394c0eafa Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 3 Jan 2020 17:36:07 +0000
Subject: user/*: Modernise / fix syntax / deps

---
 user/gavl/APKBUILD      | 5 ++---
 user/gsm/APKBUILD       | 2 --
 user/libao/APKBUILD     | 4 +---
 user/opusfile/APKBUILD  | 4 ----
 user/rttr/APKBUILD      | 4 ++--
 user/sdl_image/APKBUILD | 5 +----
 user/sox/APKBUILD       | 3 ---
 7 files changed, 6 insertions(+), 21 deletions(-)

(limited to 'user')

diff --git a/user/gavl/APKBUILD b/user/gavl/APKBUILD
index bc81e1a5b..8e97e7407 100644
--- a/user/gavl/APKBUILD
+++ b/user/gavl/APKBUILD
@@ -12,7 +12,8 @@ depends=""
 makedepends="doxygen"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://downloads.sourceforge.net/sourceforge/gmerlin/gavl-$pkgver.tar.gz
-	musl-sched_h.patch"
+	musl-sched_h.patch
+	"
 
 prepare() {
 	default_prepare
@@ -20,7 +21,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,7 +32,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/gsm/APKBUILD b/user/gsm/APKBUILD
index 17ff21e6f..493eac0a3 100644
--- a/user/gsm/APKBUILD
+++ b/user/gsm/APKBUILD
@@ -19,13 +19,11 @@ source="http://www.quut.com/gsm/gsm-$pkgver.tar.gz
 builddir="$srcdir"/gsm-${pkgver%.*}-pl${pkgver##*.}
 
 build() {
-	cd "$builddir"
 	export RPM_OPT_FLAGS="$CFLAGS -fPIC"
 	make all
 }
 
 package() {
-	cd "$builddir"
 	mkdir -p "$pkgdir"/usr/bin \
 		"$pkgdir"/usr/include/gsm \
 		"$pkgdir"/usr/lib \
diff --git a/user/libao/APKBUILD b/user/libao/APKBUILD
index 425116964..581b5c148 100644
--- a/user/libao/APKBUILD
+++ b/user/libao/APKBUILD
@@ -8,12 +8,11 @@ arch="all"
 options="!check"  # No test suite.
 license="GPL-2.0+"
 depends=""
-makedepends="alsa-lib-dev autoconf automake pulseaudio-dev"
+makedepends="alsa-lib-dev autoconf automake libtool pulseaudio-dev"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-pulse"
 source="$pkgname-$pkgver.tar.gz::https://github.com/xiph/libao/archive/$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./autogen.sh
 	./configure \
 		--build=$CBUILD \
@@ -25,7 +24,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/opusfile/APKBUILD b/user/opusfile/APKBUILD
index fa68d8249..c0208b12d 100644
--- a/user/opusfile/APKBUILD
+++ b/user/opusfile/APKBUILD
@@ -12,8 +12,6 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="https://downloads.xiph.org/releases/opus/$pkgname-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,12 +26,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/rttr/APKBUILD b/user/rttr/APKBUILD
index bb9b5e7b0..58d0bb293 100644
--- a/user/rttr/APKBUILD
+++ b/user/rttr/APKBUILD
@@ -8,7 +8,7 @@ url=" "
 arch="all"
 license="MIT"
 depends=""
-makedepends="doxygen graphviz"
+makedepends="cmake doxygen graphviz"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://github.com/rttrorg/rttr/releases/download/v$pkgver/rttr-$pkgver-src.tar.gz
 	arm64.patch
@@ -27,7 +27,7 @@ build() {
 		-DBUILD_SHARED_LIBS=True \
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-error=class-memaccess -DNDEBUG" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
diff --git a/user/sdl_image/APKBUILD b/user/sdl_image/APKBUILD
index 16f3d6551..05612a04d 100644
--- a/user/sdl_image/APKBUILD
+++ b/user/sdl_image/APKBUILD
@@ -15,13 +15,11 @@ source="https://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.ta
 builddir="$srcdir"/SDL_image-$pkgver
 
 prepare() {
-	cd "$builddir"
-	update_config_sub
 	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -33,7 +31,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/sox/APKBUILD b/user/sox/APKBUILD
index efcdeba1e..31a5d4b1e 100644
--- a/user/sox/APKBUILD
+++ b/user/sox/APKBUILD
@@ -20,13 +20,11 @@ source="https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.
 	"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	autoreconf -vif
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -38,7 +36,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	ln -sf play "$pkgdir"/usr/bin/rec
 	ln -sf ../man1/sox.1.gz "$pkgdir"/usr/share/man/man7/soxeffect.7
-- 
cgit v1.2.3-60-g2f50