commit: 88e32c614265db1783bc02782cdae880d786d227 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sat May 20 10:21:13 2017 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sat May 20 10:21:36 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88e32c61
media-sound/xmms2: bump up to 0.8_p20161122, latest snapshot This bump is a snapshot of a xmms2-devel/master git branch. Devel tree has fixes like: - waf bump (ruby-2.1 support) - ffmpeg/libav upstream patches - new plugins - new s4 storage as a database (instead of sqlite) - many other things It's a a bit hard to backport patches to 6 years old release. Reported-by: Toralf Förster Bug: https://bugs.gentoo.org/618850 Package-Manager: Portage-2.3.6, Repoman-2.3.2 media-sound/xmms2/Manifest | 1 + .../xmms2/files/xmms2-0.8_p20161122-tarball.patch | 78 ++++++++++++++++++++++ media-sound/xmms2/metadata.xml | 2 + media-sound/xmms2/xmms2-0.8-r4.ebuild | 2 +- ...s2-0.8-r4.ebuild => xmms2-0.8_p20161122.ebuild} | 56 ++++++++-------- 5 files changed, 108 insertions(+), 31 deletions(-) diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest index be39c6eeee9..442ad25250d 100644 --- a/media-sound/xmms2/Manifest +++ b/media-sound/xmms2/Manifest @@ -1 +1,2 @@ +DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 SHA256 58bd62f1e3ca83d4d82ad6854ee769b97238fc1c89967262c0e9e9e20e35092e SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb WHIRLPOOL 438d33793b808dd151b27ac51af9998b819ffc03cbc0ce789d693192f8aa5cab3c48402ef83f2b8fe1442dd9130248f561b1fe466168c0569c2e017ee1a0ede3 DIST xmms2-0.8DrO_o.tar.bz2 1670726 SHA256 c77e41e7bd5788889d5a2f78331ca8c748b8721bd2e59f36c36ad4c7cae8694a SHA512 478103d80264c0cb32912e828f74d0f5b2f10fe310f530a87ebecda7ca547a69e238cd572788f90bda29494494160d459fa6d1356b4fb87c7a8f0bf02e3b75f8 WHIRLPOOL 741dd85b8c065eea799675588a8d4c389c47fa3dcf129a9fd799bb5da0ffcb1eeffa45cfaca40af7c505908818b5e7960c1a54e947f53358edeb43841f2eaa5c diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-tarball.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-tarball.patch new file mode 100644 index 00000000000..eef49b13f16 --- /dev/null +++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-tarball.patch @@ -0,0 +1,78 @@ +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 acb83130968..26ce4e0e0a6 100644 --- a/media-sound/xmms2/metadata.xml +++ b/media-sound/xmms2/metadata.xml @@ -33,10 +33,12 @@ <use> <flag name="airplay">Support for airplay format</flag> <flag name="asf">Support for Monkey's Audio (APE) format with help of bundled libasf</flag> + <flag name="fluidsynth">Enable fluidsynth support (MIDI)</flag> <flag name="gvfs">Transport for glibs virtual filesystem</flag> <flag name="ices">Icecast source output plugin</flag> <flag name="mac">Support for Monkey's Audio (APE) format with help of <pkg>media-sound/mac</pkg></flag> <flag name="ofa">Support for Open Fingerprint Architecture (OFA)</flag> + <flag name="opus">Enable Opus audio codec support</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</flag> diff --git a/media-sound/xmms2/xmms2-0.8-r4.ebuild b/media-sound/xmms2/xmms2-0.8-r4.ebuild index ae57af19d22..b01887b80b1 100644 --- a/media-sound/xmms2/xmms2-0.8-r4.ebuild +++ b/media-sound/xmms2/xmms2-0.8-r4.ebuild @@ -51,7 +51,7 @@ RDEPEND="server? ( musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) pulseaudio? ( media-sound/pulseaudio ) - samba? ( >=net-fs/samba-4.2[client] ) + samba? ( >=net-fs/samba-4.2 ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) diff --git a/media-sound/xmms2/xmms2-0.8-r4.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122.ebuild similarity index 83% copy from media-sound/xmms2/xmms2-0.8-r4.ebuild copy to media-sound/xmms2/xmms2-0.8_p20161122.ebuild index ae57af19d22..f9e24892bd0 100644 --- a/media-sound/xmms2/xmms2-0.8-r4.ebuild +++ b/media-sound/xmms2/xmms2-0.8_p20161122.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 # waf fails on python3_5: AttributeError: Can't pickle local object 'Context.__init__.<locals>.node_class' PYTHON_COMPAT=( python{2_7,3_4} ) @@ -9,18 +9,20 @@ USE_RUBY="ruby20 ruby21 ruby22" inherit eutils multiprocessing python-single-r1 ruby-single toolchain-funcs -MY_P="${P}DrO_o" +# generated as 'python2 ./utils/gen-tarball.py' from clean git tree +MY_P="${P%_p*}DrO_o-949-gca15e830" DESCRIPTION="X(cross)platform Music Multiplexing System. Next generation of the XMMS player" HOMEPAGE="http://xmms2.org/wiki/Main_Page"; -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" +#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" +SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2"; LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 ppc x86" +KEYWORDS="~alpha ~amd64 ~ppc ~x86" -IUSE="aac airplay +alsa ao asf cdda curl cxx ffmpeg flac gvfs ices -jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa oss +IUSE="aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth gvfs 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" @@ -37,6 +39,7 @@ RDEPEND="server? ( curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) + fluidsynth? ( media-sound/fluidsynth ) gvfs? ( gnome-base/gnome-vfs ) ices? ( media-libs/libogg media-libs/libshout @@ -50,8 +53,10 @@ RDEPEND="server? ( 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[client] ) + samba? ( >=net-fs/samba-4.2 ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) @@ -117,30 +122,18 @@ xmms2_flag() { src_prepare() { ./waf # inflate waf cd .waf* || die - epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch #578778 + # needs port + #epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch #578778 cd "${S}" - epatch "${FILESDIR}/${P}"-ffmpeg-0.11.patch #443256 - epatch "${FILESDIR}/${P}"-libav-9-p2.patch #443256 - epatch "${FILESDIR}/${P}"-libav-9.patch #443256 - epatch "${FILESDIR}/${P}"-cython-0.19.1.patch - epatch "${FILESDIR}/${P}"-memset.patch - epatch "${FILESDIR}/${P}"-ffmpeg2.patch #536232 - epatch "${FILESDIR}/${P}"-cpython.patch - epatch "${FILESDIR}/${P}"-modpug.patch #536046 - epatch "${FILESDIR}/${P}"-audio4-p1.patch #540890 - epatch "${FILESDIR}/${P}"-audio4-p2.patch - epatch "${FILESDIR}/${P}"-audio4-p3.patch - epatch "${FILESDIR}/${P}"-audio4-p4.patch - epatch "${FILESDIR}/${P}"-audio4-p5.patch - epatch "${FILESDIR}/${P}"-audio4-p6.patch - epatch "${FILESDIR}/${P}"-audio4-p7.patch - epatch "${FILESDIR}/${P}"-rtvg.patch #424377 - epatch "${FILESDIR}/${P}"-samba-4.patch - - if has_version dev-libs/libcdio-paranoia; then - sed -i -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' src/plugins/cdda/cdda.c || die - fi - epatch_user + + eapply "${FILESDIR}/${PN}"-0.8-ffmpeg2.patch #536232 + + eapply "${FILESDIR}/${PN}"-0.8-rtvg.patch #424377 + + # required to build tarball from git tree + eapply "${FILESDIR}/${P}"-tarball.patch + + eapply_user } src_configure() { @@ -197,6 +190,7 @@ src_configure() { "aac faad" "ENABLED file" " flac" + " fluidsynth" "ffmpeg flv" "ffmpeg tta" "DISABLED gme" # not in tree @@ -211,6 +205,7 @@ src_configure() { " mac" " mms" " mad" + "ENABLED midsquash" " mp4" # bug #387961 (aac, mp3, ape can sit there) "mp3 mpg123" " modplug" @@ -220,6 +215,7 @@ src_configure() { "ENABLED null" "ENABLED nulstripper" " ofa" + " opus" " oss" "ENABLED pls" "pulseaudio pulse"
