From 1bf803ecf676d6602c06b693055333c6b51261a8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jan 25 2017 15:12:16 +0000 Subject: phonon-4.9.1 better handle optional (default off) features: declarative, zeitgeist --- diff --git a/.gitignore b/.gitignore index cb7a885..9dfe4ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/phonon-4.8.3.tar.xz -/phonon-4.9.0.tar.xz +/phonon-4.9.1.tar.xz diff --git a/phonon.spec b/phonon.spec index 40c5323..9775e45 100644 --- a/phonon.spec +++ b/phonon.spec @@ -1,17 +1,20 @@ -# When bootstrapping new releases/archs, set this initially to avoid -# unresolvable dependency on phonon-backend (and friends) -#define bootstrap 1 - -%if 0 -# enable zeitgeist support -%define zeitgeist 1 +## When bootstrapping new releases/archs, set this initially to avoid +## unresolvable dependency on phonon-backend (and friends) +#global bootstrap 1 + +%if !0%{?bootstrap} +## enable zeitgeist support +#global zeitgeist 1 +## enable experimental qtdeclarative/qml1 plugin +## FIXME/TODO: still FTBFS if enabling this feature (unpackaged files, where to put them?) +#global declarative 1 %endif Summary: Multimedia framework api Name: phonon -Version: 4.9.0 -Release: 4%{?dist} +Version: 4.9.1 +Release: 1%{?dist} License: LGPLv2+ URL: http://phonon.kde.org/ @@ -42,15 +45,20 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libpulse-mainloop-glib) > 0.9.15 BuildRequires: pkgconfig(libxml-2.0) # Qt4 -BuildRequires: pkgconfig(QtDBus) pkgconfig(QtDesigner) pkgconfig(QtOpenGL) pkgconfig(QtDeclarative) -%if 0%{?zeitgeist} -BuildRequires: pkgconfig(QZeitgeist) -%endif +BuildRequires: pkgconfig(QtDBus) pkgconfig(QtDesigner) pkgconfig(QtOpenGL) # Qt5 BuildRequires: pkgconfig(Qt5DBus) pkgconfig(Qt5Designer) pkgconfig(Qt5OpenGL) pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(Qt5Declarative) BuildRequires: pkgconfig(xcb) +## optional features +%if 0%{?declarative} +BuildRequires: pkgconfig(QtDeclarative) +BuildRequires: pkgconfig(Qt5Declarative) +%endif +%if 0%{?zeitgeist} +BuildRequires: pkgconfig(QZeitgeist) +%endif + %global pulseaudio_version %((pkg-config --modversion libpulse 2>/dev/null || echo 0.9.15) | cut -d- -f1) Requires: kde-filesystem @@ -105,6 +113,8 @@ mkdir %{_target_platform} pushd %{_target_platform} %{cmake} .. \ -DCMAKE_BUILD_TYPE:STRING="Release" \ + %{!?zeitgeist:-DCMAKE_DISABLE_FIND_PACKAGE_QZeitgeist:BOOL=ON} \ + -DPHONON_BUILD_DECLARATIVE_PLUGIN:BOOL=%{?declarative:ON}%{!?declarative:OFF} \ -DPHONON_INSTALL_QT_COMPAT_HEADERS:BOOL=ON \ -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=ON popd @@ -115,6 +125,7 @@ mkdir %{_target_platform}-Qt5 pushd %{_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_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=ON popd @@ -211,6 +222,10 @@ end %changelog +* Wed Jan 25 2017 Rex Dieter - 4.9.1-1 +- phonon-4.9.1 +- better handle optional (default off) features: declarative, zeitgeist + * Mon Jan 02 2017 Rex Dieter - 4.9.0-4 - filter plugin provides diff --git a/sources b/sources index 35a3aab..736d693 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8abeb7b1eaf4935668c7fb441fc2491a phonon-4.9.0.tar.xz +SHA512 (phonon-4.9.1.tar.xz) = a1741765071a625d9b9073d9ad1571b91cf5bfce2223bd1b034828d02dc52624587a6ec5352f3702df79f6e4201007596843fbcb9f15c9b489a858200787d728