From 3168d584bf531dec929201e07da37d0bccfdec1c Mon Sep 17 00:00:00 2001 From: idriskalp Date: Sun, 12 Jan 2020 01:52:55 +0300 Subject: [PATCH] gsm 1.0.18 --- multimedia/sound/gsm/actions.py | 21 +- multimedia/sound/gsm/files/gsm-shared.patch | 189 ++++++++++++++++++ .../sound/gsm/files/pardusflags_1.0.18.patch | 13 ++ multimedia/sound/gsm/pspec.xml | 17 +- 4 files changed, 231 insertions(+), 9 deletions(-) create mode 100644 multimedia/sound/gsm/files/gsm-shared.patch create mode 100644 multimedia/sound/gsm/files/pardusflags_1.0.18.patch diff --git a/multimedia/sound/gsm/actions.py b/multimedia/sound/gsm/actions.py index 0cbf908eec..78b768f54b 100644 --- a/multimedia/sound/gsm/actions.py +++ b/multimedia/sound/gsm/actions.py @@ -9,7 +9,7 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import get from pisi.actionsapi import shelltools -WorkDir="gsm-1.0-pl13" +WorkDir="gsm-1.0-pl18" def setup(): multilib = " -m32" if get.buildTYPE() == "emul32" else "" @@ -20,12 +20,23 @@ def build(): autotools.make() def install(): + #if get.buildTYPE() == "emul32": + #autotools.rawInstall("DESTDIR=%s bindir=/emul32 libdir=/usr/lib32" % get.installDIR()) + #pisitools.remove("/usr/lib32/libgsm.a") + #return + #else: + #autotools.rawInstall("DESTDIR=%s bindir=/usr/bin" % get.installDIR()) + if get.buildTYPE() == "emul32": - autotools.rawInstall("DESTDIR=%s bindir=/emul32 libdir=/usr/lib32" % get.installDIR()) - pisitools.remove("/usr/lib32/libgsm.a") + pisitools.insinto("/usr/lib32", "lib/*") + #pisitools.remove("/usr/lib32/libgsm.a") return else: - autotools.rawInstall("DESTDIR=%s bindir=/usr/bin" % get.installDIR()) + pisitools.insinto("/usr/bin", "bin/*") + pisitools.insinto("/usr/lib", "lib/*") + pisitools.insinto("/usr/include/gsm", "inc/*") + pisitools.insinto("/usr/share/man/man3", "man/*") + pisitools.domove("/usr/share/man/man3/toast.1", "/usr/share/man/man1") for bin in ["tcat","untoast"]: pisitools.remove("/usr/bin/%s" % bin) @@ -36,6 +47,6 @@ def install(): # pisitools.removeDir("/usr/include/gsm") # No static libs - pisitools.remove("/usr/lib/libgsm.a") + #pisitools.remove("/usr/lib/libgsm.a") pisitools.dodoc("ChangeLog", "COPYRIGHT", "MACHINES", "MANIFEST", "README") diff --git a/multimedia/sound/gsm/files/gsm-shared.patch b/multimedia/sound/gsm/files/gsm-shared.patch new file mode 100644 index 0000000000..18d70cb6cf --- /dev/null +++ b/multimedia/sound/gsm/files/gsm-shared.patch @@ -0,0 +1,189 @@ +--- Makefile 2006-04-26 15:14:26.000000000 -0400 ++++ Makefile 2010-06-19 16:53:25.000000000 -0400 +@@ -96,11 +96,11 @@ + # Other tools + + SHELL = /bin/sh +-LN = ln ++LN = ln -s -f + BASENAME = basename + AR = ar + ARFLAGS = cr +-RMFLAGS = ++RMFLAGS = -f + FIND = find + COMPRESS = compress + COMPRESSFLAGS = +@@ -139,7 +139,7 @@ + + # Targets + +-LIBGSM = $(LIB)/libgsm.a ++LIBGSMSO = $(LIB)/libgsm.so + + TOAST = $(BIN)/toast + UNTOAST = $(BIN)/untoast +@@ -257,7 +257,7 @@ + # Install targets + + GSM_INSTALL_TARGETS = \ +- $(GSM_INSTALL_LIB)/libgsm.a \ ++ $(GSM_INSTALL_LIB)/libgsm.so \ + $(GSM_INSTALL_INC)/gsm.h \ + $(GSM_INSTALL_MAN)/gsm.3 \ + $(GSM_INSTALL_MAN)/gsm_explode.3 \ +@@ -279,7 +279,7 @@ + + # Target rules + +-all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST) ++all: $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST) + @-echo $(ROOT): Done. + + tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result +@@ -299,24 +299,23 @@ + + # The basic API: libgsm + +-$(LIBGSM): $(LIB) $(GSM_OBJECTS) +- -rm $(RMFLAGS) $(LIBGSM) +- $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) +- $(RANLIB) $(LIBGSM) +- ++$(LIBGSMSO): $(LIB) $(GSM_OBJECTS) ++ $(LD) -shared -Wl,-soname,libgsm.so.1 -o $@.1.0.13 $(GSM_OBJECTS) ++ $(LN) libgsm.so.1.0.13 $(LIBGSMSO).1 ++ $(LN) libgsm.so.1.0.13 $(LIBGSMSO) + + # Toast, Untoast and Tcat -- the compress-like frontends to gsm. + +-$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) +- $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB) ++$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSMSO) ++ $(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 +@@ -351,53 +350,54 @@ + fi + + $(TOAST_INSTALL_BIN)/toast: $(TOAST) +- -rm $@ ++ -rm $(RMFLAGS) $@ + cp $(TOAST) $@ + chmod 755 $@ + + $(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast +- -rm $@ +- ln $? $@ ++ -rm $(RMFLAGS) $@ ++ $(LN) toast $@ + + $(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast +- -rm $@ +- ln $? $@ ++ -rm $(RMFLAGS) $@ ++ $(LN) toast $@ + + $(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1 +- -rm $@ ++ -rm $(RMFLAGS) $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3 +- -rm $@ ++ -rm $(RMFLAGS) $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3 +- -rm $@ ++ -rm $(RMFLAGS) $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3 +- -rm $@ ++ -rm $(RMFLAGS) $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3 +- -rm $@ ++ -rm $(RMFLAGS) $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h +- -rm $@ +- cp $? $@ +- chmod 444 $@ +- +-$(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM) +- -rm $@ ++ -rm $(RMFLAGS) $@ + cp $? $@ + chmod 444 $@ + ++$(GSM_INSTALL_LIB)/libgsm.so: $(LIBGSMSO) ++ -rm $(RMFLAGS) $@ $@.1 $@.1.0.13 ++ cp $?.1.0.13 $@.1.0.13 ++ chmod 755 $@.1.0.13 ++ $(LN) libgsm.so.1.0.13 $@ ++ $(LN) libgsm.so.1.0.13 $@.1 + + # Distribution + +@@ -425,7 +425,7 @@ + -print | xargs rm $(RMFLAGS) + + clean: semi-clean +- -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \ ++ -rm $(RMFLAGS) $(LIBGSMSO)* $(ADDTST)/add \ + $(TOAST) $(TCAT) $(UNTOAST) \ + $(ROOT)/gsm-1.0.tar.Z + +@@ -473,22 +473,22 @@ + $(TST)/test-result: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/run + ( cd $(TST); ./run ) + +-$(TST)/lin2txt: $(TST)/lin2txt.o $(LIBGSM) ++$(TST)/lin2txt: $(TST)/lin2txt.o $(LIBGSMSO) + $(LD) $(LFLAGS) -o $(TST)/lin2txt \ +- $(TST)/lin2txt.o $(LIBGSM) $(LDLIB) ++ $(TST)/lin2txt.o $(LIBGSMSO) $(LDLIB) + +-$(TST)/lin2cod: $(TST)/lin2cod.o $(LIBGSM) ++$(TST)/lin2cod: $(TST)/lin2cod.o $(LIBGSMSO) + $(LD) $(LFLAGS) -o $(TST)/lin2cod \ +- $(TST)/lin2cod.o $(LIBGSM) $(LDLIB) ++ $(TST)/lin2cod.o $(LIBGSMSO) $(LDLIB) + +-$(TST)/gsm2cod: $(TST)/gsm2cod.o $(LIBGSM) ++$(TST)/gsm2cod: $(TST)/gsm2cod.o $(LIBGSMSO) + $(LD) $(LFLAGS) -o $(TST)/gsm2cod \ +- $(TST)/gsm2cod.o $(LIBGSM) $(LDLIB) ++ $(TST)/gsm2cod.o $(LIBGSMSO) $(LDLIB) + +-$(TST)/cod2txt: $(TST)/cod2txt.o $(LIBGSM) ++$(TST)/cod2txt: $(TST)/cod2txt.o $(LIBGSMSO) + $(LD) $(LFLAGS) -o $(TST)/cod2txt \ +- $(TST)/cod2txt.o $(LIBGSM) $(LDLIB) ++ $(TST)/cod2txt.o $(LIBGSMSO) $(LDLIB) + +-$(TST)/cod2lin: $(TST)/cod2lin.o $(LIBGSM) ++$(TST)/cod2lin: $(TST)/cod2lin.o $(LIBGSMSO) + $(LD) $(LFLAGS) -o $(TST)/cod2lin \ +- $(TST)/cod2lin.o $(LIBGSM) $(LDLIB) ++ $(TST)/cod2lin.o $(LIBGSMSO) $(LDLIB) diff --git a/multimedia/sound/gsm/files/pardusflags_1.0.18.patch b/multimedia/sound/gsm/files/pardusflags_1.0.18.patch new file mode 100644 index 0000000000..f90dbcb75e --- /dev/null +++ b/multimedia/sound/gsm/files/pardusflags_1.0.18.patch @@ -0,0 +1,13 @@ +--- a/Makefile 2019-10-27 14:23:53.080463986 +0300 ++++ b/Makefile 2019-10-27 14:25:08.992459854 +0300 +@@ -43,8 +43,8 @@ + # CC = /usr/lang/acc + # CCFLAGS = -c -O + +-CC = gcc -ansi -pedantic +-CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment ++CC = pardusCC -ansi -pedantic ++CCFLAGS = -c pardusCFLAGS -fPIC -D_REENTRANT -DNeedFunctionPrototypes=1 + + LD = $(CC) + diff --git a/multimedia/sound/gsm/pspec.xml b/multimedia/sound/gsm/pspec.xml index dc99d4f866..4b6c2a36b8 100644 --- a/multimedia/sound/gsm/pspec.xml +++ b/multimedia/sound/gsm/pspec.xml @@ -12,14 +12,16 @@ library Lossy speech compression library and tool Gsm is an implementation of the final draft GSM 06.10 standard for full-rate speech transcoding - https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/osxwinebuilder/gsm-1.0.13.tar.gz + http://www.quut.com/gsm/gsm-1.0.18.tar.gz gsm-1.0.10-dyn.patch gsm-1.0-pl10-includes.patch - gsm-1.0-pl10-shared.diff - gsm-1.0-pl10-add-includefile.patch - pardusflags.patch + + + gsm-1.0.12-64bit.patch + gsm-shared.patch + pardusflags_1.0.18.patch @@ -64,6 +66,13 @@ + + 2019-10-27 + 1.0.18 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2018-08-31 1.0.13