Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/speex/files/, media-libs/speex/
Date: Mon, 30 Apr 2018 15:58:41
Message-Id: 1525102792.63d714d838dcbc32e40814b80f4d684ed385d0d2.floppym@gentoo
1 commit: 63d714d838dcbc32e40814b80f4d684ed385d0d2
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Mon Apr 30 15:31:36 2018 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 30 15:39:52 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d714d8
7
8 media-libs/speex: Delete old version (1.2_rc1-r2).
9
10 media-libs/speex/Manifest | 1 -
11 .../speex/files/speex-1.2_rc1-r1-configure.patch | 40 -----------------
12 media-libs/speex/speex-1.2_rc1-r2.ebuild | 52 ----------------------
13 3 files changed, 93 deletions(-)
14
15 diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
16 index 7f181475e7a..2f4a5429878 100644
17 --- a/media-libs/speex/Manifest
18 +++ b/media-libs/speex/Manifest
19 @@ -1,2 +1 @@
20 DIST speex-1.2.0.tar.gz 1047080 BLAKE2B 928e044e1195d4d977497cd1275a07323df233ee85e3ec188f362720f96303c2fc2002c1147c2ac93ca03570ff98428d983eb7d00439c9cdbe131041d9aa2697 SHA512 7fe10838c7d1bafcbe42295b82b79262420dba793b8a4388e2f73a3007850b5572face1b5308d9f4e8d7dfc9cb1c016cbad88cd65b2892667986107ed946836b
21 -DIST speex-1.2rc1.tar.gz 1061882 BLAKE2B 1ce4a2c6682c7142cec64dab7075525ffb485d43f61aabab82e01333df2e59c04dba56bf8982a28dd544011dab45db03b4830430303e9610846ed79d77d69d0f SHA512 bdf1ddb2d60496ab220b94c1bec7a43f267fc964fdbb5cc9f24b71b9b571f237f5ce98c1d74b02699d71a95281f4694ff464ebec25e3b135244e5b3099cb1813
22
23 diff --git a/media-libs/speex/files/speex-1.2_rc1-r1-configure.patch b/media-libs/speex/files/speex-1.2_rc1-r1-configure.patch
24 deleted file mode 100644
25 index a6c9166a925..00000000000
26 --- a/media-libs/speex/files/speex-1.2_rc1-r1-configure.patch
27 +++ /dev/null
28 @@ -1,40 +0,0 @@
29 -diff -urN speex-1.2rc1.orig/configure.ac speex-1.2rc1/configure.ac
30 ---- speex-1.2rc1.orig/configure.ac 2008-07-21 03:17:08.000000000 +0100
31 -+++ speex-1.2rc1/configure.ac 2011-03-15 00:23:21.263751871 +0000
32 -@@ -112,9 +112,6 @@
33 -
34 - AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h)
35 -
36 --XIPH_PATH_OGG([src="src"], [src=""])
37 --AC_SUBST(src)
38 --
39 - AC_CHECK_LIB(m, sin)
40 -
41 - # Check for getopt_long; if not found, use included source.
42 -@@ -139,10 +136,16 @@
43 - AC_DEFINE([ENABLE_VALGRIND], , [Enable valgrind extra checks])
44 - fi])
45 -
46 -+AC_ARG_ENABLE(ogg, [ --enable-ogg Enable OGG support], [if test "$enableval" = yes; then
47 -+ XIPH_PATH_OGG([src="src"], [src=""])
48 -+ AC_SUBST(src)
49 -+fi
50 -+])
51 -+
52 - AC_ARG_ENABLE(sse, [ --enable-sse Enable SSE support], [
53 - if test "x$enableval" != xno; then
54 - has_sse=yes
55 --CFLAGS="$CFLAGS -O3 -msse"
56 -+CFLAGS="$CFLAGS -msse"
57 - else
58 - has_sse=no
59 - fi
60 -@@ -217,7 +220,7 @@
61 - ],
62 - [gpl-fftw3], [
63 - AC_DEFINE([USE_GPL_FFTW3], [], [Use FFTW3 for FFT])
64 -- PKG_CHECK_MODULES(FFT, fftw3f)
65 -+ PKG_CHECK_MODULES([FFT], [fftw3f])
66 - ],
67 - [proprietary-intel-mkl], [
68 - AC_DEFINE([USE_INTEL_MKL], [], [Use Intel Math Kernel Library for FFT])
69
70 diff --git a/media-libs/speex/speex-1.2_rc1-r2.ebuild b/media-libs/speex/speex-1.2_rc1-r2.ebuild
71 deleted file mode 100644
72 index 17a13565651..00000000000
73 --- a/media-libs/speex/speex-1.2_rc1-r2.ebuild
74 +++ /dev/null
75 @@ -1,52 +0,0 @@
76 -# Copyright 1999-2015 Gentoo Foundation
77 -# Distributed under the terms of the GNU General Public License v2
78 -
79 -EAPI=5
80 -inherit autotools eutils flag-o-matic multilib-minimal
81 -
82 -MY_P=${P/_} ; MY_P=${MY_P/_p/.}
83 -
84 -DESCRIPTION="Audio compression format designed for speech"
85 -HOMEPAGE="http://www.speex.org/"
86 -SRC_URI="http://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
87 -
88 -LICENSE="BSD"
89 -SLOT="0"
90 -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"
91 -IUSE="ogg cpu_flags_x86_sse static-libs"
92 -
93 -RDEPEND="ogg? ( media-libs/libogg:= )"
94 -DEPEND="${RDEPEND}
95 - virtual/pkgconfig"
96 -
97 -S=${WORKDIR}/${MY_P}
98 -
99 -DOCS=( AUTHORS ChangeLog NEWS README README.TI-DSP README.blackfin README.symbian TODO )
100 -
101 -src_prepare() {
102 - epatch "${FILESDIR}"/${P}-r1-configure.patch
103 -
104 - sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467012
105 -
106 - sed -i \
107 - -e 's:noinst_PROGRAMS:check_PROGRAMS:' \
108 - libspeex/Makefile.am || die
109 -
110 - eautoreconf
111 -}
112 -
113 -multilib_src_configure() {
114 - append-lfs-flags
115 -
116 - ECONF_SOURCE="${S}" econf \
117 - $(use_enable static-libs static) \
118 - $(use_enable cpu_flags_x86_sse sse) \
119 - $( [ "${ABI}" = "${DEFAULT_ABI}" ] && echo $(use_enable ogg))
120 - # ogg is only for speexdec/speexenc binaries, useless for non native ABIs
121 -}
122 -
123 -multilib_src_install() {
124 - emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install
125 -
126 - prune_libtool_files
127 -}