[arch-commits] Commit in gsm/repos (8 files)
Pierre Schmitz
pierre at archlinux.org
Sat Feb 18 11:57:45 UTC 2012
Date: Saturday, February 18, 2012 @ 06:57:44
Author: pierre
Revision: 150517
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gsm/repos/extra-i686/PKGBUILD
(from rev 150515, gsm/trunk/PKGBUILD)
gsm/repos/extra-i686/gsm.patch
(from rev 150515, gsm/trunk/gsm.patch)
gsm/repos/extra-x86_64/PKGBUILD
(from rev 150516, gsm/trunk/PKGBUILD)
gsm/repos/extra-x86_64/gsm.patch
(from rev 150516, gsm/trunk/gsm.patch)
Deleted:
gsm/repos/extra-i686/PKGBUILD
gsm/repos/extra-i686/gsm.patch
gsm/repos/extra-x86_64/PKGBUILD
gsm/repos/extra-x86_64/gsm.patch
------------------------+
extra-i686/PKGBUILD | 86 +++++-----
extra-i686/gsm.patch | 396 +++++++++++++++++++++++------------------------
extra-x86_64/PKGBUILD | 86 +++++-----
extra-x86_64/gsm.patch | 396 +++++++++++++++++++++++------------------------
4 files changed, 482 insertions(+), 482 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-02-18 11:57:33 UTC (rev 150516)
+++ extra-i686/PKGBUILD 2012-02-18 11:57:44 UTC (rev 150517)
@@ -1,43 +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.13
-pkgrel=6
-pkgdesc="Shared libraries for GSM 06.10 lossy speech compression"
-arch=('i686' 'x86_64')
-url="http://www.quut.com/gsm/"
-license=('custom')
-depends=('glibc')
-source=(http://www.quut.com/${pkgname}/${pkgname}-${pkgver}.tar.gz
- gsm.patch)
-md5sums=('c1ba392ce61dc4aff1c29ea4e92f6df4'
- '30f46c92d0a5e5654258e707a9e8b5a6')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver%.*}-pl${pkgver##*.}/"
-
- patch -Np0 -i "${srcdir}/${pkgname}.patch"
-
- # flags for shared lib
- CFLAGS="${CFLAGS} -fPIC"
- make CCFLAGS="-c ${CFLAGS}"
-}
-
-package() {
- cd "${srcdir}/${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 || return 1
-}
Copied: gsm/repos/extra-i686/PKGBUILD (from rev 150515, gsm/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-18 11:57:44 UTC (rev 150517)
@@ -0,0 +1,43 @@
+# $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.13
+pkgrel=7
+pkgdesc="Shared libraries for GSM 06.10 lossy speech compression"
+arch=('i686' 'x86_64')
+url="http://www.quut.com/gsm/"
+license=('custom')
+depends=('glibc')
+source=("http://www.quut.com/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ 'gsm.patch')
+md5sums=('c1ba392ce61dc4aff1c29ea4e92f6df4'
+ '30f46c92d0a5e5654258e707a9e8b5a6')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver%.*}-pl${pkgver##*.}/"
+
+ patch -Np0 -i "${srcdir}/${pkgname}.patch"
+
+ # flags for shared lib
+ CFLAGS="${CFLAGS} -fPIC"
+ make CCFLAGS="-c ${CFLAGS}"
+}
+
+package() {
+ cd "${srcdir}/${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: extra-i686/gsm.patch
===================================================================
--- extra-i686/gsm.patch 2012-02-18 11:57:33 UTC (rev 150516)
+++ extra-i686/gsm.patch 2012-02-18 11:57:44 UTC (rev 150517)
@@ -1,198 +0,0 @@
---- Makefile 2006-04-26 15:14:26.000000000 -0400
-+++ Makefile 2010-06-19 16:53:25.000000000 -0400
-@@ -44,7 +44,7 @@
- # CCFLAGS = -c -O
-
- CC = gcc -ansi -pedantic
--CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1
-+CCFLAGS = -c -O2 -fPIC -DNeedFunctionPrototypes=1
-
- LD = $(CC)
-
-@@ -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-i686/gsm.patch (from rev 150515, gsm/trunk/gsm.patch)
===================================================================
--- extra-i686/gsm.patch (rev 0)
+++ extra-i686/gsm.patch 2012-02-18 11:57:44 UTC (rev 150517)
@@ -0,0 +1,198 @@
+--- Makefile 2006-04-26 15:14:26.000000000 -0400
++++ Makefile 2010-06-19 16:53:25.000000000 -0400
+@@ -44,7 +44,7 @@
+ # CCFLAGS = -c -O
+
+ CC = gcc -ansi -pedantic
+-CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1
++CCFLAGS = -c -O2 -fPIC -DNeedFunctionPrototypes=1
+
+ LD = $(CC)
+
+@@ -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)
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-02-18 11:57:33 UTC (rev 150516)
+++ extra-x86_64/PKGBUILD 2012-02-18 11:57:44 UTC (rev 150517)
@@ -1,43 +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.13
-pkgrel=6
-pkgdesc="Shared libraries for GSM 06.10 lossy speech compression"
-arch=('i686' 'x86_64')
-url="http://www.quut.com/gsm/"
-license=('custom')
-depends=('glibc')
-source=(http://www.quut.com/${pkgname}/${pkgname}-${pkgver}.tar.gz
- gsm.patch)
-md5sums=('c1ba392ce61dc4aff1c29ea4e92f6df4'
- '30f46c92d0a5e5654258e707a9e8b5a6')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver%.*}-pl${pkgver##*.}/"
-
- patch -Np0 -i "${srcdir}/${pkgname}.patch"
-
- # flags for shared lib
- CFLAGS="${CFLAGS} -fPIC"
- make CCFLAGS="-c ${CFLAGS}"
-}
-
-package() {
- cd "${srcdir}/${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 || return 1
-}
Copied: gsm/repos/extra-x86_64/PKGBUILD (from rev 150516, gsm/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-02-18 11:57:44 UTC (rev 150517)
@@ -0,0 +1,43 @@
+# $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.13
+pkgrel=7
+pkgdesc="Shared libraries for GSM 06.10 lossy speech compression"
+arch=('i686' 'x86_64')
+url="http://www.quut.com/gsm/"
+license=('custom')
+depends=('glibc')
+source=("http://www.quut.com/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ 'gsm.patch')
+md5sums=('c1ba392ce61dc4aff1c29ea4e92f6df4'
+ '30f46c92d0a5e5654258e707a9e8b5a6')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver%.*}-pl${pkgver##*.}/"
+
+ patch -Np0 -i "${srcdir}/${pkgname}.patch"
+
+ # flags for shared lib
+ CFLAGS="${CFLAGS} -fPIC"
+ make CCFLAGS="-c ${CFLAGS}"
+}
+
+package() {
+ cd "${srcdir}/${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: extra-x86_64/gsm.patch
===================================================================
--- extra-x86_64/gsm.patch 2012-02-18 11:57:33 UTC (rev 150516)
+++ extra-x86_64/gsm.patch 2012-02-18 11:57:44 UTC (rev 150517)
@@ -1,198 +0,0 @@
---- Makefile 2006-04-26 15:14:26.000000000 -0400
-+++ Makefile 2010-06-19 16:53:25.000000000 -0400
-@@ -44,7 +44,7 @@
- # CCFLAGS = -c -O
-
- CC = gcc -ansi -pedantic
--CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1
-+CCFLAGS = -c -O2 -fPIC -DNeedFunctionPrototypes=1
-
- LD = $(CC)
-
-@@ -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.patch (from rev 150516, gsm/trunk/gsm.patch)
===================================================================
--- extra-x86_64/gsm.patch (rev 0)
+++ extra-x86_64/gsm.patch 2012-02-18 11:57:44 UTC (rev 150517)
@@ -0,0 +1,198 @@
+--- Makefile 2006-04-26 15:14:26.000000000 -0400
++++ Makefile 2010-06-19 16:53:25.000000000 -0400
+@@ -44,7 +44,7 @@
+ # CCFLAGS = -c -O
+
+ CC = gcc -ansi -pedantic
+-CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1
++CCFLAGS = -c -O2 -fPIC -DNeedFunctionPrototypes=1
+
+ LD = $(CC)
+
+@@ -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