* [gentoo-commits] repo/gentoo:master commit in: media-sound/xmms2/, media-sound/xmms2/files/
@ 2020-04-14 8:41 James Le Cuirot
0 siblings, 0 replies; 5+ messages in thread
From: James Le Cuirot @ 2020-04-14 8:41 UTC (permalink / raw
To: gentoo-commits
commit: c743ee4e6e6efa0e6422da4ec756bd6f0d86d740
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 21:47:58 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 08:39:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c743ee4e
media-sound/xmms2: Patch around faad plugin breakage since faad 2.9.0
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch | 18 ++++++++++++++++++
...0161122-r6.ebuild => xmms2-0.8_p20161122-r7.ebuild} | 3 +++
2 files changed, 21 insertions(+)
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch
new file mode 100644
index 00000000000..00aa5d77082
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch
@@ -0,0 +1,18 @@
+This line has stopped working since security fixes in the faad 2.9.0
+release. XMMS2 upstream were informed via IRC but have yet to act on
+it. I've run XMMS2 with this patch for months without issue.
+
+-- Chewi
+
+diff --git a/src/plugins/faad/faad.c b/src/plugins/faad/faad.c
+index 50835d27..7074e1b5 100644
+--- a/src/plugins/faad/faad.c
++++ b/src/plugins/faad/faad.c
+@@ -242,7 +242,6 @@ xmms_faad_init (xmms_xform_t *xform)
+ * and durations calculations... So we cheat and tell libfaad2 we're feeding
+ * it frame 1.
+ */
+- NeAACDecPostSeekReset (data->decoder, 1);
+
+ /* FIXME: Because for HE AAC files some versions of libfaad return the wrong
+ * samplerate in init, we have to do one read and let it decide the real
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r6.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r7.ebuild
similarity index 99%
rename from media-sound/xmms2/xmms2-0.8_p20161122-r6.ebuild
rename to media-sound/xmms2/xmms2-0.8_p20161122-r7.ebuild
index 69165406052..88101be578c 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r6.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r7.ebuild
@@ -114,6 +114,9 @@ PATCHES=(
# 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() {
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/xmms2/, media-sound/xmms2/files/
@ 2020-01-28 19:58 Sergei Trofimovich
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2020-01-28 19:58 UTC (permalink / raw
To: gentoo-commits
commit: c77a4c00380e621c98609acdda29f135bfa37b99
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 19:58:29 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 19:58:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c77a4c00
media-sound/xmms2: tweak for gcc-10
Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/706940
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch | 11 +++++++++++
media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild | 3 +++
2 files changed, 14 insertions(+)
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
new file mode 100644
index 00000000000..29a8311d219
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch
@@ -0,0 +1,11 @@
+--- 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/xmms2-0.8_p20161122-r5.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
index 68f9fc6c4c2..393d601eabd 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
@@ -143,6 +143,9 @@ src_prepare() {
# C++ client dangling reference: https://github.com/xmms2/xmms2-devel/pull/5
eapply "${FILESDIR}/${P}"-cpp-client.patch
+ # gcc-10 stopped putting globals into common section
+ eapply "${FILESDIR}/${P}"-gcc-10.patch
+
eapply_user
}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/xmms2/, media-sound/xmms2/files/
@ 2018-07-01 21:27 Sergei Trofimovich
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2018-07-01 21:27 UTC (permalink / raw
To: gentoo-commits
commit: c249fe51047dbe5bc689bda6a98e3d47bb1aa387
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 1 21:23:58 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jul 1 21:23:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c249fe51
media-sound/xmms2: install perl modules into /usr, not /usr/local
$ perl -MConfig -e 'print "$Config{archlib}\n"'
/usr/lib64/perl5/5.24.3/x86_64-linux
$ perl -MConfig -e 'print "$Config{sitearch}\n"'
/usr/local/lib64/perl5/5.24.3/x86_64-linux
Package-Manager: Portage-2.3.41, Repoman-2.3.9
.../files/xmms2-0.8_p20161122-perl-no-local.patch | 17 ++
media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild | 297 +++++++++++++++++++++
2 files changed, 314 insertions(+)
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-perl-no-local.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-perl-no-local.patch
new file mode 100644
index 00000000000..af18825ac00
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-perl-no-local.patch
@@ -0,0 +1,17 @@
+Install perl modules into /usr, not /usr/local.
+
+$ perl -MConfig -e 'print "$Config{archlib}\n"'
+/usr/lib64/perl5/5.24.3/x86_64-linux
+$ perl -MConfig -e 'print "$Config{sitearch}\n"'
+/usr/local/lib64/perl5/5.24.3/x86_64-linux
+--- a/waflib/Tools/perl.py
++++ b/waflib/Tools/perl.py
+@@ -75,7 +75,7 @@ def check_perl_ext_devel(self):
+ env.EXTUTILS_TYPEMAP=cfg_lst('$Config{privlib}/ExtUtils/typemap')
+ env.XSUBPP=find_xsubpp()
+ if not getattr(Options.options,'perlarchdir',None):
+- env.ARCHDIR_PERL=cfg_str('$Config{sitearch}')
++ env.ARCHDIR_PERL=cfg_str('$Config{archlib}')
+ else:
+ env.ARCHDIR_PERL=getattr(Options.options,'perlarchdir')
+ env.perlext_PATTERN='%s.'+cfg_str('$Config{dlext}')
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
new file mode 100644
index 00000000000..44013523f07
--- /dev/null
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit eutils multiprocessing 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"
+
+DESCRIPTION="X(cross)platform Music Multiplexing System. Next generation of the XMMS player"
+HOMEPAGE="https://xmms2.org/wiki/Main_Page"
+#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 ~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? ( virtual/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? ( virtual/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
+ dev-python/pyrex )
+ test? ( dev-util/cunit
+ valgrind? ( dev-util/valgrind ) )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+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() {
+ ./waf # inflate waf
+ cd .waf* || die
+ # needs port
+ #epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch #578778
+ eapply "${FILESDIR}/${PN}"-0.8_p20161122-perl-no-local.patch
+ cd "${S}"
+
+ 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
+
+ # fix hash to be the same on LE/BE platforms
+ eapply "${FILESDIR}/${P}"-be-hash.patch
+
+ # handle mac-3 -> -4 API change
+ eapply "${FILESDIR}/${P}"-mac-4.patch
+
+ eapply_user
+}
+
+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
+ 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
+ waf_params+=" --with-plugins=${plugins:1}"
+ waf_params+=" $(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
+}
+
+pkg_postinst() {
+ elog "This version is built on experimental development code"
+ elog "If you encounter any errors report them at https://bugs.xmms2.org"
+ elog "and visit #xmms2 at irc://irc.freenode.net"
+ 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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/xmms2/, media-sound/xmms2/files/
@ 2017-11-04 18:14 Sergei Trofimovich
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2017-11-04 18:14 UTC (permalink / raw
To: gentoo-commits
commit: c2395af07199c94377833699367243a29f9c83c6
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 4 18:13:47 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Nov 4 18:13:59 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2395af0
media-sound/xmms2: adapt to mac-3 -> mac-4 API change
Picked patch sas-is from:
https://github.com/xmms2/xmms2-devel/pull/2
Package-Manager: Portage-2.3.13, Repoman-2.3.4
.../xmms2/files/xmms2-0.8_p20161122-mac-4.patch | 50 ++++++++++++++++++++++
media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild | 3 ++
2 files changed, 53 insertions(+)
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch
new file mode 100644
index 00000000000..df3e4d2af85
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch
@@ -0,0 +1,50 @@
+From e87745721deaf46d7054ac40cc55838561c9f552 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Carretero?= <cJ@zougloub.eu>
+Date: Tue, 24 Oct 2017 18:43:26 -0400
+Subject: [PATCH] plugins: mac: support newer mac API version
+
+---
+ src/plugins/mac/mac.cpp | 6 +++++-
+ src/plugins/mac/source_adapter.h | 8 +++++++-
+ 2 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/mac/mac.cpp b/src/plugins/mac/mac.cpp
+index cec43e52..d8d3d1b9 100644
+--- a/src/plugins/mac/mac.cpp
++++ b/src/plugins/mac/mac.cpp
+@@ -210,8 +210,12 @@ xmms_mac_get_media_info (xmms_xform_t *xform)
+ gchar *name;
+
+ field_name = pTagField->GetFieldName ();
+- name = (gchar *)GetUTF8FromUTF16 (field_name);
+
++#if MAC_DLL_INTERFACE_VERSION_NUMBER >= 1000
++ name = (gchar *)CAPECharacterHelper::GetUTF8FromUTF16 (field_name);
++#else
++ name = (gchar *)GetUTF8FromUTF16 (field_name);
++#endif
+ memset (field_value, 0, 255);
+ int size = 255;
+ p_ape_tag->GetFieldString (field_name, (char *)field_value, &size, TRUE);
+diff --git a/src/plugins/mac/source_adapter.h b/src/plugins/mac/source_adapter.h
+index 94f75359..70617514 100644
+--- a/src/plugins/mac/source_adapter.h
++++ b/src/plugins/mac/source_adapter.h
+@@ -38,7 +38,13 @@ public:
+ ~CSourceAdapter () {};
+
+ // open / close
+- int Open (const wchar_t * pName) { return ERROR_SUCCESS; }
++#if MAC_DLL_INTERFACE_VERSION_NUMBER >= 1000
++ int Open (const wchar_t * pName, BOOL bOpenReadOnly = FALSE)
++#else
++ int Open (const wchar_t * pName)
++#endif
++ { return ERROR_SUCCESS; }
++
+ int Close () { return ERROR_SUCCESS; }
+
+ // read / write
+--
+2.15.0
+
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild
index 8e1a03998bf..f65e222e0da 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild
@@ -135,6 +135,9 @@ src_prepare() {
# fix hash to be the same on LE/BE platforms
eapply "${FILESDIR}/${P}"-be-hash.patch
+ # handle mac-3 -> -4 API change
+ eapply "${FILESDIR}/${P}"-mac-4.patch
+
eapply_user
}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/xmms2/, media-sound/xmms2/files/
@ 2016-04-02 12:04 Sergei Trofimovich
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2016-04-02 12:04 UTC (permalink / raw
To: gentoo-commits
commit: 7133a4cc49d1299e0a90ebf19ea6d2a92ed6f8b5
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 2 12:03:58 2016 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Apr 2 12:04:07 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7133a4cc
media-sound/xmms2: Add knob to disable valgrind at test runtime, bug #424377
When valgrind is installed in system but is not
working we should still be able to run tests.
Reported-by: Diego Elio Pettenò
Bug: https://bugs.gentoo.org/424377
Package-Manager: portage-2.2.28
media-sound/xmms2/files/xmms2-0.8-rtvg.patch | 36 ++++++++++++++++++++++++++++
media-sound/xmms2/metadata.xml | 1 +
media-sound/xmms2/xmms2-0.8-r2.ebuild | 9 ++++---
3 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/media-sound/xmms2/files/xmms2-0.8-rtvg.patch b/media-sound/xmms2/files/xmms2-0.8-rtvg.patch
new file mode 100644
index 0000000..20be342
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-rtvg.patch
@@ -0,0 +1,36 @@
+Add knob to disable valgrind at test runtime.
+
+When valgrind is installed in system but is not
+working we should still be able to run tests.
+
+Reported-by: Diego Elio Pettenò
+Bug: https://bugs.gentoo.org/424377
+diff --git a/waftools/unittest.py b/waftools/unittest.py
+index 4317287..6179dfd 100644
+--- a/waftools/unittest.py
++++ b/waftools/unittest.py
+@@ -64,7 +64,8 @@ def generate_coverage(bld):
+
+ def configure(conf):
+ conf.load("waf_unit_test")
+- conf.find_program("valgrind", var="VALGRIND", mandatory=False)
++ if conf.options.enable_valgrind is True:
++ conf.find_program("valgrind", var="VALGRIND", mandatory=False)
+ conf.find_program("lcov", var="LCOV", mandatory=False)
+ conf.find_program("genhtml", var="GENHTML", mandatory=False)
+
+diff --git a/wscript b/wscript
+index 99c1fa3..a98d5e3 100644
+--- a/wscript
++++ b/wscript
+@@ -501,6 +501,10 @@ def options(opt):
+ dest='ldconfig', help="Run ldconfig after install even if not root")
+ opt.add_option('--without-ldconfig', action='store_false',
+ dest='ldconfig', help="Don't run ldconfig after install")
++ opt.add_option('--with-valgrind', action='store_true', default=None,
++ dest='enable_valgrind', help="Run testsuite under valgrind (if present).")
++ opt.add_option('--without-valgrind', action='store_false', default=None,
++ dest='enable_valgrind', help="Don't run testsuite under valgrind.")
+
+ opt.sub_options("src/xmms")
+ for o in optional_subdirs + subdirs:
diff --git a/media-sound/xmms2/metadata.xml b/media-sound/xmms2/metadata.xml
index 099b501..acb8313 100644
--- a/media-sound/xmms2/metadata.xml
+++ b/media-sound/xmms2/metadata.xml
@@ -40,6 +40,7 @@
<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>
+ <flag name="valgrind">Run unit tests under valgrind.</flag>
<flag name="vocoder">Phase vocoder effect plugin</flag>
<flag name="mlib-update">Enable building of xmms2-mlib-updater client</flag>
<flag name="xml">Enable support for various XML based playlists and sources: RSS, XSPF</flag>
diff --git a/media-sound/xmms2/xmms2-0.8-r2.ebuild b/media-sound/xmms2/xmms2-0.8-r2.ebuild
index 4500c37..515550e 100644
--- a/media-sound/xmms2/xmms2-0.8-r2.ebuild
+++ b/media-sound/xmms2/xmms2-0.8-r2.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="alpha amd64 ppc x86"
IUSE="aac airplay +alsa ao asf avahi cdda curl cxx ffmpeg flac gvfs ices
jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa oss
perl phonehome pulseaudio python ruby
-samba +server sid sndfile speex test +vorbis vocoder wavpack xml"
+samba +server sid sndfile speex test valgrind +vorbis vocoder wavpack xml"
RDEPEND="server? (
>=dev-db/sqlite-3.3.4
@@ -73,7 +73,8 @@ DEPEND="${RDEPEND}
perl? ( dev-perl/Module-Build
virtual/perl-Module-Metadata )
virtual/pkgconfig
- test? ( dev-util/cunit )
+ test? ( dev-util/cunit
+ valgrind? ( dev-util/valgrind ) )
"
S="${WORKDIR}/${MY_P}"
@@ -116,13 +117,14 @@ src_prepare() {
epatch "${FILESDIR}/${P}"-ffmpeg2.patch #536232
epatch "${FILESDIR}/${P}"-cpython.patch
epatch "${FILESDIR}/${P}"-modpug.patch #536046
- epatch "${FILESDIR}/${P}"-audio4-p1.patch
+ 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
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
@@ -242,6 +244,7 @@ src_configure() {
# pass them explicitely even if empty as we try to avoid magic deps
waf_params+=" --with-optionals=${optionals:1}" # skip first ',' if yet
waf_params+=" --with-plugins=${plugins:1}"
+ waf_params+=" $(use_with valgrind)"
CC="$(tc-getCC)" \
CPP="$(tc-getCPP)" \
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-04-14 8:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-14 8:41 [gentoo-commits] repo/gentoo:master commit in: media-sound/xmms2/, media-sound/xmms2/files/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2020-01-28 19:58 Sergei Trofimovich
2018-07-01 21:27 Sergei Trofimovich
2017-11-04 18:14 Sergei Trofimovich
2016-04-02 12:04 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox