From 4796acde8277a43854b8e044c1814875afe34ca5 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 5 Apr 2018 20:07:11 -0500
Subject: main/gsm: bump to 1.0.17, modernise, no tests, license

---
 main/gsm/APKBUILD           | 36 +++++++++++++-----------------------
 main/gsm/gsm-makefile.patch |  2 +-
 2 files changed, 14 insertions(+), 24 deletions(-)

(limited to 'main/gsm')

diff --git a/main/gsm/APKBUILD b/main/gsm/APKBUILD
index 9a63953355..f74b41a186 100644
--- a/main/gsm/APKBUILD
+++ b/main/gsm/APKBUILD
@@ -1,13 +1,14 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gsm
-pkgver=1.0.16
+pkgver=1.0.17
 pkgrel=0
 _soname=1.0.12
 pkgdesc="Shared libraries for GSM speech compressor"
 url="http://www.quut.com/gsm/"
 arch="all"
-license="MIT"
+options="!check"  # No test data included in this release.
+license="custom:TU-Berlin-2.0"
 depends=
 depends_dev=
 makedepends="$depends_dev"
@@ -18,25 +19,15 @@ source="http://www.quut.com/gsm/gsm-$pkgver.tar.gz
 	gsm-makefile.patch
 	"
 
-_builddir="$srcdir"/gsm-${pkgver%.*}-pl${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"/gsm-${pkgver%.*}-pl${pkgver##*.}
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	export RPM_OPT_FLAGS="$CFLAGS -fPIC"
-	make all || return 1
+	make all
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	mkdir -p "$pkgdir"/usr/bin \
 		"$pkgdir"/usr/include/gsm \
 		"$pkgdir"/usr/lib \
@@ -46,11 +37,10 @@ package() {
 	make install \
 		INSTALL_ROOT="$pkgdir"/usr \
 		GSM_INSTALL_INC="$pkgdir"/usr/include/gsm \
-		GSM_INSTALL_LIB="$pkgdir"/usr/lib \
-		|| return 1
-	cp -p lib/libgsm.so.$_soname "$pkgdir"/usr/lib/ || return 1
-	ln -s libgsm.so.$_soname "$pkgdir"/usr/lib/libgsm.so.1 || return 1
-	ln -s libgsm.so.$_soname "$pkgdir"/usr/lib/libgsm.so || return 1
+		GSM_INSTALL_LIB="$pkgdir"/usr/lib
+	cp -p lib/libgsm.so.$_soname "$pkgdir"/usr/lib/
+	ln -s libgsm.so.$_soname "$pkgdir"/usr/lib/libgsm.so.1
+	ln -s libgsm.so.$_soname "$pkgdir"/usr/lib/libgsm.so
 
 	ln -s gsm/gsm.h "$pkgdir"/usr/include/
 	rm -f "$pkgdir"/usr/lib/lib*.a
@@ -62,6 +52,6 @@ tools() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
 }
 
-sha512sums="dfcadca2ff062294deed23859f73f704fc28e2f30f5544f44befd445cb031308673f4885ba9b65c6a4e304bf12398c3458ee2b2f476e998fa4f8ea7728c9589b  gsm-1.0.16.tar.gz
+sha512sums="983b442a1ee3f8bce0523f671071823598c4edb222f8d3de1ad7997c85cbeb7bc49ee87130e12f0f815266a29ad2ef58e59672e81bf41cdadc292baf66942026  gsm-1.0.17.tar.gz
 5b01f6d2fd3ee7cd859da70870463e2ccc6614c5fb1bd5efc88a223a0c5477271221557fef13ba46697e70cc5820c13efff738413f8990d5884b95cc89c30152  gsm-64bit.patch
-8a9b32ca6bf049e92840ac4ada40b6963fac7ffec23f4764f353795d29d58e1be28e83a927fa0919b95da42f97f603fe82764e999aaed566f88b4031a12877ca  gsm-makefile.patch"
+1d92b7eacf52e5281c9f1a0f08313d10f15c35d22fb2292e5a885ceb3cb766557a5e3a08954db75fb13db59345ef9f6b08939881ba38c9d384e09a1c96b47bc5  gsm-makefile.patch"
diff --git a/main/gsm/gsm-makefile.patch b/main/gsm/gsm-makefile.patch
index cf3e99bc9c..b11e1506d5 100644
--- a/main/gsm/gsm-makefile.patch
+++ b/main/gsm/gsm-makefile.patch
@@ -15,7 +15,7 @@
  # CCFLAGS 	= -c -O
  
  CC		= gcc -ansi -pedantic
--CCFLAGS 	= -c -O2 -DNeedFunctionPrototypes=1
+-CCFLAGS 	= -c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment
 +CCFLAGS 	= -c $(RPM_OPT_FLAGS) -D_REENTRANT -DNeedFunctionPrototypes=1
  
  LD 		= $(CC)
-- 
cgit v1.2.3