[gentoo-commits] repo/gentoo:master commit in: media-sound/tapestrea/, profiles/, media-sound/tapestrea/files/

[gentoo-commits] repo/gentoo:master commit in: media-sound/tapestrea/, profiles/, media-sound/tapestrea/files/

[David Seifert]

commit:     cf52f0641bfca37fc9a49800bbaed1b18d94319e
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Tue Aug 24 12:38:41 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Aug 24 12:38:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf52f064

media-sound/tapestrea: Remove last-rited package

Closes: https://github.com/gentoo/gentoo/pull/22088
Closes: https://bugs.gentoo.org/740536
Closes: https://bugs.gentoo.org/624746
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-sound/tapestrea/Manifest                     |   1 -
 .../tapestrea/files/tapestrea-0.1.0.5-gcc44.patch  |  33 ------
 ...trea-0.1.0.5-r1-underlinking-alsa-pthread.patch |  34 ------
 media-sound/tapestrea/metadata.xml                 |   5 -
 media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild  | 114 ---------------------
 profiles/package.mask                              |   5 -
 6 files changed, 192 deletions(-)

diff --git a/media-sound/tapestrea/Manifest b/media-sound/tapestrea/Manifest
deleted file mode 100644
index e26ad09bcc4..00000000000
--- a/media-sound/tapestrea/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tapestrea-0.1.0.5.tgz 21987831 BLAKE2B 30ee2574acbb1a4577b0e952f9c474304ce6248bb6c4329c2788c0e640c6d82b35f3898e293a1e91ec38ca332bb4f910fd35278edf5c703dde456a6c006d14f4 SHA512 8df64cb31e85167afb78e4891192dde7d5476c637241e53f6218b013bb8c40e43a626cc2a2c1368498491f00451a719e1126a90ca2d67aa52137a9e1cd034656

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
deleted file mode 100644
index ca6e0370c95..00000000000
--- a/media-sound/tapestrea/files/tapestrea-0.1.0.5-gcc44.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
---- tapestrea-0.1.0.5-orig/scripting/chuck-1.2.1.2/src/util_string.h	2009-06-27 19:06:03.000000000 -0400
-+++ tapestrea-0.1.0.5/scripting/chuck-1.2.1.2/src/util_string.h	2009-06-27 19:06:54.000000000 -0400
-@@ -36,6 +36,7 @@
- #include "chuck_def.h"
- #include <string>
- #include <vector>
-+#include <cstdio>
- 
- 
- // itoa
-diff -ur tapestrea-0.1.0.5-orig/src/taps_birdbrain.cpp tapestrea-0.1.0.5/src/taps_birdbrain.cpp
---- tapestrea-0.1.0.5-orig/src/taps_birdbrain.cpp	2009-06-27 19:06:18.000000000 -0400
-+++ tapestrea-0.1.0.5/src/taps_birdbrain.cpp	2009-06-27 17:49:18.000000000 -0400
-@@ -35,6 +35,7 @@
- #include "taps_birdbrain.h"
- #include "util_thread.h"
- #include <stdarg.h>
-+#include <cstdio>
- 
- // for getcwd and chdir
- #ifdef __PLATFORM_WIN32__
-diff -ur tapestrea-0.1.0.5-orig/src/ui_audiofx.cpp tapestrea-0.1.0.5/src/ui_audiofx.cpp
---- tapestrea-0.1.0.5-orig/src/ui_audiofx.cpp	2009-06-27 19:06:18.000000000 -0400
-+++ tapestrea-0.1.0.5/src/ui_audiofx.cpp	2009-06-27 17:49:18.000000000 -0400
-@@ -36,6 +36,7 @@
- #include "taps_birdbrain.h"
- #include "ui_audiofx.h"
- #include <iostream>
-+#include <cstdio>
- using namespace std;
- 
- // Start FxStk

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
deleted file mode 100644
index 3f866d5c88e..00000000000
--- a/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/src/makefile.alsa
-+++ b/src/makefile.alsa
-@@ -3,7 +3,7 @@
- CHUCK_DIR=../scripting/chuck-1.2.1.2/src
- INCLUDES=-I$(CHUCK_DIR)
- FLAGS=-D__LINUX_ALSA__ `pkg-config --cflags gtk+-2.0` $(CFLAGS) -c
--LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `pkg-config --libs gtk+-2.0`
-+LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `pkg-config --libs gtk+-2.0` -lpthread
- 
- TAPS_OBJS= taps_analysis.o taps_birdbrain.o taps_driver.o \
- 	taps_featurelibrary.o taps_pvc.o taps_regioncomparer.o \
---- a/scripting/chuck-1.2.1.2/src/makefile.alsa
-+++ b/scripting/chuck-1.2.1.2/src/makefile.alsa
-@@ -5,7 +5,7 @@
- INCLUDES=
- CFLAGS?= -O3
- FLAGS= -D__LINUX_ALSA__ -c $(CFLAGS)
--LIBS=-lasound -lstdc++ -ldl -lm
-+LIBS=-lasound -lstdc++ -lm -lpthread -ldl
- SF_OBJ=util_sndfile.o
- 
- ifneq ($(CHUCK_DEBUG),)
-diff -Naur a/src/makefile.alsa b/src/makefile.alsa
---- a/src/makefile.alsa	2014-01-30 02:21:02.173891275 +0100
-+++ b/src/makefile.alsa	2014-01-30 02:21:23.026891253 +0100
-@@ -48,7 +48,7 @@
- OBJS+=ui_scripting.o
- # scripting disable needs most of chuck anyway due to includes 
- # in latest rtaudio.cpp, so always keep this line:
--LIBS+=$(CHUCK_OBJS)
-+LIBS+=$(CHUCK_OBJS) -ldl
- 
- # uncomment to use preconfigured sndfile
- #FLAGS+=-D__USE_SNDFILE_PRECONF__

diff --git a/media-sound/tapestrea/metadata.xml b/media-sound/tapestrea/metadata.xml
deleted file mode 100644
index 7a38bb90096..00000000000
--- a/media-sound/tapestrea/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild b/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
deleted file mode 100644
index 89e4d50d770..00000000000
--- a/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Expressive Synthesis, Transformation, Rendering of Environmental Audio"
-HOMEPAGE="http://taps.cs.princeton.edu/"
-SRC_URI="http://taps.cs.princeton.edu/release/files/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa doc jack oss"
-
-RDEPEND="jack? ( media-sound/jack-audio-connection-kit:0 )
-	alsa? ( >=media-libs/alsa-lib-0.9:0 )
-	media-libs/libsndfile:0
-	media-libs/freeglut:0
-	virtual/opengl:0
-	virtual/glu:0
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc44.patch
-	"${FILESDIR}"/${PF}-underlinking-alsa-pthread.patch
-)
-
-pkg_setup() {
-	if ! use alsa && ! use jack && ! use oss; then
-		eerror "One of the following USE flags is needed: jack, alsa or oss"
-		die "Please set at least one audio engine type"
-	fi
-}
-
-src_prepare() {
-	# Respect LDFLAGS/CC
-	for bend in alsa jack oss; do
-		sed -i -e "s:gcc -o:\$(CC) \$(LDFLAGS) -o :" \
-			-e "s:-O3 -c:\$(CFLAGS) -c:" \
-			-e "s:make -C:\$(MAKE) -C :" \
-			"${S}/src/makefile.${bend}" || die
-	done
-
-	# Avoid "make jobserver unavailable" warning
-	sed -i -e "s:-make:\$(MAKE):g" \
-		"${S}/src/makefile" || die
-
-	sed -i -e "s:-make:\$(MAKE):g" \
-		"${S}/scripting/chuck-1.2.1.2/src/makefile" || die
-
-	default
-}
-
-compile_backend() {
-	backend=${1}
-	einfo "Compiling against ${backend}"
-
-	cd "${S}/scripting/chuck-1.2.1.2/src" || die
-
-	emake -f "makefile.${backend}" \
-		PKG_CONFIG=$(tc-getPKG_CONFIG) CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-
-	cd "${S}/src"
-	emake -f "makefile.${backend}" \
-		PKG_CONFIG=$(tc-getPKG_CONFIG) CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-
-	mv taps{,-${backend}} || die
-	emake -f makefile clean
-	cd "${S}/scripting/chuck-1.2.1.2/src"
-	emake -f makefile clean
-}
-
-src_compile() {
-	# When compiled with athlon or athlon-xp flags
-	# chuck crashes on removing a shred with a double free or corruption,
-	# it happens in Chuck_VM_Stack::shutdown() on the line
-	#   SAFE_DELETE_ARRAY( stack );
-	replace-cpu-flags athlon athlon-xp i686
-
-	use jack && compile_backend jack
-	use alsa && compile_backend alsa
-	use oss && compile_backend oss
-}
-
-src_install() {
-	use jack && dobin src/taps-jack
-	use alsa && dobin src/taps-alsa
-	use oss && dobin src/taps-oss
-
-	dodoc AUTHORS BUGS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
-
-	if use doc ; then
-		local tapedir
-		for tapedir in $(find examples/* -type d -maxdepth 0); do
-			docinto ${tapedir}
-			dodoc $(find ${tapedir}/* -type f -maxdepth 0)
-
-			local tapedir2
-			for tapedir2 in $(find ${tapedir}/* -type d -maxdepth 0); do
-				docinto ${tapedir2}
-				dodoc $(find ${tapedir2}/* -type f -maxdepth 0)
-			done
-		done
-		docinto doc
-		dodoc doc/*
-	fi
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 5dcfad36313..83298c10239 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -285,11 +285,6 @@ dev-java/jgoodies-forms
 # breaks if not all at least many revdeps. #805011 for tracker bug.
 >=net-libs/mbedtls-3.0.0
 
-# Sam James <sam@gentoo.org> (2021-07-26)
-# Fails to build with GCC 11. No activity upstream.
-# Removal on 2021-08-26. bug #740536, bug #624746.
-media-sound/tapestrea
-
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2021-07-12)
 # Version 3.3.0 suffers from ridiculously high CPU usage, this version has
 # therefore been retracted upstream.