* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacious/, media-sound/audacious/files/
@ 2018-11-17 22:00 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-11-17 22:00 UTC (permalink / raw
To: gentoo-commits
commit: 0e02b5efb750155e16b77d0af5c637c01611a014
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 17 21:50:24 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 17 22:00:04 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e02b5ef
media-sound/audacious: 3.10 version bump
Bug: https://bugs.gentoo.org/640672
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/audacious/Manifest | 1 +
media-sound/audacious/audacious-3.10.ebuild | 83 ++++++++++++++++++++++
.../files/audacious-3.10-dbus-crash.patch | 60 ++++++++++++++++
.../audacious/files/audacious-3.10-ui-freeze.patch | 30 ++++++++
.../files/audacious-3.10-use-after-free.patch | 38 ++++++++++
.../audacious-3.10-volume-slider-boundaries.patch | 25 +++++++
6 files changed, 237 insertions(+)
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 183e77e2dce..091c016fb12 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,3 +1,4 @@
+DIST audacious-3.10.tar.bz2 563531 BLAKE2B cde59bd5aff8e0530f76f3bdde20b48f829592a0a67cc03e8b7c08a8892259e99e9de2b1608698ff28819b7a6d0341d5237491f7591c4380566512076a0889b9 SHA512 513d5f9608c1ebeae9cf9bb95128244e990e66c74bf49aff6570ec557d537809f3ebf93c400f5df2708ff61cf04ecc95da183b111f5a757735cef5a68dd9907f
DIST audacious-3.9-gtk3.tar.bz2 600249 BLAKE2B 08559eafc85236e8e881d0cbe6f08e29c82baf0fc46b9209f1d3eee290460260bfa99e6e8f26940f8c6854f3782da24061226ebdb416b6249d10914093e16276 SHA512 6ff98d027c13b30ea9600a9aba914ec993c69826199b8dc303cb60cebdf2af06a7e3dd4af1d34a86343be5485848a57c8a29e48d2a45a33945585550de4e5f9c
DIST audacious-3.9.tar.bz2 599488 BLAKE2B 2288fe6919c1770cd283af809629fda72186cc0b87a42821f5fb9b7a20c8e7cd5bc00611d10677a82877c5ebc8a1b5ad728626027b95cc875b66dda732b8747f SHA512 d8ef24c91c84bfa80831075cd9a12fc4bf02cec8bc96bcfa5a941254d194cccdc482482b1c015bc63e1142718c2221034c0f3a87e2cb6e4daf3b4cc428328aaa
DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
diff --git a/media-sound/audacious/audacious-3.10.ebuild b/media-sound/audacious/audacious-3.10.ebuild
new file mode 100644
index 00000000000..926f5853cae
--- /dev/null
+++ b/media-sound/audacious/audacious-3.10.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils xdg-utils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
+else
+ SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="nls"
+
+RDEPEND="
+ >=dev-libs/dbus-glib-0.60
+ >=dev-libs/glib-2.28
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ >=x11-libs/cairo-1.2.6
+ >=x11-libs/pango-1.8.0
+ virtual/freedesktop-icon-theme
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( dev-util/intltool )
+"
+PDEPEND="~media-plugins/audacious-plugins-${PV}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-ui-freeze.patch"
+ "${FILESDIR}/${P}-dbus-crash.patch"
+ "${FILESDIR}/${P}-use-after-free.patch"
+ "${FILESDIR}/${P}-volume-slider-boundaries.patch"
+)
+
+src_configure() {
+ # D-Bus is a mandatory dependency, remote control,
+ # session management and some plugins depend on this.
+ # Building without D-Bus is *unsupported* and a USE-flag
+ # will not be added due to the bug reports that will result.
+ # Bugs #197894, #199069, #207330, #208606
+ econf \
+ --disable-valgrind \
+ --enable-dbus \
+ --enable-qt \
+ --disable-gtk \
+ $(use_enable nls)
+}
+
+src_install() {
+ default
+
+ # Gentoo_ice skin installation; bug #109772
+ insinto /usr/share/audacious/Skins/gentoo_ice
+ doins -r "${WORKDIR}"/gentoo_ice/.
+ docinto gentoo_ice
+ dodoc "${WORKDIR}"/README
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+}
diff --git a/media-sound/audacious/files/audacious-3.10-dbus-crash.patch b/media-sound/audacious/files/audacious-3.10-dbus-crash.patch
new file mode 100644
index 00000000000..83b9c74f98c
--- /dev/null
+++ b/media-sound/audacious/files/audacious-3.10-dbus-crash.patch
@@ -0,0 +1,60 @@
+From 1528e780825b1fc49639ea16d332c5752051dab7 Mon Sep 17 00:00:00 2001
+From: John Lindgren <john@jlindgren.net>
+Date: Sun, 19 Aug 2018 14:12:30 -0400
+Subject: [PATCH] Fix crash when an invalid field name is sent via D-Bus.
+ Closes: #817.
+
+Regression introduced by commit 203b41f8e249.
+---
+ src/audacious/dbus-server.cc | 31 +++++++++++++++++--------------
+ 1 file changed, 17 insertions(+), 14 deletions(-)
+
+diff --git a/src/audacious/dbus-server.cc b/src/audacious/dbus-server.cc
+index 7602ace22..20a6c5839 100644
+--- a/src/audacious/dbus-server.cc
++++ b/src/audacious/dbus-server.cc
+@@ -635,27 +635,30 @@ static gboolean do_song_title (Obj * obj, Invoc * invoc, unsigned pos)
+ static gboolean do_song_tuple (Obj * obj, Invoc * invoc, unsigned pos, const char * key)
+ {
+ Tuple::Field field = Tuple::field_by_name (key);
+- Tuple tuple;
+- GVariant * var;
++ GVariant * var = nullptr;
+
+ if (field >= 0)
+- tuple = CURRENT.entry_tuple (pos);
+-
+- switch (tuple.get_value_type (field))
+ {
+- case Tuple::String:
+- var = g_variant_new_string (tuple.get_str (field));
+- break;
++ Tuple tuple = CURRENT.entry_tuple (pos);
+
+- case Tuple::Int:
+- var = g_variant_new_int32 (tuple.get_int (field));
+- break;
++ switch (tuple.get_value_type (field))
++ {
++ case Tuple::String:
++ var = g_variant_new_string (tuple.get_str (field));
++ break;
+
+- default:
+- var = g_variant_new_string ("");
+- break;
++ case Tuple::Int:
++ var = g_variant_new_int32 (tuple.get_int (field));
++ break;
++
++ default:
++ break;
++ }
+ }
+
++ if (! var)
++ var = g_variant_new_string ("");
++
+ FINISH2 (song_tuple, g_variant_new_variant (var));
+ return true;
+ }
diff --git a/media-sound/audacious/files/audacious-3.10-ui-freeze.patch b/media-sound/audacious/files/audacious-3.10-ui-freeze.patch
new file mode 100644
index 00000000000..da05bc5b000
--- /dev/null
+++ b/media-sound/audacious/files/audacious-3.10-ui-freeze.patch
@@ -0,0 +1,30 @@
+From 8f9745a5a539e44244d5e8200c61ed443c638aad Mon Sep 17 00:00:00 2001
+From: John Lindgren <john@jlindgren.net>
+Date: Sun, 19 Aug 2018 13:47:17 -0400
+Subject: [PATCH] Prevent UI freeze when displaying song info window. Closes:
+ #822.
+
+---
+ src/libaudcore/probe.cc | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/libaudcore/probe.cc b/src/libaudcore/probe.cc
+index 5c57ef884..38cf73d96 100644
+--- a/src/libaudcore/probe.cc
++++ b/src/libaudcore/probe.cc
+@@ -242,6 +242,15 @@ EXPORT bool aud_custom_infowin (const char * filename, PluginHandle * decoder)
+ if (! strncmp (filename, "stdin://", 8))
+ return false;
+
++ // In hindsight, a flag should have been added indicating whether a
++ // plugin provides a custom info window or not. Currently, only two
++ // plugins do so. Since custom info windows are deprecated anyway,
++ // check for those two plugins explicitly and in all other cases,
++ // don't open the input file to prevent freezing the UI.
++ const char * base = aud_plugin_get_basename (decoder);
++ if (strcmp (base, "amidi-plug") && strcmp (base, "vtx"))
++ return false;
++
+ auto ip = (InputPlugin *) aud_plugin_get_header (decoder);
+ if (! ip)
+ return false;
diff --git a/media-sound/audacious/files/audacious-3.10-use-after-free.patch b/media-sound/audacious/files/audacious-3.10-use-after-free.patch
new file mode 100644
index 00000000000..8271a3d6d1b
--- /dev/null
+++ b/media-sound/audacious/files/audacious-3.10-use-after-free.patch
@@ -0,0 +1,38 @@
+From 1d34f6799b8f5910fc6863ae96afd5ab035e830f Mon Sep 17 00:00:00 2001
+From: John Lindgren <john@jlindgren.net>
+Date: Thu, 20 Sep 2018 13:46:52 -0400
+Subject: [PATCH] audqt: Use deleteLater() to prevent use-after-free in Qt
+ event handling. Closes: #828.
+
+---
+ src/libaudqt/infopopup-qt.cc | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/libaudqt/infopopup-qt.cc b/src/libaudqt/infopopup-qt.cc
+index fdbba41d2..81dd87f5c 100644
+--- a/src/libaudqt/infopopup-qt.cc
++++ b/src/libaudqt/infopopup-qt.cc
+@@ -176,7 +176,9 @@ static InfoPopup * s_infopopup;
+
+ static void infopopup_show (const String & filename, const Tuple & tuple)
+ {
+- delete s_infopopup;
++ if (s_infopopup)
++ s_infopopup->deleteLater ();
++
+ s_infopopup = new InfoPopup (filename, tuple);
+
+ QObject::connect (s_infopopup, & QObject::destroyed, [] () {
+@@ -206,7 +208,11 @@ EXPORT void infopopup_show_current ()
+
+ EXPORT void infopopup_hide ()
+ {
+- delete s_infopopup;
++ /* This function can be called from an enter/leave event, and Qt does not
++ * like widgets being deleted from such events. This is debatably a bug in
++ * Qt, but deleteLater() is an effective workaround. */
++ if (s_infopopup)
++ s_infopopup->deleteLater ();
+ }
+
+ } // namespace audqt
diff --git a/media-sound/audacious/files/audacious-3.10-volume-slider-boundaries.patch b/media-sound/audacious/files/audacious-3.10-volume-slider-boundaries.patch
new file mode 100644
index 00000000000..99155bf79e8
--- /dev/null
+++ b/media-sound/audacious/files/audacious-3.10-volume-slider-boundaries.patch
@@ -0,0 +1,25 @@
+From 473ee3b3b0ce09feb23afcfc0ff276986db4f1af Mon Sep 17 00:00:00 2001
+From: Eugene Paskevich <eugene@raptor.kiev.ua>
+Date: Sun, 4 Nov 2018 21:45:07 +0200
+Subject: [PATCH] Qt: don't let the volume slider go beyong upper and/or left
+ screen boundaries.
+
+---
+ src/libaudqt/volumebutton.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/libaudqt/volumebutton.cc b/src/libaudqt/volumebutton.cc
+index e9144cb60..71edf16a1 100644
+--- a/src/libaudqt/volumebutton.cc
++++ b/src/libaudqt/volumebutton.cc
+@@ -134,7 +134,9 @@ void VolumeButton::showSlider ()
+ int dy = container_size.height () / 2 - button_size.height () / 2;
+
+ QPoint pos = mapToGlobal (QPoint (0, 0));
+- pos += QPoint (-dx, -dy);
++ pos -= QPoint (dx, dy);
++ pos.setX(qMax(pos.x(), 0));
++ pos.setY(qMax(pos.y(), 0));
+
+ m_container->move (pos);
+ window_bring_to_front (m_container);
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacious/, media-sound/audacious/files/
@ 2024-11-04 9:13 Miroslav Šulc
0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2024-11-04 9:13 UTC (permalink / raw
To: gentoo-commits
commit: 2c7d678e1dc4418a8c2cde7e41a7a702eaefb17a
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 4 07:50:56 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Nov 4 07:50:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c7d678e
media-sound/audacious: dropped obsolete 4.3.1
Bug: https://bugs.gentoo.org/942640
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/audacious/Manifest | 1 -
media-sound/audacious/audacious-4.3.1.ebuild | 71 ----------------------
.../files/audacious-enum-backporting.patch | 35 -----------
3 files changed, 107 deletions(-)
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index e2d17eb87fec..623e3b91226e 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,4 +1,3 @@
-DIST audacious-4.3.1.tar.bz2 630820 BLAKE2B e8885d25cce4a480ac58c5ee1874a530f4b169f264eaafb13830be17ce7e25933a2fb491ed0b86220fdb2e916ea5d7b13bca8a5ac00695ffd06e1ad8b2a6ff67 SHA512 7662a1b136c6ced346ce160a3a6b71ea5941644860466e23248a44168179118202006e8892a5bbd1f6d77730846a4644b6cb4e008af38e1117588b9f4d1521f5
DIST audacious-4.4.1.tar.bz2 636301 BLAKE2B 875b214e3372ce000684d4e9a2868062bc0addea19ecaa652b605e1ae79d13f58f42eeb761451da682301124c54cacdb61b326a3b1855d0cc7b47c4d8983e459 SHA512 68ba1f468b540dfeec82825b19352dab785243aa3dc456d2a5acfda97601d64a11dadd2de668a1b0adab3a42e232509d60b5658f0a0047e153791ab9318f2b76
DIST audacious-4.4.2.tar.bz2 636838 BLAKE2B 6e0b4e099660249d3631091e6c38e2b2ad40e2fafeb9e85bb365134fe1c28f128f294bdeadf50643329569c21475fc6d0da8e41fb9839cff0131ddce61597c72 SHA512 a1a561ac969863555aa349c068d85398bc6e58c3f11b74842799c7ed1287a826bd6ce9624421b9da47354a632d2e0ccb8326de27c0730028d98dd85fa0c061c1
DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
diff --git a/media-sound/audacious/audacious-4.3.1.ebuild b/media-sound/audacious/audacious-4.3.1.ebuild
deleted file mode 100644
index 591c2b60ab94..000000000000
--- a/media-sound/audacious/audacious-4.3.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="${P/_/-}"
-
-inherit xdg
-
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
-SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-KEYWORDS="amd64 ~riscv x86"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="nls"
-
-BDEPEND="
- virtual/pkgconfig
- nls? ( dev-util/intltool )
-"
-DEPEND="
- dev-libs/glib:2
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- virtual/freedesktop-icon-theme
-"
-RDEPEND="${DEPEND}"
-PDEPEND="~media-plugins/audacious-plugins-${PV}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-enum-backporting.patch
-)
-
-src_prepare() {
- default
- if ! use nls; then
- sed -e "/SUBDIRS/s/ po//" -i Makefile || die "failed to sed" # bug #512698
- fi
-}
-
-src_configure() {
- # D-Bus is a mandatory dependency, remote control,
- # session management and some plugins depend on this.
- # Building without D-Bus is *unsupported* and a USE-flag
- # will not be added due to the bug reports that will result.
- # Bugs #197894, #199069, #207330, #208606
- local myeconfargs=(
- --disable-valgrind
- --disable-gtk
- --enable-dbus
- --enable-qt
- $(use_enable nls)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- # Gentoo_ice skin installation; bug #109772
- insinto /usr/share/audacious/Skins/gentoo_ice
- doins -r "${WORKDIR}"/gentoo_ice/.
- docinto gentoo_ice
- dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/files/audacious-enum-backporting.patch b/media-sound/audacious/files/audacious-enum-backporting.patch
deleted file mode 100644
index 66bb959f737e..000000000000
--- a/media-sound/audacious/files/audacious-enum-backporting.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3989bafcb7a8843cef4e25875cd6c0e72680ad80 Mon Sep 17 00:00:00 2001
-From: Guido Falsi <mad@madpilot.net>
-Date: Wed, 28 Jun 2023 15:42:37 +0200
-Subject: [PATCH] Add missing enum value.
-
-New versions of the clang compiler have strict checks for enum values.
-
-The value "-1" is returned as a last resort from to_vfs_seek_type() as a VFSSeekType.
-
-Replace usage of `-1` with the new enum name.
----
- src/libaudcore/vfs.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/libaudcore/vfs.h b/src/libaudcore/vfs.h
-index 33c5a65c97..f6a1dd3f23 100644
---- a/src/libaudcore/vfs.h
-+++ b/src/libaudcore/vfs.h
-@@ -51,6 +51,7 @@ enum VFSReadOptions
-
- enum VFSSeekType
- {
-+ VFS_SEEK_INVALID = -1,
- VFS_SEEK_SET = 0,
- VFS_SEEK_CUR = 1,
- VFS_SEEK_END = 2
-@@ -75,7 +76,7 @@ constexpr VFSSeekType to_vfs_seek_type(int whence)
- ? VFS_SEEK_SET
- : (whence == SEEK_CUR)
- ? VFS_SEEK_CUR
-- : (whence == SEEK_END) ? VFS_SEEK_END : (VFSSeekType)-1;
-+ : (whence == SEEK_END) ? VFS_SEEK_END : VFS_SEEK_INVALID;
- }
-
- #endif // WANT_VFS_STDIO_COMPAT
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacious/, media-sound/audacious/files/
@ 2023-07-22 6:37 Miroslav Šulc
0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2023-07-22 6:37 UTC (permalink / raw
To: gentoo-commits
commit: 84011e51778257bb65cfce4adde9833f64ed596c
Author: x7upLime <andrew <AT> andrewdomain <DOT> com>
AuthorDate: Thu Jul 20 23:09:47 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jul 22 06:37:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84011e51
media-sound/audacious: VFS_SEEK enum backporting
backported from:
https://github.com/audacious-media-player/audacious/pull/64
Closes: https://bugs.gentoo.org/896412
Signed-off-by: Andrei Corduneanu <andrew <AT> andrewdomain.com>
Closes: https://github.com/gentoo/gentoo/pull/31980
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/audacious/audacious-4.3.1.ebuild | 4 +++
.../files/audacious-enum-backporting.patch | 35 ++++++++++++++++++++++
2 files changed, 39 insertions(+)
diff --git a/media-sound/audacious/audacious-4.3.1.ebuild b/media-sound/audacious/audacious-4.3.1.ebuild
index ee999ce83200..591c2b60ab94 100644
--- a/media-sound/audacious/audacious-4.3.1.ebuild
+++ b/media-sound/audacious/audacious-4.3.1.ebuild
@@ -33,6 +33,10 @@ PDEPEND="~media-plugins/audacious-plugins-${PV}"
S="${WORKDIR}/${MY_P}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-enum-backporting.patch
+)
+
src_prepare() {
default
if ! use nls; then
diff --git a/media-sound/audacious/files/audacious-enum-backporting.patch b/media-sound/audacious/files/audacious-enum-backporting.patch
new file mode 100644
index 000000000000..66bb959f737e
--- /dev/null
+++ b/media-sound/audacious/files/audacious-enum-backporting.patch
@@ -0,0 +1,35 @@
+From 3989bafcb7a8843cef4e25875cd6c0e72680ad80 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Wed, 28 Jun 2023 15:42:37 +0200
+Subject: [PATCH] Add missing enum value.
+
+New versions of the clang compiler have strict checks for enum values.
+
+The value "-1" is returned as a last resort from to_vfs_seek_type() as a VFSSeekType.
+
+Replace usage of `-1` with the new enum name.
+---
+ src/libaudcore/vfs.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/libaudcore/vfs.h b/src/libaudcore/vfs.h
+index 33c5a65c97..f6a1dd3f23 100644
+--- a/src/libaudcore/vfs.h
++++ b/src/libaudcore/vfs.h
+@@ -51,6 +51,7 @@ enum VFSReadOptions
+
+ enum VFSSeekType
+ {
++ VFS_SEEK_INVALID = -1,
+ VFS_SEEK_SET = 0,
+ VFS_SEEK_CUR = 1,
+ VFS_SEEK_END = 2
+@@ -75,7 +76,7 @@ constexpr VFSSeekType to_vfs_seek_type(int whence)
+ ? VFS_SEEK_SET
+ : (whence == SEEK_CUR)
+ ? VFS_SEEK_CUR
+- : (whence == SEEK_END) ? VFS_SEEK_END : (VFSSeekType)-1;
++ : (whence == SEEK_END) ? VFS_SEEK_END : VFS_SEEK_INVALID;
+ }
+
+ #endif // WANT_VFS_STDIO_COMPAT
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacious/, media-sound/audacious/files/
@ 2017-08-13 11:11 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2017-08-13 11:11 UTC (permalink / raw
To: gentoo-commits
commit: f9f037be81b3eefde94e3bf71e9c97fd997da5c1
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Tue Aug 1 04:53:38 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 11:06:06 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9f037be
media-sound/audacious: Fix building with -Werror=terminate using GCC-6
Bug: https://bugs.gentoo.org/show_bug.cgi?id=600882
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/5264
media-sound/audacious/audacious-3.7.1-r1.ebuild | 4 +++
.../audacious-3.7.1-c++11-throw-in-dtors.patch | 39 ++++++++++++++++++++++
2 files changed, 43 insertions(+)
diff --git a/media-sound/audacious/audacious-3.7.1-r1.ebuild b/media-sound/audacious/audacious-3.7.1-r1.ebuild
index 800ba90ecbc..808810c14cb 100644
--- a/media-sound/audacious/audacious-3.7.1-r1.ebuild
+++ b/media-sound/audacious/audacious-3.7.1-r1.ebuild
@@ -48,6 +48,10 @@ src_unpack() {
fi
}
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-c++11-throw-in-dtors.patch
+}
+
src_configure() {
if use gtk ;then
gtk="--enable-gtk"
diff --git a/media-sound/audacious/files/audacious-3.7.1-c++11-throw-in-dtors.patch b/media-sound/audacious/files/audacious-3.7.1-c++11-throw-in-dtors.patch
new file mode 100644
index 00000000000..309dbc0319f
--- /dev/null
+++ b/media-sound/audacious/files/audacious-3.7.1-c++11-throw-in-dtors.patch
@@ -0,0 +1,39 @@
+Bug: https://bugs.gentoo.org/600882
+Upstream commit: https://github.com/audacious-media-player/audacious/commit/1cf1a81a16cc70b2d9c78994ad98e26db99943ed
+
+From 1cf1a81a16cc70b2d9c78994ad98e26db99943ed Mon Sep 17 00:00:00 2001
+From: John Lindgren <john.lindgren@aol.com>
+Date: Sun, 8 May 2016 22:39:00 -0400
+Subject: [PATCH] Fix compiler warning.
+
+---
+ src/libaudcore/objects.h | 2 +-
+ src/libaudcore/stringbuf.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/libaudcore/objects.h b/src/libaudcore/objects.h
+index fd57f5e15..4b98cc624 100644
+--- a/src/libaudcore/objects.h
++++ b/src/libaudcore/objects.h
+@@ -250,7 +250,7 @@ class StringBuf
+ }
+
+ // only allowed for top (or null) string
+- ~StringBuf ();
++ ~StringBuf () noexcept (false);
+
+ // only allowed for top (or null) string
+ void resize (int size);
+diff --git a/src/libaudcore/stringbuf.cc b/src/libaudcore/stringbuf.cc
+index 041b1e9de..fc646f6ab 100644
+--- a/src/libaudcore/stringbuf.cc
++++ b/src/libaudcore/stringbuf.cc
+@@ -139,7 +139,7 @@ EXPORT void StringBuf::resize (int len)
+ }
+ }
+
+-EXPORT StringBuf::~StringBuf ()
++EXPORT StringBuf::~StringBuf () noexcept (false)
+ {
+ if (m_data)
+ {
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacious/, media-sound/audacious/files/
@ 2017-05-13 9:41 Jeroen Roovers
0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2017-05-13 9:41 UTC (permalink / raw
To: gentoo-commits
commit: 920589369bf2f7efbeb396cb5237ca44c9fa527c
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat May 13 09:35:03 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat May 13 09:41:31 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92058936
media-sound/audacious: Old.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
media-sound/audacious/Manifest | 9 ---
media-sound/audacious/audacious-2.5.4.ebuild | 59 --------------
media-sound/audacious/audacious-3.1.1.ebuild | 64 ----------------
media-sound/audacious/audacious-3.1.ebuild | 64 ----------------
media-sound/audacious/audacious-3.2.2-r1.ebuild | 67 ----------------
media-sound/audacious/audacious-3.2.3.ebuild | 65 ----------------
media-sound/audacious/audacious-3.2.4.ebuild | 59 --------------
media-sound/audacious/audacious-3.3.3.ebuild | 55 -------------
media-sound/audacious/audacious-3.3.4.ebuild | 55 -------------
media-sound/audacious/audacious-3.5.1.ebuild | 55 -------------
.../files/audacious-3.2.2-fix-build-gmodule.patch | 51 -------------
.../files/audacious-3.2.3-fix-mutex.patch | 89 ----------------------
.../audacious/files/audacious_ldflags.patch | 11 ---
13 files changed, 703 deletions(-)
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 777356d6d38..ed209347872 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,13 +1,4 @@
-DIST audacious-2.5.4.tar.gz 1221134 SHA256 47bc36010e84c2c9638537a42a8451743d55a699bf85c614f3b913596f6e2fcd SHA512 4c6cdcd19e2de468c60c3a65fd75320f47febf3890011a6d7ebf5886ea34179bfb98bbbedd822ceeb278a466a63ba47d0243c90dd8cc04bb814ac50d60b54a1d WHIRLPOOL 99fb1f1541647ee378ab771975691b40230d3a3f7051cc714e9a0276101f3eda92e00c2071b89e62c1211481c41a0a9722a9ca494e50c93a88d4d69a334aa14a
-DIST audacious-3.1.1.tar.bz2 766551 SHA256 50e229579a0ee06e88d2b123c8db6b373db73e87898e8b4843a1bd02e3cab8ac SHA512 507381330ffb20898ece803a5782047ef316925e749940cffff590129f4b5eef895c4062b20e59cc7663e51e45c5668565bff009e71d31a5ee03f4d0e720ee79 WHIRLPOOL c5d4695308b6a219de77aa0803d0975454814156ee9c1cac142781f092d66b48121d67f2834b3949efaef1e8f75ebe42cbf1b0559864e8ba6c06c2a1c83eef1c
-DIST audacious-3.1.tar.bz2 793321 SHA256 306db180cd269b072cfb23551b4139cd2af28d8afb6699836ad82aa3bcec3a46 SHA512 c80c44dc94bf25bbf0dbcb0a2de2c8a0e2cbdb7261792f7b12b96f7aaec049b227cd67704228ad6dcd33b955d0b4ce3393511eca036cbaf996f753e85c9f7141 WHIRLPOOL 195061cc46ac5b9d6e79fafc4736d756501955b144bf2e53c439c6175632507c57962e0a29adbd030168e6d08498f2aedaa520213fbe14dfd819e27e0951825d
-DIST audacious-3.2.2.tar.bz2 675192 SHA256 c69c20e48c2ed330a0ffb55f3a648b50323406e2a15ca407e3291f83e57042ee SHA512 e9c1e4c6c9bccac83f64280742036bfbab07737af903c8b3cf7d41dda0ce1c7d449eecba6c87918d750197cb8bd7b6c9eb034e670ea3a04cbcc3699de4762e36 WHIRLPOOL 0fe8ff2bcbd366ba0f887910f99bb4f691bca716c49a31f69a90b0ee4db209875514da8fa2c440ccaae934ff0bd10692f07713bf73cb89bddb00a7e0caf00f31
-DIST audacious-3.2.3.tar.bz2 695917 SHA256 aea8ad2f4da80fb58cf8b0e880585ab49ac42e8a02247c364ea29ccca5572bae SHA512 29bcb02240cfeca8611935a9093b6271bc52809515b07fdaf846457b914ff13c03d82332a762332a16cc7a036963c582f5ab2f0b25592312478dee3a38510c7e WHIRLPOOL d92d6a5f9cb2ef46138527c47adac50f44acf33f2dd89a624875467dff39e20e72be61eb4aebd9216306b70cce43abb75e5c286da3108ec7bc14d27127b0991a
-DIST audacious-3.2.4.tar.bz2 690943 SHA256 12a14542883407110d2b4367db38e8e0620d83a266388427f358a66689a4553a SHA512 a6d4ce6c352f875caa84b32d8ff30d49e787ca387f6a25cb6a7d44be7f5432c147259a9112b247497804ffc2959ffc2713a90eeed7204d55dd26607896d3936e WHIRLPOOL a50cc579b50266e581b7c25ee56b97a54433f1c5310dd8e34eec96c5d205e921ae781ff4207f87bf1d08800b1a94cbc2baedc84f72dad30f2b2fd35bfeb79b7f
-DIST audacious-3.3.3.tar.bz2 470286 SHA256 bda1074c98284471b8ded1caa5f640cdde6e8723fa8b3f4fd685de97228f7c94 SHA512 82593b3cb2b104e6d1dcbd87ff51dad0d8ff125065700db8349032fd4eb2bdf4d08f214fd575cc405914234817a6c3092c3cf4ad62c223b4287a44845b91350f WHIRLPOOL 646980115e8c3cbe2441700b4926adb528e9a2c1e234e82290a1e9c702f5eb7aa7e069d94af210ecee8337aae905bedf77055e7ff5b16043f670094c62a65855
-DIST audacious-3.3.4.tar.bz2 473345 SHA256 671cdbf9b6b722b4ff4f43bcf85da0bdd1dfdf461b510cf6ecdb9187a427fca7 SHA512 0da20e09dec3104f6e0c16a61eee7fdbd221e21d460544efd1dd2b2f12476f62f0f9042976e6b682510a21fb894fa8a089730ed7a780544e4b49ca6f5b0b6b89 WHIRLPOOL 38ae46e98e378d8b16dc3841f2ebf9907735cb7d2a204d00cc93837f132a0fdeab9acc6c1da40dd3ac0a41a1e33074a308a7941653e4d0ca5e1347b1ef24ed04
DIST audacious-3.4.1.tar.bz2 474755 SHA256 57ed4d8378b1e753e266a82424c3ae595b6c0e88fc3e32957720cd6cc14ac971 SHA512 2a9e203544861a0b902b720823202ef1038927932826847dc9b9a9c321dbecc19e2187afbdeb62a22ee8e6348c7df609ad671c8c63da2abc003a37556df20ac3 WHIRLPOOL 4b8facfb9fb3187286a59f5ddbba4ec784a3fd42e2fcadf322ee27cd8d1ae08ee3d5e23cb5c56875d3d3a879c1dd7ba21407cf19ef400693b8ab7a0adc176087
-DIST audacious-3.5.1.tar.bz2 446632 SHA256 df380e1ade112c703f57bc3883c71a1025e8d77091a772b86c0f9072efa69507 SHA512 b9ae3e0647b2fe76856a79d014db53ccdbce9524b62522c626032cf4a8d67b3828c280dade79a0327f4f279ece39d6aa600405a018aea0a11707c1903f479fad WHIRLPOOL 9f3a0c4f894aeb7a7274cfbfa181f25c6e4fedfd302c6b79c1a2fac47195ff73250229477278da704240a1259f9592966a0b07afaede41c5f424fd1afad61a0a
DIST audacious-3.6.2-gtk3.tar.bz2 539937 SHA256 ed951e588a9f3cb6766301cc387138a3fe2abc81c243eba478e4261390cb51ed SHA512 6667f71de1951265d7c8bfbd83079d67942c2c97323ffc7214394ef3f81b1f58e0432117417281833611964e88c629ef855bd90562da46be1c5d350a51c0d997 WHIRLPOOL 4e218ca1c236b3e02b20e5ed5bb9d91fd95d8132273de8451963c84e2aabb869298cf4c58704ab07036ed7c1e5a6b1ea7855f733812aaed7685b13ce7a4ecd9d
DIST audacious-3.6.2.tar.bz2 539843 SHA256 b2fdb9f3cafd65b2afc50efea6f17a7a329547f1d394f525870e42cb0483cb04 SHA512 b2fbf0b0628031ae5c883108cb1963232b50381b44882bf01faa7e11cd645e10a1d686d9ed078305a2cda66d238feaf7bdffd45c512830d20cef6770df327dde WHIRLPOOL f7b069b7e1f9538032d1bc290c7d476f16b075cf44a5d5d2b6f582a9e95ca3aa3e0a87d21ca00d4fc57a19983a9e74f3ded5e883acbd990df2064ac75e3da69a
DIST audacious-3.7.1-gtk3.tar.bz2 571720 SHA256 30d63066916d0de32891c74b6b39e3c9e81fc2449274eba3d0a9b8c9f70d02eb SHA512 0ead2827c74b31e10c555fd1254deb3d11e5aebf8c15d455cf5d6ab258012b293324700693b2b9da48b2b4c25418c7149a1901e1dfe3f210ddf730c25a43a358 WHIRLPOOL 2ceaa0194378b12ad8905c86fcf15e696f6deefa6da793d24e4e6282f0619f0fc9f7d7b8a7db0c231ba3a4e17052b4e8cdbad32c2b5a886f9aedec520c29cc25
diff --git a/media-sound/audacious/audacious-2.5.4.ebuild b/media-sound/audacious/audacious-2.5.4.ebuild
deleted file mode 100644
index 3441a7f6042..00000000000
--- a/media-sound/audacious/audacious-2.5.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.gz
- mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="altivec chardet nls session cpu_flags_x86_sse2"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
- >=dev-libs/glib-2.16
- >=dev-libs/libmcs-0.7.1-r2
- >=dev-libs/libmowgli-0.9.50:0
- dev-libs/libxml2
- >=x11-libs/cairo-1.2.6
- >=x11-libs/gtk+-2.14:2
- >=x11-libs/pango-1.8.0
- session? ( x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- chardet? ( app-i18n/libguess )
- nls? ( dev-util/intltool )"
-
-PDEPEND="~media-plugins/audacious-plugins-2.5.4"
-
-src_configure() {
- # D-Bus is a mandatory dependency, remote control,
- # session management and some plugins depend on this.
- # Building without D-Bus is *unsupported* and a USE-flag
- # will not be added due to the bug reports that will result.
- # Bugs #197894, #199069, #207330, #208606
- econf \
- --enable-dbus \
- $(use_enable altivec) \
- $(use_enable chardet) \
- $(use_enable nls) \
- $(use_enable session sm) \
- $(use_enable cpu_flags_x86_sse2 sse2)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS NEWS README
-
- # Gentoo_ice skin installation; bug #109772
- insinto /usr/share/audacious/Skins/gentoo_ice
- doins "${WORKDIR}"/gentoo_ice/*
- docinto gentoo_ice
- dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-3.1.1.ebuild b/media-sound/audacious/audacious-3.1.1.ebuild
deleted file mode 100644
index de4a449ca26..00000000000
--- a/media-sound/audacious/audacious-3.1.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.bz2
- mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="chardet nls session"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
- >=dev-libs/glib-2.16
- >=dev-libs/libmcs-0.7.1-r2
- >=dev-libs/libmowgli-0.9.50:0
- dev-libs/libxml2
- >=x11-libs/cairo-1.2.6
- >=x11-libs/pango-1.8.0
- x11-libs/gtk+:3
- session? ( x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- chardet? ( >=app-i18n/libguess-1.1 )
- nls? ( dev-util/intltool )"
-
-PDEPEND="~media-plugins/audacious-plugins-3.1.1"
-
-src_configure() {
- # Some gccs don't like "-z defs" on their command line. Explicitly make it a
- # linker flag (bug 395213).
- epatch "${FILESDIR}/audacious_ldflags.patch"
-
- # D-Bus is a mandatory dependency, remote control,
- # session management and some plugins depend on this.
- # Building without D-Bus is *unsupported* and a USE-flag
- # will not be added due to the bug reports that will result.
- # Bugs #197894, #199069, #207330, #208606
- # Use of GTK+2 causes plugin build failures, bug #384185
- econf \
- --enable-dbus \
- --enable-gtk3 \
- $(use_enable chardet) \
- $(use_enable nls) \
- $(use_enable session sm)
-}
-
-src_install() {
- default
- dodoc AUTHORS NEWS README
-
- # Gentoo_ice skin installation; bug #109772
- insinto /usr/share/audacious/Skins/gentoo_ice
- doins "${WORKDIR}"/gentoo_ice/*
- docinto gentoo_ice
- dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-3.1.ebuild b/media-sound/audacious/audacious-3.1.ebuild
deleted file mode 100644
index 274bb25d3d5..00000000000
--- a/media-sound/audacious/audacious-3.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.bz2
- mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="chardet nls session"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
- >=dev-libs/glib-2.16
- >=dev-libs/libmcs-0.7.1-r2
- >=dev-libs/libmowgli-0.9.50:0
- dev-libs/libxml2
- >=x11-libs/cairo-1.2.6
- >=x11-libs/pango-1.8.0
- x11-libs/gtk+:3
- session? ( x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- chardet? ( app-i18n/libguess )
- nls? ( dev-util/intltool )"
-
-PDEPEND="~media-plugins/audacious-plugins-3.1"
-
-src_configure() {
- # Some gccs don't like "-z defs" on their command line. Explicitly make it a
- # linker flag (bug 395213).
- epatch "${FILESDIR}/audacious_ldflags.patch"
-
- # D-Bus is a mandatory dependency, remote control,
- # session management and some plugins depend on this.
- # Building without D-Bus is *unsupported* and a USE-flag
- # will not be added due to the bug reports that will result.
- # Bugs #197894, #199069, #207330, #208606
- # Use of GTK+2 causes plugin build failures, bug #384185
- econf \
- --enable-dbus \
- --enable-gtk3 \
- $(use_enable chardet) \
- $(use_enable nls) \
- $(use_enable session sm)
-}
-
-src_install() {
- default
- dodoc AUTHORS NEWS README
-
- # Gentoo_ice skin installation; bug #109772
- insinto /usr/share/audacious/Skins/gentoo_ice
- doins "${WORKDIR}"/gentoo_ice/*
- docinto gentoo_ice
- dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-3.2.2-r1.ebuild b/media-sound/audacious/audacious-3.2.2-r1.ebuild
deleted file mode 100644
index 508a595672e..00000000000
--- a/media-sound/audacious/audacious-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils autotools
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
- mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="chardet +gtk gtk3 nls session"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
- >=dev-libs/glib-2.16
- dev-libs/libxml2
- >=x11-libs/cairo-1.2.6
- >=x11-libs/pango-1.8.0
- gtk? ( x11-libs/gtk+:2 )
- gtk3? ( x11-libs/gtk+:3 )
- session? ( x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- chardet? ( >=app-i18n/libguess-1.1 )
- nls? ( dev-util/intltool )"
-
-PDEPEND="~media-plugins/audacious-plugins-3.2.2"
-REQUIRED_USE="^^ ( gtk gtk3 )"
-
-src_prepare() {
- epatch "$FILESDIR"/${P}-fix-build-gmodule.patch
- eaclocal -I m4
- eautoheader
- eautoconf
-}
-
-src_configure() {
- # D-Bus is a mandatory dependency, remote control,
- # session management and some plugins depend on this.
- # Building without D-Bus is *unsupported* and a USE-flag
- # will not be added due to the bug reports that will result.
- # Bugs #197894, #199069, #207330, #208606
- # Use of GTK+2 causes plugin build failures, bug #384185
- econf \
- --enable-dbus \
- $(use_enable gtk3) \
- $(use_enable chardet) \
- $(use_enable nls) \
- $(use_enable session sm)
-}
-
-src_install() {
- default
- dodoc AUTHORS README
-
- # Gentoo_ice skin installation; bug #109772
- insinto /usr/share/audacious/Skins/gentoo_ice
- doins "${WORKDIR}"/gentoo_ice/*
- docinto gentoo_ice
- dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-3.2.3.ebuild b/media-sound/audacious/audacious-3.2.3.ebuild
deleted file mode 100644
index 761b15ca788..00000000000
--- a/media-sound/audacious/audacious-3.2.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
- mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="chardet nls session"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
- >=dev-libs/glib-2.16
- dev-libs/libxml2
- >=x11-libs/cairo-1.2.6
- >=x11-libs/pango-1.8.0
- x11-libs/gtk+:2
- session? ( x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- chardet? ( >=app-i18n/libguess-1.1 )
- nls? ( dev-util/intltool )"
-
-PDEPEND="~media-plugins/audacious-plugins-3.2.3"
-
-src_prepare() {
- epatch "$FILESDIR"/${P}-fix-mutex.patch
-}
-
-src_configure() {
- # D-Bus is a mandatory dependency, remote control,
- # session management and some plugins depend on this.
- # Building without D-Bus is *unsupported* and a USE-flag
- # will not be added due to the bug reports that will result.
- # Bugs #197894, #199069, #207330, #208606
- # Use of gtk+:3 causes some plugins to not have preference pages
- # and statusicon to not build. Disable till Audacious 3.3 when
- # these issues will have been fixed.
- econf \
- --enable-dbus \
- --disable-gtk3 \
- $(use_enable chardet) \
- $(use_enable nls) \
- $(use_enable session sm)
-}
-
-src_install() {
- default
- dodoc AUTHORS README
-
- # Gentoo_ice skin installation; bug #109772
- insinto /usr/share/audacious/Skins/gentoo_ice
- doins "${WORKDIR}"/gentoo_ice/*
- docinto gentoo_ice
- dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-3.2.4.ebuild b/media-sound/audacious/audacious-3.2.4.ebuild
deleted file mode 100644
index b0a22f660ff..00000000000
--- a/media-sound/audacious/audacious-3.2.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
- mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="chardet nls session"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
- >=dev-libs/glib-2.16
- dev-libs/libxml2
- >=x11-libs/cairo-1.2.6
- >=x11-libs/pango-1.8.0
- x11-libs/gtk+:2
- session? ( x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- chardet? ( >=app-i18n/libguess-1.1 )
- nls? ( dev-util/intltool )"
-
-PDEPEND="~media-plugins/audacious-plugins-3.2.4"
-
-src_configure() {
- # D-Bus is a mandatory dependency, remote control,
- # session management and some plugins depend on this.
- # Building without D-Bus is *unsupported* and a USE-flag
- # will not be added due to the bug reports that will result.
- # Bugs #197894, #199069, #207330, #208606
- # Disable gtk+:3 till Audacious 3.3
- econf \
- --enable-dbus \
- --disable-gtk3 \
- $(use_enable chardet) \
- $(use_enable nls) \
- $(use_enable session sm)
-}
-
-src_install() {
- default
- dodoc AUTHORS
-
- # Gentoo_ice skin installation; bug #109772
- insinto /usr/share/audacious/Skins/gentoo_ice
- doins "${WORKDIR}"/gentoo_ice/*
- docinto gentoo_ice
- dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-3.3.3.ebuild b/media-sound/audacious/audacious-3.3.3.ebuild
deleted file mode 100644
index 9d7ba384645..00000000000
--- a/media-sound/audacious/audacious-3.3.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
- mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="chardet nls"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
- >=dev-libs/glib-2.30
- dev-libs/libxml2
- >=x11-libs/cairo-1.2.6
- >=x11-libs/pango-1.8.0
- x11-libs/gtk+:3"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- chardet? ( >=app-i18n/libguess-1.1 )
- nls? ( dev-util/intltool )"
-
-PDEPEND="~media-plugins/audacious-plugins-3.3.3"
-
-src_configure() {
- # D-Bus is a mandatory dependency, remote control,
- # session management and some plugins depend on this.
- # Building without D-Bus is *unsupported* and a USE-flag
- # will not be added due to the bug reports that will result.
- # Bugs #197894, #199069, #207330, #208606
- econf \
- --enable-dbus \
- $(use_enable chardet) \
- $(use_enable nls)
-}
-
-src_install() {
- default
- dodoc AUTHORS
-
- # Gentoo_ice skin installation; bug #109772
- insinto /usr/share/audacious/Skins/gentoo_ice
- doins "${WORKDIR}"/gentoo_ice/*
- docinto gentoo_ice
- dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-3.3.4.ebuild b/media-sound/audacious/audacious-3.3.4.ebuild
deleted file mode 100644
index 4681df0942e..00000000000
--- a/media-sound/audacious/audacious-3.3.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
- mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="chardet nls"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
- >=dev-libs/glib-2.28
- dev-libs/libxml2
- >=x11-libs/cairo-1.2.6
- >=x11-libs/pango-1.8.0
- x11-libs/gtk+:3"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- chardet? ( >=app-i18n/libguess-1.1 )
- nls? ( dev-util/intltool )"
-
-PDEPEND="~media-plugins/audacious-plugins-3.3.4"
-
-src_configure() {
- # D-Bus is a mandatory dependency, remote control,
- # session management and some plugins depend on this.
- # Building without D-Bus is *unsupported* and a USE-flag
- # will not be added due to the bug reports that will result.
- # Bugs #197894, #199069, #207330, #208606
- econf \
- --enable-dbus \
- $(use_enable chardet) \
- $(use_enable nls)
-}
-
-src_install() {
- default
- dodoc AUTHORS
-
- # Gentoo_ice skin installation; bug #109772
- insinto /usr/share/audacious/Skins/gentoo_ice
- doins "${WORKDIR}"/gentoo_ice/*
- docinto gentoo_ice
- dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-3.5.1.ebuild b/media-sound/audacious/audacious-3.5.1.ebuild
deleted file mode 100644
index 76bb00bfa6d..00000000000
--- a/media-sound/audacious/audacious-3.5.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
- mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="chardet nls"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
- >=dev-libs/glib-2.28
- dev-libs/libxml2
- >=x11-libs/cairo-1.2.6
- >=x11-libs/pango-1.8.0
- x11-libs/gtk+:3"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- chardet? ( >=app-i18n/libguess-1.2 )
- nls? ( dev-util/intltool )"
-
-PDEPEND="~media-plugins/audacious-plugins-3.5.1"
-
-src_configure() {
- # D-Bus is a mandatory dependency, remote control,
- # session management and some plugins depend on this.
- # Building without D-Bus is *unsupported* and a USE-flag
- # will not be added due to the bug reports that will result.
- # Bugs #197894, #199069, #207330, #208606
- econf \
- --enable-dbus \
- $(use_enable chardet) \
- $(use_enable nls)
-}
-
-src_install() {
- default
- dodoc AUTHORS
-
- # Gentoo_ice skin installation; bug #109772
- insinto /usr/share/audacious/Skins/gentoo_ice
- doins "${WORKDIR}"/gentoo_ice/*
- docinto gentoo_ice
- dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/files/audacious-3.2.2-fix-build-gmodule.patch b/media-sound/audacious/files/audacious-3.2.2-fix-build-gmodule.patch
deleted file mode 100644
index 587b68fa1a4..00000000000
--- a/media-sound/audacious/files/audacious-3.2.2-fix-build-gmodule.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit 7b68fdab1dbd2ec3e8eeb37a7a0837d4d0e20851
-Author: John Lindgren <john.lindgren@aol.com>
-Date: Mon Apr 2 16:50:39 2012 -0400
-
- Use GMODULE_{CFLAGS,LIBS}.
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 6f6f293..5acb6b7 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -194,6 +194,7 @@ AC_PATH_PROG([WINDRES], [windres])
- dnl Check for Gtk+/GLib and pals
- dnl ============================
- AUD_CHECK_MODULE([GLIB], [glib-2.0], [>= 2.16], [Glib2])
-+AUD_CHECK_MODULE([GMODULE], [gmodule-2.0], [>= 2.16], [GModule])
- AUD_CHECK_MODULE([GTHREAD], [gthread-2.0], [>= 2.16], [GThread])
- AUD_CHECK_MODULE([PANGO], [pango], [>= 1.20], [Pango])
- AUD_CHECK_MODULE([CAIRO], [cairo], [>= 1.6], [Cairo])
-diff --git a/extra.mk.in b/extra.mk.in
-index 464bbb0..1ff2a08 100644
---- a/extra.mk.in
-+++ b/extra.mk.in
-@@ -21,6 +21,8 @@ DBUS_CFLAGS ?= @DBUS_CFLAGS@
- DBUS_LIBS ?= @DBUS_LIBS@
- GLIB_CFLAGS ?= @GLIB_CFLAGS@
- GLIB_LIBS ?= @GLIB_LIBS@
-+GMODULE_CFLAGS ?= @GMODULE_CFLAGS@
-+GMODULE_LIBS ?= @GMODULE_LIBS@
- GTHREAD_CFLAGS ?= @GTHREAD_CFLAGS@
- GTHREAD_LIBS ?= @GTHREAD_LIBS@
- GTK_CFLAGS ?= @GTK_CFLAGS@
-diff --git a/src/audacious/Makefile b/src/audacious/Makefile
-index ea95c85..22dad64 100644
---- a/src/audacious/Makefile
-+++ b/src/audacious/Makefile
-@@ -99,6 +99,7 @@ pre-depend: ${DBUS_BINDINGS}
- CPPFLAGS := -I.. -I../.. \
- ${CPPFLAGS} \
- ${GLIB_CFLAGS} \
-+ ${GMODULE_LIBS} \
- ${GTHREAD_CFLAGS} \
- ${GTK_CFLAGS} \
- ${AUDACIOUS_DEFINES} \
-@@ -119,6 +120,7 @@ LIBS := -L../libaudcore -laudcore \
- ${LIBINTL} \
- ${EGGSM_LIBS} \
- ${GLIB_LIBS} \
-+ ${GMODULE_LIBS} \
- ${GTHREAD_LIBS} \
- ${GTK_LIBS} \
- ${DBUS_LIBS} \
diff --git a/media-sound/audacious/files/audacious-3.2.3-fix-mutex.patch b/media-sound/audacious/files/audacious-3.2.3-fix-mutex.patch
deleted file mode 100644
index 3fb209196f8..00000000000
--- a/media-sound/audacious/files/audacious-3.2.3-fix-mutex.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-commit b53935921298b8164f80454c2016bd40de29704b
-Author: John Lindgren <john.lindgren@aol.com>
-Date: Sat May 26 11:55:42 2012 -0400
-
- Fix violation of mutex locking order (playback then playlist). Found by Helgrind.
-
-diff --git a/src/audacious/playlist-new.c b/src/audacious/playlist-new.c
-index 6407f64..596fbaa 100644
---- a/src/audacious/playlist-new.c
-+++ b/src/audacious/playlist-new.c
-@@ -822,6 +822,7 @@ void playlist_reorder (int from, int to, int count)
-
- void playlist_delete (int playlist_num)
- {
-+ /* stop playback before locking playlists */
- if (playback_get_playing () && playlist_num == playlist_get_playing ())
- playback_stop ();
-
-@@ -969,6 +970,7 @@ int playlist_get_active (void)
-
- void playlist_set_playing (int playlist_num)
- {
-+ /* stop playback before locking playlists */
- if (playback_get_playing ())
- playback_stop ();
-
-@@ -1112,6 +1114,7 @@ void playlist_entry_insert_batch_raw (int playlist_num, int at,
-
- void playlist_entry_delete (int playlist_num, int at, int number)
- {
-+ /* stop playback before locking playlists */
- if (playback_get_playing () && playlist_num == playlist_get_playing () &&
- playlist_get_position (playlist_num) >= at && playlist_get_position
- (playlist_num) < at + number)
-@@ -1225,6 +1228,7 @@ int playlist_entry_get_length (int playlist_num, int entry_num, bool_t fast)
-
- void playlist_set_position (int playlist_num, int entry_num)
- {
-+ /* stop playback before locking playlists */
- if (playback_get_playing () && playlist_num == playlist_get_playing ())
- playback_stop ();
-
-@@ -1423,6 +1427,7 @@ int playlist_shift (int playlist_num, int entry_num, int distance)
-
- void playlist_delete_selected (int playlist_num)
- {
-+ /* stop playback before locking playlists */
- if (playback_get_playing () && playlist_num == playlist_get_playing () &&
- playlist_get_position (playlist_num) >= 0 && playlist_entry_get_selected
- (playlist_num, playlist_get_position (playlist_num)))
-@@ -2023,6 +2028,7 @@ static bool_t shuffle_prev (Playlist * playlist)
-
- bool_t playlist_prev_song (int playlist_num)
- {
-+ /* stop playback before locking playlists */
- if (playback_get_playing () && playlist_num == playlist_get_playing ())
- playback_stop ();
-
-@@ -2110,6 +2116,7 @@ static void shuffle_reset (Playlist * playlist)
-
- bool_t playlist_next_song (int playlist_num, bool_t repeat)
- {
-+ /* stop playback before locking playlists */
- if (playback_get_playing () && playlist_num == playlist_get_playing ())
- playback_stop ();
-
-@@ -2253,6 +2260,11 @@ int playback_entry_get_end_time (void)
-
- void playlist_save_state (void)
- {
-+ /* get playback state before locking playlists */
-+ resume_state = playback_get_playing () ? (playback_get_paused () ?
-+ RESUME_PAUSE : RESUME_PLAY) : RESUME_STOP;
-+ resume_time = playback_get_playing () ? playback_get_time () : 0;
-+
- ENTER;
-
- char * path = g_strdup_printf ("%s/" STATE_FILE, get_path (AUD_PATH_USER_DIR));
-@@ -2261,10 +2273,6 @@ void playlist_save_state (void)
- if (! handle)
- LEAVE_RET_VOID;
-
-- resume_state = playback_get_playing () ? (playback_get_paused () ?
-- RESUME_PAUSE : RESUME_PLAY) : RESUME_STOP;
-- resume_time = playback_get_playing () ? playback_get_time () : 0;
--
- fprintf (handle, "resume-state %d\n", resume_state);
- fprintf (handle, "resume-time %d\n", resume_time);
-
diff --git a/media-sound/audacious/files/audacious_ldflags.patch b/media-sound/audacious/files/audacious_ldflags.patch
deleted file mode 100644
index e030b1af5da..00000000000
--- a/media-sound/audacious/files/audacious_ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.old 2012-01-17 12:41:09.000000000 +0000
-+++ configure 2012-01-17 12:41:42.000000000 +0000
-@@ -4759,7 +4759,7 @@
- *linux*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-- LDFLAGS="$LDFLAGS -z defs"
-+ LDFLAGS="$LDFLAGS -Wl,-z,defs"
- ;;
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-11-04 9:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-17 22:00 [gentoo-commits] repo/gentoo:master commit in: media-sound/audacious/, media-sound/audacious/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-11-04 9:13 Miroslav Šulc
2023-07-22 6:37 Miroslav Šulc
2017-08-13 11:11 David Seifert
2017-05-13 9:41 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox