From 9dc27da3897465da743ae31f615b19f8b9536371 Mon Sep 17 00:00:00 2001 From: Tim Dickson Date: Fri, 8 Jul 2022 06:50:53 +0100 Subject: libraries/gsm: Updated for version 1.0.19. New maintainer. Signed-off-by: Dave Woodfall Signed-off-by: Willy Sudiarto Raharjo --- libraries/gsm/gsm.SlackBuild | 21 +++- libraries/gsm/gsm.info | 10 +- libraries/gsm/patches/gsm-1.0.13-shared.patch | 151 -------------------------- libraries/gsm/patches/gsm-1.0.19-shared.patch | 151 ++++++++++++++++++++++++++ libraries/gsm/slack-desc | 2 +- 5 files changed, 172 insertions(+), 163 deletions(-) delete mode 100644 libraries/gsm/patches/gsm-1.0.13-shared.patch create mode 100644 libraries/gsm/patches/gsm-1.0.19-shared.patch (limited to 'libraries/gsm') diff --git a/libraries/gsm/gsm.SlackBuild b/libraries/gsm/gsm.SlackBuild index 554b57b65a..5ab252f713 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 1a26744e6a..6f3ec7f342 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.13-shared.patch deleted file mode 100644 index fc99e2c304..0000000000 --- a/libraries/gsm/patches/gsm-1.0.13-shared.patch +++ /dev/null @@ -1,151 +0,0 @@ -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 -@@ -96,7 +96,7 @@ - # Other tools - - SHELL = /bin/sh --LN = ln -+LN = ln -s - BASENAME = basename - AR = ar - ARFLAGS = cr -@@ -140,6 +140,7 @@ - # Targets - - LIBGSM = $(LIB)/libgsm.a -+LIBGSMSO= $(LIB)/libgsm.so - - TOAST = $(BIN)/toast - UNTOAST = $(BIN)/untoast -@@ -203,24 +204,43 @@ - - # Object files - --GSM_OBJECTS = $(SRC)/add.o \ -- $(SRC)/code.o \ -- $(SRC)/debug.o \ -- $(SRC)/decode.o \ -- $(SRC)/long_term.o \ -- $(SRC)/lpc.o \ -- $(SRC)/preprocess.o \ -- $(SRC)/rpe.o \ -- $(SRC)/gsm_destroy.o \ -- $(SRC)/gsm_decode.o \ -- $(SRC)/gsm_encode.o \ -- $(SRC)/gsm_explode.o \ -- $(SRC)/gsm_implode.o \ -- $(SRC)/gsm_create.o \ -- $(SRC)/gsm_print.o \ -- $(SRC)/gsm_option.o \ -- $(SRC)/short_term.o \ -- $(SRC)/table.o -+STATIC_GSM_OBJECTS = $(SRC)/add.o \ -+ $(SRC)/code.o \ -+ $(SRC)/debug.o \ -+ $(SRC)/decode.o \ -+ $(SRC)/long_term.o \ -+ $(SRC)/lpc.o \ -+ $(SRC)/preprocess.o \ -+ $(SRC)/rpe.o \ -+ $(SRC)/gsm_destroy.o \ -+ $(SRC)/gsm_decode.o \ -+ $(SRC)/gsm_encode.o \ -+ $(SRC)/gsm_explode.o \ -+ $(SRC)/gsm_implode.o \ -+ $(SRC)/gsm_create.o \ -+ $(SRC)/gsm_print.o \ -+ $(SRC)/gsm_option.o \ -+ $(SRC)/short_term.o \ -+ $(SRC)/table.o -+ -+SHARED_GSM_OBJECTS = $(SRC)/add.lo \ -+ $(SRC)/code.lo \ -+ $(SRC)/debug.lo \ -+ $(SRC)/decode.lo \ -+ $(SRC)/long_term.lo \ -+ $(SRC)/lpc.lo \ -+ $(SRC)/preprocess.lo \ -+ $(SRC)/rpe.lo \ -+ $(SRC)/gsm_destroy.lo \ -+ $(SRC)/gsm_decode.lo \ -+ $(SRC)/gsm_encode.lo \ -+ $(SRC)/gsm_explode.lo \ -+ $(SRC)/gsm_implode.lo \ -+ $(SRC)/gsm_create.lo \ -+ $(SRC)/gsm_print.lo \ -+ $(SRC)/gsm_option.lo \ -+ $(SRC)/short_term.lo \ -+ $(SRC)/table.lo - - TOAST_OBJECTS = $(SRC)/toast.o \ - $(SRC)/toast_lin.o \ -@@ -228,7 +248,7 @@ - $(SRC)/toast_alaw.o \ - $(SRC)/toast_audio.o - --OBJECTS = $(GSM_OBJECTS) $(TOAST_OBJECTS) -+OBJECTS = $(STATIC_GSM_OBJECTS) $(SHARED_GSM_OBJECTS) $(TOAST_OBJECTS) - - # Manuals - -@@ -277,9 +297,12 @@ - $(CC) $(CFLAGS) $? - @-mv `$(BASENAME) $@` $@ > /dev/null 2>&1 - -+%.lo: %.c -+ $(CC) $(CFLAGS) -fPIC -c $< -o $@ -+ - # Target rules - --all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST) -+all: $(LIBGSM) $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST) - @-echo $(ROOT): Done. - - tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result -@@ -299,24 +322,29 @@ - - # The basic API: libgsm - --$(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 -+ -+$(LIBGSM): $(LIB) $(STATIC_GSM_OBJECTS) - -rm $(RMFLAGS) $(LIBGSM) -- $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) -+ $(AR) $(ARFLAGS) $(LIBGSM) $(STATIC_GSM_OBJECTS) - $(RANLIB) $(LIBGSM) - - - # Toast, Untoast and Tcat -- the compress-like frontends to gsm. - - $(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) -- $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB) -+ $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB) - - $(UNTOAST): $(BIN) $(TOAST) - -rm $(RMFLAGS) $(UNTOAST) -- $(LN) $(TOAST) $(UNTOAST) -+ $(LN) toast $(UNTOAST) - - $(TCAT): $(BIN) $(TOAST) - -rm $(RMFLAGS) $(TCAT) -- $(LN) $(TOAST) $(TCAT) -+ $(LN) toast $(TCAT) - - - # The local bin and lib directories -@@ -426,7 +454,9 @@ - - clean: semi-clean - -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \ -- $(TOAST) $(TCAT) $(UNTOAST) \ -+ $(LIBGSMSO) $(LIB)/libgsm.so.1.0.13 \ -+ $(LIB)libgsm.so.1 \ -+ $(TOAST) $(TCAT) $(UNTOAST) \ - $(ROOT)/gsm-1.0.tar.Z - - diff --git a/libraries/gsm/patches/gsm-1.0.19-shared.patch b/libraries/gsm/patches/gsm-1.0.19-shared.patch new file mode 100644 index 0000000000..3a9141c698 --- /dev/null +++ b/libraries/gsm/patches/gsm-1.0.19-shared.patch @@ -0,0 +1,151 @@ +diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile +--- 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 + + SHELL = /bin/sh +-LN = ln ++LN = ln -s + BASENAME = basename + AR = ar + ARFLAGS = cr +@@ -140,6 +140,7 @@ + # Targets + + LIBGSM = $(LIB)/libgsm.a ++LIBGSMSO= $(LIB)/libgsm.so + + TOAST = $(BIN)/toast + UNTOAST = $(BIN)/untoast +@@ -203,24 +204,43 @@ + + # Object files + +-GSM_OBJECTS = $(SRC)/add.o \ +- $(SRC)/code.o \ +- $(SRC)/debug.o \ +- $(SRC)/decode.o \ +- $(SRC)/long_term.o \ +- $(SRC)/lpc.o \ +- $(SRC)/preprocess.o \ +- $(SRC)/rpe.o \ +- $(SRC)/gsm_destroy.o \ +- $(SRC)/gsm_decode.o \ +- $(SRC)/gsm_encode.o \ +- $(SRC)/gsm_explode.o \ +- $(SRC)/gsm_implode.o \ +- $(SRC)/gsm_create.o \ +- $(SRC)/gsm_print.o \ +- $(SRC)/gsm_option.o \ +- $(SRC)/short_term.o \ +- $(SRC)/table.o ++STATIC_GSM_OBJECTS = $(SRC)/add.o \ ++ $(SRC)/code.o \ ++ $(SRC)/debug.o \ ++ $(SRC)/decode.o \ ++ $(SRC)/long_term.o \ ++ $(SRC)/lpc.o \ ++ $(SRC)/preprocess.o \ ++ $(SRC)/rpe.o \ ++ $(SRC)/gsm_destroy.o \ ++ $(SRC)/gsm_decode.o \ ++ $(SRC)/gsm_encode.o \ ++ $(SRC)/gsm_explode.o \ ++ $(SRC)/gsm_implode.o \ ++ $(SRC)/gsm_create.o \ ++ $(SRC)/gsm_print.o \ ++ $(SRC)/gsm_option.o \ ++ $(SRC)/short_term.o \ ++ $(SRC)/table.o ++ ++SHARED_GSM_OBJECTS = $(SRC)/add.lo \ ++ $(SRC)/code.lo \ ++ $(SRC)/debug.lo \ ++ $(SRC)/decode.lo \ ++ $(SRC)/long_term.lo \ ++ $(SRC)/lpc.lo \ ++ $(SRC)/preprocess.lo \ ++ $(SRC)/rpe.lo \ ++ $(SRC)/gsm_destroy.lo \ ++ $(SRC)/gsm_decode.lo \ ++ $(SRC)/gsm_encode.lo \ ++ $(SRC)/gsm_explode.lo \ ++ $(SRC)/gsm_implode.lo \ ++ $(SRC)/gsm_create.lo \ ++ $(SRC)/gsm_print.lo \ ++ $(SRC)/gsm_option.lo \ ++ $(SRC)/short_term.lo \ ++ $(SRC)/table.lo + + TOAST_OBJECTS = $(SRC)/toast.o \ + $(SRC)/toast_lin.o \ +@@ -228,7 +248,7 @@ + $(SRC)/toast_alaw.o \ + $(SRC)/toast_audio.o + +-OBJECTS = $(GSM_OBJECTS) $(TOAST_OBJECTS) ++OBJECTS = $(STATIC_GSM_OBJECTS) $(SHARED_GSM_OBJECTS) $(TOAST_OBJECTS) + + # Manuals + +@@ -277,9 +297,12 @@ + $(CC) $(CFLAGS) $? + @-mv `$(BASENAME) $@` $@ > /dev/null 2>&1 + ++%.lo: %.c ++ $(CC) $(CFLAGS) -fPIC -c $< -o $@ ++ + # Target rules + +-all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST) ++all: $(LIBGSM) $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST) + @-echo $(ROOT): Done. + + tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result +@@ -299,24 +322,29 @@ + + # The basic API: libgsm + +-$(LIBGSM): $(LIB) $(GSM_OBJECTS) ++$(LIBGSMSO): $(LIB) $(SHARED_GSM_OBJECTS) ++ $(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) +- $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) ++ $(AR) $(ARFLAGS) $(LIBGSM) $(STATIC_GSM_OBJECTS) + $(RANLIB) $(LIBGSM) + + + # Toast, Untoast and Tcat -- the compress-like frontends to gsm. + + $(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) +- $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB) ++ $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB) + + $(UNTOAST): $(BIN) $(TOAST) + -rm $(RMFLAGS) $(UNTOAST) +- $(LN) $(TOAST) $(UNTOAST) ++ $(LN) toast $(UNTOAST) + + $(TCAT): $(BIN) $(TOAST) + -rm $(RMFLAGS) $(TCAT) +- $(LN) $(TOAST) $(TCAT) ++ $(LN) toast $(TCAT) + + + # The local bin and lib directories +@@ -426,7 +454,9 @@ + + clean: semi-clean + -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \ +- $(TOAST) $(TCAT) $(UNTOAST) \ ++ $(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 04fd15ad2d..c3764fa6fc 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: -- cgit v1.2.3-65-gdbad