diff options
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/Manifest.gz | bin | 56883 -> 56883 bytes | |||
| -rw-r--r-- | media-sound/xmms2/Manifest | 4 | ||||
| -rw-r--r-- | media-sound/xmms2/metadata.xml | 1 | ||||
| -rw-r--r-- | media-sound/xmms2/xmms2-0.9.1-r2.ebuild (renamed from media-sound/xmms2/xmms2-0.9.1-r1.ebuild) | 56 |
4 files changed, 31 insertions, 30 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz Binary files differindex db0fba87d292..f2a7f5433a29 100644 --- a/media-sound/Manifest.gz +++ b/media-sound/Manifest.gz diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest index ab93e62a9489..e79fc832d33d 100644 --- a/media-sound/xmms2/Manifest +++ b/media-sound/xmms2/Manifest @@ -2,5 +2,5 @@ AUX xmms2-0.9.1-cpp-client.patch 503 BLAKE2B b8127c72ab8830cb0c4ca45c5c7887f194f AUX xmms2-0.9.1-faad.patch 437 BLAKE2B 832db481404d470d347ee73ae04064d5ce423aca2a4a7681a80301e33522245429306e26eb200f9e111de60e2fa5341478f51282ee8c2264cf3b60a79b83a797 SHA512 7b5380762e311e1479073ca922343ce5d0dbfe2b3ab0f9218e2d85d52d8a37e301a6bb7bdfc0603b3f72578421df0ff335edb8bd9ea20e485cc1037a2197c62c AUX xmms2-0.9.1-rtvg.patch 1076 BLAKE2B cb0eee29a4245850f2455fd7b12845017ddd2453d48d903386fcc083e4429389fb50b2fd296ebac41e101e68d7f030b646e65b2e493f351c91ec81a9672f6f77 SHA512 113b90339f4afc99f54eeb6776354c471ffa0d4e60d3525150ed2020af3d95dcca89aeaa849cd216c54f0d6eaf712f157c08145901a89b4cb0460c752c526e40 DIST xmms2-0.9.1.tar.bz2 1940773 BLAKE2B 4044499c2ffc55e66d5836e2e36360486b970ff05f0dc17b62e65111c06cfcc84f58c74427b1afa4455b4e0bdb7784dc8840cc84411bc57cb7b9f0cac4e46359 SHA512 a7d42202571d7eb5d9da4c9f5d55d2f6e072df52892080d6cc4349f66a55f5fece510c9872be9814dd5b258d0c59e2704ea8497c2d3be515c510d602c17b703a -EBUILD xmms2-0.9.1-r1.ebuild 5474 BLAKE2B 50287222483a91ab096c0a61aaaa20ca9b065b3023fbc82efd160420e4be31ccd34491271cbc145693ca172a3caef4b3003afc755c8aa411f3b2e14762b9f56c SHA512 4c60cc0ed51f7931042477a0ec8bbd77664db3f826525cd285491aa690518c7d068c8f34599904910423dc7907aa2132f1b42dc96842aeef9c7c56631f54c2fc -MISC metadata.xml 1437 BLAKE2B 7f3c3cd1d134ee5c24a9dc1990108012640b366a587832eda270bcef2bca91777f9358a067d351f9ac83c118680b60af2955a3f195a6adc20eb84dc334553fb8 SHA512 0533f6c30210a6c2f06cefd833df6fbd8ebfcc510e6bf05133210a57d7d05e45875d829555011b6827b8fc440cb0779f85d4ca17dd3e862cf0519e874e0d8c9f +EBUILD xmms2-0.9.1-r2.ebuild 5547 BLAKE2B 129226be8e71d861eb0f76f9b4281ab71d855d61e1162b9a0a2611a173909d1cf11486b3ba0c6db8d7a6a3667a2b8d15a9612d15c09e467c94ce799e62593730 SHA512 8687c7b63555ae80a38e251d8fda91af5c004d2631f8af4bc0062fb95ad6c97d9774884c8490a19a7b80d8233e28d29f7866c3139ba0a587ed0d5cf71367cf9b +MISC metadata.xml 1533 BLAKE2B 260527ce9ba7070a2b799079df9ad4ab3eff10e8568d4015da83648dab4c3862fe6ebc3e7472cc8fe2bd8130f56d8c92a2c910612c475aafefaea047834175bc SHA512 f2939005bdff85690f2be6282c4ee4aa2adfe4ed87ae21bb9e906393d0fdf90666852b3f441acfebe5c2d9737ba6572733d304b7eff370b672975e6fcc8dab25 diff --git a/media-sound/xmms2/metadata.xml b/media-sound/xmms2/metadata.xml index cbdd35464dea..941958b6ab34 100644 --- a/media-sound/xmms2/metadata.xml +++ b/media-sound/xmms2/metadata.xml @@ -10,6 +10,7 @@ <flag name="fluidsynth">Enable fluidsynth support (MIDI)</flag> <flag name="gme">Support for various game audio formats using <pkg>media-libs/game-music-emu</pkg></flag> <flag name="ices">Icecast source output plugin</flag> + <flag name="libvisual">Install xmms2-libvisual for use with the 'visualization' effect</flag> <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> diff --git a/media-sound/xmms2/xmms2-0.9.1-r1.ebuild b/media-sound/xmms2/xmms2-0.9.1-r2.ebuild index cf96eb8a448c..8142d1441029 100644 --- a/media-sound/xmms2/xmms2-0.9.1-r1.ebuild +++ b/media-sound/xmms2/xmms2-0.9.1-r2.ebuild @@ -4,7 +4,8 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..11} ) -inherit multiprocessing optfeature perl-functions python-single-r1 toolchain-funcs +PYTHON_REQ_USE="threads(+)" +inherit flag-o-matic optfeature perl-functions python-single-r1 waf-utils DESCRIPTION="X(cross)platform Music Multiplexing System, next generation of the XMMS player" HOMEPAGE="https://github.com/XMMS2" @@ -19,8 +20,8 @@ KEYWORDS="~alpha amd64 ~arm ppc ~riscv x86" # (if have a use for some of these disabled features, please fill a bug) XMMS2_OPTIONALS=( cxx:xmmsclient++,xmmsclient++-glib :launcher mlib-update:medialib-updater - :nycli perl :pixmaps python server:s4 test:tests - # disabled: et,mdns,migrate-collections,ruby,sqlite2s4,vistest,xmmsclient-cf,xmmsclient-ecore + :nycli perl :pixmaps python server:s4 test:tests libvisual:vistest + # disabled: et,mdns,migrate-collections,ruby,sqlite2s4,xmmsclient-cf,xmmsclient-ecore ) XMMS2_PLUGINS=( aac:faad airplay alsa ao :asx cdda :cue curl :diskwrite :equalizer @@ -36,12 +37,18 @@ IUSE=" ${XMMS2_OPTIONALS[@]%:*} ${XMMS2_PLUGINS[@]%:*} +server valgrind" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test ) !server? ( test )" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + test? ( server )" +RESTRICT="!test? ( test )" COMMON_DEPEND=" dev-libs/glib:2 sys-libs/readline:= + libvisual? ( + media-libs/libsdl[opengl,video] + media-libs/libvisual:0.4 + ) server? ( aac? ( media-libs/faad2 ) airplay? ( dev-libs/openssl:= ) @@ -77,11 +84,7 @@ COMMON_DEPEND=" media-libs/libofa sci-libs/fftw:3.0= ) - opus? ( - media-libs/libogg - media-libs/opus - media-libs/opusfile - ) + opus? ( media-libs/opusfile ) pulseaudio? ( media-libs/libpulse ) samba? ( net-fs/samba ) sid? ( media-libs/libsidplay:2 ) @@ -142,11 +145,10 @@ src_prepare() { } src_configure() { - local waf=( - ./waf configure - --prefix="${EPREFIX}"/usr - --libdir="${EPREFIX}"/usr/$(get_libdir) - --boost-includes="${ESYSROOT}"/usr/include # needed for prefix + filter-lto # `xmms2 add somefile` breaks with lto + fortify=2 + + local wafargs=( + --boost-includes="${ESYSROOT}"/usr/include --with-target-platform="${CHOST}" ) @@ -168,14 +170,14 @@ src_configure() { plugins+=$(xmms2_flag ${flag}) done else - waf+=( --without-xmms2d ) + wafargs+=( --without-xmms2d ) fi for flag in "${XMMS2_OPTIONALS[@]}"; do optionals+=$(xmms2_flag ${flag}) done - waf+=( + wafargs+=( # pass even if empty to avoid automagic --with-optionals=${optionals:1} --with-plugins=${plugins:1} @@ -183,40 +185,38 @@ src_configure() { if use perl; then perl_set_version - waf+=( --with-perl-archdir="${ARCH_LIB}" ) + wafargs+=( --with-perl-archdir="${ARCH_LIB}" ) fi if use valgrind; then if valgrind true &>/dev/null; then - waf+=( --with-valgrind ) + wafargs+=( --with-valgrind ) else ewarn "valgrind was disabled due to failing a basic sanity check" #807271 fi fi - tc-export AR CC CXX - - echo "${waf[*]}" - "${waf[@]}" || die + waf-utils_src_configure "${wafargs[@]}" } src_compile() { - ./waf build -j$(makeopts_jobs) --verbose --notests || die + waf-utils_src_compile --notests } src_test() { - ./waf --alltests || die + waf-utils_src_compile --alltests } src_install() { - ./waf install --destdir="${D}" --without-ldconfig --notests || die + local DOCS=( AUTHORS README.mdown *.ChangeLog ) + waf-utils_src_install --without-ldconfig --notests - dodoc AUTHORS README.mdown *.ChangeLog + use libvisual && dobin _build_/src/clients/vistest/xmms2-libvisual use python && python_optimize # to avoid editing waftools/man.py (use find given not always installed) - find "${ED}" -name '*.gz' -exec gzip -d {} + || die + find "${ED}" -type f -name '*.gz' -exec gzip -d {} + || die } pkg_postinst() { |