libraries/gsm: Updated for version 1.0.19. New maintainer.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 28 insertions, 19 deletions

diff --git a/libraries/gsm/gsm.SlackBuild b/libraries/gsm/gsm.SlackBuild
index 554b57b65a931..5ab252f713b3e 100644
--- a/libraries/gsm/gsm.SlackBuild
+++ b/libraries/gsm/gsm.SlackBuild
@@ -26,12 +26,16 @@
 # - add -j1 to the 'make install' command. without this, the tcat
 #   binary wasn't getting installed.
 # - i486 => i586.
+# 20220619 tim dickson: updated to 1.0.19. source url and homepage updated, and take over maintainership..
+# patched patch, removed rm error messages and fixed script as
+# version labling in source is modified. 
+#note to self: update patching to sed or similar for next release.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gsm
-VERSION=${VERSION:-1.0.13}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.0.19}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -72,8 +76,10 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+ALTVER=`echo $VERSION|awk -F"." '{print $1 "." $2 "-pl" $3 }'`
+rm -rf $PRGNAM-$ALTVER
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$ALTVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -81,10 +87,13 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
-# Patches ripped off from gentoo...
-patch -p1 < $CWD/patches/gsm-1.0.13-shared.patch
+# Patches ripped off from gentoo... (one is post updated by me)
+patch -p1 < $CWD/patches/gsm-1.0.19-shared.patch
 patch -p1 < $CWD/patches/gsm-1.0.12-memcpy.patch
 patch -p1 < $CWD/patches/gsm-1.0.12-64bit.patch
+#patch makefile to remove rm error messages
+sed -i '/^RMFLAGS/ c\RMFLAGS		= -f' Makefile
+sed -i 's/-rm \$\@/-rm \$\(RMFLAGS\) \$\@/g' Makefile
 
 mkdir -p $PKG/usr/bin
 mkdir -p $PKG/usr/lib$LIBDIRSUFFIX
diff --git a/libraries/gsm/gsm.info b/libraries/gsm/gsm.info
index 1a26744e6a13e..6f3ec7f34256b 100644
--- a/libraries/gsm/gsm.info
+++ b/libraries/gsm/gsm.info
@@ -1,10 +1,10 @@
 PRGNAM="gsm"
-VERSION="1.0.13"
+VERSION="1.0.19"
 HOMEPAGE="http://www.quut.com/gsm/"
-DOWNLOAD="http://www.imagemagick.org/download/delegates/ffmpeg/gsm-1.0.13.tar.bz2"
-MD5SUM="9a01ad263f8c7646c32c39cb4b8024c1"
+DOWNLOAD="http://www.quut.com/gsm/gsm-1.0.19.tar.gz"
+MD5SUM="36cca922928d68fa5fa53996c62f5854"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Somero"
-EMAIL="dsomero@hotmail.com"
+MAINTAINER="Tim Dickson"
+EMAIL="dickson.tim@googlemail.com"
diff --git a/libraries/gsm/patches/gsm-1.0.13-shared.patch b/libraries/gsm/patches/gsm-1.0.19-shared.patch
index fc99e2c30437f..3a9141c698d3b 100644
--- a/libraries/gsm/patches/gsm-1.0.13-shared.patch
+++ b/libraries/gsm/patches/gsm-1.0.19-shared.patch
@@ -1,6 +1,6 @@
 diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
---- gsm-1.0-pl13.orig/Makefile	2006-04-26 22:14:26.000000000 +0300
-+++ gsm-1.0-pl13/Makefile	2009-09-08 14:50:02.000000000 +0300
+--- gsm-1.0-pl19.orig/Makefile	2006-04-26 22:14:26.000000000 +0300
++++ gsm-1.0-pl19/Makefile	2009-09-08 14:50:02.000000000 +0300
 @@ -96,7 +96,7 @@
  #  Other tools
  
@@ -9,7 +9,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
 +LN		= ln -s
  BASENAME 	= basename
  AR		= ar
- ARFLAGS		= cr
+ ARFLAGS	= cr
 @@ -140,6 +140,7 @@
  # Targets
  
@@ -109,9 +109,9 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
  
 -$(LIBGSM):	$(LIB) $(GSM_OBJECTS)
 +$(LIBGSMSO):	$(LIB) $(SHARED_GSM_OBJECTS)
-+		$(LD) $(LFLAGS) -o $@.1.0.13 -shared -Xlinker -soname -Xlinker libgsm.so.1 $(SHARED_GSM_OBJECTS) -lc
-+		ln -fs libgsm.so.1.0.13 lib/libgsm.so.1
-+		ln -fs libgsm.so.1.0.13 lib/libgsm.so
++		$(LD) $(LFLAGS) -o $@.1.0.19 -shared -Xlinker -soname -Xlinker libgsm.so.1 $(SHARED_GSM_OBJECTS) -lc
++		ln -fs libgsm.so.1.0.19 lib/libgsm.so.1
++		ln -fs libgsm.so.1.0.19 lib/libgsm.so
 +
 +$(LIBGSM):	$(LIB) $(STATIC_GSM_OBJECTS)
  		-rm $(RMFLAGS) $(LIBGSM)
@@ -143,7 +143,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
  clean:	semi-clean
  		-rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add		\
 -			$(TOAST) $(TCAT) $(UNTOAST)	\
-+			$(LIBGSMSO) $(LIB)/libgsm.so.1.0.13	\
++			$(LIBGSMSO) $(LIB)/libgsm.so.1.0.19	\
 +			$(LIB)libgsm.so.1			\
 +			$(TOAST) $(TCAT) $(UNTOAST)		\
  			$(ROOT)/gsm-1.0.tar.Z
diff --git a/libraries/gsm/slack-desc b/libraries/gsm/slack-desc
index 04fd15ad2d99f..c3764fa6fc07a 100644
--- a/libraries/gsm/slack-desc
+++ b/libraries/gsm/slack-desc
@@ -13,7 +13,7 @@ gsm: of the European GSM 06.10 provisional standard for full-rate speech
 gsm: transcoding, prI-ETS 300 036, which uses RPE/LTP (residual pulse
 gsm: excitation/long term prediction) coding at 13 kbit/s.
 gsm:
-gsm: Homepage: http://kbs.cs.tu-berlin.de/~jutta/toast.html
+gsm: Homepage: http://www.quut.com/gsm/
 gsm:
 gsm:
 gsm: