Skip to content

Commit e636b6a

Browse files
committed
deb: add players
1 parent 45cee9e commit e636b6a

File tree

14 files changed

+70
-33
lines changed

14 files changed

+70
-33
lines changed

debian/control

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Section: libs
33
Priority: extra
44
Maintainer: Sou Bunnbu <[email protected]>
55
Build-Depends: debhelper (>= 9),
6-
qt5-qmake, libqt5opengl5-dev, qtdeclarative5-dev,
6+
qt5-default, qt5-qmake, libqt5opengl5-dev, qtdeclarative5-dev,
77
libavutil-dev,
88
libavresample-dev,
99
libavcodec-dev,
@@ -90,3 +90,15 @@ Description: QtAV QML module
9090
It can help you to write a player with less effort than ever before.
9191
.
9292
This package contains the QtAV QML module for Qt declarative.
93+
94+
Package: qtav-players
95+
Section: video
96+
Architecture: any
97+
Pre-Depends: ${misc:Pre-Depends}
98+
Depends: ${misc:Depends}, ${shlibs:Depends}, libqtav, qml-module-qtav
99+
Multi-Arch: same
100+
Description: QtAV/QML players
101+
QtAV is a multimedia playback framework based on Qt and FFmpeg.
102+
High performance. User & developer friendly.
103+
.
104+
This package contains the QtAV based players

debian/qtav-players.install

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
usr/lib/*/qt5/bin/libcommon.so.*
2+
usr/lib/*/qt5/bin/player
3+
usr/lib/*/qt5/bin/QMLPlayer
4+
usr/bin/player
5+
usr/bin/QMLPlayer
6+
usr/share/applications/player.desktop
7+
usr/share/applications/QMLPlayer.desktop
8+
usr/share/icons/hicolor/64x64/apps/QtAV.svg

debian/rules

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/make -f
22

3-
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
3+
DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
44

55
%:
66
dh $@
@@ -10,4 +10,7 @@ override_dh_auto_configure:
1010

1111
override_dh_auto_install:
1212
dh_auto_install
13-
ln -s libQtAV.so ${CURDIR}/debian/tmp/usr/lib/${DEB_BUILD_GNU_TYPE}/libQt5AV.so
13+
ln -s libQtAV.so ${CURDIR}/debian/tmp/usr/lib/${DEB_BUILD_MULTIARCH}/libQt5AV.so
14+
mkdir -p ${CURDIR}/debian/tmp/usr/bin
15+
cd ${CURDIR}/debian/tmp/usr/bin && ln -s ../lib/${DEB_BUILD_MULTIARCH}/qt5/bin/player .
16+
cd ${CURDIR}/debian/tmp/usr/bin && ln -s ../lib/${DEB_BUILD_MULTIARCH}/qt5/bin/QMLPlayer .

deploy.pri

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ isEqual(TEMPLATE, app) {
3232
}
3333
INSTALLS += desktopfile icon
3434
#debian.path = /DEBIAN
35-
target.path = $${INSTALL_PREFIX}/bin
35+
isEmpty(target.path): target.path = $${INSTALL_PREFIX}/bin
3636
}
3737
} else {
3838
unix:!symbian {

examples/QMLPlayer/QMLPlayer.desktop

Lines changed: 0 additions & 11 deletions
This file was deleted.

examples/QMLPlayer/QMLPlayer.pro

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# Add more folders to ship with the application, here
33
folder_01.source = qml/QMLPlayer
44
folder_01.target = qml
5-
DEPLOYMENTFOLDERS = folder_01
5+
#will copy to target path
6+
#DEPLOYMENTFOLDERS = folder_01
67

78
# Additional import path used to resolve QML modules in Creator's code model
89
QML_IMPORT_PATH =
@@ -21,6 +22,10 @@ SOURCES += main.cpp
2122
# Installation path
2223
target.path = $$[QT_INSTALL_BINS]
2324

25+
26+
desktopfile.files = $$PWD/../../qtc_packaging/debian_generic/QMLPlayer.desktop
27+
desktopfile.path = /usr/share/applications
28+
2429
# Please do not modify the following two lines. Required for deployment.
2530
include(qtquick2applicationviewer/qtquick2applicationviewer.pri)
2631
qtcAddDeployment()

examples/common/common.pro

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,7 @@ macx:!ios {
4141
}
4242

4343
include($$PROJECTROOT/deploy.pri)
44+
45+
target.path = $$[QT_INSTALL_BINS]
46+
INSTALLS += target
47+

examples/player/player.pro

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ HEADERS += \
6262
filters/AVFilterSubtitle.h
6363

6464
tv.files = res/tv.ini
65-
BIN_INSTALLS += tv
65+
#BIN_INSTALLS += tv
66+
target.path = $$[QT_INSTALL_BINS]
6667
include($$PROJECTROOT/deploy.pri)
6768

6869
RESOURCES += \
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[Desktop Entry]
2+
Type=Application
3+
Name=QtAV QML Player
4+
GenericName=QtAV QML player
5+
Comment=QtAV Multimedia Player
6+
Comment[zh]=多媒体播放器
7+
Icon=QtAV
8+
TryExec=/usr/bin/QMLPlayer
9+
Exec=QMLPlayer %U
10+
Terminal=false
11+
Categories=Qt;AudioVideo;Audio;Video;Player;TV;
12+
MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;video/webm;audio/x-flac;audio/x-vorbis+ogg;video/x-ogm+ogg;audio/x-shorten;audio/x-ape;audio/x-wavpack;audio/x-tta;audio/AMR;audio/ac3;video/mp2t;audio/flac;
13+
X-KDE-Protocols=ftp,http,https,mms,rtmp,rtsp,sftp,smb

qtc_packaging/debian_generic/QtAV.desktop

Lines changed: 0 additions & 13 deletions
This file was deleted.

qtc_packaging/debian_generic/player.desktop

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[Desktop Entry]
2+
Type=Application
3+
Name=QtAV Player
4+
GenericName=QtAV player
5+
Comment=QtAV Multimedia Player
6+
Comment[zh]=多媒体播放器
7+
Icon=QtAV
8+
TryExec=/usr/bin/player
9+
Exec=player %U
10+
Terminal=false
11+
Categories=Qt;AudioVideo;Audio;Video;Player;TV;
12+
MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;video/webm;audio/x-flac;audio/x-vorbis+ogg;video/x-ogm+ogg;audio/x-shorten;audio/x-ape;audio/x-wavpack;audio/x-tta;audio/AMR;audio/ac3;video/mp2t;audio/flac;
13+
X-KDE-Protocols=ftp,http,https,mms,rtmp,rtsp,sftp,smb

qtc_packaging/ifw/packages/com.qtav.product.player/data/bin/QMLPlayer.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
D=`readlink -f $0`
33
D=${D%/*}
44
export LD_LIBRARY_PATH=$D:$D/lib
5-
$D/QMLPlayer
5+
$D/QMLPlayer $@

qtc_packaging/ifw/packages/com.qtav.product.player/data/bin/player.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
D=`readlink -f $0`
33
D=${D%/*}
44
export LD_LIBRARY_PATH=$D:$D/lib
5-
$D/player
5+
$D/player $@

src/libQtAV.pro

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,3 +421,6 @@ MODULE_VERSION = $$VERSION
421421
!mac_framework: MODULE_VERSION = $${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
422422
include($$PROJECTROOT/deploy.pri)
423423

424+
icon.files = $$PWD/$${TARGET}.svg
425+
icon.path = /usr/share/icons/hicolor/64x64/apps
426+
INSTALLS += icon

0 commit comments

Comments
 (0)