[gentoo-commits] repo/gentoo:master commit in: media-libs/speex/, media-libs/speex/files/

2024-12-13 Thread Sam James
commit: e9245494e258c3d50806d6640d7aae97debc75a3
Author: orbea  riseup  net>
AuthorDate: Thu Dec 12 14:40:59 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 13 09:32:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9245494

media-libs/speex: fix autoreconf with slibtoolize

Upstream-PR: https://github.com/xiph/speex/pull/24
Upstream-Commit: 
https://github.com/xiph/speex/commit/1de1260d24e01224df5fbb8b92893106c89bb8de
Signed-off-by: orbea  riseup.net>
Signed-off-by: Sam James  gentoo.org>

 .../speex/files/speex-1.2.1-slibtoolize.patch  | 28 ++
 media-libs/speex/speex-1.2.1-r2.ebuild |  1 +
 2 files changed, 29 insertions(+)

diff --git a/media-libs/speex/files/speex-1.2.1-slibtoolize.patch 
b/media-libs/speex/files/speex-1.2.1-slibtoolize.patch
new file mode 100644
index ..eef545d9648a
--- /dev/null
+++ b/media-libs/speex/files/speex-1.2.1-slibtoolize.patch
@@ -0,0 +1,28 @@
+https://github.com/xiph/speex/pull/24
+https://github.com/xiph/speex/commit/1de1260d24e01224df5fbb8b92893106c89bb8de
+
+From 1de1260d24e01224df5fbb8b92893106c89bb8de Mon Sep 17 00:00:00 2001
+From: orbea 
+Date: Tue, 4 Jun 2024 08:59:02 -0700
+Subject: [PATCH] configure.ac: don't use internal GNU libtool functions
+
+This doesn't work when using slibtoolize instead of GNU libtoolize and
+is not necessary anyways.
+
+Signed-off-by: orbea 
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0a7d5c1c..0a631b15 100644
+--- a/configure.ac
 b/configure.ac
+@@ -27,7 +27,6 @@ AM_INIT_AUTOMAKE([foreign no-define])
+ AM_MAINTAINER_MODE([enable])
+ 
+ AC_CANONICAL_HOST
+-_LT_SET_OPTION([LT_INIT],[win32-dll])
+ LT_INIT
+ 
+ AC_C_BIGENDIAN

diff --git a/media-libs/speex/speex-1.2.1-r2.ebuild 
b/media-libs/speex/speex-1.2.1-r2.ebuild
index f249467b5235..1381791341de 100644
--- a/media-libs/speex/speex-1.2.1-r2.ebuild
+++ b/media-libs/speex/speex-1.2.1-r2.ebuild
@@ -33,6 +33,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
"${FILESDIR}"/${PN}-1.2.0-configure.patch
"${FILESDIR}"/${P}-vla-detection.patch
+   "${FILESDIR}"/${P}-slibtoolize.patch
"${FILESDIR}"/${PN}-1.2.1-valgrind.patch
 )
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/speex/, media-libs/speex/files/

2023-05-15 Thread Sam James
commit: f6baa20f72862687508e23181f49972f8e428a50
Author: Sam James  gentoo  org>
AuthorDate: Tue May 16 03:55:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 16 03:55:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6baa20f

media-libs/speex: fix valgrind build

Closes: https://bugs.gentoo.org/906455
Thanks-to: Andrei Slavoiu  yahoo.com>
Signed-off-by: Sam James  gentoo.org>

 media-libs/speex/files/speex-1.2.1-valgrind.patch | 53 +++
 media-libs/speex/speex-1.2.1-r1.ebuild|  1 +
 media-libs/speex/speex-1.2.1.ebuild   |  5 ++-
 3 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/media-libs/speex/files/speex-1.2.1-valgrind.patch 
b/media-libs/speex/files/speex-1.2.1-valgrind.patch
new file mode 100644
index ..a9fd9789a127
--- /dev/null
+++ b/media-libs/speex/files/speex-1.2.1-valgrind.patch
@@ -0,0 +1,53 @@
+https://gitlab.xiph.org/xiph/speex/-/merge_requests/13
+
+From b15993fd560c90658ff2e4974e8b3a1afcfcfff2 Mon Sep 17 00:00:00 2001
+From: Andrei Slavoiu 
+Date: Tue, 16 May 2023 04:49:45 +0100
+Subject: [PATCH] Fix --enable-valgrind build
+
+VALGRIND_MAKE_READABLE has been replaced with VALGRIND_MAKE_MEM_DEFINED
+starting with version 3.2 (2006) 
https://valgrind.org/docs/manual/dist.news.old.html.
+
+Bug: https://bugs.gentoo.org/906455
+--- a/libspeex/nb_celp.c
 b/libspeex/nb_celp.c
+@@ -172,7 +172,7 @@ void *nb_encoder_init(const SpeexMode *m)
+st->highpass_enabled = 1;
+ 
+ #ifdef ENABLE_VALGRIND
+-   VALGRIND_MAKE_READABLE(st, NB_ENC_STACK);
++   VALGRIND_MAKE_MEM_DEFINED(st, NB_ENC_STACK);
+ #endif
+return st;
+ }
+@@ -1113,7 +1113,7 @@ void *nb_decoder_init(const SpeexMode *m)
+st->highpass_enabled = 1;
+ 
+ #ifdef ENABLE_VALGRIND
+-   VALGRIND_MAKE_READABLE(st, NB_DEC_STACK);
++   VALGRIND_MAKE_MEM_DEFINED(st, NB_DEC_STACK);
+ #endif
+return st;
+ }
+--- a/libspeex/sb_celp.c
 b/libspeex/sb_celp.c
+@@ -223,7 +223,7 @@ void *sb_encoder_init(const SpeexMode *m)
+speex_encoder_ctl(st->st_low, SPEEX_GET_SAMPLING_RATE, &st->sampling_rate);
+st->sampling_rate*=2;
+ #ifdef ENABLE_VALGRIND
+-   VALGRIND_MAKE_READABLE(st, (st->stack-(char*)st));
++   VALGRIND_MAKE_MEM_DEFINED(st, (st->stack-(char*)st));
+ #endif
+return st;
+ }
+@@ -1017,7 +1017,7 @@ void *sb_decoder_init(const SpeexMode *m)
+st->seed = 1000;
+ 
+ #ifdef ENABLE_VALGRIND
+-   VALGRIND_MAKE_READABLE(st, (st->stack-(char*)st));
++   VALGRIND_MAKE_MEM_DEFINED(st, (st->stack-(char*)st));
+ #endif
+return st;
+ }
+-- 
+GitLab

diff --git a/media-libs/speex/speex-1.2.1-r1.ebuild 
b/media-libs/speex/speex-1.2.1-r1.ebuild
index c966d61c2a6e..f84f46069fda 100644
--- a/media-libs/speex/speex-1.2.1-r1.ebuild
+++ b/media-libs/speex/speex-1.2.1-r1.ebuild
@@ -33,6 +33,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
"${FILESDIR}"/${PN}-1.2.0-configure.patch
"${FILESDIR}"/${P}-vla-detection.patch
+   "${FILESDIR}"/${PN}-1.2.1-valgrind.patch
 )
 
 src_prepare() {

diff --git a/media-libs/speex/speex-1.2.1.ebuild 
b/media-libs/speex/speex-1.2.1.ebuild
index eecc7ebf0031..a79308db25b2 100644
--- a/media-libs/speex/speex-1.2.1.ebuild
+++ b/media-libs/speex/speex-1.2.1.ebuild
@@ -30,7 +30,10 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.2.0-configure.patch )
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.2.0-configure.patch
+   "${FILESDIR}"/${PN}-1.2.1-valgrind.patch
+)
 
 src_prepare() {
default



[gentoo-commits] repo/gentoo:master commit in: media-libs/speex/, media-libs/speex/files/

2023-05-14 Thread Sam James
commit: c6e05e88a81cd19c57175f4dc91e9dec0befc227
Author: Sam James  gentoo  org>
AuthorDate: Mon May 15 06:42:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 15 06:47:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e05e88

media-libs/speex: modernise ebuild; fix configure issue; simplify multilib

- Modernise ebuild (use an array etc for econf)
- Backport an upstream patch to fix configure typo for C99 VLA detection
- Simplify/speed up multilib build by not building thrown-away utilities
(only needed for native ABI).

Signed-off-by: Sam James  gentoo.org>

 .../speex/files/speex-1.2.1-vla-detection.patch| 27 
 media-libs/speex/speex-1.2.1-r1.ebuild | 81 ++
 2 files changed, 108 insertions(+)

diff --git a/media-libs/speex/files/speex-1.2.1-vla-detection.patch 
b/media-libs/speex/files/speex-1.2.1-vla-detection.patch
new file mode 100644
index ..1b3826f8b25e
--- /dev/null
+++ b/media-libs/speex/files/speex-1.2.1-vla-detection.patch
@@ -0,0 +1,27 @@
+https://gitlab.xiph.org/xiph/speex/-/commit/5b036b2ca5e27004502e67ee20490a16f5e68aa1
+
+From 5b036b2ca5e27004502e67ee20490a16f5e68aa1 Mon Sep 17 00:00:00 2001
+From: Kai Pastor 
+Date: Wed, 24 Aug 2022 20:14:31 +0200
+Subject: [PATCH] Fix vla detection
+
+Signed-off-by: Tristan Matthews 
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index d94c2feb..b8131482 100644
+--- a/configure.ac
 b/configure.ac
+@@ -37,7 +37,7 @@ AC_C_RESTRICT
+ 
+ 
+ AC_MSG_CHECKING(for C99 variable-size arrays)
+-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
+ int foo;
+ foo = 10;
+ int array[foo];
+-- 
+GitLab

diff --git a/media-libs/speex/speex-1.2.1-r1.ebuild 
b/media-libs/speex/speex-1.2.1-r1.ebuild
new file mode 100644
index ..c966d61c2a6e
--- /dev/null
+++ b/media-libs/speex/speex-1.2.1-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multilib-minimal
+
+MY_P=${P/_}
+MY_P=${MY_P/_p/.}
+
+DESCRIPTION="Audio compression format designed for speech"
+HOMEPAGE="https://www.speex.org/";
+SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz";
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x86-solaris"
+IUSE="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse 
utils valgrind +vbr"
+
+RDEPEND="
+   utils? (
+   media-libs/libogg:=
+   media-libs/speexdsp[${MULTILIB_USEDEP}]
+   )"
+DEPEND="
+   ${RDEPEND}
+   valgrind? ( dev-util/valgrind )
+"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.2.0-configure.patch
+   "${FILESDIR}"/${P}-vla-detection.patch
+)
+
+src_prepare() {
+   default
+
+   sed -i \
+   -e 's:noinst_PROGRAMS:check_PROGRAMS:' \
+   libspeex/Makefile.am || die
+
+   eautoreconf
+}
+
+multilib_src_configure() {
+   append-lfs-flags
+
+   local myeconfargs=(
+   $(multilib_native_use_enable valgrind)
+   $(use_enable cpu_flags_x86_sse sse)
+   $(use_enable vbr)
+   $(multilib_native_use_with utils speexdsp)
+   $(multilib_native_use_enable utils binaries)
+   )
+
+   local FIXED_ARG="--disable-fixed-point"
+   local ARM4_ARG="--disable-arm4-asm"
+   local ARM5_ARG="--disable-arm5e-asm"
+
+   if use arm && ! use cpu_flags_arm_v6; then
+   FIXED_ARG="--enable-fixed-point"
+
+   if use cpu_flags_arm_v5; then
+   ARM5_ARG="--enable-arm5e-asm"
+   elif use cpu_flags_arm_v4; then
+   ARM4_ARG="--enable-arm4-asm"
+   fi
+   fi
+
+   myeconfargs+=( ${FIXED_ARG} ${ARM4_ARG} ${ARM5_ARG} )
+
+   ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+   einstalldocs
+   find "${ED}" -name '*.la' -type f -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: media-libs/speex/, media-libs/speex/files/

2017-03-03 Thread Michael Palimaka
commit: 2776a627b16b7a06060cd2d563a77f35680f9910
Author: Aric Belsito  gmail  com>
AuthorDate: Fri Mar  3 20:59:43 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Mar  3 23:11:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2776a627

media-libs/speex: version bump to 1.2.0

Move to EAPI 6
Gentoo-Bug: https://bugs.gentoo.org/596400

 media-libs/speex/Manifest  |  1 +
 media-libs/speex/files/speex-1.2.0-configure.patch | 27 ++
 media-libs/speex/metadata.xml  | 19 ---
 media-libs/speex/speex-1.2.0.ebuild| 59 ++
 4 files changed, 99 insertions(+), 7 deletions(-)

diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index d7e33b8ef61..e5c7256f86e 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -1 +1,2 @@
+DIST speex-1.2.0.tar.gz 1047080 SHA256 
eaae8af0ac742dc7d542c9439ac72f1f385ce838392dc849cae4536af9210094 SHA512 
7fe10838c7d1bafcbe42295b82b79262420dba793b8a4388e2f73a3007850b5572face1b5308d9f4e8d7dfc9cb1c016cbad88cd65b2892667986107ed946836b
 WHIRLPOOL 
25274b640424318e06bceeb33c748f1299ebb35297ebbfe4a80aa183beb1fe4d3d656597e48d781c77ae104f9911770ffcebe9ff20a0fa555fbf68a07d5841d1
 DIST speex-1.2rc1.tar.gz 1061882 SHA256 
342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f1179cb7a6 SHA512 
bdf1ddb2d60496ab220b94c1bec7a43f267fc964fdbb5cc9f24b71b9b571f237f5ce98c1d74b02699d71a95281f4694ff464ebec25e3b135244e5b3099cb1813
 WHIRLPOOL 
c984f04a9c78332509b76ef98ff0eb84b8b4b8755d02890c5de41501325c2055e42243eaed2671e0087c8ca2cdea5967e5113c3d85a53f3704a8d8a3cfc487cb

diff --git a/media-libs/speex/files/speex-1.2.0-configure.patch 
b/media-libs/speex/files/speex-1.2.0-configure.patch
new file mode 100644
index 000..e0aca82b908
--- /dev/null
+++ b/media-libs/speex/files/speex-1.2.0-configure.patch
@@ -0,0 +1,27 @@
+diff -Naur speex-1.2.0.orig/configure.ac speex-1.2.0/configure.ac
+--- speex-1.2.0.orig/configure.ac  2016-12-12 13:53:12.254983043 -0800
 speex-1.2.0/configure.ac   2016-12-12 13:58:44.950298126 -0800
+@@ -138,7 +138,7 @@
+ AC_ARG_ENABLE(sse, [  --enable-sseEnable SSE support], [
+ if test "x$enableval" != xno; then
+ has_sse=yes
+-CFLAGS="$CFLAGS -O3 -msse"
++CFLAGS="$CFLAGS -msse"
+ else
+ has_sse=no
+ fi
+@@ -257,7 +257,13 @@
+ 
+ AM_CONDITIONAL(BUILD_VORBIS_PSY, [test "x$vorbis_psy" = "xyes"])
+ 
+-PKG_CHECK_MODULES([SPEEXDSP], [speexdsp], [AC_DEFINE([USE_SPEEXDSP], [], [Use 
SpeexDSP library])], [speexdsp_failed=yes])
++AC_ARG_WITH(speexdsp, [  --without-speexdsp   Do not build with SpeexDSP])
++if test "x$withval" != xno; then
++  PKG_CHECK_MODULES([SPEEXDSP], [speexdsp], [AC_DEFINE([USE_SPEEXDSP], [], 
[Use SpeexDSP library])])
++else
++  AC_DEFINE([USE_SPEEXDSP], false)
++fi
++
+ 
+ 
+ AC_CHECK_SIZEOF([int16_t])

diff --git a/media-libs/speex/metadata.xml b/media-libs/speex/metadata.xml
index 18e9eb1cce0..7617efb0161 100644
--- a/media-libs/speex/metadata.xml
+++ b/media-libs/speex/metadata.xml
@@ -1,11 +1,16 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-
-  so...@gentoo.org
-  Gentoo Sound project
-
-
-  cpe:/a:xiph:speex
-
+  
+so...@gentoo.org
+Gentoo Sound project
+  
+  
+cpe:/a:xiph:speex
+  
+  
+Enables optimizations for armv5te processors.
+Enables speex commandline utilities (speexenc, 
speexdec).
+Enable VBR support.
+  
 

diff --git a/media-libs/speex/speex-1.2.0.ebuild 
b/media-libs/speex/speex-1.2.0.ebuild
new file mode 100644
index 000..33b2bb8cee1
--- /dev/null
+++ b/media-libs/speex/speex-1.2.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic multilib-minimal
+
+MY_P=${P/_}
+MY_P=${MY_P/_p/.}
+
+DESCRIPTION="Audio compression format designed for speech"
+HOMEPAGE="http://www.speex.org/";
+SRC_URI="http://downloads.xiph.org/releases/speex/${MY_P}.tar.gz";
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="armv5te cpu_flags_x86_sse static-libs utils +vbr"
+
+RDEPEND="
+   utils? (
+   media-libs/libogg:=
+   media-libs/speexdsp
+   )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}/${P}-configure.patch" )
+
+src_prepare() {
+   default
+
+   sed -i \
+   -e 's:noinst_PROGRAMS:check_PROGRAMS:' \
+   libspeex/Makefile.am || die
+
+   eautoreconf
+}
+
+multilib_src_configure() {
+   append-lfs-flags
+
+   # Can also be configured without floating point
+   # --enable-fixed-point
+   ECONF_SOURCE="${S}" econf \
+   $(use_enable static-libs static) \
+   $(usex arm $(usex armv5te '--disa