summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD11
-rw-r--r--gsm-shared.patch130
3 files changed, 48 insertions, 106 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 71e7f6f7793b..8881ef3cb406 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
pkgbase = lib32-gsm
pkgdesc = Shared libraries for GSM 06.10 lossy speech compression
- pkgver = 1.0.18
+ pkgver = 1.0.22
pkgrel = 1
url = http://www.quut.com/gsm/
arch = x86_64
license = custom
- makedepends = gcc-multilib
- depends = glibc
+ makedepends = lib32-gcc-libs
depends = gsm
- source = http://www.quut.com/gsm/gsm-1.0.18.tar.gz
+ depends = lib32-glibc
+ source = http://www.quut.com/gsm/gsm-1.0.22.tar.gz
source = gsm-shared.patch
- sha256sums = 04f68087c3348bf156b78d59f4d8aff545da7f6e14f33be8f47d33f4efae2a10
- sha256sums = 1b9fabd7da83a688fc0e5ec712d53c428ff5575b1d5feac8437283ade1448c2b
+ sha256sums = f0072e91f6bb85a878b2f6dbf4a0b7c850c4deb8049d554c65340b3bf69df0ac
+ sha256sums = b959059dccdf2aba260125d43f264f1ce3d14ded631a6af0482e026c8cb2b96c
pkgname = lib32-gsm
-
diff --git a/PKGBUILD b/PKGBUILD
index 60c5a30ab8f0..9c3480db9fcb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,18 +5,19 @@
pkgname=lib32-gsm
_pkgbase=gsm
-pkgver=1.0.18
+pkgver=1.0.22
pkgrel=1
pkgdesc="Shared libraries for GSM 06.10 lossy speech compression"
arch=('x86_64')
url="http://www.quut.com/gsm/"
license=('custom')
-makedepends=('gcc-multilib')
-depends=('glibc' 'gsm')
+depends=('gsm' 'lib32-glibc')
+makedepends=('lib32-gcc-libs')
source=("http://www.quut.com/${_pkgbase}/${_pkgbase}-${pkgver}.tar.gz"
'gsm-shared.patch')
-sha256sums=('04f68087c3348bf156b78d59f4d8aff545da7f6e14f33be8f47d33f4efae2a10'
- '1b9fabd7da83a688fc0e5ec712d53c428ff5575b1d5feac8437283ade1448c2b')
+sha256sums=('f0072e91f6bb85a878b2f6dbf4a0b7c850c4deb8049d554c65340b3bf69df0ac'
+ 'b959059dccdf2aba260125d43f264f1ce3d14ded631a6af0482e026c8cb2b96c')
+
prepare() {
cd "${srcdir}/${_pkgbase}-${pkgver%.*}-pl${pkgver##*.}/"
diff --git a/gsm-shared.patch b/gsm-shared.patch
index 18d70cb6cfcf..c25b01f7fa0d 100644
--- a/gsm-shared.patch
+++ b/gsm-shared.patch
@@ -1,6 +1,17 @@
---- Makefile 2006-04-26 15:14:26.000000000 -0400
-+++ Makefile 2010-06-19 16:53:25.000000000 -0400
-@@ -96,11 +96,11 @@
+--- Makefile 2022-08-04 20:46:46.107815841 +0200
++++ Makefile 2022-08-08 17:22:23.799342237 +0200
+@@ -65,6 +65,10 @@
+ ######### Additional libraries needed by $(LD)
+
+
++# What is the version of this release (in standard dotted syntax)?
++DOTTED_VERSION = 1.0.22
++
++
+ # Where do you want to install libraries, binaries, a header file
+ # and the manual pages?
+ #
+@@ -96,7 +100,7 @@
# Other tools
SHELL = /bin/sh
@@ -9,21 +20,16 @@
BASENAME = basename
AR = ar
ARFLAGS = cr
--RMFLAGS =
-+RMFLAGS = -f
- FIND = find
- COMPRESS = compress
- COMPRESSFLAGS =
-@@ -139,7 +139,7 @@
+@@ -139,7 +143,7 @@
# Targets
-LIBGSM = $(LIB)/libgsm.a
-+LIBGSMSO = $(LIB)/libgsm.so
++LIBGSMSO = $(LIB)/libgsm.so
TOAST = $(BIN)/toast
UNTOAST = $(BIN)/untoast
-@@ -257,7 +257,7 @@
+@@ -257,7 +261,7 @@
# Install targets
GSM_INSTALL_TARGETS = \
@@ -32,7 +38,7 @@
$(GSM_INSTALL_INC)/gsm.h \
$(GSM_INSTALL_MAN)/gsm.3 \
$(GSM_INSTALL_MAN)/gsm_explode.3 \
-@@ -279,7 +279,7 @@
+@@ -279,7 +283,7 @@
# Target rules
@@ -41,7 +47,7 @@
@-echo $(ROOT): Done.
tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
-@@ -299,24 +299,23 @@
+@@ -299,16 +303,16 @@
# The basic API: libgsm
@@ -49,11 +55,11 @@
- -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)
++$(LIBGSMSO): $(LIB) $(GSM_OBJECTS)
++ $(LD) -shared -Wl,-soname,libgsm.so.1 -o $@.$(DOTTED_VERSION) $(GSM_OBJECTS)
++ $(LN) `$(BASENAME) $@.$(DOTTED_VERSION)` $@.1
++ $(LN) `$(BASENAME) $@.$(DOTTED_VERSION)` $@
+
# Toast, Untoast and Tcat -- the compress-like frontends to gsm.
@@ -64,97 +70,33 @@
$(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) $@
+@@ -393,10 +397,12 @@
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 $@
+-$(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM)
+- -rm $(RMFLAGS) $@
- 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
++ -rm $(RMFLAGS) $@ $@.1 $@.$(DOTTED_VERSION)
++ cp $?.$(DOTTED_VERSION) $@.$(DOTTED_VERSION)
++ chmod 755 $@.$(DOTTED_VERSION)
++ $(LN) libgsm.so.$(DOTTED_VERSION) $@
++ $(LN) libgsm.so.$(DOTTED_VERSION) $@.1
- # Distribution
-@@ -425,7 +425,7 @@
+ # Distribution
+@@ -425,7 +431,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
+ $(ROOT)/gsm-1.0.tar.gz
-@@ -473,22 +473,22 @@
+@@ -473,22 +479,22 @@
$(TST)/test-result: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/run
( cd $(TST); ./run )