Merge lp:~aacid/qtubuntu-media/noprivate into lp:qtubuntu-media

[Albert Astals Cid]

No need for private, works fine without it

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:28
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-trusty-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-trusty-armhf-ci/1/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-trusty-i386-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/13/rebuild

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Builds fine here, not sure what the jenkins i386 failures is about though.

review: Approve

[Timo Jyrinki (timo-jyrinki)]

Well, it seems it truly does fail on i386 (only):
https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-beta2/+sourcepub/3842830/+listing-archive-extra

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-autolanding/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-trusty-amd64-autolanding/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-trusty-armhf-autolanding/1
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-trusty-armhf-autolanding/1/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-trusty-i386-autolanding/1/console

review: Needs Fixing (continuous-integration)

[lp:~aacid/qtubuntu-media/noprivate]

29. By Albert Astals Cid on 2014-01-23

Include GL stuff in a different way

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:29
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-trusty-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-trusty-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-trusty-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-trusty-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/14/rebuild

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Great again, this time also on i386.

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-06-13 19:01:21 +0000
+++ debian/control	2014-01-23 08:55:21 +0000
@@ -14,7 +14,6 @@
                qt5-default,
                qtbase5-dev,
                qtmultimedia5-dev,
-               qtmultimedia5-private-dev,
 Standards-Version: 3.9.4
 # If you don't have commit rights to lp:qtubuntu-media but need to upload
 # packaging changes, just go ahead.  The developers will notice and sync

=== modified file 'src/aalvideorenderercontrol.h'
--- src/aalvideorenderercontrol.h	2013-03-12 16:07:19 +0000
+++ src/aalvideorenderercontrol.h	2014-01-23 08:55:21 +0000
@@ -21,7 +21,7 @@
 #include <QVideoFrame>
 #include <QVideoRendererControl>
 
-#include <qgl.h>
+#include <media/media_compatibility_layer.h>
 
 class AalMediaPlayerService;
 class AalGLTextureBuffer;

=== modified file 'src/src.pro'
--- src/src.pro	2013-06-05 15:46:17 +0000
+++ src/src.pro	2014-01-23 08:55:21 +0000
@@ -1,6 +1,6 @@
 include(../coverage.pri)
 TARGET = aalmediaplayer
-QT += multimedia-private opengl
+QT += multimedia opengl
 TEMPLATE = lib
 CONFIG += plugin
 PLUGIN_TYPE = mediaservice

=== modified file 'unittests/unittests.pro'
--- unittests/unittests.pro	2013-03-25 16:03:08 +0000
+++ unittests/unittests.pro	2014-01-23 08:55:21 +0000
@@ -4,7 +4,7 @@
 TARGET = tst_mediaplayerplugin
 
 QT += testlib
-QT += multimedia-private opengl
+QT += multimedia opengl
 
 INCLUDEPATH += ../src \
     /usr/include/qt5/QtMultimedia \