[SCM] Qt Mobility packaging branch, master, updated. e6d84ccc97c06260fe272cc1f220cf0a4e35b805
Fathi Boudra
fabo at alioth.debian.org
Wed Jun 9 09:55:03 UTC 2010
The following commit has been merged in the master branch:
commit e6d84ccc97c06260fe272cc1f220cf0a4e35b805
Author: Fathi Boudra <fabo at debian.org>
Date: Wed Jun 9 12:52:39 2010 +0300
Enable Multimedia module and add related packages
---
debian/control | 23 ++++-
debian/libdeclarative-multimedia.install | 2 +
debian/libqtmultimediakit1.install | 4 +
debian/patches/03_ftbfs_multimedia_plugin.diff | 41 ++++++++
debian/patches/04_ftbfs_multimedia_examples.diff | 21 ++++
debian/patches/series | 2 +
debian/qtmobility-dev.install | 114 ++++++++++++++++++++++
debian/qtmobility-examples.install | 37 ++------
debian/rules | 3 +-
9 files changed, 215 insertions(+), 32 deletions(-)
diff --git a/debian/control b/debian/control
index 953bd0e..598c6d3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,9 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Fathi Boudra <fabo at debian.org>
Build-Depends: debhelper (>= 7.4.15), pkg-kde-tools (>= 0.6.4),
libqt4-dev (>= 4:4.7.0~beta1), libqt4-opengl-dev (>= 4:4.7.0~beta1),
-# libasound2-dev,
+ libasound2-dev,
libbluetooth-dev,
-# libpulse-dev,
+ libpulse-dev,
libx11-dev,
network-manager-dev
Standards-Version: 3.8.4
@@ -22,6 +22,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
libqtbearer1 (= ${binary:Version}),
libqtcontacts1 (= ${binary:Version}),
libqtlocation1 (= ${binary:Version}),
+ libqtmultimediakit1 (= ${binary:Version}),
libqtpublishsubscribe1 (= ${binary:Version}),
libqtsensors1 (= ${binary:Version}),
libqtserviceframework1 (= ${binary:Version}),
@@ -59,6 +60,15 @@ Description: Qt Mobility Location module
This package contains the Location API. It provides a library for distributing
and receiving location data using arbitrary data sources.
+Package: libqtmultimediakit1
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Qt Mobility MultimediaKit module
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+ .
+ This package contains a set of APIs to play and record media, and manage a
+ collection of media content.
+
Package: libqtpublishsubscribe1
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -103,6 +113,14 @@ Description: Qt Mobility Versit module
.
This package contains an API to manage Versit documents.
+Package: libdeclarative-multimedia
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Qt Mobility Multimedia QML plugin
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+ .
+ This package contains the Multimedia QML plugin for QtDeclarative.
+
Package: libdeclarative-publishsubscribe
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -136,6 +154,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
libqtbearer1 (= ${binary:Version}),
libqtcontacts1 (= ${binary:Version}),
libqtlocation1 (= ${binary:Version}),
+ libqtmultimediakit1 (= ${binary:Version}),
libqtpublishsubscribe1 (= ${binary:Version}),
libqtsensors1 (= ${binary:Version}),
libqtserviceframework1 (= ${binary:Version}),
diff --git a/debian/libdeclarative-multimedia.install b/debian/libdeclarative-multimedia.install
new file mode 100644
index 0000000..af29cee
--- /dev/null
+++ b/debian/libdeclarative-multimedia.install
@@ -0,0 +1,2 @@
+usr/lib/qt4/imports/Qt/multimedia/libdeclarative_multimedia.so
+usr/lib/qt4/imports/Qt/multimedia/qmldir
diff --git a/debian/libqtmultimediakit1.install b/debian/libqtmultimediakit1.install
new file mode 100644
index 0000000..dfdbff4
--- /dev/null
+++ b/debian/libqtmultimediakit1.install
@@ -0,0 +1,4 @@
+usr/lib/libQtMultimediaKit.so.*
+usr/lib/qt4/plugins/mediaservice/libqtmedia_audioengine.so
+usr/lib/qt4/plugins/mediaservice/libqtmedia_v4lengine.so
+usr/lib/qt4/plugins/playlistformats/libqtmultimediakit_m3u.so
diff --git a/debian/patches/03_ftbfs_multimedia_plugin.diff b/debian/patches/03_ftbfs_multimedia_plugin.diff
new file mode 100644
index 0000000..de0e6a7
--- /dev/null
+++ b/debian/patches/03_ftbfs_multimedia_plugin.diff
@@ -0,0 +1,41 @@
+Description: Include a copy of QAbstractDynamicMetaObject in qmetadatacontrolmetaobject_p.h
+
+QMetaDataControlMetaObject inherits from QAbstractDynamicMetaObject but the
+qobject_p.h header can't be included when building against packages which don't
+include private headers. We have to make do with a copy of the class instead.
+
+Author: Fathi Boudra <fabo at debian.org>
+
+--- a/plugins/declarative/multimedia/qmetadatacontrolmetaobject_p.h
++++ b/plugins/declarative/multimedia/qmetadatacontrolmetaobject_p.h
+@@ -59,15 +59,27 @@
+ // We mean it.
+ //
+
+-#include <QtCore/qmetaobject.h>
++#include <QtCore/QMetaObject>
++#include <QtCore/QObject>
+ #include <qtmedianamespace.h>
+
+-#include <QtCore/private/qobject_p.h>
+-
+ QT_BEGIN_HEADER
+
+ QT_BEGIN_NAMESPACE
+
++#ifndef QOBJECT_P_H
++#if (QT_VERSION >= QT_VERSION_CHECK(4, 6, 0))
++
++struct Q_CORE_EXPORT QAbstractDynamicMetaObject : public QMetaObject
++{
++ virtual ~QAbstractDynamicMetaObject() {}
++ virtual int metaCall(QMetaObject::Call, int _id, void **) { return _id; }
++ virtual int createProperty(const char *, const char *) { return -1; }
++};
++
++#endif
++#endif
++
+ class QMetaDataReaderControl;
+
+ class QMetaDataControlMetaObject : public QAbstractDynamicMetaObject
diff --git a/debian/patches/04_ftbfs_multimedia_examples.diff b/debian/patches/04_ftbfs_multimedia_examples.diff
new file mode 100644
index 0000000..cd1fc83
--- /dev/null
+++ b/debian/patches/04_ftbfs_multimedia_examples.diff
@@ -0,0 +1,21 @@
+Description: Fix multimediakit examples link failure (undefined reference to pulseaudio functions)
+
+QT_CFLAGS_PULSEAUDIO and QT_LIBS_PULSEAUDIO are defined by Qt's configure.
+Qt Mobility's confgure should defined them.
+As a workaround, define a 'standard' value.
+
+Author: Fathi Boudra <fabo at debian.org>
+
+--- a/src/multimedia/effects/effects.pri
++++ b/src/multimedia/effects/effects.pri
+@@ -5,8 +5,8 @@ unix:!mac {
+ DEFINES += QT_MULTIMEDIA_PULSEAUDIO
+ HEADERS += $$PWD/qsoundeffect_pulse_p.h
+ SOURCES += $$PWD/qsoundeffect_pulse_p.cpp
+- QMAKE_CXXFLAGS += $$QT_CFLAGS_PULSEAUDIO
+- LIBS += $$QT_LIBS_PULSEAUDIO
++ QMAKE_CXXFLAGS += -D_REENTRANT
++ LIBS += -lpulse
+ } else {
+ DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER
+ HEADERS += $$PWD/qsoundeffect_qmedia_p.h
diff --git a/debian/patches/series b/debian/patches/series
index 1156209..f699b01 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@
0002_rename_sysinfo.diff
01_fix_ftbfs_incorrect_copy2build_output_value.diff
02_no_rpath.diff
+03_ftbfs_multimedia_plugin.diff
+04_ftbfs_multimedia_examples.diff
diff --git a/debian/qtmobility-dev.install b/debian/qtmobility-dev.install
index 1c4f81a..71e700e 100644
--- a/debian/qtmobility-dev.install
+++ b/debian/qtmobility-dev.install
@@ -143,6 +143,118 @@ usr/include/QtLocation/qgeopositioninfosource.h
usr/include/QtLocation/qgeosatelliteinfo.h
usr/include/QtLocation/qgeosatelliteinfosource.h
usr/include/QtLocation/qnmeapositioninfosource.h
+usr/include/QtMultimediaKit/QAbstractAudioDeviceInfo
+usr/include/QtMultimediaKit/QAbstractAudioInput
+usr/include/QtMultimediaKit/QAbstractAudioOutput
+usr/include/QtMultimediaKit/QAbstractVideoBuffer
+usr/include/QtMultimediaKit/QAbstractVideoSurface
+usr/include/QtMultimediaKit/QAudioCaptureSource
+usr/include/QtMultimediaKit/QAudioDeviceInfo
+usr/include/QtMultimediaKit/QAudioEncoderControl
+usr/include/QtMultimediaKit/QAudioEncoderSettings
+usr/include/QtMultimediaKit/QAudioEndpointSelector
+usr/include/QtMultimediaKit/QAudioFormat
+usr/include/QtMultimediaKit/QAudioInput
+usr/include/QtMultimediaKit/QAudioOutput
+usr/include/QtMultimediaKit/QAudioSystemPlugin
+usr/include/QtMultimediaKit/QGraphicsVideoItem
+usr/include/QtMultimediaKit/QImageEncoderControl
+usr/include/QtMultimediaKit/QImageEncoderSettings
+usr/include/QtMultimediaKit/QLocalMediaPlaylistProvider
+usr/include/QtMultimediaKit/QMediaBindableInterface
+usr/include/QtMultimediaKit/QMediaContainerControl
+usr/include/QtMultimediaKit/QMediaContent
+usr/include/QtMultimediaKit/QMediaControl
+usr/include/QtMultimediaKit/QMediaImageViewer
+usr/include/QtMultimediaKit/QMediaObject
+usr/include/QtMultimediaKit/QMediaPlayer
+usr/include/QtMultimediaKit/QMediaPlayerControl
+usr/include/QtMultimediaKit/QMediaPlaylist
+usr/include/QtMultimediaKit/QMediaPlaylistControl
+usr/include/QtMultimediaKit/QMediaPlaylistIOPlugin
+usr/include/QtMultimediaKit/QMediaPlaylistNavigator
+usr/include/QtMultimediaKit/QMediaPlaylistProvider
+usr/include/QtMultimediaKit/QMediaPlaylistReader
+usr/include/QtMultimediaKit/QMediaPlaylistSourceControl
+usr/include/QtMultimediaKit/QMediaPlaylistWriter
+usr/include/QtMultimediaKit/QMediaRecorder
+usr/include/QtMultimediaKit/QMediaRecorderControl
+usr/include/QtMultimediaKit/QMediaResource
+usr/include/QtMultimediaKit/QMediaService
+usr/include/QtMultimediaKit/QMediaServiceProvider
+usr/include/QtMultimediaKit/QMediaServiceProviderHint
+usr/include/QtMultimediaKit/QMediaServiceProviderPlugin
+usr/include/QtMultimediaKit/QMediaStreamsControl
+usr/include/QtMultimediaKit/QMediaTimeInterval
+usr/include/QtMultimediaKit/QMediaTimeRange
+usr/include/QtMultimediaKit/QMetaDataReaderControl
+usr/include/QtMultimediaKit/QMetaDataWriterControl
+usr/include/QtMultimediaKit/QRadioTuner
+usr/include/QtMultimediaKit/QRadioTunerControl
+usr/include/QtMultimediaKit/QVideoDeviceControl
+usr/include/QtMultimediaKit/QVideoEncoderControl
+usr/include/QtMultimediaKit/QVideoEncoderSettings
+usr/include/QtMultimediaKit/QVideoFrame
+usr/include/QtMultimediaKit/QVideoRendererControl
+usr/include/QtMultimediaKit/QVideoSurfaceFormat
+usr/include/QtMultimediaKit/QVideoWidget
+usr/include/QtMultimediaKit/QVideoWidgetControl
+usr/include/QtMultimediaKit/QVideoWindowControl
+usr/include/QtMultimediaKit/qabstractvideobuffer.h
+usr/include/QtMultimediaKit/qabstractvideobuffer_p.h
+usr/include/QtMultimediaKit/qabstractvideosurface.h
+usr/include/QtMultimediaKit/qabstractvideosurface_p.h
+usr/include/QtMultimediaKit/qaudio.h
+usr/include/QtMultimediaKit/qaudiocapturesource.h
+usr/include/QtMultimediaKit/qaudiodeviceinfo.h
+usr/include/QtMultimediaKit/qaudioencodercontrol.h
+usr/include/QtMultimediaKit/qaudioendpointselector.h
+usr/include/QtMultimediaKit/qaudioformat.h
+usr/include/QtMultimediaKit/qaudioinput.h
+usr/include/QtMultimediaKit/qaudiooutput.h
+usr/include/QtMultimediaKit/qaudiosystem.h
+usr/include/QtMultimediaKit/qaudiosystemplugin.h
+usr/include/QtMultimediaKit/qgraphicsvideoitem.h
+usr/include/QtMultimediaKit/qimageencodercontrol.h
+usr/include/QtMultimediaKit/qimagevideobuffer_p.h
+usr/include/QtMultimediaKit/qlocalmediaplaylistprovider.h
+usr/include/QtMultimediaKit/qmediabindableinterface.h
+usr/include/QtMultimediaKit/qmediacontainercontrol.h
+usr/include/QtMultimediaKit/qmediacontent.h
+usr/include/QtMultimediaKit/qmediacontrol.h
+usr/include/QtMultimediaKit/qmediaencodersettings.h
+usr/include/QtMultimediaKit/qmediaimageviewer.h
+usr/include/QtMultimediaKit/qmediaobject.h
+usr/include/QtMultimediaKit/qmediaplayer.h
+usr/include/QtMultimediaKit/qmediaplayercontrol.h
+usr/include/QtMultimediaKit/qmediaplaylist.h
+usr/include/QtMultimediaKit/qmediaplaylistcontrol.h
+usr/include/QtMultimediaKit/qmediaplaylistioplugin.h
+usr/include/QtMultimediaKit/qmediaplaylistnavigator.h
+usr/include/QtMultimediaKit/qmediaplaylistprovider.h
+usr/include/QtMultimediaKit/qmediaplaylistsourcecontrol.h
+usr/include/QtMultimediaKit/qmediarecorder.h
+usr/include/QtMultimediaKit/qmediarecordercontrol.h
+usr/include/QtMultimediaKit/qmediaresource.h
+usr/include/QtMultimediaKit/qmediaservice.h
+usr/include/QtMultimediaKit/qmediaserviceprovider.h
+usr/include/QtMultimediaKit/qmediaserviceproviderplugin.h
+usr/include/QtMultimediaKit/qmediastreamscontrol.h
+usr/include/QtMultimediaKit/qmediatimerange.h
+usr/include/QtMultimediaKit/qmemoryvideobuffer_p.h
+usr/include/QtMultimediaKit/qmetadatareadercontrol.h
+usr/include/QtMultimediaKit/qmetadatawritercontrol.h
+usr/include/QtMultimediaKit/qradiotuner.h
+usr/include/QtMultimediaKit/qradiotunercontrol.h
+usr/include/QtMultimediaKit/qtmedianamespace.h
+usr/include/QtMultimediaKit/qvideodevicecontrol.h
+usr/include/QtMultimediaKit/qvideoencodercontrol.h
+usr/include/QtMultimediaKit/qvideoframe.h
+usr/include/QtMultimediaKit/qvideorenderercontrol.h
+usr/include/QtMultimediaKit/qvideosurfaceformat.h
+usr/include/QtMultimediaKit/qvideowidget.h
+usr/include/QtMultimediaKit/qvideowidgetcontrol.h
+usr/include/QtMultimediaKit/qvideowindowcontrol.h
usr/include/QtPublishSubscribe/QValueSpacePublisher
usr/include/QtPublishSubscribe/QValueSpaceSubscriber
usr/include/QtPublishSubscribe/qvaluespace.h
@@ -236,6 +348,8 @@ usr/lib/libQtContacts.prl
usr/lib/libQtContacts.so
usr/lib/libQtLocation.prl
usr/lib/libQtLocation.so
+usr/lib/libQtMultimediaKit.prl
+usr/lib/libQtMultimediaKit.so
usr/lib/libQtPublishSubscribe.prl
usr/lib/libQtPublishSubscribe.so
usr/lib/libQtSensors.prl
diff --git a/debian/qtmobility-examples.install b/debian/qtmobility-examples.install
index a0ab933..797f590 100644
--- a/debian/qtmobility-examples.install
+++ b/debian/qtmobility-examples.install
@@ -1,33 +1,9 @@
-#usr/bin/battery-subscriber/battery-subscriber.qml
-#usr/bin/battery-subscriber/content/bubble.png
-#usr/bin/declarative-sfw-dialer/README
-#usr/bin/declarative-sfw-dialer/content/DialButton.qml
-#usr/bin/declarative-sfw-dialer/content/DialScreen.qml
-#usr/bin/declarative-sfw-dialer/content/DialerList.qml
-#usr/bin/declarative-sfw-dialer/content/call.png
-#usr/bin/declarative-sfw-dialer/content/hangup.png
-#usr/bin/declarative-sfw-dialer/content/qmldir
-#usr/bin/declarative-sfw-dialer/declarative-sfw-dialer.qml
-#usr/bin/declarative-sfw-notes/README
-#usr/bin/declarative-sfw-notes/content/Button.qml
-#usr/bin/declarative-sfw-notes/content/Dialog.qml
-#usr/bin/declarative-sfw-notes/content/InputDialog.qml
-#usr/bin/declarative-sfw-notes/content/icons/addIcon.png
-#usr/bin/declarative-sfw-notes/content/icons/deleteIcon.png
-#usr/bin/declarative-sfw-notes/content/icons/nextIcon.png
-#usr/bin/declarative-sfw-notes/content/icons/prevIcon.png
-#usr/bin/declarative-sfw-notes/content/icons/searchIcon.png
-#usr/bin/declarative-sfw-notes/content/qmldir
-#usr/bin/declarative-sfw-notes/declarative-sfw-notes.qml
-#usr/bin/nmealog.txt
-#usr/bin/simplelog.txt
-#usr/bin/xmldata/bluetoothtransferservice.xml
-#usr/bin/xmldata/filemanagerservice.xml
-#usr/bin/xmldata/landlinedialerservice.xml
-#usr/bin/xmldata/notesmanagerservice.xml
-#usr/bin/xmldata/voipdialerservice.xml
usr/bin/accel
usr/bin/arrowkeys
+usr/bin/audiodevices
+usr/bin/audioinput
+usr/bin/audiooutput
+usr/bin/audiorecorder
usr/bin/battery-publisher
usr/bin/bearercloud
usr/bin/bearermonitor
@@ -39,9 +15,11 @@ usr/bin/lightmaps_with_location
usr/bin/logfilepositionsource
usr/bin/metadata
usr/bin/orientation
+usr/bin/player
usr/bin/publish-subscribe
usr/bin/qmlcontacts
usr/bin/qsysinfo
+usr/bin/radio
usr/bin/reading_perf
usr/bin/samplephonebook
usr/bin/satellitedialog
@@ -56,7 +34,10 @@ usr/bin/show_orientation
usr/bin/show_proximity
usr/bin/show_rotation
usr/bin/show_tap
+usr/bin/slideshow
usr/bin/smallsensors
+usr/bin/videographicsitem
+usr/bin/videowidget
usr/bin/weatherinfo_with_location
usr/lib/qt4/plugins/sensors/libqtsensors_grueplugin.so
usr/lib/qt4/plugins/serviceframework/libserviceframework_bluetoothtransferplugin.so
diff --git a/debian/rules b/debian/rules
index 59dcf7f..8a137ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,8 +13,7 @@ override_dh_auto_configure:
-libdir "/usr/lib" \
-bindir "/usr/bin" \
-plugindir "/usr/lib/qt4/plugins" \
- -examples \
- -modules "bearer contacts location publishsubscribe sensors serviceframework systeminfo serviceframework versit"
+ -examples
override_dh_auto_clean:
dh_auto_clean
--
Qt Mobility packaging
More information about the pkg-kde-commits
mailing list