Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/tremor/files/, media-libs/tremor/
Date: Sat, 16 Oct 2021 13:59:09
Message-Id: 1634392723.176fa54352795eb7aada243865dd7665ff1835c1.soap@gentoo
1 commit: 176fa54352795eb7aada243865dd7665ff1835c1
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 16 13:58:43 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 16 13:58:43 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=176fa543
7
8 media-libs/tremor: port to EAPI 8
9
10 Closes: https://bugs.gentoo.org/629756
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 .../files/tremor-0_pre20130223-autoconf.patch | 26 ++++++++++++++++++
14 media-libs/tremor/tremor-0_pre20130223-r2.ebuild | 32 ++++++++--------------
15 2 files changed, 37 insertions(+), 21 deletions(-)
16
17 diff --git a/media-libs/tremor/files/tremor-0_pre20130223-autoconf.patch b/media-libs/tremor/files/tremor-0_pre20130223-autoconf.patch
18 new file mode 100644
19 index 00000000000..97dda9ffac9
20 --- /dev/null
21 +++ b/media-libs/tremor/files/tremor-0_pre20130223-autoconf.patch
22 @@ -0,0 +1,26 @@
23 +--- a/configure.in
24 ++++ b/configure.in
25 +@@ -9,7 +9,7 @@
26 + AC_CANONICAL_HOST
27 + AC_CANONICAL_TARGET
28 +
29 +-AM_CONFIG_HEADER([config.h])
30 ++AC_CONFIG_HEADERS([config.h])
31 +
32 + AM_INIT_AUTOMAKE(libvorbisidec,1.2.1)
33 +
34 +@@ -62,12 +62,12 @@
35 + case $host in
36 + arm-*-*)
37 + DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -D_ARM_ASSEM_"
38 +- CFLAGS="-O2 -D_ARM_ASSEM_ -fsigned-char"
39 ++ CFLAGS=" -D_ARM_ASSEM_ -fsigned-char"
40 + PROFILE="-W -pg -g -O2 -D_ARM_ASSEM_ -fsigned-char -fno-inline-functions";;
41 +
42 + *)
43 + DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
44 +- CFLAGS="-O2 -Wall -fsigned-char"
45 ++ CFLAGS=" -Wall -fsigned-char"
46 + PROFILE="-Wall -pg -g -O2 -fsigned-char -fno-inline-functions";;
47 + esac
48 + fi
49
50 diff --git a/media-libs/tremor/tremor-0_pre20130223-r2.ebuild b/media-libs/tremor/tremor-0_pre20130223-r2.ebuild
51 index dd8a83316d2..1fa4c476ded 100644
52 --- a/media-libs/tremor/tremor-0_pre20130223-r2.ebuild
53 +++ b/media-libs/tremor/tremor-0_pre20130223-r2.ebuild
54 @@ -1,11 +1,9 @@
55 # Copyright 1999-2021 Gentoo Authors
56 # Distributed under the terms of the GNU General Public License v2
57
58 -EAPI=5
59 +EAPI=8
60
61 -# svn export http://svn.xiph.org/trunk/Tremor tremor-${PV}
62 -
63 -inherit autotools eutils multilib-minimal
64 +inherit autotools multilib-minimal
65
66 DESCRIPTION="A fixed-point version of the Ogg Vorbis decoder (also known as libvorbisidec)"
67 HOMEPAGE="https://wiki.xiph.org/Tremor"
68 @@ -14,37 +12,29 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
69 LICENSE="BSD"
70 SLOT="0"
71 KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
72 -IUSE="low-accuracy static-libs"
73 +IUSE="low-accuracy"
74
75 RDEPEND=">=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]"
76 -DEPEND="${RDEPEND}
77 - virtual/pkgconfig"
78 -
79 -DOCS=( "CHANGELOG" "README" )
80 +DEPEND="${RDEPEND}"
81 +BDEPEND="virtual/pkgconfig"
82
83 PATCHES=(
84 "${FILESDIR}"/${P}-out-of-bounds-write.patch
85 + "${FILESDIR}"/${P}-autoconf.patch
86 )
87
88 src_prepare() {
89 - epatch "${PATCHES[@]}"
90 -
91 - sed -i \
92 - -e '/CFLAGS/s:-O2::' \
93 - -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
94 - configure.in || die
95 -
96 + default
97 eautoreconf
98 }
99
100 multilib_src_configure() {
101 - ECONF_SOURCE="${S}" econf \
102 - $(use_enable static-libs static) \
103 - $(use_enable low-accuracy)
104 + ECONF_SOURCE="${S}" econf $(use_enable low-accuracy)
105 }
106
107 multilib_src_install_all() {
108 + HTML_DOCS=( doc/. )
109 einstalldocs
110 - dohtml -r doc/*
111 - find "${D}" -name '*.la' -type f -delete || die
112 +
113 + find "${ED}" -name '*.la' -type f -delete || die
114 }