[arch-commits] Commit in gsm/repos/extra-x86_64 (5 files)
Felix Yan
felixonmars at gemini.archlinux.org
Mon Aug 1 21:13:53 UTC 2022
Date: Monday, August 1, 2022 @ 21:13:53
Author: felixonmars
Revision: 451841
archrelease: copy trunk to extra-x86_64
Added:
gsm/repos/extra-x86_64/PKGBUILD
(from rev 451840, gsm/trunk/PKGBUILD)
gsm/repos/extra-x86_64/gsm-fix-toast-install.patch
(from rev 451840, gsm/trunk/gsm-fix-toast-install.patch)
gsm/repos/extra-x86_64/gsm-shared.patch
(from rev 451840, gsm/trunk/gsm-shared.patch)
Deleted:
gsm/repos/extra-x86_64/PKGBUILD
gsm/repos/extra-x86_64/gsm-shared.patch
-----------------------------+
PKGBUILD | 88 +++++++-------
gsm-fix-toast-install.patch | 16 ++
gsm-shared.patch | 260 +++++++++++++++++++++---------------------
3 files changed, 191 insertions(+), 173 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-08-01 21:13:02 UTC (rev 451840)
+++ PKGBUILD 2022-08-01 21:13:53 UTC (rev 451841)
@@ -1,43 +0,0 @@
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Maxime de Roucy <maxime.deroucy at gmail.com>
-# Contributor: Darwin Bautista <djclue917 at gmail.com>
-
-pkgname=gsm
-pkgver=1.0.21
-pkgrel=1
-pkgdesc="Shared libraries for GSM 06.10 lossy speech compression"
-arch=('x86_64')
-url="http://www.quut.com/gsm/"
-license=('custom')
-depends=('glibc')
-source=("http://www.quut.com/$pkgname/$pkgname-$pkgver.tar.gz" gsm-shared.patch)
-sha512sums=('2ad92a8acea7cb47c3237f49805f21cdc180009f6a31ede3e7befbb361968f5235e5b0664503b46f74dd4ef85c602e60ac9c37029075b026ceeed33a72848e0f'
- 'a0c7116d3800806eb5faa1f381a739b29b2e6f73cdeff8377c44da03cb0cba99004eb44681815a8dd5507ca50124fa8b5e24aed5b68c779706917915a56478bf')
-
-prepare() {
- cd $pkgname-${pkgver%.*}-pl${pkgver##*.}
-
- patch -p0 -i ../gsm-shared.patch
-}
-
-build() {
- cd $pkgname-${pkgver%.*}-pl${pkgver##*.}
-
- make CCFLAGS="-c ${CFLAGS} -fPIC"
-}
-
-package() {
- cd $pkgname-${pkgver%.*}-pl${pkgver##*.}
-
- # Prepare directories
- install -m755 -d "$pkgdir"/usr/{bin,lib,include/gsm,share/{licenses/$pkgname,man/man{1,3}}}
-
- make -j1 INSTALL_ROOT="$pkgdir"/usr \
- GSM_INSTALL_INC="$pkgdir"/usr/include/gsm \
- GSM_INSTALL_MAN="$pkgdir"/usr/share/man/man3 \
- TOAST_INSTALL_MAN="$pkgdir"/usr/share/man/man1 \
- install
-
- # Install license
- install -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/license.txt
-}
Copied: gsm/repos/extra-x86_64/PKGBUILD (from rev 451840, gsm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-08-01 21:13:53 UTC (rev 451841)
@@ -0,0 +1,45 @@
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Maxime de Roucy <maxime.deroucy at gmail.com>
+# Contributor: Darwin Bautista <djclue917 at gmail.com>
+
+pkgname=gsm
+pkgver=1.0.21
+pkgrel=1
+pkgdesc="Shared libraries for GSM 06.10 lossy speech compression"
+arch=('x86_64')
+url="http://www.quut.com/gsm/"
+license=('custom')
+depends=('glibc')
+source=("http://www.quut.com/$pkgname/$pkgname-$pkgver.tar.gz" gsm-shared.patch gsm-fix-toast-install.patch)
+sha512sums=('2ad92a8acea7cb47c3237f49805f21cdc180009f6a31ede3e7befbb361968f5235e5b0664503b46f74dd4ef85c602e60ac9c37029075b026ceeed33a72848e0f'
+ 'a0c7116d3800806eb5faa1f381a739b29b2e6f73cdeff8377c44da03cb0cba99004eb44681815a8dd5507ca50124fa8b5e24aed5b68c779706917915a56478bf'
+ '88f3214e92d4f5b9dae9c5d67073abb36c7889cdcb90a00fb023794ae474c0560d8ea5098ce3e5424a1021fe44cd4f6b91d86c77e4b864fe97b51d69debf0c5d')
+
+prepare() {
+ cd $pkgname-${pkgver%.*}-pl${pkgver##*.}
+
+ patch -p0 -i ../gsm-shared.patch
+ patch -p0 -i ../gsm-fix-toast-install.patch
+}
+
+build() {
+ cd $pkgname-${pkgver%.*}-pl${pkgver##*.}
+
+ make CCFLAGS="-c ${CFLAGS} -fPIC"
+}
+
+package() {
+ cd $pkgname-${pkgver%.*}-pl${pkgver##*.}
+
+ # Prepare directories
+ install -m755 -d "$pkgdir"/usr/{bin,lib,include/gsm,share/{licenses/$pkgname,man/man{1,3}}}
+
+ make -j1 INSTALL_ROOT="$pkgdir"/usr \
+ GSM_INSTALL_INC="$pkgdir"/usr/include/gsm \
+ GSM_INSTALL_MAN="$pkgdir"/usr/share/man/man3 \
+ TOAST_INSTALL_MAN="$pkgdir"/usr/share/man/man1 \
+ install
+
+ # Install license
+ install -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/license.txt
+}
Copied: gsm/repos/extra-x86_64/gsm-fix-toast-install.patch (from rev 451840, gsm/trunk/gsm-fix-toast-install.patch)
===================================================================
--- gsm-fix-toast-install.patch (rev 0)
+++ gsm-fix-toast-install.patch 2022-08-01 21:13:53 UTC (rev 451841)
@@ -0,0 +1,16 @@
+--- Makefile.orig 2022-08-02 00:11:31.493613903 +0300
++++ Makefile 2022-08-02 00:11:40.203644903 +0300
+@@ -359,11 +359,11 @@
+
+ $(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast
+ -rm $(RMFLAGS) $@
+- $(LN) $? $@
++ $(LN) toast $@
+
+ $(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast
+ -rm $(RMFLAGS) $@
+- $(LN) $? $@
++ $(LN) toast $@
+
+ $(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1
+ -rm $(RMFLAGS) $@
Deleted: gsm-shared.patch
===================================================================
--- gsm-shared.patch 2022-08-01 21:13:02 UTC (rev 451840)
+++ gsm-shared.patch 2022-08-01 21:13:53 UTC (rev 451841)
@@ -1,130 +0,0 @@
---- Makefile 2006-04-26 15:14:26.000000000 -0400
-+++ Makefile 2010-06-19 16:53:25.000000000 -0400
-@@ -96,7 +96,7 @@
- # Other tools
-
- SHELL = /bin/sh
--LN = ln
-+LN = ln -s -f
- BASENAME = basename
- AR = ar
- ARFLAGS = cr
-@@ -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) $(LFLAGS) -shared -Wl,-soname,libgsm.so.1 -o $@.1.0.21 $(GSM_OBJECTS)
-+ $(LN) libgsm.so.1.0.21 $(LIBGSMSO).1
-+ $(LN) libgsm.so.1.0.21 $(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,10 +350,12 @@
- cp $? $@
- chmod 444 $@
-
--$(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM)
-- -rm $(RMFLAGS) $@
-- cp $? $@
-- chmod 444 $@
-+$(GSM_INSTALL_LIB)/libgsm.so: $(LIBGSMSO)
-+ -rm $(RMFLAGS) $@ $@.1 $@.1.0.21
-+ cp $?.1.0.21 $@.1.0.21
-+ chmod 755 $@.1.0.21
-+ $(LN) libgsm.so.1.0.21 $@
-+ $(LN) libgsm.so.1.0.21 $@.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)
Copied: gsm/repos/extra-x86_64/gsm-shared.patch (from rev 451840, gsm/trunk/gsm-shared.patch)
===================================================================
--- gsm-shared.patch (rev 0)
+++ gsm-shared.patch 2022-08-01 21:13:53 UTC (rev 451841)
@@ -0,0 +1,130 @@
+--- Makefile 2006-04-26 15:14:26.000000000 -0400
++++ Makefile 2010-06-19 16:53:25.000000000 -0400
+@@ -96,7 +96,7 @@
+ # Other tools
+
+ SHELL = /bin/sh
+-LN = ln
++LN = ln -s -f
+ BASENAME = basename
+ AR = ar
+ ARFLAGS = cr
+@@ -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) $(LFLAGS) -shared -Wl,-soname,libgsm.so.1 -o $@.1.0.21 $(GSM_OBJECTS)
++ $(LN) libgsm.so.1.0.21 $(LIBGSMSO).1
++ $(LN) libgsm.so.1.0.21 $(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,10 +350,12 @@
+ cp $? $@
+ chmod 444 $@
+
+-$(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM)
+- -rm $(RMFLAGS) $@
+- cp $? $@
+- chmod 444 $@
++$(GSM_INSTALL_LIB)/libgsm.so: $(LIBGSMSO)
++ -rm $(RMFLAGS) $@ $@.1 $@.1.0.21
++ cp $?.1.0.21 $@.1.0.21
++ chmod 755 $@.1.0.21
++ $(LN) libgsm.so.1.0.21 $@
++ $(LN) libgsm.so.1.0.21 $@.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)
More information about the arch-commits
mailing list