gsm: upgraded package to upstream
Upgraded media-sound/gsm to version 1.0.13-r1 on amd64
BUG=b:163146931
TEST=sudo emerge gsm
Change-Id: I01ffb2a62bcca3ec2ff0b8bc51a9b74d5dd996be
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2343455
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Kevin Lund <kglund@google.com>
Commit-Queue: En-Shuo Hsu <enshuo@chromium.org>
diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest
index a70e47c..377c6dd 100644
--- a/media-sound/gsm/Manifest
+++ b/media-sound/gsm/Manifest
@@ -1 +1 @@
-DIST gsm-1.0.13.tar.gz 65318 RMD160 e44f70d481328038b3b16a25cc99b7855113db61 SHA1 668b0a180039a50d379b3d5a22e78da4b1d90afc SHA256 52c518244d428c2e56c543b98c9135f4a76ff780c32455580b793f60a0a092ad
+DIST gsm-1.0.13.tar.gz 65318 BLAKE2B 22bb79e3afd9a2e99041693288342b55969207223486200d4aebc61908930040b6b766a9bf673ec6b484eeb95833684c79f34c95d32da17cfb4c36d025004858 SHA512 0d0cf9e1e81e64cd84f588c1e4f0cb74b849d45e41fdebf860f63588084c73c7c5198bfe73a6c976bda5735ee516661d3db00afbb5cc5886a7ee3a7b31d673aa
diff --git a/media-sound/gsm/files/gsm-1.0.13-shared.patch b/media-sound/gsm/files/gsm-1.0.13-shared.patch
index fc99e2c..ba17809 100644
--- a/media-sound/gsm/files/gsm-1.0.13-shared.patch
+++ b/media-sound/gsm/files/gsm-1.0.13-shared.patch
@@ -1,16 +1,24 @@
-diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
---- gsm-1.0-pl13.orig/Makefile 2006-04-26 22:14:26.000000000 +0300
-+++ gsm-1.0-pl13/Makefile 2009-09-08 14:50:02.000000000 +0300
-@@ -96,7 +96,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -96,16 +96,14 @@
# Other tools
SHELL = /bin/sh
-LN = ln
+LN = ln -s
BASENAME = basename
- AR = ar
+-AR = ar
ARFLAGS = cr
-@@ -140,6 +140,7 @@
+ RMFLAGS =
+ FIND = find
+ COMPRESS = compress
+ COMPRESSFLAGS =
+ # RANLIB = true
+-RANLIB = ranlib
+
+ #
+ # You shouldn't have to configure below this line if you're porting.
+@@ -140,6 +138,7 @@
# Targets
LIBGSM = $(LIB)/libgsm.a
@@ -18,7 +26,7 @@
TOAST = $(BIN)/toast
UNTOAST = $(BIN)/untoast
-@@ -203,24 +204,43 @@
+@@ -203,24 +202,43 @@
# Object files
@@ -80,7 +88,7 @@
TOAST_OBJECTS = $(SRC)/toast.o \
$(SRC)/toast_lin.o \
-@@ -228,7 +248,7 @@
+@@ -228,7 +246,7 @@
$(SRC)/toast_alaw.o \
$(SRC)/toast_audio.o
@@ -89,7 +97,7 @@
# Manuals
-@@ -277,9 +297,12 @@
+@@ -277,9 +295,12 @@
$(CC) $(CFLAGS) $?
@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
@@ -103,7 +111,7 @@
@-echo $(ROOT): Done.
tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
-@@ -299,24 +322,29 @@
+@@ -299,24 +320,29 @@
# The basic API: libgsm
@@ -138,7 +146,7 @@
# The local bin and lib directories
-@@ -426,7 +454,9 @@
+@@ -426,7 +452,9 @@
clean: semi-clean
-rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \
diff --git a/media-sound/gsm/gsm-1.0.13-r1.ebuild b/media-sound/gsm/gsm-1.0.13-r1.ebuild
new file mode 100644
index 0000000..0be2804
--- /dev/null
+++ b/media-sound/gsm/gsm-1.0.13-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Lossy speech compression library and tool"
+HOMEPAGE="https://packages.qa.debian.org/libg/libgsm.html"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="gsm"
+SLOT="0"
+KEYWORDS="*"
+
+S="${WORKDIR}/${PN}-$(ver_rs 2 '-pl' )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-shared.patch
+ "${FILESDIR}"/${PN}-1.0.12-memcpy.patch
+ "${FILESDIR}"/${PN}-1.0.12-64bit.patch
+)
+
+DOCS=( ChangeLog MACHINES MANIFEST README )
+
+src_prepare() {
+ default
+ sed -e 's/\$(GSM_INSTALL_LIB)\/libgsm.a //g' -i Makefile || die
+
+ multilib_copy_sources
+}
+
+src_configure() {
+ # From upstream Makefile. Define this if your host multiplies
+ # floats faster than integers, e.g. on a SPARCstation.
+ use sparc && append-flags -DUSE_FLOAT_MUL -DFAST
+}
+
+multilib_src_compile() {
+ emake -j1 CCFLAGS="${CFLAGS} -c -DNeedFunctionPrototypes=1" \
+ LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)"
+}
+
+multilib_src_install() {
+ dodir /usr/bin /usr/$(get_libdir) /usr/include/gsm /usr/share/man/man{1,3}
+
+ emake -j1 INSTALL_ROOT="${ED}"/usr \
+ LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" \
+ GSM_INSTALL_LIB="${ED}"/usr/$(get_libdir) \
+ GSM_INSTALL_INC="${ED}"/usr/include/gsm \
+ GSM_INSTALL_MAN="${ED}"/usr/share/man/man3 \
+ TOAST_INSTALL_MAN="${ED}"/usr/share/man/man1 \
+ install
+
+ dolib.so lib/libgsm.so*
+
+ dosym ../gsm/gsm.h /usr/include/libgsm/gsm.h
+}
diff --git a/media-sound/gsm/gsm-1.0.13.ebuild b/media-sound/gsm/gsm-1.0.13.ebuild
deleted file mode 100644
index dca7ce1..0000000
--- a/media-sound/gsm/gsm-1.0.13.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/gsm-1.0.13.ebuild,v 1.7 2012/05/15 12:59:33 aballier Exp $
-
-EAPI=2
-inherit eutils flag-o-matic multilib toolchain-funcs versionator
-
-DESCRIPTION="Lossy speech compression library and tool."
-HOMEPAGE="http://packages.qa.debian.org/libg/libgsm.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="gsm"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-S=${WORKDIR}/${PN}-"$(replace_version_separator 2 '-pl' )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-shared.patch \
- "${FILESDIR}"/${PN}-1.0.12-memcpy.patch \
- "${FILESDIR}"/${PN}-1.0.12-64bit.patch
-}
-
-src_compile() {
- # From upstream Makefile. Define this if your host multiplies
- # floats faster than integers, e.g. on a SPARCstation.
- use sparc && append-flags -DUSE_FLOAT_MUL -DFAST
-
- emake -j1 CCFLAGS="${CFLAGS} -c -DNeedFunctionPrototypes=1" \
- LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" || die "emake failed."
-}
-
-src_install() {
- dodir /usr/bin /usr/$(get_libdir) /usr/include/gsm /usr/share/man/man{1,3}
-
- emake -j1 INSTALL_ROOT="${D}"/usr \
- GSM_INSTALL_LIB="${D}"/usr/$(get_libdir) \
- GSM_INSTALL_INC="${D}"/usr/include/gsm \
- GSM_INSTALL_MAN="${D}"/usr/share/man/man3 \
- TOAST_INSTALL_MAN="${D}"/usr/share/man/man1 \
- install || die "emake install failed."
-
- dolib lib/libgsm.so*
-
- dosym ../gsm/gsm.h /usr/include/libgsm/gsm.h
-
- dodoc ChangeLog* MACHINES MANIFEST README
-}
diff --git a/media-sound/gsm/metadata.xml b/media-sound/gsm/metadata.xml
index e1774e3..c870d0e 100644
--- a/media-sound/gsm/metadata.xml
+++ b/media-sound/gsm/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sound</herd>
+<maintainer type="project">
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/metadata/md5-cache/media-sound/gsm-1.0.13 b/metadata/md5-cache/media-sound/gsm-1.0.13
deleted file mode 100644
index 342c1c7..0000000
--- a/metadata/md5-cache/media-sound/gsm-1.0.13
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Lossy speech compression library and tool.
-EAPI=2
-HOMEPAGE=http://packages.qa.debian.org/libg/libgsm.html
-KEYWORDS=*
-LICENSE=gsm
-SLOT=0
-SRC_URI=mirror://gentoo/gsm-1.0.13.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=02010f2e1a3b0cd46a17b29e351f6812
diff --git a/metadata/md5-cache/media-sound/gsm-1.0.13-r1 b/metadata/md5-cache/media-sound/gsm-1.0.13-r1
new file mode 100644
index 0000000..5a0898b
--- /dev/null
+++ b/metadata/md5-cache/media-sound/gsm-1.0.13-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Lossy speech compression library and tool
+EAPI=7
+HOMEPAGE=https://packages.qa.debian.org/libg/libgsm.html
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=gsm
+SLOT=0
+SRC_URI=mirror://gentoo/gsm-1.0.13.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build 1979aa0ff4d356d32507ca4650d9f37d multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=b956946ad2bb64572a981cb3a8d83bf1
