commit: e1518299472358d02997f641a51b00accb95a955
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 22 21:45:55 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 22 22:25:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1518299
media-sound/xmms2: drop 0.8_p20161122-r8
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
media-sound/xmms2/Manifest | 2 -
media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch | 15 -
.../xmms2/files/xmms2-0.8_p20161122-be-hash.patch | 39 ---
.../xmms2/files/xmms2-0.8_p20161122-gcc-10.patch | 11 -
.../xmms2/files/xmms2-0.8_p20161122-tarball.patch | 78 -----
media-sound/xmms2/metadata.xml | 1 -
media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild | 327 ---------------------
7 files changed, 473 deletions(-)
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 0ae44e63d98..38569c9908a 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1,5 +1,3 @@
-DIST waf-2.0.19.tar.bz2 682213 BLAKE2B
0bd2e31827ac65e0565abc09df37a42193ff37b50b6d0244f8b10ba7f308b4ba31ba864742d8c8d4005b86e611223dc4315cf70c0dbbf6b7db8f02e4f551fbb2
SHA512
ae7f3973c79e44313b4894c75763ad43ccd2be88e0d351d7f606ce495c5a464a379c85c076ebd8ba577fc88918af2bbb39bbec1049f25f02c14d98388e012c59
DIST waf-2.0.22.tar.bz2 687244 BLAKE2B
feea82e7e6aaba1187f368aa00025f206a7217196de9be7a97ca6aa8882823decd79db38dda4f1f25e81541eaa44edf029eea8d57e28f7d31b94d9ee93201ea9
SHA512
a3a275fd4c81c7b7385c2da001f3924d272105b8f33839265ebbb38708051b7cb13b9b9019e84325707d04513de0c13b032b1ad21458aec6586d10df4ed8d5f5
-DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B
f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390
SHA512
affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb
DIST xmms2-0.8_p20201016.tar.gz 1720185 BLAKE2B
e1cad8ed2ece9d8ce905ffe86de53bb4010639d83fd15700eefccf190034577ff8666f3557bfb23741ed8400eba1e6246ef28ff21c4dbbe499239da945befc74
SHA512
0e73771f56c341e5dea15451457426958217de3ac19cad1924c11740f96feb69e385242a27a9cf9258841ed4e6538c12e135492f715bfae6976b31fb358508bf
DIST xmms2-s4-0.8_p20201016.tar.gz 184231 BLAKE2B
0676f89b743e265af01593c215c609ae48ea368d861fd28b022b4124a00852182686a46ebf90ac44a10343f86ba5c398c47fd85e2688971b2b4445f3c3843af5
SHA512
f510141ca792893feba2c00d9bc437f492fdce7c29b12c9a8432792ca5a1703cc7068e1a9f4641abd50b320fefb5867fb5bc58a58b0b0272cf75828c764f94ed
diff --git a/media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch
b/media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch
deleted file mode 100644
index 2e9fac380ea..00000000000
--- a/media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: xmms2-0.8DrO_o/src/plugins/avcodec/avcodec.c
-===================================================================
---- xmms2-0.8DrO_o.orig/src/plugins/avcodec/avcodec.c
-+++ xmms2-0.8DrO_o/src/plugins/avcodec/avcodec.c
-@@ -29,6 +29,10 @@
-
- #define AVCODEC_BUFFER_SIZE 16384
-
-+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
-+#endif
-+
- typedef struct {
- AVCodecContext *codecctx;
-
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-be-hash.patch
b/media-sound/xmms2/files/xmms2-0.8_p20161122-be-hash.patch
deleted file mode 100644
index 5fa43298cf7..00000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-be-hash.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d97c8b8239e8b3c5ddb951d427b7d78ea7faad25 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <sly...@gentoo.org>
-Date: Sun, 30 Jul 2017 23:08:02 +0100
-Subject: [PATCH] OTHER: _xmmsv_dict_hash: make hash function
- endianness-agnostic
-
-The following code:
- uint32_t k;
- memcpy (&k, data, sizeof (k));
-computes different data depending on platform endianness.
-
-That causes test_xmmsv_serialize_coll_match test to fail
-as collection order is serialized in wrong order.
-
-Signed-off-by: Sergei Trofimovich <sly...@gentoo.org>
----
- src/lib/xmmstypes/xmmsv_dict.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/xmmstypes/xmmsv_dict.c b/src/lib/xmmstypes/xmmsv_dict.c
-index 5ebe4eb3..32533285 100644
---- a/src/lib/xmmstypes/xmmsv_dict.c
-+++ b/src/lib/xmmstypes/xmmsv_dict.c
-@@ -66,8 +66,10 @@ _xmmsv_dict_hash (const void *key, int len)
-
- while (len >= 4)
- {
-- uint32_t k;
-- memcpy (&k, data, sizeof (k));
-+ uint32_t k = data [0]
-+ | data [1] << 8
-+ | data [2] << 16
-+ | data [3] << 24;
-
- k *= m;
- k ^= k >> r;
---
-2.13.3
-
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch
b/media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch
deleted file mode 100644
index 29a8311d219..00000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/lib/s4/tests/s4/t_transactions.c
-+++ b/src/lib/s4/tests/s4/t_transactions.c
-@@ -19,7 +19,7 @@
- #include <glib.h>
- #include <glib/gstdio.h>
-
--s4_t *s4;
-+extern s4_t *s4;
- s4_val_t *val;
-
- SETUP (Transactions) {
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-tarball.patch
b/media-sound/xmms2/files/xmms2-0.8_p20161122-tarball.patch
deleted file mode 100644
index eef49b13f16..00000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-tarball.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/utils/gen-changelog.py b/utils/gen-changelog.py
-index b539088a..301c0461 100755
---- a/utils/gen-changelog.py
-+++ b/utils/gen-changelog.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- from subprocess import check_output
- import os
-
-diff --git a/utils/gen-tarball.py b/utils/gen-tarball.py
-index 2ae2a4d1..09ed5074 100755
---- a/utils/gen-tarball.py
-+++ b/utils/gen-tarball.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from subprocess import check_output, call
- import tarfile
- import os
-@@ -40,15 +40,19 @@ def add_files(ball, prefix, template, files):
-
- VERSION = check_output(["git", "describe"]).strip()
-
-+# TODO: derive paths from submodule configuration
- TUTORIAL_DIR="doc/tutorial"
-+S4_DIR="src/lib/s4"
-
- PREFIX="xmms2-%s" % VERSION
- PREFIX_TUTORIAL="%s/%s" % (PREFIX, TUTORIAL_DIR)
-+PREFIX_S4="%s/%s" % (PREFIX, S4_DIR)
-
- DIST_DIR="dist"
- DIST_XMMS2="%s/xmms2-%s.tar" % (DIST_DIR, VERSION)
- DIST_XMMS2_BZ2="%s/xmms2-%s.tar.bz2" % (DIST_DIR, VERSION)
- DIST_TUTORIAL="%s/xmms2-tutorial-%s.tar" % (DIST_DIR, VERSION)
-+DIST_S4="%s/xmms2-tutorial-%s.tar" % (DIST_DIR, VERSION)
-
- if not os.path.exists(DIST_DIR):
- os.mkdir(DIST_DIR)
-@@ -62,6 +66,9 @@ if os.path.exists(DIST_XMMS2_BZ2):
- if os.path.exists(DIST_TUTORIAL):
- os.unlink(DIST_TUTORIAL)
-
-+if os.path.exists(DIST_S4):
-+ os.unlink(DIST_S4)
-+
- # Tar up XMMS2
- call("git archive --format=tar --prefix=%s/ HEAD > %s" % (PREFIX,
DIST_XMMS2), shell=True)
-
-@@ -69,9 +76,11 @@ call("git archive --format=tar --prefix=%s/ HEAD > %s" %
(PREFIX, DIST_XMMS2), s
- call("git submodule init", shell=True)
- call("git submodule update", shell=True)
- call("git --git-dir=%s/.git archive --format=tar --prefix=%s/ HEAD > %s" %
(TUTORIAL_DIR, PREFIX_TUTORIAL, DIST_TUTORIAL), shell=True)
-+call("git --git-dir=%s/.git archive --format=tar --prefix=%s/ HEAD > %s" %
(S4_DIR, PREFIX_S4, DIST_S4), shell=True)
-
--# Append the tutorials to the XMMS2 archive
-+# Append the tutorials and s4 to the XMMS2 archive
- call("tar -Af %s %s" % (DIST_XMMS2, DIST_TUTORIAL), shell=True)
-+call("tar -Af %s %s" % (DIST_XMMS2, DIST_S4), shell=True)
-
- # Append ChangeLog and a summary of all file hashes."
- add_files(DIST_XMMS2, PREFIX, get_template(DIST_XMMS2, os.path.join(PREFIX,
"wscript")), [
-diff --git a/utils/gen-tree-hashes.py b/utils/gen-tree-hashes.py
-index 7f8b9e4f..9d27adb0 100755
---- a/utils/gen-tree-hashes.py
-+++ b/utils/gen-tree-hashes.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from subprocess import check_output
- from operator import itemgetter
- import os
-@@ -21,3 +21,4 @@ def collect_hashes(*paths):
-
- print check_output("git describe", shell=True)
- print collect_hashes(".", "doc/tutorial")
-+print collect_hashes(".", "src/lib/s4")
diff --git a/media-sound/xmms2/metadata.xml b/media-sound/xmms2/metadata.xml
index 34034fc9473..7f08040bab7 100644
--- a/media-sound/xmms2/metadata.xml
+++ b/media-sound/xmms2/metadata.xml
@@ -14,7 +14,6 @@
<flag name="mac">Support for Monkey's Audio (APE) format using
<pkg>media-sound/mac</pkg></flag>
<flag name="mlib-update">Enable building of xmms2-mlib-updater
client</flag>
<flag name="ofa">Support for Open Fingerprint Architecture
(OFA)</flag>
- <flag name="phonehome">This client sends anonymous
usage-statistics to the xmms2</flag>
<flag name="server">Build xmms2 player daemon (otherwise only
clients are built)</flag>
<flag name="sid">Support for C64 SID using
<pkg>media-libs/libsidplay</pkg></flag>
<flag name="tremor">Support Vorbis using an alternate
fixed-point decoder with <pkg>media-libs/tremor</pkg></flag>
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
b/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
deleted file mode 100644
index bf8cb66ac17..00000000000
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit multiprocessing perl-functions python-single-r1 ruby-single
toolchain-funcs
-
-# generated as 'python2 ./utils/gen-tarball.py' from clean git tree
-MY_P="${P%_p*}DrO_o-949-gca15e830"
-WAF_VER="2.0.19"
-
-DESCRIPTION="X(cross)platform Music Multiplexing System. Next generation of
the XMMS player"
-HOMEPAGE="https://github.com/XMMS2";
-#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2
- https://waf.io/waf-${WAF_VER}.tar.bz2";
-LICENSE="GPL-2 LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc x86"
-
-IUSE="aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth ices
-jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss
-perl phonehome pulseaudio python ruby samba +server sid sndfile speex
-test valgrind +vorbis vocoder wavpack xml zeroconf"
-
-RDEPEND="server? (
- >=dev-db/sqlite-3.3.4
-
- aac? ( >=media-libs/faad2-2.0 )
- airplay? ( dev-libs/openssl:0= )
- alsa? ( media-libs/alsa-lib )
- ao? ( media-libs/libao )
- cdda? ( dev-libs/libcdio-paranoia
- >=media-libs/libdiscid-0.1.1
- >=media-sound/cdparanoia-3.9.8 )
- curl? ( >=net-misc/curl-7.15.1 )
- ffmpeg? ( media-video/ffmpeg )
- flac? ( media-libs/flac )
- fluidsynth? ( media-sound/fluidsynth )
- ices? ( media-libs/libogg
- media-libs/libshout
- media-libs/libvorbis )
- jack? ( virtual/jack )
- mac? ( media-sound/mac )
- mms? ( media-video/ffmpeg
- >=media-libs/libmms-0.3 )
- modplug? ( media-libs/libmodplug )
- mad? ( media-libs/libmad )
- mp3? ( >=media-sound/mpg123-1.5.1 )
- musepack? ( media-sound/musepack-tools )
- ofa? ( media-libs/libofa )
- opus? ( media-libs/opus
- media-libs/opusfile )
- pulseaudio? ( media-sound/pulseaudio )
- samba? ( >=net-fs/samba-4.2 )
- sid? ( media-sound/sidplay
- media-libs/resid )
- sndfile? ( media-libs/libsndfile )
- speex? ( media-libs/speex
- media-libs/libogg )
- vorbis? ( media-libs/libvorbis )
- vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate )
- wavpack? ( media-sound/wavpack )
- xml? ( dev-libs/libxml2 )
- zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
- )
-
- >=dev-libs/glib-2.12.9
- cxx? ( >=dev-libs/boost-1.32 )
- perl? ( >=dev-lang/perl-5.8.8 )
- python? ( ${PYTHON_DEPS} )
- ruby? ( ${RUBY_DEPS} )
-"
-
-DEPEND="${RDEPEND}
- dev-lang/python
- virtual/pkgconfig
- perl? ( dev-perl/Module-Build
- virtual/perl-Module-Metadata )
- python? ( >=dev-python/cython-0.15.1 )
- test? ( dev-util/cunit
- valgrind? ( dev-util/valgrind ) )
-"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- # needs port
- #epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch #578778
-
- "${FILESDIR}/${PN}"-0.8-ffmpeg2.patch #536232
-
- "${FILESDIR}/${PN}"-0.8-rtvg.patch #424377
-
- # required to build tarball from git tree
- "${FILESDIR}/${P}"-tarball.patch
-
- # fix hash to be the same on LE/BE platforms
- "${FILESDIR}/${P}"-be-hash.patch
-
- # handle mac-3 -> -4 API change
- "${FILESDIR}/${P}"-mac-4.patch
-
- # C++ client dangling reference:
https://github.com/xmms2/xmms2-devel/pull/5
- "${FILESDIR}/${P}"-cpp-client.patch
-
- # gcc-10 stopped putting globals into common section
- "${FILESDIR}/${P}"-gcc-10.patch
-
- # fix required since faad 2.9.0
- "${FILESDIR}/${P}"-faad.patch
-)
-
-pkg_setup() {
- # used both for building xmms2 and
- # optionally linking client library
- # against python
- python-single-r1_pkg_setup
-}
-
-# use_enable() is taken as proto
-# ${1} - useflag
-# ${2} - xmms2 option/plugin name (equals to ${1} if not set)
-
-xmms2_flag() {
- [[ -z ${1} ]] && eerror "!!! empty arg. usage: xmms2_flag <USEFLAG>
[<xmms2_flagname>]."
-
- local UWORD=${2:-${1}}
-
- case ${1} in
- ENABLED)
- echo ",${UWORD}"
- ;;
- DISABLED)
- ;;
- *)
- use ${1} && echo ",${UWORD}"
- ;;
- esac
-}
-
-src_prepare() {
- mv "${WORKDIR}/waf-${WAF_VER}"/{waf,waflib/} . || die
- default
-}
-
-src_configure() {
- # ./configure alike options.
- local waf_params=(
- --prefix=/usr
- --libdir=/usr/$(get_libdir)
- --with-target-platform="${CHOST}"
- --mandir=/usr/share/man
- --infodir=/usr/share/info
- --datadir=/usr/share
- --sysconfdir=/etc
- --localstatedir=/var/lib
- )
-
- local optionals=""
- local plugins=""
- if ! use server ; then
- waf_params+=( --without-xmms2d )
- else
- # some fun static mappings:
- local option_map=( # USE # sorted xmms2 option
flag (same, as USE if empty)
- "phonehome et"
- "ENABLED launcher"
- "mlib-update medialib-updater"
- "ENABLED nycli"
- " perl"
- "ENABLED pixmaps"
- " python"
- " ruby"
- "DISABLED tests"
- "DISABLED vistest"
- "cxx xmmsclient++"
- "cxx xmmsclient++-glib"
- "DISABLED xmmsclient-cf"
- "DISABLED xmmsclient-ecore" # not
in tree
-
- "test tests"
- )
-
- local plugin_map=( # USE # sorted xmms2 plugin
flag (same, as USE if empty)
- " alsa"
- " airplay"
- " ao"
- "ffmpeg apefile"
- "ffmpeg avcodec"
- " asf"
- "ENABLED asx"
- " cdda"
- "DISABLED coreaudio" # MacOS only?
- " curl"
- "ENABLED cue"
- "zeroconf daap"
- "ENABLED diskwrite"
- "ENABLED equalizer"
- "aac faad"
- "ENABLED file"
- " flac"
- " fluidsynth"
- "ffmpeg flv"
- "ffmpeg tta"
- "DISABLED gme" # not in tree
- "DISABLED gvfs" # obsolete #647604
- "ENABLED html"
- " ices"
- "ENABLED icymetaint"
- "ENABLED id3v2"
- " jack"
- "ENABLED karaoke"
- "ENABLED m3u"
- " mac"
- " mms"
- " mad"
- "ENABLED midsquash"
- " mp4" # bug #387961
(aac, mp3, ape can sit there)
- "mp3 mpg123"
- " modplug"
- " musepack"
- "DISABLED nms" # not in tree
- "ENABLED normalize"
- "ENABLED null"
- "ENABLED nulstripper"
- " ofa"
- " opus"
- " oss"
- "ENABLED pls"
- "pulseaudio pulse"
- "ENABLED replaygain"
- "xml rss"
- " samba"
- "DISABLED sc68" #not in tree
- " sid"
- " sndfile"
- " speex"
- "DISABLED sun" # {Open,Net}BSD
only
- "DISABLED tremor" # not in tree
- " vorbis"
- " vocoder"
- "ffmpeg tta"
- "ENABLED wave"
- "DISABLED waveout" # windows only
- " wavpack"
- "xml xspf"
- "ENABLED xml"
- )
-
- local option
- for option in "${option_map[@]}"; do
- optionals+=$(xmms2_flag ${option})
- done
-
- local plugin
- for plugin in "${plugin_map[@]}"; do
- plugins+=$(xmms2_flag ${plugin})
- done
-
- if use perl; then
- perl_set_version
- waf_params+=( --with-perl-archdir="${ARCH_LIB}" )
- fi
- fi # ! server
-
- # pass them explicitely even if empty as we try to avoid magic deps
- waf_params+=(
- --with-optionals="${optionals:1}" # skip first ',' if yet
- --with-plugins="${plugins:1}"
- $(use_with valgrind)
- )
-
- CC="$(tc-getCC)" \
- CPP="$(tc-getCPP)" \
- AR="$(tc-getAR)" \
- RANLIB="$(tc-getRANLIB)" \
- CXX="$(tc-getCXX)" \
- ./waf configure "${waf_params[@]}" || die "'waf configure' failed"
-}
-
-src_compile() {
- # waf is very keen to run tests in build phase (bug #424377) but
- # it does not bother running tests twice, so the hack below works:
- ./waf --verbose build || ./waf --verbose build || die "waf build failed"
-}
-
-src_test() {
- # rerun tests
- ./waf --alltests || die "waf --alltests failed"
-}
-
-src_install() {
- ./waf --without-ldconfig --destdir="${D}" install || die "'waf install'
failed"
- dodoc AUTHORS TODO
-
- python_optimize
-
- # waftools/man.py always compresses man pages with gzip.
- # to avoid code changed let's just un-gzip manpages
- local m
- for m in "${ED}"/usr/share/man/man1/*.gz; do
- # For some combination of USEs no mans are installed.
- if [[ -f ${m} ]]; then
- einfo "Uncompressing '${m#${ED}}' back."
- gzip -d "${m}" || die
- fi
- done
-}
-
-pkg_postinst() {
- if use phonehome ; then
- einfo ""
- einfo "The phone-home client xmms2-et was activated"
- einfo "This client sends anonymous usage-statistics to the
xmms2"
- einfo "developers which may help finding bugs"
- einfo "Disable the phonehome useflag if you don't like that"
- fi
-}
