diff --git a/0001-modify-compile-error-of-kylin-video.patch b/0001-modify-compile-error-of-kylin-video.patch new file mode 100644 index 0000000..9f3bafd --- /dev/null +++ b/0001-modify-compile-error-of-kylin-video.patch @@ -0,0 +1,97 @@ +From cbd3af35feb59f1bb4a084bbb7ec70bf011d3020 Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Tue, 7 Jun 2022 15:59:00 +0800 +Subject: [PATCH] modify compile error of kylin-video + +--- + src/eventpasswidget.cpp | 1 + + src/playlist.h | 1 + + .../resource/ico/menubar/shuoming.png | Bin + src/resource/res.qrc | 2 +- + src/resource/resource.qrc | 2 +- + src/src.pro | 2 +- + src/translations/generate_translations_pm.sh | 2 +- + 7 files changed, 6 insertions(+), 4 deletions(-) + rename "src/resource/ico/menubar/\303\250\302\257\302\264\303\246\302\230\302\216.png" => src/resource/ico/menubar/shuoming.png (100%) + +diff --git a/src/eventpasswidget.cpp b/src/eventpasswidget.cpp +index b3be9e0..75c8488 100644 +--- a/src/eventpasswidget.cpp ++++ b/src/eventpasswidget.cpp +@@ -2,6 +2,7 @@ + + #include + #include ++#include + + #include "global/globalsignal.h" + #include "global/global.h" +diff --git a/src/playlist.h b/src/playlist.h +index b282ec6..d8eed8a 100644 +--- a/src/playlist.h ++++ b/src/playlist.h +@@ -2,6 +2,7 @@ + #define PLAYLIST_H + + #include ++#include + + #include + +diff --git "a/src/resource/ico/menubar/\303\250\302\257\302\264\303\246\302\230\302\216.png" b/src/resource/ico/menubar/shuoming.png +similarity index 100% +rename from "src/resource/ico/menubar/\303\250\302\257\302\264\303\246\302\230\302\216.png" +rename to src/resource/ico/menubar/shuoming.png +diff --git a/src/resource/res.qrc b/src/resource/res.qrc +index 667aded..012f03e 100644 +--- a/src/resource/res.qrc ++++ b/src/resource/res.qrc +@@ -24,7 +24,7 @@ + ico/menubar/zuixh_b_3x.png + ico/menubar/zuixh_c_3x.png + ico/menubar/zuixh_d_3x.png +- ico/menubar/说明.png ++ ico/menubar/shuoming.png + ico/application-exit-symbolic@2x.png + ico/audio-volume-high-symbolic-h.png + ico/audio-volume-medium-symbolic-h.png +diff --git a/src/resource/resource.qrc b/src/resource/resource.qrc +index b68f280..a876eb4 100644 +--- a/src/resource/resource.qrc ++++ b/src/resource/resource.qrc +@@ -8,7 +8,7 @@ + ico/menubar/caidan_b_3x.png + ico/menubar/caidan_c_3x.png + ico/menubar/caidan_d_3x.png +- ico/menubar/说明.png ++ ico/menubar/shuoming.png + ico/menubar/guanbi_a_3x.png + ico/menubar/guanbi_b_3x.png + ico/menubar/guanbi_c_3x.png +diff --git a/src/src.pro b/src/src.pro +index 33976d0..ec58c5e 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -19,7 +19,7 @@ DEFINES += QT_DEPRECATED_WARNINGS _UNICODE + # You can also select to disable deprecated APIs only up to a certain version of Qt. + #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +-INCLUDEPATH += /usr/include/KF5/KWindowSystem/ ./log ./sliderbar ++INCLUDEPATH += /usr/include/KF5/KWindowSystem/ ./log ./sliderbar /usr/include/ffmpeg/ + + !system($$PWD/translations/generate_translations_pm.sh): error("Failed to generate pm") + qm_files.files = translations/*.qm +diff --git a/src/translations/generate_translations_pm.sh b/src/translations/generate_translations_pm.sh +index a5e938e..2359710 100755 +--- a/src/translations/generate_translations_pm.sh ++++ b/src/translations/generate_translations_pm.sh +@@ -4,5 +4,5 @@ ts_file_list=(`ls translations/*.ts`) + + for ts in "${ts_file_list[@]}" + do +- lrelease "${ts}" ++ lrelease-qt5 "${ts}" + done +-- +2.33.0 + diff --git a/fix-lrelease.patch b/fix-lrelease.patch deleted file mode 100644 index 90b1118..0000000 --- a/fix-lrelease.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/src/translations/generate_translations_pm.sh -+++ b/src/translations/generate_translations_pm.sh -@@ -4,5 +4,5 @@ - - for ts in "${ts_file_list[@]}" - do -- lrelease "${ts}" -+ /usr/lib64/qt5/bin/lrelease "${ts}" - done diff --git a/kylin-video-2.1.1.1.tar.gz b/kylin-video-2.1.1.1.tar.gz deleted file mode 100644 index 56e9b4c..0000000 Binary files a/kylin-video-2.1.1.1.tar.gz and /dev/null differ diff --git a/kylin-video-3.1.3.tar.gz b/kylin-video-3.1.3.tar.gz new file mode 100644 index 0000000..e894231 Binary files /dev/null and b/kylin-video-3.1.3.tar.gz differ diff --git a/kylin-video.spec b/kylin-video.spec index 670b1e2..b0413a6 100644 --- a/kylin-video.spec +++ b/kylin-video.spec @@ -1,72 +1,70 @@ %global debug_package %{nil} Name: kylin-video -Version: 2.1.1.1 -Release: 2 +Version: 3.1.3 +Release: 1 Summary: A powerful video player - -License: LGPL-2.0-only and LGPL-2.1-only and GPL-2.0-only and LGPL-2.0-or-later and GPL-2.0-or-later and BSD and LGPL-3.0-only and GPL-3.0-only -URL: https://www.ubuntukylin.com/applications/26-cn.html -Source0: https://github.com/UbuntuKylin/kylin-video/kylin-video-2.1.1.1.tar.gz -Patch1: fix-lrelease.patch +License: GPL-2.0-or-later +URL: https://github.com/UbuntuKylin/kylin-video +Source0: kylin-video-3.1.3.tar.gz +Patch1: 0001-modify-compile-error-of-kylin-video.patch BuildRequires: qt5-devel -BuildRequires: desktop-file-utils -BuildRequires: gcc-c++ -BuildRequires: libappstream-glib -BuildRequires: pkgconfig(Qt5) -BuildRequires: pkgconfig(Qt5Designer) -BuildRequires: pkgconfig(Qt5Concurrent) -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5PrintSupport) -BuildRequires: pkgconfig(Qt5Script) -BuildRequires: pkgconfig(Qt5Sql) -BuildRequires: pkgconfig(Qt5WebKitWidgets) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(Qt5Xml) -BuildRequires: pkgconfig(xext) +BuildRequires: qtchooser +BuildRequires: qt5-qtscript-devel +BuildRequires: qt5-qttools-devel BuildRequires: qt5-qtbase-private-devel -BuildRequires: pkgconfig(zlib) -Requires: hicolor-icon-theme -Requires: mpv +BuildRequires: qt5-qtx11extras-devel +BuildRequires: libX11-devel +BuildRequires: libcrystalhd-devel +BuildRequires: zlib-devel +BuildRequires: ffmpeg-devel +BuildRequires: gsettings-qt-devel +BuildRequires: mpv-libs-devel +BuildRequires: kf5-kwindowsystem-devel +BuildRequires: kf5-kwayland-devel +BuildRequires: wayland-devel +BuildRequires: libzen-devel +BuildRequires: libmediainfo-devel +BuildRequires: ffmpegthumbnailer-devel +BuildRequires: ukui-interface +Requires: mesa-vdpau-drivers libcrystalhd-devel mpv ffmpegthumbnailer-devel -%{?kf5_kinit_requires} - -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils %description -Kylin Video utilizes MPV and MPlayer as background play engine (use MPV by default). Its GUI front end is written by Qt5. Plus, it supports both x86 and ARM platform. As a powerful video player, Kylin Video supports most of the audio and video formats. Functions of shortcut keys/ preview/ screenshot/ sound settings/ subtitles and so on are provided. Users can even customize settings as they like. - - +Front-end for MPlayer and MPV Qt5 Mplayer and MPV front-end, with basic features like playing videos and audios to more advanced features. +It supports both x86 and ARM platform, and supports most of the audio and video formatsprep %prep -%autosetup -p1 +%setup -q +%patch1 -p1 %build -%{qmake_qt5} -%make_build - +export PATH=%{_qt5_bindir}:$PATH +mkdir qmake-build +pushd qmake-build +%{qmake_qt5} .. +%{make_build} +popd %install -cd %{_builddir}/%{name}-%{version} -%make_install PREFIX=%{_prefix} INSTALL_ROOT=%{buildroot} - +pushd qmake-build +%{make_install} INSTALL_ROOT=%{buildroot} +popd %files -%license COPYING -%doc README.md -%{_bindir}/* -%{_datarootdir}/* - +%{_bindir}/kylin-video-new +%{_datadir}/applications/kylin-video.desktop +%{_datadir}/kylin-user-guide/data/guide/kylin-video/* +%{_datadir}/kylin-video/translations/kylin-video_zh_CN.qm %changelog +* Wed Jun 8 2022 peijiankang - 3.1.3-1 +- update version to 3.1.3 + * Wed Sep 8 2021 peijiankang - 2.1.1.1-2 - add mpv requires diff --git a/kylin-video.yaml b/kylin-video.yaml index 4909983..091952d 100644 --- a/kylin-video.yaml +++ b/kylin-video.yaml @@ -1,4 +1,4 @@ -version_control: github -src_repo: https://github.com/UbuntuKylin/kylin-video.git -tag_prefix: "v" -separator: "." \ No newline at end of file +version_control: github +src_repo: https://github.com/UbuntuKylin/kylin-video.git +tag_prefix: "v" +separator: "."