Hello community, here is the log from the commit of package nulloy for openSUSE:Factory checked in at 2019-05-07 23:20:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nulloy (Old) and /work/SRC/openSUSE:Factory/.nulloy.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nulloy" Tue May 7 23:20:20 2019 rev:6 rq:701341 version:0.8.2.pre61qt5 Changes: -------- --- /work/SRC/openSUSE:Factory/nulloy/nulloy.changes 2019-05-06 13:28:07.753369295 +0200 +++ /work/SRC/openSUSE:Factory/.nulloy.new.5148/nulloy.changes 2019-05-07 23:20:23.361110182 +0200 @@ -1,0 +2,6 @@ +Tue May 7 14:09:33 UTC 2019 - plater <[email protected]> + +- Fix vlc plugin build with 0001-vlc-phonon-plugins-update.patch +- Add 0001-pkg_check_lib-fix.patch from git. + +------------------------------------------------------------------- New: ---- 0001-pkg_check_lib-fix.patch 0001-vlc-phonon-plugins-update.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nulloy.spec ++++++ --- /var/tmp/diff_new_pack.b4PkWO/_old 2019-05-07 23:20:23.817111222 +0200 +++ /var/tmp/diff_new_pack.b4PkWO/_new 2019-05-07 23:20:23.821111231 +0200 @@ -12,14 +12,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define rev d15e0f3aee22ef1cdd84729cf75f505adcc0ffda -%bcond_with libvlc -%bcond_with phonon +%bcond_without libvlc +%bcond_without phonon Name: nulloy Version: 0.8.2.pre61qt5 @@ -30,6 +30,8 @@ Url: http://nulloy.com Source: https://github.com/nulloy/nulloy/archive/%{rev}.tar.gz#/%{name}-%{version}.tar.gz Patch0: fix-library-directory.patch +Patch1: 0001-vlc-phonon-plugins-update.patch +Patch2: 0001-pkg_check_lib-fix.patch BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: libQt5Gui-private-headers-devel @@ -48,7 +50,7 @@ BuildRequires: pkgconfig(libvlc) %endif %if %{with phonon} -BuildRequires: pkgconfig(phonon) +BuildRequires: pkgconfig(phonon4qt5) %endif BuildRequires: pkgconfig(taglib) Recommends: %{name}-gstreamer @@ -98,7 +100,7 @@ %prep %setup -qn %{name}-%{rev} -%patch0 -p1 +%autopatch -p1 %build # This is not an autotools configure ++++++ 0001-pkg_check_lib-fix.patch ++++++ >From 39e7b6d0144800e2f1c8824b38863f9f1cc52e82 Mon Sep 17 00:00:00 2001 From: Sergey Vlasov <[email protected]> Date: Tue, 7 May 2019 11:54:58 +0000 Subject: [PATCH] pkg_check_lib fix --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 645d280..cabd0c3 100755 --- a/configure +++ b/configure @@ -117,9 +117,9 @@ echo "PKG_CONFIG = $PKG_CONFIG" >> $QMAKE_CACHE [[ -n "$LDFLAGS" ]] && echo "QMAKE_LFLAGS += ${LDFLAGS}" >> $QMAKE_CACHE pkg_check_lib() { - for P in $@; do - if $PKG_CONFIG --print-errors $1; then - echo "Found $1" + for LIB in $@; do + if $PKG_CONFIG --print-errors $LIB; then + echo "Found '$LIB'" else echo exit 1 -- 2.16.4 ++++++ 0001-vlc-phonon-plugins-update.patch ++++++ >From fc10f2d746c58e8fecb52319d1209a49e1cf8aa9 Mon Sep 17 00:00:00 2001 From: Sergey Vlasov <[email protected]> Date: Tue, 7 May 2019 11:39:24 +0000 Subject: [PATCH] vlc & phonon plugins update --- configure | 19 +++++++++++-------- src/main.cpp | 4 ++++ src/plugins/phonon/containerPhonon.cpp | 3 --- src/plugins/phonon/containerPhonon.h | 1 + src/plugins/phonon/playbackEnginePhonon.cpp | 4 ++-- src/plugins/phonon/playbackEnginePhonon.h | 2 +- src/plugins/phonon/pluginPhonon.pro | 2 +- src/plugins/vlc/containerVlc.cpp | 3 --- src/plugins/vlc/containerVlc.h | 1 + src/plugins/vlc/playbackEngineVlc.cpp | 2 +- src/plugins/vlc/playbackEngineVlc.h | 2 +- 11 files changed, 23 insertions(+), 20 deletions(-) diff --git a/configure b/configure index a4583f4..645d280 100755 --- a/configure +++ b/configure @@ -117,18 +117,21 @@ echo "PKG_CONFIG = $PKG_CONFIG" >> $QMAKE_CACHE [[ -n "$LDFLAGS" ]] && echo "QMAKE_LFLAGS += ${LDFLAGS}" >> $QMAKE_CACHE pkg_check_lib() { - if $PKG_CONFIG --print-errors $1; then - echo "Found $1" - else - echo - exit 1 - fi + for P in $@; do + if $PKG_CONFIG --print-errors $1; then + echo "Found $1" + else + echo + exit 1 + fi + shift + done } [[ $BUILD_GSTREAMER == "yes" ]] && pkg_check_lib gstreamer-1.0 [[ $BUILD_GSTREAMER_TAGREADER == "yes" ]] && pkg_check_lib gstreamer-pbutils-1.0 -[[ $BUILD_VLC == "yes" ]] && pkg_check_lib libvlc +[[ $BUILD_VLC == "yes" ]] && pkg_check_lib libvlc vlc-plugin [[ $BUILD_TAGLIB == "yes" ]] && pkg_check_lib taglib -[[ $BUILD_PHONON == "yes" ]] && pkg_check_lib phonon +[[ $BUILD_PHONON == "yes" ]] && pkg_check_lib phonon4qt5 [[ $BUILD_GSTREAMER == "yes" ]] && echo "CONFIG += gstreamer" >> $QMAKE_CACHE [[ $BUILD_GSTREAMER_TAGREADER == "yes" ]] && echo "CONFIG += gstreamer-tagreader" >> $QMAKE_CACHE diff --git a/src/main.cpp b/src/main.cpp index 414d619..bcb13d9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -60,11 +60,15 @@ static void print_try() void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) { + Q_UNUSED(context); print_err(msg); if (logToFile) { QString prefix; switch (type) { + case QtInfoMsg: + prefix = "Info"; + break; case QtDebugMsg: prefix = "Debug"; break; diff --git a/src/plugins/phonon/containerPhonon.cpp b/src/plugins/phonon/containerPhonon.cpp index 7a6c387..efb65ba 100644 --- a/src/plugins/phonon/containerPhonon.cpp +++ b/src/plugins/phonon/containerPhonon.cpp @@ -33,6 +33,3 @@ QList<NPlugin *> NContainerPhonon::plugins() const { return m_plugins; } - -Q_EXPORT_PLUGIN2(plugin_phonon, NContainerPhonon) - diff --git a/src/plugins/phonon/containerPhonon.h b/src/plugins/phonon/containerPhonon.h index bd2abfc..12416bf 100644 --- a/src/plugins/phonon/containerPhonon.h +++ b/src/plugins/phonon/containerPhonon.h @@ -22,6 +22,7 @@ class NContainerPhonon : public QObject, public NPluginContainer { Q_OBJECT Q_INTERFACES(NPluginContainer) + Q_PLUGIN_METADATA(IID "com.nulloy.NContainerPhonon") private: QList<NPlugin *> m_plugins; diff --git a/src/plugins/phonon/playbackEnginePhonon.cpp b/src/plugins/phonon/playbackEnginePhonon.cpp index fc4a893..55094ed 100644 --- a/src/plugins/phonon/playbackEnginePhonon.cpp +++ b/src/plugins/phonon/playbackEnginePhonon.cpp @@ -58,13 +58,13 @@ void NPlaybackEnginePhonon::setMedia(const QString &file) return; if (!QFile(file).exists()) { - emit message(N::MessageBox::Warning, file, "No such file or directory"); + emit message(N::Warning, file, "No such file or directory"); emit mediaChanged(""); emit failed(); return; } - m_mediaObject->setCurrentSource(Phonon::MediaSource(file)); + m_mediaObject->setCurrentSource(Phonon::MediaSource(QUrl::fromLocalFile(file))); emit mediaChanged(file); } diff --git a/src/plugins/phonon/playbackEnginePhonon.h b/src/plugins/phonon/playbackEnginePhonon.h index 1cd911b..0c04951 100644 --- a/src/plugins/phonon/playbackEnginePhonon.h +++ b/src/plugins/phonon/playbackEnginePhonon.h @@ -65,7 +65,7 @@ private slots: signals: void positionChanged(qreal pos); void volumeChanged(qreal volume); - void message(N::MessageBox::Icon icon, const QString &title, const QString &msg); + void message(N::MessageIcon icon, const QString &title, const QString &msg); void mediaChanged(const QString &file); void finished(); void failed(); diff --git a/src/plugins/phonon/pluginPhonon.pro b/src/plugins/phonon/pluginPhonon.pro index 859c4e3..3c9fac9 100644 --- a/src/plugins/phonon/pluginPhonon.pro +++ b/src/plugins/phonon/pluginPhonon.pro @@ -3,7 +3,7 @@ win32:TARGET = PluginPhonon include(../plugin.pri) -QT += phonon +QT += phonon4qt5 HEADERS += *.h SOURCES += *.cpp diff --git a/src/plugins/vlc/containerVlc.cpp b/src/plugins/vlc/containerVlc.cpp index a39117b..98b0ca3 100644 --- a/src/plugins/vlc/containerVlc.cpp +++ b/src/plugins/vlc/containerVlc.cpp @@ -33,6 +33,3 @@ QList<NPlugin *> NContainerVlc::plugins() const { return m_plugins; } - -Q_EXPORT_PLUGIN2(plugin_vlc, NContainerVlc) - diff --git a/src/plugins/vlc/containerVlc.h b/src/plugins/vlc/containerVlc.h index 26955ac..f9459af 100644 --- a/src/plugins/vlc/containerVlc.h +++ b/src/plugins/vlc/containerVlc.h @@ -22,6 +22,7 @@ class NContainerVlc : public QObject, public NPluginContainer { Q_OBJECT Q_INTERFACES(NPluginContainer) + Q_PLUGIN_METADATA(IID "com.nulloy.NContainerVlc") private: QList<NPlugin *> m_plugins; diff --git a/src/plugins/vlc/playbackEngineVlc.cpp b/src/plugins/vlc/playbackEngineVlc.cpp index 599962a..697703b 100644 --- a/src/plugins/vlc/playbackEngineVlc.cpp +++ b/src/plugins/vlc/playbackEngineVlc.cpp @@ -88,7 +88,7 @@ void NPlaybackEngineVlc::setMedia(const QString &file) return; if (!QFile(file).exists()) { - emit message(N::MessageBox::Warning, file, "No such file or directory"); + emit message(N::Warning, file, "No such file or directory"); emit mediaChanged(""); emit failed(); return; diff --git a/src/plugins/vlc/playbackEngineVlc.h b/src/plugins/vlc/playbackEngineVlc.h index a252293..9f81e45 100644 --- a/src/plugins/vlc/playbackEngineVlc.h +++ b/src/plugins/vlc/playbackEngineVlc.h @@ -71,7 +71,7 @@ private slots: signals: void positionChanged(qreal pos); void volumeChanged(qreal volume); - void message(N::MessageBox::Icon icon, const QString &title, const QString &msg); + void message(N::MessageIcon icon, const QString &title, const QString &msg); void mediaChanged(const QString &file); void finished(); void failed(); -- 2.16.4
