Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package audacious-plugins for openSUSE:Factory checked in at 2023-03-08 14:53:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audacious-plugins (Old) and /work/SRC/openSUSE:Factory/.audacious-plugins.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "audacious-plugins" Wed Mar 8 14:53:18 2023 rev:25 rq:1070050 version:4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/audacious-plugins/audacious-plugins.changes 2022-07-15 13:53:02.767574434 +0200 +++ /work/SRC/openSUSE:Factory/.audacious-plugins.new.31432/audacious-plugins.changes 2023-03-08 14:53:24.294947985 +0100 @@ -1,0 +2,11 @@ +Thu Mar 7 20:06:08 UTC 2023 - Alexei Sorokin <[email protected]> + +- Update to version 4.3: + * See https://audacious-media-player.org/news/56-audacious-4-3-released +- Add PipeWire, ModPlug and Opus build requirements. +- Add audacious-plugins-fix-qt6-qthotkey.patch: Fix Qt6 support in + qthotkey. +- Switch to Qt 6 on openSUSE newer than 15.x +- Switch to GTK 3. + +------------------------------------------------------------------- Old: ---- audacious-plugins-4.2.tar.bz2 New: ---- audacious-plugins-4.3.tar.bz2 audacious-plugins-fix-qt6-qthotkey.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacious-plugins.spec ++++++ --- /var/tmp/diff_new_pack.bNdfGs/_old 2023-03-08 14:53:24.958951601 +0100 +++ /var/tmp/diff_new_pack.bNdfGs/_new 2023-03-08 14:53:24.962951622 +0100 @@ -1,7 +1,7 @@ # # spec file for package audacious-plugins # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,11 +17,11 @@ %define __provides_exclude_from ^%{_libdir}/audacious/*/.*.so$ -%define aud_ver_min 4.2 -%define aud_ver_max 4.2.99 +%define aud_ver_min 4.3 +%define aud_ver_max 4.3.99 %bcond_with faad Name: audacious-plugins -Version: 4.2 +Version: 4.3 Release: 0 Summary: Plugins for Audacious License: BSD-2-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-3.0-only AND MIT @@ -29,25 +29,22 @@ Source: https://distfiles.audacious-media-player.org/%{name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE fix-linking-mpg123.patch boo#1187525 Patch0: fix-linking-mpg123.patch +# PATCH-FIX-UPSTREAM audacious-plugins-fix-qt6-qthotkey.patch [email protected] -- Fix Qt6 support in qthotkey. +Patch1: audacious-plugins-fix-qt6-qthotkey.patch BuildRequires: fdupes -BuildRequires: gcc-c++ >= 4.6 +BuildRequires: gcc-c++ BuildRequires: libmp3lame-devel BuildRequires: lirc-devel BuildRequires: meson BuildRequires: pkgconfig BuildRequires: sndio-devel -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Multimedia) -BuildRequires: pkgconfig(Qt5OpenGL) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(alsa) >= 1.0.16 BuildRequires: pkgconfig(audacious) >= %{aud_ver_min} BuildRequires: pkgconfig(flac) >= 1.2.1 BuildRequires: pkgconfig(fluidsynth) >= 1.0.6 BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(jack) >= 1.9.7 BuildRequires: pkgconfig(libavcodec) >= 53.40.0 BuildRequires: pkgconfig(libavformat) >= 53.25.0 @@ -59,6 +56,7 @@ BuildRequires: pkgconfig(libcue) BuildRequires: pkgconfig(libcurl) >= 7.9.7 BuildRequires: pkgconfig(libmms) >= 0.3 +BuildRequires: pkgconfig(libmodplug) BuildRequires: pkgconfig(libmpg123) >= 1.12 BuildRequires: pkgconfig(libnotify) >= 0.7 BuildRequires: pkgconfig(libopenmpt) @@ -67,6 +65,8 @@ BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(neon) >= 0.27 BuildRequires: pkgconfig(ogg) >= 1.0 +BuildRequires: pkgconfig(opus) >= 1.0.1 +BuildRequires: pkgconfig(opusfile) >= 0.4 BuildRequires: pkgconfig(samplerate) BuildRequires: pkgconfig(sdl2) >= 2.0 BuildRequires: pkgconfig(sndfile) >= 0.19 @@ -81,6 +81,25 @@ Requires: libaudcore%{?_isa} <= %{aud_ver_max} Requires: libaudcore%{?_isa} >= %{aud_ver_min} Recommends: %{name}-extra +%if 0%{?suse_version} > 1500 +BuildRequires: qt6-gui-private-devel +BuildRequires: cmake(Qt6Core) +BuildRequires: cmake(Qt6Gui) +BuildRequires: cmake(Qt6Multimedia) +BuildRequires: cmake(Qt6Network) +BuildRequires: cmake(Qt6OpenGL) +BuildRequires: cmake(Qt6OpenGLWidgets) +BuildRequires: cmake(Qt6Widgets) +BuildRequires: pkgconfig(libpipewire-0.3) +%else +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Multimedia) +BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5OpenGL) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(Qt5X11Extras) +%endif %if %{with faad} BuildRequires: libfaad-devel %endif @@ -104,6 +123,13 @@ %build %meson \ -Dqt=true \ +%if 0%{?suse_version} > 1500 + -Dqt6=true \ +%else + -Dqt6=false \ +%endif + -Dgtk=true \ + -Dgtk3=true \ %ifarch %{arm} aarch64 -Dgl-spectrum=false \ %endif ++++++ audacious-plugins-4.2.tar.bz2 -> audacious-plugins-4.3.tar.bz2 ++++++ ++++ 114430 lines of diff (skipped) ++++++ audacious-plugins-fix-qt6-qthotkey.patch ++++++ --- a/src/qthotkey/gui.cc +++ b/src/qthotkey/gui.cc @@ -40,11 +40,14 @@ #include <QtCore/QMap> #include <QtCore/QStringList> +#include <QtGui/QGuiApplication> #include <QtGui/QKeyEvent> #include <QtGui/QMouseEvent> #include <QtWidgets/QApplication> #include <QtWidgets/QStyle> +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <QtX11Extras/QX11Info> +#endif #include <libaudcore/i18n.h> #include <libaudcore/preferences.h> @@ -106,8 +109,14 @@ public: QStringList strings; - KeySym keysym; - keysym = XkbKeycodeToKeysym(QX11Info::display(), key, 0, 0); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + Display * xdisplay = reinterpret_cast<Display *>(qApp + ->nativeInterface<QNativeInterface::QX11Application>() + ->display()); +#else + Display * xdisplay = QX11Info::display(); +#endif + KeySym keysym = XkbKeycodeToKeysym(xdisplay, key, 0, 0); if (keysym == 0 || keysym == NoSymbol) { text = QString::fromLocal8Bit("#%1").arg(key); --- a/src/qthotkey/meson.build +++ b/src/qthotkey/meson.build @@ -1,17 +1,17 @@ if get_option('qt6') - qtx11extras_dep = dependency('qt6', version: qt_req, required: false, modules: ['X11Extras']) + qtprivate_dep = dependency('qt6', version: qt_req, private_headers: true, required: false, modules: ['Core', 'Gui']) else - qtx11extras_dep = dependency('qt5', version: qt_req, required: false, modules: ['X11Extras']) + qtprivate_dep = dependency('qt5', version: qt_req, required: false, modules: ['X11Extras']) endif -have_qthotkey = qtx11extras_dep.found() +have_qthotkey = qtprivate_dep.found() if have_qthotkey shared_module('qthotkey', 'gui.cc', 'plugin.cc', - dependencies: [audacious_dep, qt_dep, audqt_dep, qtx11extras_dep], + dependencies: [audacious_dep, qt_dep, audqt_dep, qtprivate_dep], name_prefix: '', install: true, install_dir: general_plugin_dir --- a/src/qthotkey/plugin.cc +++ b/src/qthotkey/plugin.cc @@ -42,7 +42,10 @@ #include <QtCore/QCoreApplication> #include <QtCore/QString> #include <QtCore/QTimer> +#include <QtGui/QGuiApplication> +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <QtX11Extras/QX11Info> +#endif #include <libaudcore/drct.h> #include <libaudcore/hook.h> @@ -95,6 +98,7 @@ static GlobalHotkeysEventFilter event_fi static PluginConfig plugin_cfg; static int grabbed = 0; +static Display * xdisplay = nullptr; unsigned int numlock_mask = 0; unsigned int scrolllock_mask = 0; unsigned int capslock_mask = 0; @@ -336,7 +340,7 @@ void add_hotkey(QList<HotkeyConfiguratio return; } - keycode = XKeysymToKeycode(QX11Info::display(), keysym); + keycode = XKeysymToKeycode(xdisplay, keysym); if (keycode == 0) { return; @@ -436,13 +440,25 @@ bool GlobalHotkeys::init() { audqt::init(); - if (!QX11Info::isPlatformX11()) +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + auto * native = qApp->nativeInterface<QNativeInterface::QX11Application>(); +#else + bool native = QX11Info::isPlatformX11(); +#endif + + if (!native) { AUDERR("Global Hotkey plugin only supports X11.\n"); audqt::cleanup(); return false; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + xdisplay = reinterpret_cast<Display *>(native->display()); +#else + xdisplay = QX11Info::display(); +#endif + load_config(); grab_keys(); QCoreApplication::instance()->installNativeEventFilter(&event_filter); @@ -610,7 +626,6 @@ void grab_keys() PluginConfig * plugin_cfg = get_config(); XErrorHandler old_handler = nullptr; - Display * xdisplay = QX11Info::display(); if (grabbed || (!xdisplay)) { @@ -704,7 +719,6 @@ void ungrab_keys() PluginConfig * plugin_cfg = get_config(); XErrorHandler old_handler = nullptr; - Display * xdisplay = QX11Info::display(); if ((!grabbed) || (!xdisplay)) {
