[arch-commits] Commit in gsm/repos/extra-x86_64 (4 files)

Felix Yan felixonmars at archlinux.org
Sun Mar 29 18:04:00 UTC 2020


    Date: Sunday, March 29, 2020 @ 18:04:00
  Author: felixonmars
Revision: 378661

archrelease: copy trunk to extra-x86_64

Added:
  gsm/repos/extra-x86_64/PKGBUILD
    (from rev 378660, gsm/trunk/PKGBUILD)
  gsm/repos/extra-x86_64/gsm-shared.patch
    (from rev 378660, gsm/trunk/gsm-shared.patch)
Deleted:
  gsm/repos/extra-x86_64/PKGBUILD
  gsm/repos/extra-x86_64/gsm-shared.patch

------------------+
 PKGBUILD         |   87 ++++++------
 gsm-shared.patch |  378 ++++++++++++++++++++++++++---------------------------
 2 files changed, 232 insertions(+), 233 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-29 18:03:35 UTC (rev 378660)
+++ PKGBUILD	2020-03-29 18:04:00 UTC (rev 378661)
@@ -1,44 +0,0 @@
-# $Id: $
-# 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.18
-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)
-sha256sums=('04f68087c3348bf156b78d59f4d8aff545da7f6e14f33be8f47d33f4efae2a10'
-            '1b9fabd7da83a688fc0e5ec712d53c428ff5575b1d5feac8437283ade1448c2b')
-
-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 378660, gsm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-03-29 18:04:00 UTC (rev 378661)
@@ -0,0 +1,43 @@
+# 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.19
+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=('f69b4bf2d918b118b5de90b8ab88fd026008ac7432f07b872b81fe52cdc781f605dca8eedcdaebc8beb974cef388496c618f92a41961c62057009964159f8392'
+            'ece13a62503a50173a9fbf43d939f643d5a831a0208f13b108708989f73db63f9e3a5ac04c30ab11533ae19ad9e0ff348436a1184bb2a173518970d87da04b78')
+
+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
+}

Deleted: gsm-shared.patch
===================================================================
--- gsm-shared.patch	2020-03-29 18:03:35 UTC (rev 378660)
+++ gsm-shared.patch	2020-03-29 18:04:00 UTC (rev 378661)
@@ -1,189 +0,0 @@
---- 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)

Copied: gsm/repos/extra-x86_64/gsm-shared.patch (from rev 378660, gsm/trunk/gsm-shared.patch)
===================================================================
--- gsm-shared.patch	                        (rev 0)
+++ gsm-shared.patch	2020-03-29 18:04:00 UTC (rev 378661)
@@ -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)



More information about the arch-commits mailing list