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-sound/tapestrea/, profiles/, media-sound/tapestrea/files/
Date: Tue, 24 Aug 2021 12:39:33
Message-Id: 1629808721.cf52f0641bfca37fc9a49800bbaed1b18d94319e.soap@gentoo
1 commit: cf52f0641bfca37fc9a49800bbaed1b18d94319e
2 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
3 AuthorDate: Tue Aug 24 12:38:41 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 24 12:38:41 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf52f064
7
8 media-sound/tapestrea: Remove last-rited package
9
10 Closes: https://github.com/gentoo/gentoo/pull/22088
11 Closes: https://bugs.gentoo.org/740536
12 Closes: https://bugs.gentoo.org/624746
13 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
14 Signed-off-by: David Seifert <soap <AT> gentoo.org>
15
16 media-sound/tapestrea/Manifest | 1 -
17 .../tapestrea/files/tapestrea-0.1.0.5-gcc44.patch | 33 ------
18 ...trea-0.1.0.5-r1-underlinking-alsa-pthread.patch | 34 ------
19 media-sound/tapestrea/metadata.xml | 5 -
20 media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild | 114 ---------------------
21 profiles/package.mask | 5 -
22 6 files changed, 192 deletions(-)
23
24 diff --git a/media-sound/tapestrea/Manifest b/media-sound/tapestrea/Manifest
25 deleted file mode 100644
26 index e26ad09bcc4..00000000000
27 --- a/media-sound/tapestrea/Manifest
28 +++ /dev/null
29 @@ -1 +0,0 @@
30 -DIST tapestrea-0.1.0.5.tgz 21987831 BLAKE2B 30ee2574acbb1a4577b0e952f9c474304ce6248bb6c4329c2788c0e640c6d82b35f3898e293a1e91ec38ca332bb4f910fd35278edf5c703dde456a6c006d14f4 SHA512 8df64cb31e85167afb78e4891192dde7d5476c637241e53f6218b013bb8c40e43a626cc2a2c1368498491f00451a719e1126a90ca2d67aa52137a9e1cd034656
31
32 diff --git a/media-sound/tapestrea/files/tapestrea-0.1.0.5-gcc44.patch b/media-sound/tapestrea/files/tapestrea-0.1.0.5-gcc44.patch
33 deleted file mode 100644
34 index ca6e0370c95..00000000000
35 --- a/media-sound/tapestrea/files/tapestrea-0.1.0.5-gcc44.patch
36 +++ /dev/null
37 @@ -1,33 +0,0 @@
38 -diff -ur tapestrea-0.1.0.5-orig/scripting/chuck-1.2.1.2/src/util_string.h tapestrea-0.1.0.5/scripting/chuck-1.2.1.2/src/util_string.h
39 ---- tapestrea-0.1.0.5-orig/scripting/chuck-1.2.1.2/src/util_string.h 2009-06-27 19:06:03.000000000 -0400
40 -+++ tapestrea-0.1.0.5/scripting/chuck-1.2.1.2/src/util_string.h 2009-06-27 19:06:54.000000000 -0400
41 -@@ -36,6 +36,7 @@
42 - #include "chuck_def.h"
43 - #include <string>
44 - #include <vector>
45 -+#include <cstdio>
46 -
47 -
48 - // itoa
49 -diff -ur tapestrea-0.1.0.5-orig/src/taps_birdbrain.cpp tapestrea-0.1.0.5/src/taps_birdbrain.cpp
50 ---- tapestrea-0.1.0.5-orig/src/taps_birdbrain.cpp 2009-06-27 19:06:18.000000000 -0400
51 -+++ tapestrea-0.1.0.5/src/taps_birdbrain.cpp 2009-06-27 17:49:18.000000000 -0400
52 -@@ -35,6 +35,7 @@
53 - #include "taps_birdbrain.h"
54 - #include "util_thread.h"
55 - #include <stdarg.h>
56 -+#include <cstdio>
57 -
58 - // for getcwd and chdir
59 - #ifdef __PLATFORM_WIN32__
60 -diff -ur tapestrea-0.1.0.5-orig/src/ui_audiofx.cpp tapestrea-0.1.0.5/src/ui_audiofx.cpp
61 ---- tapestrea-0.1.0.5-orig/src/ui_audiofx.cpp 2009-06-27 19:06:18.000000000 -0400
62 -+++ tapestrea-0.1.0.5/src/ui_audiofx.cpp 2009-06-27 17:49:18.000000000 -0400
63 -@@ -36,6 +36,7 @@
64 - #include "taps_birdbrain.h"
65 - #include "ui_audiofx.h"
66 - #include <iostream>
67 -+#include <cstdio>
68 - using namespace std;
69 -
70 - // Start FxStk
71
72 diff --git a/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch b/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch
73 deleted file mode 100644
74 index 3f866d5c88e..00000000000
75 --- a/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch
76 +++ /dev/null
77 @@ -1,34 +0,0 @@
78 ---- a/src/makefile.alsa
79 -+++ b/src/makefile.alsa
80 -@@ -3,7 +3,7 @@
81 - CHUCK_DIR=../scripting/chuck-1.2.1.2/src
82 - INCLUDES=-I$(CHUCK_DIR)
83 - FLAGS=-D__LINUX_ALSA__ `pkg-config --cflags gtk+-2.0` $(CFLAGS) -c
84 --LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `pkg-config --libs gtk+-2.0`
85 -+LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `pkg-config --libs gtk+-2.0` -lpthread
86 -
87 - TAPS_OBJS= taps_analysis.o taps_birdbrain.o taps_driver.o \
88 - taps_featurelibrary.o taps_pvc.o taps_regioncomparer.o \
89 ---- a/scripting/chuck-1.2.1.2/src/makefile.alsa
90 -+++ b/scripting/chuck-1.2.1.2/src/makefile.alsa
91 -@@ -5,7 +5,7 @@
92 - INCLUDES=
93 - CFLAGS?= -O3
94 - FLAGS= -D__LINUX_ALSA__ -c $(CFLAGS)
95 --LIBS=-lasound -lstdc++ -ldl -lm
96 -+LIBS=-lasound -lstdc++ -lm -lpthread -ldl
97 - SF_OBJ=util_sndfile.o
98 -
99 - ifneq ($(CHUCK_DEBUG),)
100 -diff -Naur a/src/makefile.alsa b/src/makefile.alsa
101 ---- a/src/makefile.alsa 2014-01-30 02:21:02.173891275 +0100
102 -+++ b/src/makefile.alsa 2014-01-30 02:21:23.026891253 +0100
103 -@@ -48,7 +48,7 @@
104 - OBJS+=ui_scripting.o
105 - # scripting disable needs most of chuck anyway due to includes
106 - # in latest rtaudio.cpp, so always keep this line:
107 --LIBS+=$(CHUCK_OBJS)
108 -+LIBS+=$(CHUCK_OBJS) -ldl
109 -
110 - # uncomment to use preconfigured sndfile
111 - #FLAGS+=-D__USE_SNDFILE_PRECONF__
112
113 diff --git a/media-sound/tapestrea/metadata.xml b/media-sound/tapestrea/metadata.xml
114 deleted file mode 100644
115 index 7a38bb90096..00000000000
116 --- a/media-sound/tapestrea/metadata.xml
117 +++ /dev/null
118 @@ -1,5 +0,0 @@
119 -<?xml version="1.0" encoding="UTF-8"?>
120 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
121 -<pkgmetadata>
122 - <!-- maintainer-needed -->
123 -</pkgmetadata>
124
125 diff --git a/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild b/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
126 deleted file mode 100644
127 index 89e4d50d770..00000000000
128 --- a/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
129 +++ /dev/null
130 @@ -1,114 +0,0 @@
131 -# Copyright 1999-2021 Gentoo Authors
132 -# Distributed under the terms of the GNU General Public License v2
133 -
134 -EAPI=7
135 -
136 -inherit flag-o-matic toolchain-funcs
137 -
138 -DESCRIPTION="Expressive Synthesis, Transformation, Rendering of Environmental Audio"
139 -HOMEPAGE="http://taps.cs.princeton.edu/"
140 -SRC_URI="http://taps.cs.princeton.edu/release/files/${P}.tgz"
141 -
142 -LICENSE="GPL-2"
143 -SLOT="0"
144 -KEYWORDS="~amd64 ~x86"
145 -IUSE="+alsa doc jack oss"
146 -
147 -RDEPEND="jack? ( media-sound/jack-audio-connection-kit:0 )
148 - alsa? ( >=media-libs/alsa-lib-0.9:0 )
149 - media-libs/libsndfile:0
150 - media-libs/freeglut:0
151 - virtual/opengl:0
152 - virtual/glu:0
153 - x11-libs/gtk+:2"
154 -DEPEND="${RDEPEND}"
155 -BDEPEND="
156 - sys-devel/bison
157 - sys-devel/flex
158 - virtual/pkgconfig"
159 -
160 -PATCHES=(
161 - "${FILESDIR}"/${P}-gcc44.patch
162 - "${FILESDIR}"/${PF}-underlinking-alsa-pthread.patch
163 -)
164 -
165 -pkg_setup() {
166 - if ! use alsa && ! use jack && ! use oss; then
167 - eerror "One of the following USE flags is needed: jack, alsa or oss"
168 - die "Please set at least one audio engine type"
169 - fi
170 -}
171 -
172 -src_prepare() {
173 - # Respect LDFLAGS/CC
174 - for bend in alsa jack oss; do
175 - sed -i -e "s:gcc -o:\$(CC) \$(LDFLAGS) -o :" \
176 - -e "s:-O3 -c:\$(CFLAGS) -c:" \
177 - -e "s:make -C:\$(MAKE) -C :" \
178 - "${S}/src/makefile.${bend}" || die
179 - done
180 -
181 - # Avoid "make jobserver unavailable" warning
182 - sed -i -e "s:-make:\$(MAKE):g" \
183 - "${S}/src/makefile" || die
184 -
185 - sed -i -e "s:-make:\$(MAKE):g" \
186 - "${S}/scripting/chuck-1.2.1.2/src/makefile" || die
187 -
188 - default
189 -}
190 -
191 -compile_backend() {
192 - backend=${1}
193 - einfo "Compiling against ${backend}"
194 -
195 - cd "${S}/scripting/chuck-1.2.1.2/src" || die
196 -
197 - emake -f "makefile.${backend}" \
198 - PKG_CONFIG=$(tc-getPKG_CONFIG) CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
199 -
200 - cd "${S}/src"
201 - emake -f "makefile.${backend}" \
202 - PKG_CONFIG=$(tc-getPKG_CONFIG) CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
203 -
204 - mv taps{,-${backend}} || die
205 - emake -f makefile clean
206 - cd "${S}/scripting/chuck-1.2.1.2/src"
207 - emake -f makefile clean
208 -}
209 -
210 -src_compile() {
211 - # When compiled with athlon or athlon-xp flags
212 - # chuck crashes on removing a shred with a double free or corruption,
213 - # it happens in Chuck_VM_Stack::shutdown() on the line
214 - # SAFE_DELETE_ARRAY( stack );
215 - replace-cpu-flags athlon athlon-xp i686
216 -
217 - use jack && compile_backend jack
218 - use alsa && compile_backend alsa
219 - use oss && compile_backend oss
220 -}
221 -
222 -src_install() {
223 - use jack && dobin src/taps-jack
224 - use alsa && dobin src/taps-alsa
225 - use oss && dobin src/taps-oss
226 -
227 - dodoc AUTHORS BUGS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
228 -
229 - if use doc ; then
230 - local tapedir
231 - for tapedir in $(find examples/* -type d -maxdepth 0); do
232 - docinto ${tapedir}
233 - dodoc $(find ${tapedir}/* -type f -maxdepth 0)
234 -
235 - local tapedir2
236 - for tapedir2 in $(find ${tapedir}/* -type d -maxdepth 0); do
237 - docinto ${tapedir2}
238 - dodoc $(find ${tapedir2}/* -type f -maxdepth 0)
239 - done
240 - done
241 - docinto doc
242 - dodoc doc/*
243 - fi
244 -}
245
246 diff --git a/profiles/package.mask b/profiles/package.mask
247 index 5dcfad36313..83298c10239 100644
248 --- a/profiles/package.mask
249 +++ b/profiles/package.mask
250 @@ -285,11 +285,6 @@ dev-java/jgoodies-forms
251 # breaks if not all at least many revdeps. #805011 for tracker bug.
252 >=net-libs/mbedtls-3.0.0
253
254 -# Sam James <sam@g.o> (2021-07-26)
255 -# Fails to build with GCC 11. No activity upstream.
256 -# Removal on 2021-08-26. bug #740536, bug #624746.
257 -media-sound/tapestrea
258 -
259 # Andrew Ammerlaan <andrewammerlaan@g.o> (2021-07-12)
260 # Version 3.3.0 suffers from ridiculously high CPU usage, this version has
261 # therefore been retracted upstream.