[SCM] qt3d packaging branch, experimental, updated. debian/5.7.1+dfsg-2-32-g8a2c214

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt3d.git;a=commitdiff;h=86137ff

The following commit has been merged in the experimental branch:
commit 86137ffe7949f6fb3b7c86e81b796aa3e8f923c2
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Jul 16 10:17:39 2017 +0300

    Drop Build-Conflicts on qtmultimedia5-dev, replace with a patch hunk.
---
 debian/changelog                      |  1 +
 debian/control                        |  1 -
 debian/patches/nonfree_resources.diff | 11 ++++++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 09802f4..aa96651 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ qt3d-opensource-src (5.9.1+dfsg-1) UNRELEASED; urgency=medium
   * Bump Qt build-dependencies to 5.9.1.
   * Remove some non-free example assets from the tarball.
     - Disable code which was using them (nonfree_resources.diff).
+  * Drop Build-Conflicts on qtmultimedia5-dev, not needed with this patch.
 
  -- Simon Quigley <tsimonq2 at ubuntu.com>  Fri, 09 Jun 2017 23:52:28 -0500
 
diff --git a/debian/control b/debian/control
index 22aa5ef..ee2ff57 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,6 @@ Build-Depends-Indep: libqt5sql5-sqlite (>= 5.9.1+dfsg~),
                      qtbase5-doc-html (>= 5.9.1+dfsg~),
                      qtdeclarative5-doc-html (>= 5.9.1~),
                      qttools5-dev-tools (>= 5.9.1~)
-Build-Conflicts: qtmultimedia5-dev
 Standards-Version: 3.9.8
 Homepage: http://qt-project.org/
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qt3d.git
diff --git a/debian/patches/nonfree_resources.diff b/debian/patches/nonfree_resources.diff
index 932182f..a203d26 100644
--- a/debian/patches/nonfree_resources.diff
+++ b/debian/patches/nonfree_resources.diff
@@ -1,7 +1,7 @@
 Description: disable code which is using resources not in DFSG tarball
 Author: Dmitry Shachnev <mitya57 at debian.org>
 Forwarded: not-needed
-Last-Update: 2017-07-15
+Last-Update: 2017-07-16
 
 --- a/examples/qt3d/exampleresources/obj.qrc
 +++ b/examples/qt3d/exampleresources/obj.qrc
@@ -32,6 +32,15 @@ Last-Update: 2017-07-15
      compute-particles \
      3d-text \
      qardboard \
+@@ -22,8 +19,6 @@
+     simplecustommaterial \
+     scene2d
+ 
+-qtHaveModule(multimedia): SUBDIRS += audio-visualizer-qml
+-
+ # qmake seems to break in some CI configurations, disable this for now
+ #SUBDIRS += qgltf
+ 
 --- a/tests/tests.pro
 +++ b/tests/tests.pro
 @@ -1,8 +1,7 @@

-- 
qt3d packaging