[audacious-plugins] import the Audacious 3.6 packages from my Copr with changes
Michael Schwendt
mschwendt at fedoraproject.org
Tue Mar 3 13:20:45 UTC 2015
commit bbc0d15ed4cc8d3d20981cd13db4fe9ca9166d7a
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Tue Mar 3 14:20:41 2015 +0100
import the Audacious 3.6 packages from my Copr with changes
.gitignore | 1 +
README | 3 +
audacious-plugins-3.0-alpha1-xmms-skindir.patch | 17 ---
audacious-plugins-3.1-beta1-ladspa.patch | 11 --
...s-plugins-3.4-beta2-enable-gnomeshortcuts.patch | 26 -----
audacious-plugins-3.4.3-skins-vector-fonts.patch | 29 -----
...-plugins-3.6-alpha1-enable-gnomeshortcuts.patch | 44 +++++++
audacious-plugins-3.6-alpha1-xmms-skindir.patch | 17 +++
audacious-plugins-3.6-ladspa.patch | 11 ++
audacious-plugins.spec | 128 ++++++++++++++++-----
sources | 2 +-
11 files changed, 174 insertions(+), 115 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 69fe070..eb595a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
/audacious-plugins-3.5.tar.bz2
/audacious-plugins-3.5.1.tar.bz2
/audacious-plugins-3.5.2.tar.bz2
+/audacious-plugins-3.6.tar.bz2
diff --git a/README b/README
index 8b3bde5..dd3df94 100644
--- a/README
+++ b/README
@@ -1,3 +1,6 @@
+20150303:
+ffaudio plugin handles ".opus" files
+
20131106:
Opus Codec support? So far, it's the ffmpeg based "ffaudio" input plugin
that handles Opus files but without supporting the ".opus" file extension:
diff --git a/audacious-plugins-3.6-alpha1-enable-gnomeshortcuts.patch b/audacious-plugins-3.6-alpha1-enable-gnomeshortcuts.patch
new file mode 100644
index 0000000..d905f25
--- /dev/null
+++ b/audacious-plugins-3.6-alpha1-enable-gnomeshortcuts.patch
@@ -0,0 +1,44 @@
+diff -Nurb --strip-trailing-cr audacious-plugins-3.6-alpha1-gtk3-orig/src/gnomeshortcuts/gnomeshortcuts.cc audacious-plugins-3.6-alpha1-gtk3/src/gnomeshortcuts/gnomeshortcuts.cc
+--- audacious-plugins-3.6-alpha1-gtk3-orig/src/gnomeshortcuts/gnomeshortcuts.cc 2014-12-06 00:07:48.000000000 +0100
++++ audacious-plugins-3.6-alpha1-gtk3/src/gnomeshortcuts/gnomeshortcuts.cc 2014-12-09 23:04:45.000000000 +0100
+@@ -23,6 +23,7 @@
+ #include <string.h>
+ #include <dbus/dbus.h>
+ #include <dbus/dbus-glib-bindings.h>
++#include <dbus/dbus-glib-lowlevel.h>
+ #include <glib-object.h>
+
+ #include <libaudcore/drct.h>
+@@ -40,7 +41,7 @@
+ about
+ };
+
+- constexpr GNOMEShortcuts () : GeneralPlugin (info, false) {}
++ constexpr GNOMEShortcuts () : GeneralPlugin (info, true) {}
+
+ bool init ();
+ void cleanup ();
+@@ -227,6 +228,7 @@
+ {
+ DBusGConnection *bus;
+ GError *error = nullptr;
++ DBusError derror;
+ dbus_g_thread_init();
+
+ bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+@@ -235,6 +237,15 @@
+ g_error_free (error);
+ return false;
+ } else {
++ dbus_error_init(&derror);
++ if ( !dbus_bus_name_has_owner(dbus_g_connection_get_connection(bus),
++ "org.gnome.SettingsDaemon", &derror) ) {
++ if (dbus_error_is_set(&derror)) {
++ g_warning(derror.message);
++ dbus_error_free(&derror);
++ }
++ return false;
++ }
+ media_player_keys_proxy = dbus_g_proxy_new_for_name (bus,
+ "org.gnome.SettingsDaemon",
+ "/org/gnome/SettingsDaemon/MediaKeys",
diff --git a/audacious-plugins-3.6-alpha1-xmms-skindir.patch b/audacious-plugins-3.6-alpha1-xmms-skindir.patch
new file mode 100644
index 0000000..76af77c
--- /dev/null
+++ b/audacious-plugins-3.6-alpha1-xmms-skindir.patch
@@ -0,0 +1,17 @@
+diff -Nurb --strip-trailing-cr audacious-plugins-3.6-alpha1-gtk3-orig/src/skins/ui_skinselector.cc audacious-plugins-3.6-alpha1-gtk3/src/skins/ui_skinselector.cc
+--- audacious-plugins-3.6-alpha1-gtk3-orig/src/skins/ui_skinselector.cc 2014-12-06 00:07:48.000000000 +0100
++++ audacious-plugins-3.6-alpha1-gtk3/src/skins/ui_skinselector.cc 2014-12-09 22:43:00.846839928 +0100
+@@ -237,9 +237,13 @@
+ skinlist_update(void)
+ {
+ char *skinsdir;
++ char xmmsskinsdir[] = "/usr/share/xmms/Skins";
+
+ skinlist_clear();
+
++ if (g_file_test(xmmsskinsdir, G_FILE_TEST_IS_DIR)) {
++ scan_skindir( xmmsskinsdir );
++ }
+ if (g_file_test (skins_paths[SKINS_PATH_USER_SKIN_DIR], G_FILE_TEST_EXISTS))
+ scan_skindir (skins_paths[SKINS_PATH_USER_SKIN_DIR]);
+
diff --git a/audacious-plugins-3.6-ladspa.patch b/audacious-plugins-3.6-ladspa.patch
new file mode 100644
index 0000000..1eba4b8
--- /dev/null
+++ b/audacious-plugins-3.6-ladspa.patch
@@ -0,0 +1,11 @@
+diff -Nur audacious-plugins-3.6-orig/src/ladspa/plugin.cc audacious-plugins-3.6/src/ladspa/plugin.cc
+--- audacious-plugins-3.6-orig/src/ladspa/plugin.cc 2015-02-28 22:57:53.000000000 +0100
++++ audacious-plugins-3.6/src/ladspa/plugin.cc 2015-03-02 15:57:15.499371104 +0100
+@@ -35,6 +35,7 @@
+
+ const char * const LADSPAHost::defaults[] = {
+ "plugin_count", "0",
++ "module_path", "__RPM_LIBDIR__/ladspa",
+ nullptr};
+
+ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index c7aa2ae..c71fad4 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -1,17 +1,29 @@
-%global aud_plugin_api %(grep '[ ]*#define[ ]*_AUD_PLUGIN_VERSION[ ]\\+' %{_includedir}/audacious/api.h 2>/dev/null | sed 's!.*_AUD_PLUGIN_VERSION[ ]*\\([0-9]\\+\\).*!\\1!')
+### Fedora 22 package
+
+# if without gtk2, build with gtk3 (requires a different source tarball)
+%bcond_without gtk2
+# build without Qt
+%bcond_with qt
+
+%global aud_plugin_api %(grep '[ ]*#define[ ]*_AUD_PLUGIN_VERSION[ ]\\+' %{_includedir}/libaudcore/plugin.h 2>/dev/null | sed 's!.*_AUD_PLUGIN_VERSION[ ]*\\([0-9]\\+\\).*!\\1!')
%if 0%{aud_plugin_api} > 0
%global aud_plugin_dep Requires: audacious(plugin-api)%{?_isa} = %{aud_plugin_api}
%endif
%{?aud_plugin_dep}
-%global tar_ver 3.5.2
+Name: audacious-plugins
+Version: 3.6
+Release: 3%{?dist}
+
+%if %{with gtk2}
+ %global tar_ver %{version}
+%else
+ %global tar_ver %{version}-gtk3
+%endif
# Minimum audacious/audacious-plugins version in inter-package dependencies.
-%global aud_ver 3.5
+%global aud_ver 3.6
-Name: audacious-plugins
-Version: 3.5.2
-Release: 3%{?dist}
Summary: Plugins for the Audacious audio player
Group: Applications/Multimedia
URL: http://audacious-media-player.org/
@@ -19,7 +31,7 @@ URL: http://audacious-media-player.org/
# list of license per plugin in README.licences
License: GPLv2+ and LGPLv2+ and GPLv3 and MIT and BSD
-Source0: http://distfiles.audacious-media-player.org/audacious-plugins-%{tar_ver}.tar.bz2
+Source0: http://distfiles.audacious-media-player.org/%{name}-%{tar_ver}.tar.bz2
Source3: README.licenses
# for optional packages
Source100: audacious-plugins-amidi.metainfo.xml
@@ -27,11 +39,11 @@ Source101: audacious-plugins-exotic.metainfo.xml
Source102: audacious-plugins-jack.metainfo.xml
# Fedora customization
-Patch0: audacious-plugins-3.0-alpha1-xmms-skindir.patch
+Patch0: audacious-plugins-3.6-alpha1-xmms-skindir.patch
# Fedora customization (RFE bz #632388)
-Patch1: audacious-plugins-3.4-beta2-enable-gnomeshortcuts.patch
+Patch1: audacious-plugins-3.6-alpha1-enable-gnomeshortcuts.patch
# Fedora customization: add default system-wide module_path
-Patch2: audacious-plugins-3.1-beta1-ladspa.patch
+Patch2: audacious-plugins-3.6-ladspa.patch
BuildRequires: audacious-devel >= %{aud_ver}
BuildRequires: gettext-devel
@@ -62,6 +74,12 @@ BuildRequires: libnotify-devel
BuildRequires: libbs2b-devel
BuildRequires: curl-devel
+%if %{with qt}
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Widgets)
+%endif
+
# experimental, disabled by default
BuildRequires: neon-devel
@@ -92,12 +110,6 @@ License: GPLv2+ and LGPLv2+ and GPLv3 and MIT and BSD
Group: Applications/Multimedia
%{?aud_plugin_dep}
Requires: audacious-plugins%{?_isa} >= %{aud_ver}
-# last in F17 Updates for Audacious 3.2.4 and based on libsidplay 1.x
-Obsoletes: audacious-plugins-sid < %{version}
-Provides: audacious-plugins-sid = %{version}-%{release}
-# only included the sid.so decoder based on libsidplay 2.x
-Obsoletes: audacious-plugins-nonfree < 3.3.4-2
-Provides: audacious-plugins-nonfree = 3.3.4-2
%description exotic
@@ -130,7 +142,7 @@ input plugin for Audacious.
%patch1 -p1 -b .enable-gnomeshortcuts
%patch2 -p1 -b .ladspa
-for i in src/ladspa/plugin.c
+for i in src/ladspa/plugin.cc
do
sed -i -e 's!__RPM_LIBDIR__!%{_libdir}!g' $i
sed -i -e 's!__RPM_LIB__!%{_lib}!g' $i
@@ -144,6 +156,14 @@ sed -i '\,^.SILENT:,d' buildsys.mk.in
# Enforce availability of the audacious(plugin-api) dependency.
%{!?aud_plugin_dep:echo 'No audacious(plugin-api) dependency!' && exit -1}
+%if %{with qt}
+rm -rf _bin
+mkdir _bin
+ln -s /usr/bin/moc-qt5 _bin/moc
+ln -s /usr/bin/uic-qt5 _bin/uic
+export PATH=$PATH:$(pwd)/_bin
+%endif
+
%configure --enable-gio \
--enable-vorbis \
--enable-flacng \
@@ -155,13 +175,20 @@ sed -i '\,^.SILENT:,d' buildsys.mk.in
--disable-mms \
--with-ffmpeg=none \
\
+%if %{with qt}
+ --enable-qt \
+%else
+ --disable-qt \
+%endif
+ --enable-gtk \
+ \
--disable-rpath \
--disable-dependency-tracking
make %{?_smp_mflags}
%install
-make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
+%make_install INSTALL="install -p"
%find_lang %{name}
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/appdata
@@ -171,7 +198,7 @@ install -p -m0644 %{SOURCE102} ${RPM_BUILD_ROOT}%{_datadir}/appdata
%files -f %{name}.lang
-%doc AUTHORS COPYING
+%license COPYING
%dir %{_libdir}/audacious
%dir %{_libdir}/audacious/Container/
%{_libdir}/audacious/Container/asx.so
@@ -190,6 +217,7 @@ install -p -m0644 %{SOURCE102} ${RPM_BUILD_ROOT}%{_datadir}/appdata
%{_libdir}/audacious/Effect/ladspa.so
%{_libdir}/audacious/Effect/mixer.so
%{_libdir}/audacious/Effect/resample.so
+%{_libdir}/audacious/Effect/silence-removal.so
%{_libdir}/audacious/Effect/sox-resampler.so
%{_libdir}/audacious/Effect/speed-pitch.so
%{_libdir}/audacious/Effect/stereo.so
@@ -207,11 +235,15 @@ install -p -m0644 %{SOURCE102} ${RPM_BUILD_ROOT}%{_datadir}/appdata
%{_libdir}/audacious/General/lyricwiki.so
%{_libdir}/audacious/General/mpris2.so
%{_libdir}/audacious/General/notify.so
+%{_libdir}/audacious/General/playlist-manager.so
%{_libdir}/audacious/General/scrobbler.so
%{_libdir}/audacious/General/search-tool.so
%{_libdir}/audacious/General/skins.so
%{_libdir}/audacious/General/song_change.so
+# not available with gtk3
+%if %{with gtk2}
%{_libdir}/audacious/General/statusicon.so
+%endif
%dir %{_libdir}/audacious/Input/
%{_libdir}/audacious/Input/cdaudio-ng.so
%{_libdir}/audacious/Input/flacng.so
@@ -224,6 +256,7 @@ install -p -m0644 %{SOURCE102} ${RPM_BUILD_ROOT}%{_datadir}/appdata
%dir %{_libdir}/audacious/Output/
%{_libdir}/audacious/Output/alsa.so
%{_libdir}/audacious/Output/filewriter.so
+%{_libdir}/audacious/Output/oss4.so
%{_libdir}/audacious/Output/pulse_audio.so
%{_libdir}/audacious/Output/sdlout.so
%dir %{_libdir}/audacious/Visualization/
@@ -234,9 +267,17 @@ install -p -m0644 %{SOURCE102} ${RPM_BUILD_ROOT}%{_datadir}/appdata
%{_libdir}/audacious/Transport/gio.so
%{_libdir}/audacious/Transport/neon.so
%{_datadir}/audacious/
+# extra Qt specific plugin versions
+%if %{with qt}
+%{_libdir}/audacious/General/albumart-qt.so
+%{_libdir}/audacious/General/lyricwiki-qt.so
+%{_libdir}/audacious/General/qtui.so
+%{_libdir}/audacious/General/song-info-qt.so
+%{_libdir}/audacious/Visualization/gl-spectrum-qt.so
+%endif
%files jack
-%{_libdir}/audacious/Output/jackout.so
+%{_libdir}/audacious/Output/jack-ng.so
%{_datadir}/appdata/%{name}-jack.metainfo.xml
%files exotic
@@ -255,17 +296,42 @@ install -p -m0644 %{SOURCE102} ${RPM_BUILD_ROOT}%{_datadir}/appdata
%changelog
-* Thu Feb 19 2015 Michael Schwendt <mschwendt at fedoraproject.org> - 3.5.2-3
-- Rebuild for libbinio (GCC 5 C++ ABI change).
-
-* Tue Nov 11 2014 Adrian Reber <adrian at lisas.de> - 3.5.2-2
-- Rebuilt for libcdio-0.93
-
-* Wed Oct 22 2014 Michael Schwendt <mschwendt at fedoraproject.org> - 3.5.2-1
-- Update to 3.5.2 (announced as final release in the 3.5 series).
-
-* Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+* Tue Mar 3 2015 Michael Schwendt <mschwendt at fedoraproject.org> - 3.6-3
+- For Fedora 22, build with gtk2 and without Qt by default.
+- Use %%make_install and %%license.
+- Drop old Obs/Prov from -exotic subpackage.
+
+* Mon Mar 2 2015 Michael Schwendt <mschwendt at fedoraproject.org> - 3.6-2
+- Add build switches for test-building:
+ --with gtk2
+ --without qt
+- Statusicon plugin is enabled by default for gtk2.
+- Rediff ladspa patch, so it applies also to gtk2 based tarball.
+
+* Sun Mar 1 2015 Michael Schwendt <mschwendt at fedoraproject.org> - 3.6-1
+- Update to 3.6 final release.
+- Derive source tarball version and builddir from %%version as to avoid
+ a version definition in two macros.
+
+* Thu Feb 19 2015 Michael Schwendt <mschwendt at fedoraproject.org> - 3.6-0.5.beta1
+- Patch to prevent narrowing conversion error with GCC 5.
+
+* Sun Feb 15 2015 Michael Schwendt <mschwendt at fedoraproject.org> - 3.6-0.4.beta1
+- No AUTHORS file available anymore.
+- Update to 3.6-beta1-gtk3.
+
+* Tue Dec 9 2014 Michael Schwendt <mschwendt at fedoraproject.org> - 3.6-0.3.alpha1
+- Update patches.
+
+* Tue Dec 9 2014 Michael Schwendt <mschwendt at fedoraproject.org> - 3.6-0.2.alpha1
+- Update to 3.6-alpha1-gtk3.
+- Oct 7: 3.6-0.1.20141007gitgc26d0fa
+- TODO: rediff/revisit patches.
+- No statusicon plugin anymore.
+- Add a hack in %%build to make available Qt5's moc and uic in PATH.
+- Plugin API version definition has moved to libaudcore header directory.
+- Build with --enable-qt and --enable-gtk.
+- Upgrade to git snapshot for another look at the Qt GUI for 3.6.
* Fri Jul 25 2014 Michael Schwendt <mschwendt at fedoraproject.org> - 3.5.1-2
- Explicitly enable/disable some plugins for the updated configure script.
diff --git a/sources b/sources
index 7fd05a1..bf04c93 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1ba5ef956eb7b4018ff6a9f2ea404354 audacious-plugins-3.5.2.tar.bz2
+f3ea8edde73f1b07848f02d5bb957d72 audacious-plugins-3.6.tar.bz2
More information about the scm-commits
mailing list