[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.8.0-4-20-ge1cd139

Sat Aug 8 21:08:48 UTC 2015

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/phonon.git;a=commitdiff;h=dcc4334

The following commit has been merged in the master branch:
commit dcc43349f967d3618a7e16de65fb0893fa57ddfd
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sat Aug 8 17:27:34 2015 +0200

    Update phonon_is_not_forced_in_KDE patch
---
 debian/changelog                                   |  4 +++
 .../patches/do_not_assume_existing_backend.patch   | 14 +++++-----
 debian/patches/phonon-inc.patch                    | 14 ++++++----
 debian/patches/phonon_is_not_forced_in_KDE.diff    | 31 +++++++---------------
 debian/rules                                       |  4 +--
 5 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1b027f8..7ccfebd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 phonon (4:4.8.3-1~) UNRELEASED; urgency=medium
 
   * New upstream release (4.8.3).
+  * Use the new PHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT build
+    option.
+  * Refresh patches.
+  * Update phonon_is_not_forced_in_KDE patch
 
  -- Maximiliano Curia <maxy at debian.org>  Sat, 08 Aug 2015 17:14:09 +0200
 
diff --git a/debian/patches/do_not_assume_existing_backend.patch b/debian/patches/do_not_assume_existing_backend.patch
index 014713d..62becaa 100644
--- a/debian/patches/do_not_assume_existing_backend.patch
+++ b/debian/patches/do_not_assume_existing_backend.patch
@@ -24,13 +24,13 @@ Date:   Wed Nov 26 23:28:06 2014 +0100
     BUG: 341296
     CCMAIL: pkg-kde-talk at lists.alioth.debian.org
 
-diff --git a/phonon/audiooutput.cpp b/phonon/audiooutput.cpp
-index 0768768..f118824 100644
---- a/phonon/audiooutput.cpp
-+++ b/phonon/audiooutput.cpp
-@@ -54,6 +54,9 @@ static inline bool callSetOutputDevice(AudioOutputPrivate *const d, const AudioO
-     if (pulse->isActive())
-         return pulse->setOutputDevice(d->getStreamUuid(), dev.index());
+Index: phonon/phonon/audiooutput.cpp
+===================================================================
+--- phonon.orig/phonon/audiooutput.cpp	2015-08-08 17:15:27.861069323 +0200
++++ phonon/phonon/audiooutput.cpp	2015-08-08 17:15:27.833070426 +0200
+@@ -57,6 +57,9 @@
+     if (!d->backendObject())
+         return false;
  
 +    if (!d->backendObject())
 +        return false;
diff --git a/debian/patches/phonon-inc.patch b/debian/patches/phonon-inc.patch
index 84e171f..7c661be 100644
--- a/debian/patches/phonon-inc.patch
+++ b/debian/patches/phonon-inc.patch
@@ -4,17 +4,21 @@ Subject: Create a magic phonon header
 Forwarded: no
 Last-Update: 2011-12-20
 
---- a/phonon/CMakeLists.txt
-+++ b/phonon/CMakeLists.txt
-@@ -222,3 +222,6 @@ if (QT_QTDBUS_FOUND AND NOT PHONON_NO_DB
+Index: phonon/phonon/CMakeLists.txt
+===================================================================
+--- phonon.orig/phonon/CMakeLists.txt	2015-08-08 17:15:37.084706210 +0200
++++ phonon/phonon/CMakeLists.txt	2015-08-08 17:15:37.080706367 +0200
+@@ -224,3 +224,6 @@
      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.${PHONON_LIB_SONAME_CAMEL}.AudioOutput.xml DESTINATION  ${DBUS_INTERFACES_INSTALL_DIR})
  endif (QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
  
 +install(FILES
 +   phonon
 +DESTINATION ${INCLUDE_INSTALL_DIR}/phonon)
---- /dev/null
-+++ b/phonon/phonon
+Index: phonon/phonon/phonon
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ phonon/phonon/phonon	2015-08-08 17:15:37.080706367 +0200
 @@ -0,0 +1,32 @@
 +#include "abstractaudiooutput.h"
 +#include "abstractmediastream.h"
diff --git a/debian/patches/phonon_is_not_forced_in_KDE.diff b/debian/patches/phonon_is_not_forced_in_KDE.diff
index b8f90c9..6caeb1b 100644
--- a/debian/patches/phonon_is_not_forced_in_KDE.diff
+++ b/debian/patches/phonon_is_not_forced_in_KDE.diff
@@ -2,29 +2,16 @@ From: Sune Vuorela <debian at pusling.com>
 Subject: Install headers where they were earlier
 Forwarded: no
 
-Index: phonon-4.8.0/includes/CMakeLists.txt
+Index: phonon/PhononConfig.cmake.in
 ===================================================================
---- phonon-4.8.0.orig/includes/CMakeLists.txt	2014-09-06 16:14:24.000000000 +0000
-+++ phonon-4.8.0/includes/CMakeLists.txt	2014-10-29 14:31:14.000000000 +0000
-@@ -91,7 +91,7 @@
-   old/Phonon/VolumeFaderEffect
-   old/Phonon/VolumeFaderInterface
-   old/Phonon/VolumeSlider
--DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Phonon COMPONENT Devel)
-+DESTINATION ${INCLUDE_INSTALL_DIR}/phonon/Phonon COMPONENT Devel)
+--- phonon.orig/PhononConfig.cmake.in	2015-08-08 17:24:02.720798332 +0200
++++ phonon/PhononConfig.cmake.in	2015-08-08 17:25:36.869091094 +0200
+@@ -34,7 +34,7 @@
+ set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR} ${PHONON_INCLUDE_DIR}/KDE)
  
- if (PHONON_BUILD_EXPERIMENTAL)
-     install(FILES
-Index: phonon-4.8.0/PhononConfig.cmake.in
-===================================================================
---- phonon-4.8.0.orig/PhononConfig.cmake.in	2014-09-06 16:14:24.000000000 +0000
-+++ phonon-4.8.0/PhononConfig.cmake.in	2014-10-29 14:32:01.374544000 +0000
-@@ -30,7 +30,7 @@
- # The following one is only for compatiblity
- set(PHONON_LIBS ${PHONON_LIBRARIES})
- 
--set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR} ${PHONON_INCLUDE_DIR}/KDE )
-+set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR} ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR}/phonon )
+ if (PHONON_QT_COMPAT_HEADERS)
+-    list(APPEND PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/Phonon)
++    list(APPEND PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/phonon)
+ endif()
  
  # Find Internal is included in the backends' finders rather than here.
- # http://lists.kde.org/?l=kde-multimedia&m=135934335320148&w=2
diff --git a/debian/rules b/debian/rules
index 3901142..2bbe2e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,8 +16,8 @@ override_dh_auto_clean:
 	rm -rf build-qt5
 
 override_dh_auto_configure:
-	$(overridden_command) -- -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON
-	$(overridden_command) --builddirectory=build-qt5 -- -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON -DPHONON_BUILD_PHONON4QT5=ON
+	$(overridden_command) -- -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON -DPHONON_INSTALL_QT_COMPAT_HEADERS=ON
+	$(overridden_command) --builddirectory=build-qt5 -- -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON -DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_COMPAT_HEADERS=ON
 
 override_dh_auto_build:
 	$(overridden_command)

-- 
Phonon Multimedia Framework packaging

