commit phonon4qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2019-10-10 11:49:03 Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new.2352 (New) Package is "phonon4qt5" Thu Oct 10 11:49:03 2019 rev:23 rq:733475 version:4.11.1 Changes: --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes2019-09-23 12:00:17.465975900 +0200 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new.2352/phonon4qt5.changes 2019-10-10 11:49:05.812013694 +0200 @@ -1,0 +2,11 @@ +Thu Sep 26 13:03:18 UTC 2019 - wba...@tmo.at + +- Update to 4.11.1: + * ECMGeneratePriFile now correctly uses KDE_USE_QT_SYS_PATHS + * Include directory in the pri file is now using the correct path +- Drop 0001-Remove-phonon-from-the-include-directory.patch, merged + upstream +- Use %lang_package macro and provide phonon4qt5 to fulfill its + dependencies + +--- Old: 0001-Remove-phonon-from-the-include-directory.patch phonon-4.11.0.tar.xz New: phonon-4.11.1.tar.xz Other differences: -- ++ phonon4qt5.spec ++ --- /var/tmp/diff_new_pack.xM8Tm7/_old 2019-10-10 11:49:06.672011412 +0200 +++ /var/tmp/diff_new_pack.xM8Tm7/_new 2019-10-10 11:49:06.676011401 +0200 @@ -19,7 +19,7 @@ %define rname phonon %bcond_without lang Name: phonon4qt5 -Version:4.11.0 +Version:4.11.1 Release:0 Summary:Multimedia Platform Abstraction License:LGPL-2.0-or-later @@ -27,8 +27,6 @@ URL:https://phonon.kde.org/ Source: https://download.kde.org/stable/%{rname}/%{version}/%{rname}-%{version}.tar.xz Source1:baselibs.conf -# PATCH-FIX-UPSTREAM -Patch0: 0001-Remove-phonon-from-the-include-directory.patch BuildRequires: cmake BuildRequires: extra-cmake-modules >= 5.60.0 BuildRequires: fdupes @@ -63,6 +61,7 @@ %package -n libphonon4qt5 Summary:Phonon Multimedia Platform Abstraction Group: System/Libraries +Provides: %{name} = %{version} Recommends: %{name}-lang Recommends: phonon4qt5-backend Recommends: phononsettings @@ -73,15 +72,7 @@ quality on all platforms, no matter which underlying architecture is used. -%package lang -Summary:Translations for package libphonon4qt5 -Group: System/Localization -Requires: libphonon4qt5 = %{version} -Provides: %{name}-lang-all = %{version} -BuildArch: noarch - -%description lang -Provides translations for the libphonon4qt5 package. +%lang_package %package -n phononsettings Summary:Settings Tool for Phonon Multimedia Platform Abstraction @@ -99,7 +90,6 @@ %prep %setup -q -n %{rname}-%{version} -%patch0 -p1 %build %cmake_kf5 -d build @@ -139,6 +129,7 @@ %endif %files -n phononsettings +%license COPYING %{_kf5_bindir}/phononsettings %if %{with lang} ++ phonon-4.11.0.tar.xz -> phonon-4.11.1.tar.xz ++ 31120 lines of diff (skipped)
commit phonon4qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2019-09-23 12:00:16 Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new.7948 (New) Package is "phonon4qt5" Mon Sep 23 12:00:16 2019 rev:22 rq:730299 version:4.11.0 Changes: --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes2019-09-07 11:31:39.638447488 +0200 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new.7948/phonon4qt5.changes 2019-09-23 12:00:17.465975900 +0200 @@ -1,0 +2,5 @@ +Wed Sep 11 11:34:40 UTC 2019 - Christophe Giboudeaux + +- Add 0001-Remove-phonon-from-the-include-directory.patch + +--- New: 0001-Remove-phonon-from-the-include-directory.patch Other differences: -- ++ phonon4qt5.spec ++ --- /var/tmp/diff_new_pack.lPTkRZ/_old 2019-09-23 12:00:18.221975775 +0200 +++ /var/tmp/diff_new_pack.lPTkRZ/_new 2019-09-23 12:00:18.225975775 +0200 @@ -27,6 +27,8 @@ URL:https://phonon.kde.org/ Source: https://download.kde.org/stable/%{rname}/%{version}/%{rname}-%{version}.tar.xz Source1:baselibs.conf +# PATCH-FIX-UPSTREAM +Patch0: 0001-Remove-phonon-from-the-include-directory.patch BuildRequires: cmake BuildRequires: extra-cmake-modules >= 5.60.0 BuildRequires: fdupes @@ -97,6 +99,7 @@ %prep %setup -q -n %{rname}-%{version} +%patch0 -p1 %build %cmake_kf5 -d build ++ 0001-Remove-phonon-from-the-include-directory.patch ++ >From 8f08d48405c689cea5d91fe9e9d77b09c7b0c378 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 11 Sep 2019 11:51:47 +0200 Subject: [PATCH] Remove 'phonon' from the include directory Summary: Both the CMake and pkgconfig files say the include directory is `/include/phonon4qt5`. Only the .pri file points to a different location. This fixes the nulloy build with recent phonon versions. Reviewers: sitter, O4 phonon Differential Revision: https://phabricator.kde.org/D23873 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 85290887..ccf65c68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,7 +170,7 @@ ecm_generate_pri_file( LIB_NAME ${PHONON_LIB_SONAME} DEPS "core widgets" FILENAME_VAR pri_filename - INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/phonon + INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR} ) install(FILES ${pri_filename} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) -- 2.23.0
commit phonon4qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2019-09-07 11:31:38 Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new.7948 (New) Package is "phonon4qt5" Sat Sep 7 11:31:38 2019 rev:21 rq:728150 version:4.11.0 Changes: --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes2019-07-30 14:01:44.728983320 +0200 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new.7948/phonon4qt5.changes 2019-09-07 11:31:39.638447488 +0200 @@ -1,0 +2,51 @@ +Wed Sep 4 00:32:59 UTC 2019 - Stefan BrĂ¼ns + +- Add designer plugin directory to directories owned by the devel + package, as libqt5-qttools is no longer pulled in. + +--- +Fri Aug 30 11:34:34 UTC 2019 - wba...@tmo.at + +- Update to 4.11.0: + * Features ++ New phononsettings application for advanced users to control + PulseAudio device preference by-category and Phonon backend + selection. This application is an advanced utility and you + shouldn't need to visit it if you aren't very certain that + something needs changing. This replaces the previously + available System Settings module for Phonon. + * Changes ++ The backends Phonon VLC 0.11+ or Phonon GStreamer 4.10+ are + required to build with this version of libphonon! Older + versions will no longer build because of aggressive clean up + of legacy compatibility code in the build system. ++ Qt4 support has been removed. Qt5 is now the default. If you + still need the Qt4 version for whatever reason it's + recommended that you port to Qt5 quickly seeing as Qt4 is + getting really long in the tooth. Since the Qt4 and Qt5 + version are fully co-installable you can continue to use + 4.10 for Qt4 while using 4.11 for Qt5 should it be necessary. ++ CMake 3.5 is now required for building ++ Installation paths are now controlled by the KDEInstallDirs + CMake include instead of the GNUInstallDirs one ++ CCFlag and CMake settings are now shared with other KDE + software as per the extra-cmake-modules framework ++ PHONON_BUILD_DESCRIPTOR option no longer supported. ++ PHONON_BUILD_DECLARATIVE_PLUGIN option no longer supported. + It made little to no sense on Qt5. ++ PHONON_INSTALL_QT_COMPAT_HEADERS option no longer supported. + It made no sense on Qt5. ++ PHONON_NO_DBUS option no longer supported. The DBus interface + was only used to communicate with the settings interface in + Plasma, but hasn't been used in many years. This effectively + removes QtDBus as dependency. ++ PHONON_ASSERT_STATES option no longer supported. The state + machine is now always enabled unless Q_ASSERTs as a whole are + disabled (i.e. the build is not a Debug-ish build). ++ PHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT option no longer + supported. Replaced by ECM's KDE_USE_QT_SYS_PATHS. + * Bug Fixes ++ The default preference of backends is now properly + implemented. This was previously reversed. + +--- Old: phonon-4.10.3.tar.xz New: phonon-4.11.0.tar.xz Other differences: -- ++ phonon4qt5.spec ++ --- /var/tmp/diff_new_pack.k57bqu/_old 2019-09-07 11:31:40.110447429 +0200 +++ /var/tmp/diff_new_pack.k57bqu/_new 2019-09-07 11:31:40.110447429 +0200 @@ -17,8 +17,9 @@ %define rname phonon +%bcond_without lang Name: phonon4qt5 -Version:4.10.3 +Version:4.11.0 Release:0 Summary:Multimedia Platform Abstraction License:LGPL-2.0-or-later @@ -27,19 +28,16 @@ Source: https://download.kde.org/stable/%{rname}/%{version}/%{rname}-%{version}.tar.xz Source1:baselibs.conf BuildRequires: cmake -BuildRequires: extra-cmake-modules >= 1.7.0 +BuildRequires: extra-cmake-modules >= 5.60.0 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: libpulse-devel BuildRequires: pkgconfig BuildRequires: xz -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Designer) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5OpenGL) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(gl) +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5Designer) +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Widgets) BuildRequires: pkgconfig(glib-2.0) %description @@ -51,7 +49,7 @@ %package devel Summary:Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE -Requires:
commit phonon4qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2019-07-30 14:01:43 Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new.4126 (New) Package is "phonon4qt5" Tue Jul 30 14:01:43 2019 rev:20 rq:717613 version:4.10.3 Changes: --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes2019-01-21 10:24:05.889833472 +0100 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new.4126/phonon4qt5.changes 2019-07-30 14:01:44.728983320 +0200 @@ -1,0 +2,13 @@ +Mon Jul 22 14:50:22 UTC 2019 - Christophe Giboudeaux + +- Fix the -lang package dependency. + +--- +Fri Jul 19 22:35:36 UTC 2019 - wba...@tmo.at + +- Update to 4.10.3: + * QFOREACH use was removed in headers when building for Qt 5. + * Localization has been fixed for the Qt 5 build. +- Add lang subpackage containing the translations + +--- Old: phonon-4.10.2.tar.xz New: phonon-4.10.3.tar.xz Other differences: -- ++ phonon4qt5.spec ++ --- /var/tmp/diff_new_pack.6A7s3L/_old 2019-07-30 14:01:45.176983014 +0200 +++ /var/tmp/diff_new_pack.6A7s3L/_new 2019-07-30 14:01:45.176983014 +0200 @@ -18,13 +18,13 @@ %define rname phonon Name: phonon4qt5 -Version:4.10.2 +Version:4.10.3 Release:0 Summary:Multimedia Platform Abstraction License:LGPL-2.0-or-later Group: System/GUI/KDE -URL:http://phonon.kde.org/ -Source: http://download.kde.org/stable/%{rname}/%{version}/%{rname}-%{version}.tar.xz +URL:https://phonon.kde.org/ +Source: https://download.kde.org/stable/%{rname}/%{version}/%{rname}-%{version}.tar.xz Source1:baselibs.conf BuildRequires: cmake BuildRequires: extra-cmake-modules >= 1.7.0 @@ -63,6 +63,7 @@ %package -n libphonon4qt5 Summary:Phonon Multimedia Platform Abstraction Group: System/Libraries +Recommends: %{name}-lang Recommends: phonon4qt5-backend %description -n libphonon4qt5 @@ -71,6 +72,16 @@ quality on all platforms, no matter which underlying architecture is used. +%package lang +Summary:Translations for package libphonon4qt5 +Group: System/Localization +Requires: libphonon4qt5 = %{version} +Provides: %{name}-lang-all = %{version} +BuildArch: noarch + +%description lang +Provides translations for the libphonon4qt5 package. + %prep %setup -q -n %{rname}-%{version} @@ -82,6 +93,8 @@ %kf5_makeinstall -C build %fdupes -s %{buildroot}%{_includedir}/%{name} + %find_lang libphonon %{name}.lang --with-qt + %post -n libphonon4qt5 -p /sbin/ldconfig %postun -n libphonon4qt5 -p /sbin/ldconfig @@ -102,4 +115,6 @@ %{_libqt5_plugindir}/designer/phononwidgets.so %{_kf5_sharedir}/dbus-1/interfaces/org.kde.Phonon4Qt5.AudioOutput.xml +%files lang -f %{name}.lang + %changelog ++ phonon-4.10.2.tar.xz -> phonon-4.10.3.tar.xz ++ 5750 lines of diff (skipped)
commit phonon4qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2019-01-21 10:24:04 Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new.28833 (New) Package is "phonon4qt5" Mon Jan 21 10:24:04 2019 rev:19 rq:666201 version:4.10.2 Changes: --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes2019-01-15 13:14:42.868436021 +0100 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new.28833/phonon4qt5.changes 2019-01-21 10:24:05.889833472 +0100 @@ -1,0 +2,9 @@ +Thu Jan 10 15:19:42 UTC 2019 - wba...@tmo.at + +- Update to 4.10.2: + * PulseAudio support is no longer incorrectly disabled with Qt +5.12 +- Drop 0001-Fix-PulseAudio-support-with-Qt-5.12.patch, merged + upstream + +--- Old: 0001-Fix-PulseAudio-support-with-Qt-5.12.patch phonon-4.10.1.tar.xz New: phonon-4.10.2.tar.xz Other differences: -- ++ phonon4qt5.spec ++ --- /var/tmp/diff_new_pack.A2Y9ib/_old 2019-01-21 10:24:06.317833001 +0100 +++ /var/tmp/diff_new_pack.A2Y9ib/_new 2019-01-21 10:24:06.321832997 +0100 @@ -18,7 +18,7 @@ %define rname phonon Name: phonon4qt5 -Version:4.10.1 +Version:4.10.2 Release:0 Summary:Multimedia Platform Abstraction License:LGPL-2.0-or-later @@ -26,8 +26,6 @@ URL:http://phonon.kde.org/ Source: http://download.kde.org/stable/%{rname}/%{version}/%{rname}-%{version}.tar.xz Source1:baselibs.conf -# PATCH-FIX-UPSTREAM -Patch1: 0001-Fix-PulseAudio-support-with-Qt-5.12.patch BuildRequires: cmake BuildRequires: extra-cmake-modules >= 1.7.0 BuildRequires: fdupes @@ -75,7 +73,6 @@ %prep %setup -q -n %{rname}-%{version} -%autopatch -p1 %build %cmake_kf5 -d build -- -DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=true -DDBUS_INTERFACES_INSTALL_DIR=%{_kf5_sharedir}/dbus-1/interfaces/ ++ phonon-4.10.1.tar.xz -> phonon-4.10.2.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.10.1/CMakeLists.txt new/phonon-4.10.2/CMakeLists.txt --- old/phonon-4.10.1/CMakeLists.txt2018-04-27 11:23:33.0 +0200 +++ new/phonon-4.10.2/CMakeLists.txt2019-01-09 13:49:39.0 +0100 @@ -23,7 +23,7 @@ # If you are unsure about the this: http://plan99.net/~mike/writing-shared-libraries.html set(PHONON_LIB_MAJOR_VERSION "4") # Only change on binary incompatible changes set(PHONON_LIB_MINOR_VERSION "10") # Only change on binary compatible changes with new interfaces -set(PHONON_LIB_PATCH_VERSION "1") # Bump whenever you feel like it :P +set(PHONON_LIB_PATCH_VERSION "2") # Bump whenever you feel like it :P set(PHONON_LIB_VERSION "${PHONON_LIB_MAJOR_VERSION}.${PHONON_LIB_MINOR_VERSION}.${PHONON_LIB_PATCH_VERSION}") set(PHONON_LIB_SOVERSION ${PHONON_LIB_MAJOR_VERSION}) set(PHONON_LIB_SONAME phonon) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.10.1/phonon/pulsesupport.cpp new/phonon-4.10.2/phonon/pulsesupport.cpp --- old/phonon-4.10.1/phonon/pulsesupport.cpp 2018-04-27 11:23:33.0 +0200 +++ new/phonon-4.10.2/phonon/pulsesupport.cpp 2019-01-09 13:49:39.0 +0100 @@ -840,7 +840,8 @@ } // We require a glib event loop -if (!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib")) { +if (!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib") && + !QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("GlibEventDispatcher")) { qWarning("WARNING: Disabling PulseAudio integration for lack of GLib event loop."); return; }
commit phonon4qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2019-01-15 13:14:41 Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new.28833 (New) Package is "phonon4qt5" Tue Jan 15 13:14:41 2019 rev:18 rq:663605 version:4.10.1 Changes: --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes2018-05-06 14:54:37.360098400 +0200 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new.28833/phonon4qt5.changes 2019-01-15 13:14:42.868436021 +0100 @@ -1,0 +2,8 @@ +Mon Jan 7 09:25:01 UTC 2019 - Luca Beltrame + +- Add upstream patch 0001-Fix-PulseAudio-support-with-Qt-5.12.patch + to fix PulseAudio detection with Qt 5.12 +- Run spec-cleaner +- Add %license + +--- New: 0001-Fix-PulseAudio-support-with-Qt-5.12.patch Other differences: -- ++ phonon4qt5.spec ++ --- /var/tmp/diff_new_pack.M2SJgU/_old 2019-01-15 13:14:43.464435554 +0100 +++ /var/tmp/diff_new_pack.M2SJgU/_new 2019-01-15 13:14:43.468435551 +0100 @@ -1,7 +1,7 @@ # # spec file for package phonon4qt5 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,26 +12,28 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define rname phonon - Name: phonon4qt5 Version:4.10.1 Release:0 Summary:Multimedia Platform Abstraction -License:LGPL-2.0+ +License:LGPL-2.0-or-later Group: System/GUI/KDE -Url:http://phonon.kde.org/ +URL:http://phonon.kde.org/ Source: http://download.kde.org/stable/%{rname}/%{version}/%{rname}-%{version}.tar.xz Source1:baselibs.conf +# PATCH-FIX-UPSTREAM +Patch1: 0001-Fix-PulseAudio-support-with-Qt-5.12.patch BuildRequires: cmake BuildRequires: extra-cmake-modules >= 1.7.0 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: libpulse-devel +BuildRequires: pkgconfig BuildRequires: xz BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) @@ -41,7 +43,6 @@ BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glib-2.0) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Phonon is a cross-platform portable multimedia support abstraction, @@ -52,8 +53,8 @@ %package devel Summary:Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE -Requires: libphonon4qt5 = %{version} Requires: extra-cmake-modules >= 1.7.0 +Requires: libphonon4qt5 = %{version} %description devel Phonon is a cross-platform portable Multimedia Support Abstraction, @@ -74,6 +75,7 @@ %prep %setup -q -n %{rname}-%{version} +%autopatch -p1 %build %cmake_kf5 -d build -- -DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=true -DDBUS_INTERFACES_INSTALL_DIR=%{_kf5_sharedir}/dbus-1/interfaces/ @@ -84,16 +86,15 @@ %fdupes -s %{buildroot}%{_includedir}/%{name} %post -n libphonon4qt5 -p /sbin/ldconfig - %postun -n libphonon4qt5 -p /sbin/ldconfig %files -n libphonon4qt5 -%defattr(-,root,root) +%license COPYING.LIB %{_kf5_libdir}/lib%{name}.so.* %{_kf5_libdir}/lib%{name}experimental.so.* %files devel -%defattr(-,root,root) +%license COPYING.LIB %{_includedir}/%{name} %{_kf5_libdir}/cmake/%{name} %{_kf5_sharedir}/%{name} ++ 0001-Fix-PulseAudio-support-with-Qt-5.12.patch ++ >From eef6dae58a19da4c6af90a0b7cce6378e527683d Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Mon, 10 Dec 2018 21:10:13 +0100 Subject: [PATCH] Fix PulseAudio support with Qt 5.12 QAbstractEventDispatcher::instance()->metaObject()->className() now returns "QXcbGlibEventDispatcher", so the glib event loop test fails Differential Revision: https://phabricator.kde.org/D17486 --- phonon/pulsesupport.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phonon/pulsesupport.cpp b/phonon/pulsesupport.cpp index b7009b11..d3240840 100644 --- a/phonon/pulsesupport.cpp +++ b/phonon/pulsesupport.cpp @@ -840,7 +840,8 @@ PulseSupport::PulseSupport() } // We require a glib event loop -if (!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib")) { +
commit phonon4qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2018-05-06 14:54:35 Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new (New) Package is "phonon4qt5" Sun May 6 14:54:35 2018 rev:17 rq:602228 version:4.10.1 Changes: --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes2018-02-28 20:00:00.153889076 +0100 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new/phonon4qt5.changes 2018-05-06 14:54:37.360098400 +0200 @@ -1,0 +2,8 @@ +Sat Apr 28 06:44:58 UTC 2018 - lbeltr...@kde.org + +- Update to 4.10.1: + * CMake files are now compatible with Qt 5.11. Note that the +relevant CMake code is shared with the backends, and thus also +fixes the compatibility issue there. + +--- Old: phonon-4.10.0.tar.xz New: phonon-4.10.1.tar.xz Other differences: -- ++ phonon4qt5.spec ++ --- /var/tmp/diff_new_pack.z0rVpP/_old 2018-05-06 14:54:37.936077269 +0200 +++ /var/tmp/diff_new_pack.z0rVpP/_new 2018-05-06 14:54:37.940077122 +0200 @@ -19,7 +19,7 @@ %define rname phonon Name: phonon4qt5 -Version:4.10.0 +Version:4.10.1 Release:0 Summary:Multimedia Platform Abstraction License:LGPL-2.0+ ++ phonon-4.10.0.tar.xz -> phonon-4.10.1.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.10.0/CMakeLists.txt new/phonon-4.10.1/CMakeLists.txt --- old/phonon-4.10.0/CMakeLists.txt2018-02-23 15:30:17.0 +0100 +++ new/phonon-4.10.1/CMakeLists.txt2018-04-27 11:23:33.0 +0200 @@ -23,7 +23,7 @@ # If you are unsure about the this: http://plan99.net/~mike/writing-shared-libraries.html set(PHONON_LIB_MAJOR_VERSION "4") # Only change on binary incompatible changes set(PHONON_LIB_MINOR_VERSION "10") # Only change on binary compatible changes with new interfaces -set(PHONON_LIB_PATCH_VERSION "0") # Bump whenever you feel like it :P +set(PHONON_LIB_PATCH_VERSION "1") # Bump whenever you feel like it :P set(PHONON_LIB_VERSION "${PHONON_LIB_MAJOR_VERSION}.${PHONON_LIB_MINOR_VERSION}.${PHONON_LIB_PATCH_VERSION}") set(PHONON_LIB_SOVERSION ${PHONON_LIB_MAJOR_VERSION}) set(PHONON_LIB_SONAME phonon) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.10.0/cmake/PhononQt5.cmake new/phonon-4.10.1/cmake/PhononQt5.cmake --- old/phonon-4.10.0/cmake/PhononQt5.cmake 2018-02-23 15:30:17.0 +0100 +++ new/phonon-4.10.1/cmake/PhononQt5.cmake 2018-04-27 11:23:33.0 +0200 @@ -35,6 +35,17 @@ macro_log_feature(Qt5Widgets_FOUND "Qt5 Widgets (qtbase)" "" "" TRUE) # compat +# Qt 5.11 dropped this. We rely on it to enable joint Qt4+5 dep mapping. +if(NOT COMMAND qt5_use_modules) +macro (qt5_use_modules target) +set(_deps "") +foreach (arg ${ARGN}) +list(APPEND _deps Qt5::${arg}) +endforeach () +target_link_libraries(${target} ${_deps}) +endmacro (qt5_use_modules target args) +endif() + # Compat variables for plugins. function(_QT4_QUERY_QMAKE VAR RESULT) get_target_property(QT_QMAKE_EXECUTABLE ${Qt5Core_QMAKE_EXECUTABLE} LOCATION)
commit phonon4qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2018-02-28 19:59:58 Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new (New) Package is "phonon4qt5" Wed Feb 28 19:59:58 2018 rev:16 rq:579681 version:4.10.0 Changes: --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes2017-02-03 18:55:22.154628019 +0100 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new/phonon4qt5.changes 2018-02-28 20:00:00.153889076 +0100 @@ -1,0 +2,16 @@ +Fri Feb 23 21:20:40 UTC 2018 - wba...@tmo.at + +- Update to 4.10.0: + * Changes ++ PulseSupport is more robustly handling device list iteration. + * New API ++ New backend API AudioOutputInterface410. This interface + implements a long-existing frontend interface for category + configuration. Usually, this is managed by the builtin + PulseSupport to force the category on a PulseAudio level, + sometimes this may not be possible because of how the backend + subsystem works and the backend needs to manage this directly. ++ setCategory(Category) is called on the interface when the + synonymous frontend function is called. + +--- Old: phonon-4.9.1.tar.xz New: phonon-4.10.0.tar.xz Other differences: -- ++ phonon4qt5.spec ++ --- /var/tmp/diff_new_pack.pSwaZC/_old 2018-02-28 20:00:01.005858248 +0100 +++ /var/tmp/diff_new_pack.pSwaZC/_new 2018-02-28 20:00:01.009858104 +0100 @@ -19,7 +19,7 @@ %define rname phonon Name: phonon4qt5 -Version:4.9.1 +Version:4.10.0 Release:0 Summary:Multimedia Platform Abstraction License:LGPL-2.0+ ++ phonon-4.9.1.tar.xz -> phonon-4.10.0.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.9.1/.reviewboardrc new/phonon-4.10.0/.reviewboardrc --- old/phonon-4.9.1/.reviewboardrc 2017-01-24 08:29:17.0 +0100 +++ new/phonon-4.10.0/.reviewboardrc1970-01-01 01:00:00.0 +0100 @@ -1,3 +0,0 @@ -REVIEWBOARD_URL = "https://git.reviewboard.kde.org; -REPOSITORY = 'git://anongit.kde.org/phonon' -TARGET_GROUPS = 'phonon' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.9.1/CMakeLists.txt new/phonon-4.10.0/CMakeLists.txt --- old/phonon-4.9.1/CMakeLists.txt 2017-01-24 08:29:17.0 +0100 +++ new/phonon-4.10.0/CMakeLists.txt2018-02-23 15:30:17.0 +0100 @@ -22,8 +22,8 @@ # It is highly advised to think twice before changing those. # If you are unsure about the this: http://plan99.net/~mike/writing-shared-libraries.html set(PHONON_LIB_MAJOR_VERSION "4") # Only change on binary incompatible changes -set(PHONON_LIB_MINOR_VERSION "9") # Only change on binary compatible changes with new interfaces -set(PHONON_LIB_PATCH_VERSION "1") # Bump whenever you feel like it :P +set(PHONON_LIB_MINOR_VERSION "10") # Only change on binary compatible changes with new interfaces +set(PHONON_LIB_PATCH_VERSION "0") # Bump whenever you feel like it :P set(PHONON_LIB_VERSION "${PHONON_LIB_MAJOR_VERSION}.${PHONON_LIB_MINOR_VERSION}.${PHONON_LIB_PATCH_VERSION}") set(PHONON_LIB_SOVERSION ${PHONON_LIB_MAJOR_VERSION}) set(PHONON_LIB_SONAME phonon) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.9.1/metainfo.yaml new/phonon-4.10.0/metainfo.yaml --- old/phonon-4.9.1/metainfo.yaml 1970-01-01 01:00:00.0 +0100 +++ new/phonon-4.10.0/metainfo.yaml 2018-02-23 15:30:17.0 +0100 @@ -0,0 +1,14 @@ +maintainer: sitter +description: Phonon, the Qt multimedia abstraction library. +platforms: + - name: All +release: true +public_lib: true +public_source_dirs: + - phonon +public_doc_dir: + - doc +public_example_dir: + - demos +irc: kde-multimedia +mailinglist: kde-multimedia diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.9.1/phonon/audiooutput.cpp new/phonon-4.10.0/phonon/audiooutput.cpp --- old/phonon-4.9.1/phonon/audiooutput.cpp 2017-01-24 08:29:17.0 +0100 +++ new/phonon-4.10.0/phonon/audiooutput.cpp2018-02-23 15:30:17.0 +0100 @@ -39,11 +39,12 @@ #include #define PHONON_CLASSNAME AudioOutput +#define IFACES10 AudioOutputInterface410 #define IFACES9 AudioOutputInterface49 #define IFECES7 AudioOutputInterface47 #define IFACES2 AudioOutputInterface42 #define IFACES1 IFACES2 -#define IFACES0 AudioOutputInterface40, IFACES1, IFECES7, IFACES9 +#define IFACES0 AudioOutputInterface40, IFACES1, IFECES7, IFACES9, IFACES10 #define
commit phonon4qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2017-01-28 11:03:29 Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new (New) Package is "phonon4qt5" Changes: --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes2016-07-21 07:41:09.0 +0200 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new/phonon4qt5.changes 2017-02-03 18:55:22.154628019 +0100 @@ -1,0 +2,8 @@ +Tue Jan 24 09:39:59 UTC 2017 - tittiatc...@gmail.com + +- Update to 4.9.1 + * Changes +* use cmake variables to check if QtDbus is enabled +* change eol handling to not trigger static warnings + +--- Old: phonon-4.9.0.tar.xz New: phonon-4.9.1.tar.xz Other differences: -- ++ phonon4qt5.spec ++ --- /var/tmp/diff_new_pack.DU7L99/_old 2017-02-03 18:55:22.714549394 +0100 +++ /var/tmp/diff_new_pack.DU7L99/_new 2017-02-03 18:55:22.718548833 +0100 @@ -19,7 +19,7 @@ %define rname phonon Name: phonon4qt5 -Version:4.9.0 +Version:4.9.1 Release:0 Summary:Multimedia Platform Abstraction License:LGPL-2.0+ ++ phonon-4.9.0.tar.xz -> phonon-4.9.1.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.9.0/CMakeLists.txt new/phonon-4.9.1/CMakeLists.txt --- old/phonon-4.9.0/CMakeLists.txt 2016-04-18 06:25:17.0 +0200 +++ new/phonon-4.9.1/CMakeLists.txt 2017-01-24 08:29:17.0 +0100 @@ -23,7 +23,7 @@ # If you are unsure about the this: http://plan99.net/~mike/writing-shared-libraries.html set(PHONON_LIB_MAJOR_VERSION "4") # Only change on binary incompatible changes set(PHONON_LIB_MINOR_VERSION "9") # Only change on binary compatible changes with new interfaces -set(PHONON_LIB_PATCH_VERSION "0") # Bump whenever you feel like it :P +set(PHONON_LIB_PATCH_VERSION "1") # Bump whenever you feel like it :P set(PHONON_LIB_VERSION "${PHONON_LIB_MAJOR_VERSION}.${PHONON_LIB_MINOR_VERSION}.${PHONON_LIB_PATCH_VERSION}") set(PHONON_LIB_SOVERSION ${PHONON_LIB_MAJOR_VERSION}) set(PHONON_LIB_SONAME phonon) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.9.0/phonon/CMakeLists.txt new/phonon-4.9.1/phonon/CMakeLists.txt --- old/phonon-4.9.0/phonon/CMakeLists.txt 2016-04-18 06:25:17.0 +0200 +++ new/phonon-4.9.1/phonon/CMakeLists.txt 2017-01-24 08:29:17.0 +0100 @@ -12,7 +12,7 @@ # Configure File QMake Style # -if (PHONON_NO_DBUS) +if (PHONON_NO_DBUS OR NOT QT_QTDBUS_FOUND) set(PHONON_NO_DBUS_DEFINE "#define PHONON_NO_DBUS") else() set(PHONON_NO_DBUS_DEFINE "/* #undef PHONON_NO_DBUS */") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.9.0/phonon/phononconfig_p.h.in new/phonon-4.9.1/phonon/phononconfig_p.h.in --- old/phonon-4.9.0/phonon/phononconfig_p.h.in 2016-04-18 06:25:17.0 +0200 +++ new/phonon-4.9.1/phonon/phononconfig_p.h.in 2017-01-24 08:29:17.0 +0100 @@ -3,14 +3,7 @@ #ifndef PHONONCONFIG_H_P #define PHONONCONFIG_H_P -#include - /** Whether to build with D-Bus support */ $${PHONON_NO_DBUS_DEFINE} -/** If QT_NO_DBUS is defined, always set PHONON_NO_DBUS */ -#if !defined(PHONON_NO_DBUS) && defined(QT_NO_DBUS) -#define PHONON_NO_DBUS 1 -#endif - #endif // PHONONCONFIG_H_P diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.9.0/phonon/pulsesupport.cpp new/phonon-4.9.1/phonon/pulsesupport.cpp --- old/phonon-4.9.0/phonon/pulsesupport.cpp2016-04-18 06:25:17.0 +0200 +++ new/phonon-4.9.1/phonon/pulsesupport.cpp2017-01-24 08:29:17.0 +0100 @@ -437,11 +437,12 @@ // our device info and can exit and reconnect if (s_context != c) pa_context_disconnect(c); -} -if (!info) -return; +return; // eol +} +// If we aren't at eol we expect info to be valid! +Q_ASSERT(info); Q_ASSERT(info->name); Q_ASSERT(info->description); Q_ASSERT(info->icon);
commit phonon4qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2016-07-21 07:41:07 Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new (New) Package is "phonon4qt5" Changes: --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes2016-05-13 09:21:30.0 +0200 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new/phonon4qt5.changes 2016-07-21 07:41:09.0 +0200 @@ -1,0 +2,5 @@ +Sat Jun 11 14:20:31 UTC 2016 - hrvoje.sen...@gmail.com + +- Drop BuildRequires on obsolete QtQuick1 module + +--- Other differences: -- ++ phonon4qt5.spec ++ --- /var/tmp/diff_new_pack.TOwveZ/_old 2016-07-21 07:41:10.0 +0200 +++ /var/tmp/diff_new_pack.TOwveZ/_new 2016-07-21 07:41:10.0 +0200 @@ -35,7 +35,6 @@ BuildRequires: xz BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Declarative) BuildRequires: pkgconfig(Qt5Designer) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5OpenGL)
commit phonon4qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2016-05-13 09:21:29 Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new (New) Package is "phonon4qt5" Changes: --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes2015-08-10 09:11:06.0 +0200 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new/phonon4qt5.changes 2016-05-13 09:21:30.0 +0200 @@ -1,0 +2,55 @@ +Tue Apr 19 20:39:59 UTC 2016 - hrvoje.sen...@gmail.com + +- Update to 4.9.0 + * Changes +* Builsystem helpers are now installed to CMAKE_INSTALL_DATAROOTDIR +* CMake 2.8.9 is required to use GNUInstallDirs and for the Qt5 + code branches +* automoc4 support was removed. Building always use the cmake + built-in solution now. +* Qt5 and Qt4 builds use different CMake configurations now + Qt4 is as it always has been +* Qt5 moved away from crudely ported Qt4 configurations to using + extra-cmake-modules' KDE compiler and cmake flags. +* Installation paths and so forth are still jointly configured as + to retain backwards compatibility (i.e. Qt5 build does not + follow ECM's KDEInstallationPaths) + * Bug Fixes +* VolumeSlider has seen async behavior improvements making the + slider not hop around when changing the volume rapidly and + the backend is lagging a bit behind. +* The volume change now occurs upon slider release rather + than instantly. +* Fixed a duble encoding issue with local paths that contain + percent encoded characters being double-encoded [kde#356218] + * New API +* New AudioOutputInterface49 for backends to implement. This + interface implements long-existing frontend interfaces for + muting, giving the backend easier access and control. + * setMuted(bool) mutes an AudioOuput (without the 4.9 +interface this is done via setVolume(0.0) on the backend) + * mutedChanged(bool) signal emitted by the backend to +asyncronuously notify of the mute application + * The interface is only used if PulseSupport is not +intercepting calls +* New methods to differntiate states of PulseSupport + * request(bool) is used by backends to request PulseAudio +usage but no interception, this essentially enables device +listing but lets everything else fall through to the backend +(the existing isActive() method will not return true after +request(true), which makes it different from enable(true)) + * isRequested() is a getter for request()'s state + * isUsable() is part of the previouys isActive() behavior, +it is true iff pulseaudio can be used +(daemon running, connected etc) + * isUsed() is a combination of isRequested() and isUsable() +(i.e. active but not intercepting) + * The existing isActive() communicates the same state as +before (active and intercepting) but now also takes +requested into consideration + * Enabling always implies requsting automatically, so +request(false) and enable(true) will ultimately still +restul in isRequested==true +- Drop upstreamed 0001-tear-cmake-logic-for-qt4-and-qt5-apart.patch + +--- Old: 0001-tear-cmake-logic-for-qt4-and-qt5-apart.patch phonon-4.8.3.tar.xz New: phonon-4.9.0.tar.xz Other differences: -- ++ phonon4qt5.spec ++ --- /var/tmp/diff_new_pack.brQTeF/_old 2016-05-13 09:21:31.0 +0200 +++ /var/tmp/diff_new_pack.brQTeF/_new 2016-05-13 09:21:31.0 +0200 @@ -19,16 +19,14 @@ %define rname phonon Name: phonon4qt5 -Version:4.8.3 +Version:4.9.0 Release:0 Summary:Multimedia Platform Abstraction License:LGPL-2.0+ Group: System/GUI/KDE Url:http://phonon.kde.org/ -Source: http://download.kde.org/stable/%{rname}/%{version}/src/%{rname}-%{version}.tar.xz +Source: http://download.kde.org/stable/%{rname}/%{version}/%{rname}-%{version}.tar.xz Source1:baselibs.conf -# PATCH-FIX-UPSTREAM 0001-tear-cmake-logic-for-qt4-and-qt5-apart.patch -Patch0: 0001-tear-cmake-logic-for-qt4-and-qt5-apart.patch BuildRequires: cmake BuildRequires: extra-cmake-modules >= 1.7.0 BuildRequires: fdupes @@ -77,7 +75,6 @@ %prep %setup -q -n %{rname}-%{version} -%patch0 -p1 %build %cmake_kf5 -d build -- -DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=true -DDBUS_INTERFACES_INSTALL_DIR=%{_kf5_sharedir}/dbus-1/interfaces/ ++ phonon-4.8.3.tar.xz ->
commit phonon4qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2015-08-10 09:11:05 Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new (New) Package is phonon4qt5 Changes: --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes2015-05-24 19:29:21.0 +0200 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new/phonon4qt5.changes 2015-08-10 09:11:06.0 +0200 @@ -1,0 +2,9 @@ +Sat Jul 11 23:44:46 UTC 2015 - hrvoje.sen...@gmail.com + +- Added 0001-tear-cmake-logic-for-qt4-and-qt5-apart.patch from + upstream, to handle better -fPIC flag in Qt 5 builds +- Drop pic.patch +- Added extra-cmake-modules = 1.7.0 (Build)Requires, needed with + the added patch + +--- Old: pic.patch New: 0001-tear-cmake-logic-for-qt4-and-qt5-apart.patch Other differences: -- ++ phonon4qt5.spec ++ --- /var/tmp/diff_new_pack.I4tGJx/_old 2015-08-10 09:11:07.0 +0200 +++ /var/tmp/diff_new_pack.I4tGJx/_new 2015-08-10 09:11:07.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package phonon4qt5 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,22 +27,23 @@ Url:http://phonon.kde.org/ Source: http://download.kde.org/stable/%{rname}/%{version}/src/%{rname}-%{version}.tar.xz Source1:baselibs.conf -# PATCH-FIX-UPSTREAM pic.patch -Patch0: pic.patch +# PATCH-FIX-UPSTREAM 0001-tear-cmake-logic-for-qt4-and-qt5-apart.patch +Patch0: 0001-tear-cmake-logic-for-qt4-and-qt5-apart.patch BuildRequires: cmake +BuildRequires: extra-cmake-modules = 1.7.0 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: libpulse-devel +BuildRequires: xz BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Declarative) BuildRequires: pkgconfig(Qt5Designer) +BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5OpenGL) -BuildRequires: pkgconfig(Qt5Declarative) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -55,6 +56,7 @@ Summary:Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE Requires: libphonon4qt5 = %{version} +Requires: extra-cmake-modules = 1.7.0 %description devel Phonon is a cross-platform portable Multimedia Support Abstraction, @@ -103,7 +105,7 @@ %{_kf5_libdir}/lib%{name}experimental.so %{_kf5_libdir}/lib%{name}.so %{_libqt5_archdatadir}/mkspecs/modules/qt_phonon4qt5.pri -%{_libqt5_plugindir}/designer/libphononwidgets.so +%{_libqt5_plugindir}/designer/phononwidgets.so %{_kf5_sharedir}/dbus-1/interfaces/org.kde.Phonon4Qt5.AudioOutput.xml %changelog ++ 0001-tear-cmake-logic-for-qt4-and-qt5-apart.patch ++ 1030 lines (skipped)
commit phonon4qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2015-05-24 19:29:20 Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new (New) Package is phonon4qt5 Changes: --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes2015-01-07 09:38:10.0 +0100 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new/phonon4qt5.changes 2015-05-24 19:29:21.0 +0200 @@ -1,0 +2,7 @@ +Thu May 21 17:33:34 UTC 2015 - hrvoje.sen...@gmail.com + +- Added pic.patch, fix build with latest Qt5 - it now requires -fPIC + flag instead of -fPIE when Qt is built with reduced-relocations + option + +--- New: pic.patch Other differences: -- ++ phonon4qt5.spec ++ --- /var/tmp/diff_new_pack.eHCcHD/_old 2015-05-24 19:29:22.0 +0200 +++ /var/tmp/diff_new_pack.eHCcHD/_new 2015-05-24 19:29:22.0 +0200 @@ -27,6 +27,8 @@ Url:http://phonon.kde.org/ Source: http://download.kde.org/stable/%{rname}/%{version}/src/%{rname}-%{version}.tar.xz Source1:baselibs.conf +# PATCH-FIX-UPSTREAM pic.patch +Patch0: pic.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: kf5-filesystem @@ -73,6 +75,7 @@ %prep %setup -q -n %{rname}-%{version} +%patch0 -p1 %build %cmake_kf5 -d build -- -DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=true -DDBUS_INTERFACES_INSTALL_DIR=%{_kf5_sharedir}/dbus-1/interfaces/ ++ pic.patch ++ diff --git a/cmake/FindPhononInternal.cmake b/cmake/FindPhononInternal.cmake index 44862b5..96473dd 100644 --- a/cmake/FindPhononInternal.cmake +++ b/cmake/FindPhononInternal.cmake @@ -109,9 +109,8 @@ else (NOT PHONON_BUILD_PHONON4QT5) # Qt5 find_package(Qt5Widgets) macro_log_feature(Qt5Widgets_FOUND Qt5 Widgets (qtbase) TRUE) -if (Qt5_POSITION_INDEPENDENT_CODE) - set(CMAKE_POSITION_INDEPENDENT_CODE ON) -endif() +set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}) +set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}) # compat # Compat variables for plugins.
commit phonon4qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2015-01-07 09:38:09 Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new (New) Package is phonon4qt5 Changes: --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes2014-10-20 07:27:32.0 +0200 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new/phonon4qt5.changes 2015-01-07 09:38:10.0 +0100 @@ -1,0 +2,23 @@ +Sat Dec 6 18:11:12 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 4.8.3: + * Set target interface include install dir + * Do not assume we have a backend when setting an output device, +kde#341296 + +--- +Wed Nov 5 22:48:14 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 4.8.2: + * Revised the logic used by PulseSupport to come up with an icon + name for PulseAudio. If the application has + QApplication::windowIcon set with an QIcon constructed through + QIcon::fromTheme(string) the actual icon name will be used. + Otherwise the lower-case version of + QCoreApplication::applicationName is used. + * Fixed building with the compiler clang by reverting + a previously introduced workaround. +- Fix Requires of devel package, there was a wrong BuildRequires, + and they shall be found by pkg-config detection + +--- Old: phonon-4.8.1.tar.xz New: phonon-4.8.3.tar.xz Other differences: -- ++ phonon4qt5.spec ++ --- /var/tmp/diff_new_pack.4W5afn/_old 2015-01-07 09:38:12.0 +0100 +++ /var/tmp/diff_new_pack.4W5afn/_new 2015-01-07 09:38:12.0 +0100 @@ -19,13 +19,13 @@ %define rname phonon Name: phonon4qt5 -Version:4.8.1 +Version:4.8.3 Release:0 Summary:Multimedia Platform Abstraction License:LGPL-2.0+ Group: System/GUI/KDE Url:http://phonon.kde.org/ -Source: http://download.kde.org/stable/%{rname}/%{version}/%{rname}-%{version}.tar.xz +Source: http://download.kde.org/stable/%{rname}/%{version}/src/%{rname}-%{version}.tar.xz Source1:baselibs.conf BuildRequires: cmake BuildRequires: fdupes @@ -53,9 +53,6 @@ Summary:Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE Requires: libphonon4qt5 = %{version} -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Widgets) %description devel Phonon is a cross-platform portable Multimedia Support Abstraction, ++ phonon-4.8.1.tar.xz - phonon-4.8.3.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.8.1/CMakeLists.txt new/phonon-4.8.3/CMakeLists.txt --- old/phonon-4.8.1/CMakeLists.txt 2014-10-15 13:18:52.0 +0200 +++ new/phonon-4.8.3/CMakeLists.txt 2014-12-04 10:30:26.0 +0100 @@ -11,6 +11,8 @@ option(PHONON_BUILD_DESIGNER_PLUGIN Build the Qt Designer plugin ON) option(PHONON_BUILD_DOC Build the API documentation OFF) +option(PHONON_INSTALL_QT_COMPAT_HEADERS Install QtPhonon compatibility headers OFF) + option(PHONON_NO_CAPTURE Disable the capture capabilities) option(PHONON_NO_DBUS Deactivate DBus support (used to expose AudioOutputs and for deprecated runtime backend switching) OFF) @@ -21,7 +23,7 @@ # If you are unsure about the this: http://plan99.net/~mike/writing-shared-libraries.html set(PHONON_LIB_MAJOR_VERSION 4) # Only change on binary incompatible changes set(PHONON_LIB_MINOR_VERSION 8) # Only change on binary compatible changes with new interfaces -set(PHONON_LIB_PATCH_VERSION 1) # Bump whenever you feel like it :P +set(PHONON_LIB_PATCH_VERSION 3) # Bump whenever you feel like it :P set(PHONON_LIB_VERSION ${PHONON_LIB_MAJOR_VERSION}.${PHONON_LIB_MINOR_VERSION}.${PHONON_LIB_PATCH_VERSION}) set(PHONON_LIB_SOVERSION ${PHONON_LIB_MAJOR_VERSION}) set(PHONON_LIB_SONAME phonon) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.8.1/PhononConfig.cmake.in new/phonon-4.8.3/PhononConfig.cmake.in --- old/phonon-4.8.1/PhononConfig.cmake.in 2014-10-15 13:18:52.0 +0200 +++ new/phonon-4.8.3/PhononConfig.cmake.in 2014-12-04 10:30:26.0 +0100 @@ -10,6 +10,7 @@ set(PHONON_NO_GRAPHICSVIEW @PHONON_NO_GRAPHICSVIEW@) set(PHONON_PULSESUPPORT @PHONON_PULSESUPPORT@) set(PHONON_FOUND_EXPERIMENTAL @PHONON_BUILD_EXPERIMENTAL@) +set(PHONON_QT_COMPAT_HEADERS @PHONON_INSTALL_QT_COMPAT_HEADERS@) # install locations set(PHONON_INCLUDE_DIR
commit phonon4qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2014-10-20 07:27:24 Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new (New) Package is phonon4qt5 Changes: --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes2014-08-16 15:44:03.0 +0200 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new/phonon4qt5.changes 2014-10-20 07:27:32.0 +0200 @@ -1,0 +2,7 @@ +Sun Oct 19 17:40:57 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 4.8.1: + * Version bump + * Prevent a crash when failing to create the preferred backend + +--- Old: phonon-4.7.80.tar.xz New: phonon-4.8.1.tar.xz Other differences: -- ++ phonon4qt5.spec ++ --- /var/tmp/diff_new_pack.Yq0ipE/_old 2014-10-20 07:27:34.0 +0200 +++ /var/tmp/diff_new_pack.Yq0ipE/_new 2014-10-20 07:27:34.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package phonon4qt5 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,13 @@ %define rname phonon Name: phonon4qt5 -Version:4.7.80 +Version:4.8.1 Release:0 Summary:Multimedia Platform Abstraction License:LGPL-2.0+ Group: System/GUI/KDE Url:http://phonon.kde.org/ -Source: http://download.kde.org/unstable/%{rname}/%{rname}-%{version}.tar.xz +Source: http://download.kde.org/stable/%{rname}/%{version}/%{rname}-%{version}.tar.xz Source1:baselibs.conf BuildRequires: cmake BuildRequires: fdupes ++ phonon-4.7.80.tar.xz - phonon-4.8.1.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.7.80/CMakeLists.txt new/phonon-4.8.1/CMakeLists.txt --- old/phonon-4.7.80/CMakeLists.txt2014-08-12 18:53:15.0 +0200 +++ new/phonon-4.8.1/CMakeLists.txt 2014-10-15 13:18:52.0 +0200 @@ -20,8 +20,8 @@ # It is highly advised to think twice before changing those. # If you are unsure about the this: http://plan99.net/~mike/writing-shared-libraries.html set(PHONON_LIB_MAJOR_VERSION 4) # Only change on binary incompatible changes -set(PHONON_LIB_MINOR_VERSION 7) # Only change on binary compatible changes with new interfaces -set(PHONON_LIB_PATCH_VERSION 80) # Bump whenever you feel like it :P +set(PHONON_LIB_MINOR_VERSION 8) # Only change on binary compatible changes with new interfaces +set(PHONON_LIB_PATCH_VERSION 1) # Bump whenever you feel like it :P set(PHONON_LIB_VERSION ${PHONON_LIB_MAJOR_VERSION}.${PHONON_LIB_MINOR_VERSION}.${PHONON_LIB_PATCH_VERSION}) set(PHONON_LIB_SOVERSION ${PHONON_LIB_MAJOR_VERSION}) set(PHONON_LIB_SONAME phonon) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.7.80/phonon/factory.cpp new/phonon-4.8.1/phonon/factory.cpp --- old/phonon-4.7.80/phonon/factory.cpp2014-08-12 18:53:15.0 +0200 +++ new/phonon-4.8.1/phonon/factory.cpp 2014-10-15 13:18:52.0 +0200 @@ -199,12 +199,16 @@ QListBackendDescriptor::iterator it; for (it = foundBackends.begin(); it != foundBackends.end(); ++it) { const BackendDescriptor descriptor = *it; -if (descriptor.iid != iid) +if (descriptor.iid != iid) { continue; -if (tryCreateBackend(descriptor.pluginPath)) +} +if (tryCreateBackend(descriptor.pluginPath)) { return true; -else // Drop backends that failed to construct. -foundBackends.erase(it); +} else { // Drop backends that failed to construct. +it = foundBackends.erase(it); +if (it == foundBackends.end()) +break; +} } } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit phonon4qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2014-08-16 15:42:53 Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new (New) Package is phonon4qt5 Changes: --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes2014-06-23 09:24:27.0 +0200 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new/phonon4qt5.changes 2014-08-16 15:44:03.0 +0200 @@ -1,0 +2,7 @@ +Tue Aug 12 19:32:55 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 4.7.80 + * 4.8 beta: PA interaction improvements, documentation fixes and + standard bugfixes + +--- Old: phonon-4.7.2.tar.xz New: phonon-4.7.80.tar.xz Other differences: -- ++ phonon4qt5.spec ++ --- /var/tmp/diff_new_pack.Q1cTjq/_old 2014-08-16 15:44:03.0 +0200 +++ /var/tmp/diff_new_pack.Q1cTjq/_new 2014-08-16 15:44:03.0 +0200 @@ -19,13 +19,13 @@ %define rname phonon Name: phonon4qt5 -Version:4.7.2 +Version:4.7.80 Release:0 Summary:Multimedia Platform Abstraction License:LGPL-2.0+ Group: System/GUI/KDE Url:http://phonon.kde.org/ -Source: http://download.kde.org/stable/%{rname}/%{version}/%{rname}-%{version}.tar.xz +Source: http://download.kde.org/unstable/%{rname}/%{rname}-%{version}.tar.xz Source1:baselibs.conf BuildRequires: cmake BuildRequires: fdupes ++ phonon-4.7.2.tar.xz - phonon-4.7.80.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.7.2/.reviewboardrc new/phonon-4.7.80/.reviewboardrc --- old/phonon-4.7.2/.reviewboardrc 1970-01-01 01:00:00.0 +0100 +++ new/phonon-4.7.80/.reviewboardrc2014-08-12 18:53:15.0 +0200 @@ -0,0 +1,3 @@ +REVIEWBOARD_URL = https://git.reviewboard.kde.org; +REPOSITORY = 'git://anongit.kde.org/phonon' +TARGET_GROUPS = 'phonon' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.7.2/CMakeLists.txt new/phonon-4.7.80/CMakeLists.txt --- old/phonon-4.7.2/CMakeLists.txt 2014-06-20 10:37:19.0 +0200 +++ new/phonon-4.7.80/CMakeLists.txt2014-08-12 18:53:15.0 +0200 @@ -21,7 +21,7 @@ # If you are unsure about the this: http://plan99.net/~mike/writing-shared-libraries.html set(PHONON_LIB_MAJOR_VERSION 4) # Only change on binary incompatible changes set(PHONON_LIB_MINOR_VERSION 7) # Only change on binary compatible changes with new interfaces -set(PHONON_LIB_PATCH_VERSION 2) # Bump whenever you feel like it :P +set(PHONON_LIB_PATCH_VERSION 80) # Bump whenever you feel like it :P set(PHONON_LIB_VERSION ${PHONON_LIB_MAJOR_VERSION}.${PHONON_LIB_MINOR_VERSION}.${PHONON_LIB_PATCH_VERSION}) set(PHONON_LIB_SOVERSION ${PHONON_LIB_MAJOR_VERSION}) set(PHONON_LIB_SONAME phonon) @@ -234,6 +234,25 @@ # runtime different from the chosen CMAKE_INSTALL_PREFIX if under Windows the package was installed anywhere) # This relative path will be configured into the PhononConfig.cmake file(RELATIVE_PATH relInstallDir ${CMAKE_INSTALL_PREFIX}/${CMAKECONFIG_INSTALL_DIR} ${CMAKE_INSTALL_PREFIX} ) +make_abs_install_path(absInstallDir ${CMAKECONFIG_INSTALL_DIR}) + +# Exciting code copy from CMakePackageConfigHelpers to avoid the pain from porting +# to it for the 4.x series. +# The set variable is used by the PhononConfig.cmake.in to use a refined rootDir +# resolution when installed to /usr/lib +if(${absInstallDir} MATCHES ^(/usr)?/lib(64)?/.+) +# Handle /usr move symlinks created by some Linux distros. +set(USR_SYMLINK_RESOLVER +# Use original install prefix when loaded through a \/usr move\ +# cross-prefix symbolic link such as /lib - /usr/lib. +get_filename_component(_realCurr \\${CMAKE_CURRENT_LIST_DIR}\ REALPATH) +get_filename_component(_realOrig \${absInstallDir}\ REALPATH) +if(_realCurr STREQUAL _realOrig) +set(rootDir \${CMAKE_INSTALL_PREFIX}\) +endif() +unset(_realOrig) +unset(_realCurr)) +endif() configure_file(${CMAKE_CURRENT_SOURCE_DIR}/PhononConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/${PHONON_LIB_SONAME_CAMEL}Config.cmake @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/PhononConfigVersion.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/${PHONON_LIB_SONAME_CAMEL}ConfigVersion.cmake @ONLY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.7.2/PhononConfig.cmake.in new/phonon-4.7.80/PhononConfig.cmake.in --- old/phonon-4.7.2/PhononConfig.cmake.in 2014-06-20
commit phonon4qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2014-06-23 09:24:08 Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new (New) Package is phonon4qt5 Changes: --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes2014-06-19 13:20:19.0 +0200 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new/phonon4qt5.changes 2014-06-23 09:24:27.0 +0200 @@ -1,0 +2,6 @@ +Fri Jun 20 22:05:20 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 4.7.2 + * Bugfix release, no changelog provided + +--- Old: phonon-4.7.1.tar.xz New: phonon-4.7.2.tar.xz Other differences: -- ++ phonon4qt5.spec ++ --- /var/tmp/diff_new_pack.p3o1EB/_old 2014-06-23 09:24:28.0 +0200 +++ /var/tmp/diff_new_pack.p3o1EB/_new 2014-06-23 09:24:28.0 +0200 @@ -19,7 +19,7 @@ %define rname phonon Name: phonon4qt5 -Version:4.7.1 +Version:4.7.2 Release:0 Summary:Multimedia Platform Abstraction License:LGPL-2.0+ ++ phonon-4.7.1.tar.xz - phonon-4.7.2.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.7.1/CMakeLists.txt new/phonon-4.7.2/CMakeLists.txt --- old/phonon-4.7.1/CMakeLists.txt 2013-12-06 11:22:44.0 +0100 +++ new/phonon-4.7.2/CMakeLists.txt 2014-06-20 10:37:19.0 +0200 @@ -21,7 +21,7 @@ # If you are unsure about the this: http://plan99.net/~mike/writing-shared-libraries.html set(PHONON_LIB_MAJOR_VERSION 4) # Only change on binary incompatible changes set(PHONON_LIB_MINOR_VERSION 7) # Only change on binary compatible changes with new interfaces -set(PHONON_LIB_PATCH_VERSION 1) # Bump whenever you feel like it :P +set(PHONON_LIB_PATCH_VERSION 2) # Bump whenever you feel like it :P set(PHONON_LIB_VERSION ${PHONON_LIB_MAJOR_VERSION}.${PHONON_LIB_MINOR_VERSION}.${PHONON_LIB_PATCH_VERSION}) set(PHONON_LIB_SOVERSION ${PHONON_LIB_MAJOR_VERSION}) set(PHONON_LIB_SONAME phonon) @@ -129,9 +129,18 @@ set(PHONON_QT_PLUGIN_INSTALL_DIR ${QT_PLUGINS_DIR}/designer CACHE PATH The directory where Phonon Qt plugins will be installed to. FORCE) else(PHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT) # in this case, the values can be adjusted by the user e.g. via cmake-gui, so no FORCE -set(PHONON_QT_IMPORTS_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/qt5/imports CACHE PATH The directory where Phonon Qt imports (QML) will be installed to.) -set(PHONON_QT_MKSPECS_INSTALL_DIR share/qt5/mkspecs/modules CACHE PATH The directory where Phonon mkspecs will be installed to.) -set(PHONON_QT_PLUGIN_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/qt5/plugins/designer CACHE PATH The directory where Phonon Qt plugins will be installed to. ) + +# Please do note that these paths are most likely random nonensense depending on what OS and distribution is used, they most likely +# need manual adjustment for the actual envrionment. +if(PHONON_BUILD_PHONON4QT5) +set(PHONON_QT_IMPORTS_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/qt5/imports CACHE PATH The directory where Phonon Qt imports (QML) will be installed to.) +set(PHONON_QT_MKSPECS_INSTALL_DIR share/qt5/mkspecs/modules CACHE PATH The directory where Phonon mkspecs will be installed to.) +set(PHONON_QT_PLUGIN_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/qt5/plugins/designer CACHE PATH The directory where Phonon Qt plugins will be installed to. ) +else() +set(PHONON_QT_IMPORTS_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/qt4/imports CACHE PATH The directory where Phonon Qt imports (QML) will be installed to.) +set(PHONON_QT_MKSPECS_INSTALL_DIR share/qt4/mkspecs/modules CACHE PATH The directory where Phonon mkspecs will be installed to.) +set(PHONON_QT_PLUGIN_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/qt4/plugins/designer CACHE PATH The directory where Phonon Qt plugins will be installed to. ) +endif() endif(PHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.7.1/cmake/FindQt4.cmake new/phonon-4.7.2/cmake/FindQt4.cmake --- old/phonon-4.7.1/cmake/FindQt4.cmake2013-12-06 11:22:44.0 +0100 +++ new/phonon-4.7.2/cmake/FindQt4.cmake2014-06-20 10:37:19.0 +0200 @@ -2,8 +2,8 @@ # This module can be used to find Qt4. # The most important issue is that the Qt4 qmake is available via the system path. # This qmake is then used to detect basically everything else. -# This module defines a number of key variables
commit phonon4qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2014-06-19 13:20:09 Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new (New) Package is phonon4qt5 Changes: --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes2014-05-14 20:28:27.0 +0200 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new/phonon4qt5.changes 2014-06-19 13:20:19.0 +0200 @@ -1,0 +2,5 @@ +Tue Jun 3 22:59:02 UTC 2014 - hrvoje.sen...@gmail.com + +- Add baselibs.conf + +--- New: baselibs.conf Other differences: -- ++ phonon4qt5.spec ++ --- /var/tmp/diff_new_pack.u8GSaX/_old 2014-06-19 13:20:20.0 +0200 +++ /var/tmp/diff_new_pack.u8GSaX/_new 2014-06-19 13:20:20.0 +0200 @@ -25,7 +25,8 @@ License:LGPL-2.0+ Group: System/GUI/KDE Url:http://phonon.kde.org/ -Source0: http://download.kde.org/stable/%{rname}/%{version}/%{rname}-%{version}.tar.xz +Source: http://download.kde.org/stable/%{rname}/%{version}/%{rname}-%{version}.tar.xz +Source1:baselibs.conf BuildRequires: cmake BuildRequires: fdupes BuildRequires: kf5-filesystem ++ baselibs.conf ++ libphonon4qt5 phonon4qt5-devel requires libphonon4qt5-targettype = version-- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit phonon4qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2014-05-14 20:27:36 Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new (New) Package is phonon4qt5 Changes: --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes2014-02-22 18:12:30.0 +0100 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new/phonon4qt5.changes 2014-05-14 20:28:27.0 +0200 @@ -1,0 +2,5 @@ +Sun May 4 02:02:33 UTC 2014 - hrvoje.sen...@gmail.com + +- Adjust filelists to kf5-filesystem changes + +--- Other differences: -- ++ phonon4qt5.spec ++ --- /var/tmp/diff_new_pack.fmprXy/_old 2014-05-14 20:28:28.0 +0200 +++ /var/tmp/diff_new_pack.fmprXy/_new 2014-05-14 20:28:28.0 +0200 @@ -77,7 +77,7 @@ %setup -q -n %{rname}-%{version} %build - %cmake_kf5 -d build -- -DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=true -DDBUS_INTERFACES_INSTALL_DIR=%{_kf5_datadir}/dbus-1/interfaces/ + %cmake_kf5 -d build -- -DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=true -DDBUS_INTERFACES_INSTALL_DIR=%{_kf5_sharedir}/dbus-1/interfaces/ %make_jobs %install @@ -97,12 +97,12 @@ %defattr(-,root,root) %{_includedir}/%{name} %{_kf5_libdir}/cmake/%{name} -%{_kf5_datadir}/%{name} +%{_kf5_sharedir}/%{name} %{_kf5_libdir}/pkgconfig/%{name}.pc %{_kf5_libdir}/lib%{name}experimental.so %{_kf5_libdir}/lib%{name}.so %{_libqt5_archdatadir}/mkspecs/modules/qt_phonon4qt5.pri %{_libqt5_plugindir}/designer/libphononwidgets.so -%{_kf5_datadir}/dbus-1/interfaces/org.kde.Phonon4Qt5.AudioOutput.xml +%{_kf5_sharedir}/dbus-1/interfaces/org.kde.Phonon4Qt5.AudioOutput.xml %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit phonon4qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2014-02-22 18:12:29 Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new (New) Package is phonon4qt5 Changes: --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes2013-12-19 12:50:45.0 +0100 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new/phonon4qt5.changes 2014-02-22 18:12:30.0 +0100 @@ -1,0 +2,13 @@ +Fri Feb 21 20:52:57 UTC 2014 - hrvoje.sen...@gmail.com + +- Remove baselibs.conf, until baselibs for libqt5-qttools are + provided + +--- +Thu Feb 20 17:27:26 UTC 2014 - hrvoje.sen...@gmail.com + +- Move to kf5-filesystem, instead of kde4 one +- Only BuildRequire those libraries which are needed +- Adjust baselibs.conf to reality + +--- Old: baselibs.conf Other differences: -- ++ phonon4qt5.spec ++ --- /var/tmp/diff_new_pack.UncPON/_old 2014-02-22 18:12:31.0 +0100 +++ /var/tmp/diff_new_pack.UncPON/_new 2014-02-22 18:12:31.0 +0100 @@ -26,14 +26,19 @@ Group: System/GUI/KDE Url:http://phonon.kde.org/ Source0: http://download.kde.org/stable/%{rname}/%{version}/%{rname}-%{version}.tar.xz -Source1:baselibs.conf BuildRequires: cmake BuildRequires: fdupes -BuildRequires: kde4-filesystem +BuildRequires: kf5-filesystem BuildRequires: libpulse-devel -BuildRequires: libqt5-qtbase-devel -BuildRequires: libqt5-qtquick1-devel -BuildRequires: libqt5-qttools-devel +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Designer) +BuildRequires: pkgconfig(Qt5OpenGL) +BuildRequires: pkgconfig(Qt5Declarative) +BuildRequires: pkgconfig(glib-2.0) BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,9 +52,9 @@ Summary:Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE Requires: libphonon4qt5 = %{version} -Requires: libqt5-qtbase-devel -Requires: libqt5-qtquick1-devel -Requires: libqt5-qttools-devel +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Widgets) %description devel Phonon is a cross-platform portable Multimedia Support Abstraction, @@ -60,7 +65,7 @@ %package -n libphonon4qt5 Summary:Phonon Multimedia Platform Abstraction Group: System/Libraries -Recommends: phonon-backend +Recommends: phonon4qt5-backend %description -n libphonon4qt5 Phonon is a cross-platform portable Multimedia Support Abstraction, @@ -72,14 +77,12 @@ %setup -q -n %{rname}-%{version} %build - %cmake_kde4 -d build -- -DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=true + %cmake_kf5 -d build -- -DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=true -DDBUS_INTERFACES_INSTALL_DIR=%{_kf5_datadir}/dbus-1/interfaces/ %make_jobs %install - %kde4_makeinstall -C build - install -d -m 0755 %{buildroot}%{_kde4_modulesdir}/plugins - install -d -m 0755 %{buildroot}%{_kde4_modulesdir}/plugins/phonon_backend - %fdupes %{buildroot}%{_kde4_includedir} + %kf5_makeinstall -C build + %fdupes -s %{buildroot}%{_includedir}/%{name} %post -n libphonon4qt5 -p /sbin/ldconfig @@ -87,19 +90,19 @@ %files -n libphonon4qt5 %defattr(-,root,root) -%{_libdir}/lib%{name}.so.* -%{_libdir}/lib%{name}experimental.so.* -%{_datadir}/dbus-1/interfaces/org.kde.Phonon4Qt5.AudioOutput.xml +%{_kf5_libdir}/lib%{name}.so.* +%{_kf5_libdir}/lib%{name}experimental.so.* %files devel %defattr(-,root,root) %{_includedir}/%{name} -%{_libdir}/cmake/%{name} -%{_datadir}/%{name} -%{_libdir}/pkgconfig/%{name}.pc -%{_libdir}/lib%{name}experimental.so -%{_libdir}/lib%{name}.so +%{_kf5_libdir}/cmake/%{name} +%{_kf5_datadir}/%{name} +%{_kf5_libdir}/pkgconfig/%{name}.pc +%{_kf5_libdir}/lib%{name}experimental.so +%{_kf5_libdir}/lib%{name}.so %{_libqt5_archdatadir}/mkspecs/modules/qt_phonon4qt5.pri %{_libqt5_plugindir}/designer/libphononwidgets.so +%{_kf5_datadir}/dbus-1/interfaces/org.kde.Phonon4Qt5.AudioOutput.xml %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit phonon4qt5 for openSUSE:Factory
Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2013-12-19 12:50:44 Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5.new (New) Package is phonon4qt5 Changes: --- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes2013-12-03 10:28:46.0 +0100 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new/phonon4qt5.changes 2013-12-19 12:50:45.0 +0100 @@ -1,0 +2,8 @@ +Fri Dec 6 16:43:27 UTC 2013 - hrvoje.sen...@gmail.com + +- Update to 4.7.1 + * Fixed compatibility issues with older backend versions +- Move away from pkgconfig(...) BuildRequires and just use + libqt5-$upstreammodulename-(devel|private-headers-devel) + +--- Old: phonon-4.7.0.tar.xz New: phonon-4.7.1.tar.xz Other differences: -- ++ phonon4qt5.spec ++ --- /var/tmp/diff_new_pack.5OdTff/_old 2013-12-19 12:50:46.0 +0100 +++ /var/tmp/diff_new_pack.5OdTff/_new 2013-12-19 12:50:46.0 +0100 @@ -19,7 +19,7 @@ %define rname phonon Name: phonon4qt5 -Version:4.7.0 +Version:4.7.1 Release:0 Summary:Multimedia Platform Abstraction License:LGPL-2.0+ @@ -31,9 +31,9 @@ BuildRequires: fdupes BuildRequires: kde4-filesystem BuildRequires: libpulse-devel -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Declarative) -BuildRequires: pkgconfig(Qt5Designer) +BuildRequires: libqt5-qtbase-devel +BuildRequires: libqt5-qtquick1-devel +BuildRequires: libqt5-qttools-devel BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,9 +47,9 @@ Summary:Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE Requires: libphonon4qt5 = %{version} -Requires: pkgconfig(Qt5Core) -Requires: pkgconfig(Qt5Declarative) -Requires: pkgconfig(Qt5Designer) +Requires: libqt5-qtbase-devel +Requires: libqt5-qtquick1-devel +Requires: libqt5-qttools-devel %description devel Phonon is a cross-platform portable Multimedia Support Abstraction, ++ phonon-4.7.0.tar.xz - phonon-4.7.1.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.7.0/CMakeLists.txt new/phonon-4.7.1/CMakeLists.txt --- old/phonon-4.7.0/CMakeLists.txt 2013-11-04 17:49:06.0 +0100 +++ new/phonon-4.7.1/CMakeLists.txt 2013-12-06 11:22:44.0 +0100 @@ -21,7 +21,7 @@ # If you are unsure about the this: http://plan99.net/~mike/writing-shared-libraries.html set(PHONON_LIB_MAJOR_VERSION 4) # Only change on binary incompatible changes set(PHONON_LIB_MINOR_VERSION 7) # Only change on binary compatible changes with new interfaces -set(PHONON_LIB_PATCH_VERSION 0) # Bump whenever you feel like it :P +set(PHONON_LIB_PATCH_VERSION 1) # Bump whenever you feel like it :P set(PHONON_LIB_VERSION ${PHONON_LIB_MAJOR_VERSION}.${PHONON_LIB_MINOR_VERSION}.${PHONON_LIB_PATCH_VERSION}) set(PHONON_LIB_SOVERSION ${PHONON_LIB_MAJOR_VERSION}) set(PHONON_LIB_SONAME phonon) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.7.0/cmake/FindPhononInternal.cmake new/phonon-4.7.1/cmake/FindPhononInternal.cmake --- old/phonon-4.7.0/cmake/FindPhononInternal.cmake 2013-11-04 17:49:06.0 +0100 +++ new/phonon-4.7.1/cmake/FindPhononInternal.cmake 2013-12-06 11:22:44.0 +0100 @@ -217,10 +217,14 @@ # RPATH directories outside the current CMAKE_BINARY_DIR and also the library # install directory. Alex set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ${LIB_INSTALL_DIR} _isSystemPlatformLibDir) -list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES ${LIB_INSTALL_DIR} _isSystemCxxLibDir) +set(_abs_LIB_INSTALL_DIR ${LIB_INSTALL_DIR}) +if (NOT IS_ABSOLUTE ${_abs_LIB_INSTALL_DIR}) + set(_abs_LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}) +endif() +list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ${_abs_LIB_INSTALL_DIR} _isSystemPlatformLibDir) +list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES ${_abs_LIB_INSTALL_DIR} _isSystemCxxLibDir) if(${_isSystemPlatformLibDir} STREQUAL -1 AND ${_isSystemCxxLibDir} STREQUAL -1) - set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR}) + set(CMAKE_INSTALL_RPATH ${_abs_LIB_INSTALL_DIR}) endif(${_isSystemPlatformLibDir} STREQUAL -1 AND ${_isSystemCxxLibDir} STREQUAL -1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.7.0/doc/Phonon4Qt5.dox new/phonon-4.7.1/doc/Phonon4Qt5.dox ---