commit: b2e96a874d1b406a996c39a8b2948862b3365015 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Nov 9 18:34:32 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Nov 10 09:30:46 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2e96a87
media-sound/gsm: drop 1.0.13-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-sound/gsm/Manifest | 1 - media-sound/gsm/files/gsm-1.0.13-shared.patch | 159 -------------------------- media-sound/gsm/gsm-1.0.13-r1.ebuild | 58 ---------- 3 files changed, 218 deletions(-) diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest index f0e396447e37..8f0f4b727115 100644 --- a/media-sound/gsm/Manifest +++ b/media-sound/gsm/Manifest @@ -1,3 +1,2 @@ -DIST gsm-1.0.13.tar.gz 65318 BLAKE2B 22bb79e3afd9a2e99041693288342b55969207223486200d4aebc61908930040b6b766a9bf673ec6b484eeb95833684c79f34c95d32da17cfb4c36d025004858 SHA512 0d0cf9e1e81e64cd84f588c1e4f0cb74b849d45e41fdebf860f63588084c73c7c5198bfe73a6c976bda5735ee516661d3db00afbb5cc5886a7ee3a7b31d673aa DIST gsm-1.0.22.tar.gz 66583 BLAKE2B 4c654997e2dd91bc5cee406bd664426f86479bfa8624abb0d7ec164eaebe83c3f534b5ee16952b302500630a6f53df26bbb2287f7a329c8878ae48e61fb770ab SHA512 f4284f096ed4d606ddece5c1b28edb63feacc26a0b664f1350c040dbf50113d27bedfd9896bf1620cb4fc3a6c8f6a5244955a6c625ded833dcee607c63c97dd2 DIST libgsm_1.0.22-1.debian.tar.xz 10516 BLAKE2B 8839082ec446c3eb9dde5d1348806ac5015557257b0c1d319945c36080277b40b25f4903013c5242115467a73e425731661ad4882cf35bba51a90e4f44f284ae SHA512 21929f790d7c821e03113baf3e0690e8cb4b8b3c9015ca6fa05593dba9c4fb000ad41546826bc623c69b19689e81092afe0f7e266b22f9db35e8c735516c9de4 diff --git a/media-sound/gsm/files/gsm-1.0.13-shared.patch b/media-sound/gsm/files/gsm-1.0.13-shared.patch deleted file mode 100644 index ba178092c2f0..000000000000 --- a/media-sound/gsm/files/gsm-1.0.13-shared.patch +++ /dev/null @@ -1,159 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -96,16 +96,14 @@ - # Other tools - - SHELL = /bin/sh --LN = ln -+LN = ln -s - BASENAME = basename --AR = ar - ARFLAGS = cr - 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 -+LIBGSMSO= $(LIB)/libgsm.so - - TOAST = $(BIN)/toast - UNTOAST = $(BIN)/untoast -@@ -203,24 +202,43 @@ - - # Object files - --GSM_OBJECTS = $(SRC)/add.o \ -- $(SRC)/code.o \ -- $(SRC)/debug.o \ -- $(SRC)/decode.o \ -- $(SRC)/long_term.o \ -- $(SRC)/lpc.o \ -- $(SRC)/preprocess.o \ -- $(SRC)/rpe.o \ -- $(SRC)/gsm_destroy.o \ -- $(SRC)/gsm_decode.o \ -- $(SRC)/gsm_encode.o \ -- $(SRC)/gsm_explode.o \ -- $(SRC)/gsm_implode.o \ -- $(SRC)/gsm_create.o \ -- $(SRC)/gsm_print.o \ -- $(SRC)/gsm_option.o \ -- $(SRC)/short_term.o \ -- $(SRC)/table.o -+STATIC_GSM_OBJECTS = $(SRC)/add.o \ -+ $(SRC)/code.o \ -+ $(SRC)/debug.o \ -+ $(SRC)/decode.o \ -+ $(SRC)/long_term.o \ -+ $(SRC)/lpc.o \ -+ $(SRC)/preprocess.o \ -+ $(SRC)/rpe.o \ -+ $(SRC)/gsm_destroy.o \ -+ $(SRC)/gsm_decode.o \ -+ $(SRC)/gsm_encode.o \ -+ $(SRC)/gsm_explode.o \ -+ $(SRC)/gsm_implode.o \ -+ $(SRC)/gsm_create.o \ -+ $(SRC)/gsm_print.o \ -+ $(SRC)/gsm_option.o \ -+ $(SRC)/short_term.o \ -+ $(SRC)/table.o -+ -+SHARED_GSM_OBJECTS = $(SRC)/add.lo \ -+ $(SRC)/code.lo \ -+ $(SRC)/debug.lo \ -+ $(SRC)/decode.lo \ -+ $(SRC)/long_term.lo \ -+ $(SRC)/lpc.lo \ -+ $(SRC)/preprocess.lo \ -+ $(SRC)/rpe.lo \ -+ $(SRC)/gsm_destroy.lo \ -+ $(SRC)/gsm_decode.lo \ -+ $(SRC)/gsm_encode.lo \ -+ $(SRC)/gsm_explode.lo \ -+ $(SRC)/gsm_implode.lo \ -+ $(SRC)/gsm_create.lo \ -+ $(SRC)/gsm_print.lo \ -+ $(SRC)/gsm_option.lo \ -+ $(SRC)/short_term.lo \ -+ $(SRC)/table.lo - - TOAST_OBJECTS = $(SRC)/toast.o \ - $(SRC)/toast_lin.o \ -@@ -228,7 +246,7 @@ - $(SRC)/toast_alaw.o \ - $(SRC)/toast_audio.o - --OBJECTS = $(GSM_OBJECTS) $(TOAST_OBJECTS) -+OBJECTS = $(STATIC_GSM_OBJECTS) $(SHARED_GSM_OBJECTS) $(TOAST_OBJECTS) - - # Manuals - -@@ -277,9 +295,12 @@ - $(CC) $(CFLAGS) $? - @-mv `$(BASENAME) $@` $@ > /dev/null 2>&1 - -+%.lo: %.c -+ $(CC) $(CFLAGS) -fPIC -c $< -o $@ -+ - # Target rules - --all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST) -+all: $(LIBGSM) $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST) - @-echo $(ROOT): Done. - - tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result -@@ -299,24 +320,29 @@ - - # The basic API: libgsm - --$(LIBGSM): $(LIB) $(GSM_OBJECTS) -+$(LIBGSMSO): $(LIB) $(SHARED_GSM_OBJECTS) -+ $(LD) $(LFLAGS) -o [email protected] -shared -Xlinker -soname -Xlinker libgsm.so.1 $(SHARED_GSM_OBJECTS) -lc -+ ln -fs libgsm.so.1.0.13 lib/libgsm.so.1 -+ ln -fs libgsm.so.1.0.13 lib/libgsm.so -+ -+$(LIBGSM): $(LIB) $(STATIC_GSM_OBJECTS) - -rm $(RMFLAGS) $(LIBGSM) -- $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) -+ $(AR) $(ARFLAGS) $(LIBGSM) $(STATIC_GSM_OBJECTS) - $(RANLIB) $(LIBGSM) - - - # Toast, Untoast and Tcat -- the compress-like frontends to gsm. - - $(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) -- $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB) -+ $(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 -@@ -426,7 +452,9 @@ - - clean: semi-clean - -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \ -- $(TOAST) $(TCAT) $(UNTOAST) \ -+ $(LIBGSMSO) $(LIB)/libgsm.so.1.0.13 \ -+ $(LIB)libgsm.so.1 \ -+ $(TOAST) $(TCAT) $(UNTOAST) \ - $(ROOT)/gsm-1.0.tar.Z - - diff --git a/media-sound/gsm/gsm-1.0.13-r1.ebuild b/media-sound/gsm/gsm-1.0.13-r1.ebuild deleted file mode 100644 index e4001b50419d..000000000000 --- a/media-sound/gsm/gsm-1.0.13-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2022 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="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" - -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 -}
