packages/phonon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 4.11.1

Browse Source
This commit is contained in:
liweiganga 2022-11-21 13:22:17 +08:00
parent 584a094c36
commit d74efb534d
6 changed files with 65 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
0001-modify-kf5-knotifyconfig-compile-error.patch
View File

@ -1,26 +0,0 @@
From a3d1f07f230dde6c03cdd1f8835b91ca3879eeb8 Mon Sep 17 00:00:00 2001
From: pei-jiankang <peijiankang@kylinos.cn>
Date: Sun, 23 Jan 2022 08:05:19 +0800
Subject: [PATCH] modify kf5-knotifyconfig compile error
---
phonon/objectdescription.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/phonon/objectdescription.h b/phonon/objectdescription.h
index dafcca0..cb000c3 100644
--- a/phonon/objectdescription.h
+++ b/phonon/objectdescription.h
@@ -267,7 +267,8 @@ QDebug operator<<(QDebug dbg, const ObjectDescription<T> &d)
{
dbg.nospace() << "\n{\n";
dbg.nospace() << " index: " << d.index() << "\n";
- Q_FOREACH (const QByteArray &propertyName, d.propertyNames()) {
+ const QList<QByteArray> propertyNames = d.propertyNames();
+ for (const QByteArray &propertyName : propertyNames) {
dbg.nospace() << " " << propertyName << ": " <<
d.property(propertyName).toString() << "\n";
}
--
2.27.0

BIN
phonon-4.10.1.tar.xz
View File

Binary file not shown.

BIN
phonon-4.11.1.tar.xz Normal file
View File

Binary file not shown.

31
phonon-DEFAULT_SOURCE.patch
View File

@ -1,31 +0,0 @@
diff -up phonon-4.9.0/cmake/FindPhononInternal.cmake.DEFAULT_SOURCE phonon-4.9.0/cmake/FindPhononInternal.cmake
diff -up phonon-4.9.0/cmake/PhononQt4.cmake.DEFAULT_SOURCE phonon-4.9.0/cmake/PhononQt4.cmake
--- phonon-4.9.0/cmake/PhononQt4.cmake.DEFAULT_SOURCE 2016-04-17 23:25:17.000000000 -0500
+++ phonon-4.9.0/cmake/PhononQt4.cmake 2016-04-21 12:56:35.156204422 -0500
@@ -105,7 +105,7 @@ set(CMAKE_MODULE_PATH ${_phonon_cmake_mo
if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE)
+ set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -D_GNU_SOURCE)
set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
@@ -120,7 +120,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Linux OR C
endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES profile)
endif (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
if (CMAKE_C_COMPILER MATCHES "icc")
- set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE)
+ set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -D_GNU_SOURCE)
set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
endif (CMAKE_C_COMPILER MATCHES "icc")
@@ -205,7 +205,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
# It is kept here nonetheless both for backwards compatibility in case one does not use add_definitions(${KDE4_DEFINITIONS})
# and also because it is/was needed by glibc for snprintf to be available when building C files.
# See commit 4a44862b2d178c1d2e1eb4da90010d19a1e4a42c.
- add_definitions (-D_BSD_SOURCE)
+ add_definitions (-D_DEFAULT_SOURCE)
endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
if (CMAKE_SYSTEM_NAME STREQUAL GNU)

19
phonon-rpath_use_link_path.patch
View File

@ -1,19 +0,0 @@
diff -up phonon-4.9.0/cmake/PhononQt4.cmake.rpath phonon-4.9.0/cmake/PhononQt4.cmake
--- phonon-4.9.0/cmake/PhononQt4.cmake.rpath 2016-04-21 13:00:50.788470084 -0500
+++ phonon-4.9.0/cmake/PhononQt4.cmake 2016-04-21 13:04:39.194600944 -0500
@@ -33,7 +33,6 @@
# These two options below make it set the RPATH of the installed targets to all
# RPATH directories outside the current CMAKE_BINARY_DIR and also the library
# install directory. Alex
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
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}")
@@ -41,6 +40,7 @@ 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_USE_LINK_PATH TRUE)
set(CMAKE_INSTALL_RPATH "${_abs_LIB_INSTALL_DIR}")
endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")

162
phonon.spec
View File

@ -1,130 +1,98 @@
%define __cmake3 %{nil}
Name: phonon
Version: 4.10.1
Release: 5
Version: 4.11.1
Release: 1
License: LGPLv2+
Summary: Multimedia library
URL: http://phonon.kde.org/
Source0: http://download.kde.org/stable/phonon/%{version}/phonon-%{version}.tar.xz
BuildRequires: automoc4 >= 0.9.86 cmake >= 2.8.9 extra-cmake-modules kf5-rpm-macros kde-filesystem
BuildRequires: pkgconfig pkgconfig(glib-2.0) pkgconfig(libpulse-mainloop-glib) > 0.9.15 pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(QtDBus) pkgconfig(QtDesigner) pkgconfig(QtOpenGL) pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Designer) pkgconfig(Qt5OpenGL) pkgconfig(Qt5Widgets) pkgconfig(xcb)
Requires: kde-filesystem
%{?_qt4:Requires: %{_qt4} >= %{_qt4_version}}
Provides: phonon-experimental = %{version}-%{release}
Summary: Multimedia framework api
URL: https://community.kde.org/Phonon
Source0: http://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz
# filter plugins
%global __provides_exclude_from ^(^%{_qt5_plugindir}/.*\\.so)$
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: extra-cmake-modules
BuildRequires: kf5-rpm-macros
BuildRequires: pkgconfig
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pulseaudio-libs-devel
BuildRequires: pkgconfig(libxml-2.0)
# Qt5
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Designer)
BuildRequires: pkgconfig(Qt5OpenGL)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(xcb)
Patch0001: phonon-rpath_use_link_path.patch
Patch0002: phonon-DEFAULT_SOURCE.patch
Patch0003: 0001-modify-kf5-knotifyconfig-compile-error.patch
%description
Phonon provides a Qt-style interface for audio and video.It is aimed at
the average desktop application, whether that is a game that needs sound
effects or a full-blown multimedia playback application like Amarok or Bangarang.
%package devel
Summary: Developer files for phonon
Requires: phonon = %{version}-%{release}
Provides: phonon-experimental-devel = %{version}-%{release}
%description devel
Developer files for phonon.
%{summary}.
%package qt5
Summary: phonon for Qt5
Summary: Multimedia framework api for Qt5
%{?_qt5:Requires: %{_qt5} >= %{_qt5_version}}
Recommends: phonon-qt5-backend-gstreamer%{?_isa}
%description qt5
phonon for Qt5.
%{summary}.
%package qt5-devel
Summary: Developer files for phonon-qt5
Requires: phonon-qt5 = %{version}-%{release}
Summary: Developer files for %{name}-qt5
Requires: %{name}-qt5 = %{version}-%{release}
%description qt5-devel
Developer files for phonon-qt5.
%{summary}.
%prep
%autosetup -n phonon-%{version} -p1
%autosetup -n %{name}-%{version} -p1
%build
mkdir %{_target_platform}
cd %{_target_platform}
%{cmake} .. -DCMAKE_BUILD_TYPE:STRING="Release" %{!?zeitgeist:-DCMAKE_DISABLE_FIND_PACKAGE_QZeitgeist:BOOL=ON} \
-DPHONON_BUILD_DECLARATIVE_PLUGIN:BOOL=OFF -DPHONON_INSTALL_QT_COMPAT_HEADERS:BOOL=ON \
-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=ON
cd -
%make_build -C %{_target_platform}
mkdir %{_target_platform}-Qt5
cd %{_target_platform}-Qt5
%{cmake_kf5} .. -DCMAKE_BUILD_TYPE:STRING="Release" -DPHONON_BUILD_DECLARATIVE_PLUGIN:BOOL=OFF \
-DPHONON_BUILD_PHONON4QT5:BOOL=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=ON
cd -
%make_build -C %{_target_platform}-Qt5
%{cmake_kf5} \
-DCMAKE_BUILD_TYPE:STRING="Release" \
-DPHONON_BUILD_DECLARATIVE_PLUGIN:BOOL=%{?declarative:ON}%{!?declarative:OFF} \
-DPHONON_BUILD_PHONON4QT5:BOOL=ON \
-DPHONON_QT_IMPORTS_INSTALL_DIR=%{_qt5_importdir} \
-DPHONON_QT_MKSPECS_INSTALL_DIR=%{_qt5_archdatadir}/mkspecs/modules \
-DPHONON_QT_PLUGIN_INSTALL_DIR=%{_qt5_plugindir}/designer
mkdir build && cd build
%cmake ../
%install
%make_install -C %{_target_platform}-Qt5
%make_install -C %{_target_platform}
install -d %{buildroot}%{_kde4_libdir}/kde4/plugins/phonon_backend/
install -d %{buildroot}%{_kde4_datadir}/kde4/services/phononbackends/
install -d %{buildroot}%{_qt5_plugindir}/phonon4qt5_backend
%make_install
%find_lang %{name} --with-qt --all-name
# own these dirs
mkdir -p %{buildroot}%{_qt5_plugindir}/phonon4qt5_backend
%check
export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
test "$(pkg-config --modversion phonon)" = "%{version}"
export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig${PKG_CONFIG_PATH:+:}${PKG_CONFIG_PATH}
test "$(pkg-config --modversion phonon4qt5)" = "%{version}"
%post
/sbin/ldconfig
%postun
/sbin/ldconfig
%post qt5
/sbin/ldconfig
%postun qt5
/sbin/ldconfig
%pretrans devel -p <lua>
path = "%{_includedir}/phonon/Phonon"
st = posix.stat(path)
if st and st.type == "link" then
os.remove(path)
end
%files
%doc COPYING.LIB
%{_libdir}/{libphonon.so.4*,libphononexperimental.so.4*}
%{_qt4_plugindir}/designer/libphononwidgets.so
%dir %{_datadir}/phonon/
%dir %{_kde4_libdir}/kde4/plugins/phonon_backend/
%dir %{_kde4_datadir}/kde4/services/phononbackends/
%files devel
%{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
%{_datadir}/phonon/buildsystem/
%{_libdir}/cmake/phonon/
%{_includedir}/KDE/Phonon/
%{_includedir}/phonon/
%{_libdir}/pkgconfig/phonon.pc
%{_libdir}/*.so
%{_qt4_datadir}/mkspecs/modules/qt_phonon.pri
%exclude %{_libdir}/libphonon4qt5.so
%exclude %{_libdir}/libphonon4qt5experimental.so
%files qt5
%doc COPYING.LIB
%dir %{_datadir}/phonon4qt5
%{_libdir}/{libphonon4qt5.so.4*,libphonon4qt5experimental.so.4*}
%{_qt5_plugindir}/designer/phononwidgets.so
%files qt5 -f %{name}.lang
%license COPYING.LIB
%{_bindir}/phononsettings
%{_libdir}/libphonon4qt5.so.4*
%{_libdir}/libphonon4qt5experimental.so.4*
# own backends dir
%dir %{_qt5_plugindir}/phonon4qt5_backend/
# designer plugin
%{_qt5_plugindir}/designer/phononwidgets.so
%files qt5-devel
%{_datadir}/dbus-1/interfaces/org.kde.Phonon4Qt5.AudioOutput.xml
%dir %{_datadir}/phonon4qt5
%{_datadir}/phonon4qt5/buildsystem/
%{_libdir}/cmake/phonon4qt5/
%{_includedir}/phonon4qt5/
%{_libdir}/*.so
%{_libdir}/libphonon4qt5.so
%{_libdir}/libphonon4qt5experimental.so
%{_libdir}/pkgconfig/phonon4qt5.pc
%{_qt5_archdatadir}/mkspecs/modules/qt_phonon4qt5.pri
%exclude %{_libdir}/libphonon.so
%exclude %{_libdir}/libphononexperimental.so
%changelog
* Mon Nov 21 2022 liweiganga <liweiganga@uniontech.com> - 4.11.1-1
- update to 4.11.1
* Tue Jan 25 2022 pei-jiankang<peijiankang@kylinos.com> - 4.10.1-5
- modify kf5-knotifyconfig compile error