commit 9147cb6b33f0b26276d9e1517dbfb1e26afcc7d1 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Fri Apr 23 21:32:09 2021 +0100 Update to 5.7.11 .gitignore | 1 + add_missing-qt_includes.patch | 11 -- add_qthelper.patch | 422 ------------------------------------------ deepin-movie.spec | 34 ++-- fix_linking.patch | 24 +++ sources | 2 +- 6 files changed, 48 insertions(+), 446 deletions(-) --- diff --git a/.gitignore b/.gitignore index a664acb..e9f576c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /deepin-movie-3.2.14.tar.gz /deepin-movie-3.2.24.3.tar.gz +/deepin-movie-5.7.11.tar.gz diff --git a/deepin-movie.spec b/deepin-movie.spec index f1389fc..4d58bfe 100644 --- a/deepin-movie.spec +++ b/deepin-movie.spec @@ -1,27 +1,29 @@ %undefine __cmake_in_source_build +%global _lto_cflags %{nil} Name: deepin-movie -Version: 3.2.24.3 -Release: 7%{?dist} +Version: 5.7.11 +Release: 1%{?dist} Summary: Deepin movie based on mpv Summary(zh_CN): 深度影音 License: GPLv3 URL: https://github.com/linuxdeepin/deepin-movie-reborn Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Source1: %{name}-appdata.xml -Patch0: add_qthelper.patch -Patch1: add_missing-qt_includes.patch +Patch0: fix_linking.patch BuildRequires: cmake(Qt5Concurrent) BuildRequires: cmake(Qt5DBus) BuildRequires: cmake(Qt5LinguistTools) BuildRequires: cmake(Qt5Network) BuildRequires: cmake(Qt5Sql) +BuildRequires: cmake(Qt5Svg) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5X11Extras) BuildRequires: pkgconfig(dtkcore) BuildRequires: pkgconfig(dtkwidget) >= 2.0.6 BuildRequires: pkgconfig(dvdnav) +BuildRequires: pkgconfig(gsettings-qt) BuildRequires: pkgconfig(libffmpegthumbnailer) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) @@ -29,6 +31,7 @@ BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavresample) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse-simple) +BuildRequires: pkgconfig(mpris-qt5) BuildRequires: mpv-libs-devel BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(xtst) @@ -40,6 +43,8 @@ BuildRequires: libappstream-glib BuildRequires: gcc BuildRequires: desktop-file-utils +Requires: deepin-qt5integration + %description Deepin movie for deepin desktop environment. @@ -56,6 +61,8 @@ Header files and libraries for %{name}. %prep %autosetup -p1 -n %{name}-reborn-%{version} sed -i '/dtk2/s|lib|libexec|' src/CMakeLists.txt +sed -i '/#include <DPalette>/a #include <QPainterPath>' src/widgets/{tip,toolbutton}.h +sed -i 's/Exec=deepin-movie/Exec=env QT_QPA_PLATFORMTHEME=deepin deepin-movie/g' ./%{name}.desktop %build %cmake3 -DCMAKE_BUILD_TYPE=Release @@ -63,10 +70,12 @@ sed -i '/dtk2/s|lib|libexec|' src/CMakeLists.txt %install %cmake3_install -install -Dm644 %SOURCE1 %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml +install -Dm644 %SOURCE1 %{buildroot}%{_metainfodir}/%{name}.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop +rm -rf %{buildroot}/%{_datadir}/deepin-manual/ + %find_lang %{name} --with-qt %files @@ -75,20 +84,21 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_bindir}/%{name} %{_libdir}/libdmr.so.0.1 %{_libdir}/libdmr.so.0.1.0 -%{_datadir}/appdata/%{name}.appdata.xml -%{_datadir}/%{name} -%{_datadir}/%{name}/translations -%{_datadir}/%{name}/translations/%{name}*.qm +%{_metainfodir}/%{name}.appdata.xml +%{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%{_datadir}/glib-2.0/schemas/com.deepin.%{name}.gschema.xml %files devel -%{_includedir}/libdmr -%{_includedir}/libdmr/*.h +%{_includedir}/libdmr/ %{_libdir}/pkgconfig/libdmr.pc %{_libdir}/libdmr.so %changelog +* Fri Apr 23 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 5.7.11-1 +- Update to 5.7.11 + * Wed Feb 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 3.2.24.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/fix_linking.patch b/fix_linking.patch new file mode 100644 index 0000000..2d202cb --- /dev/null +++ b/fix_linking.patch @@ -0,0 +1,24 @@ +diff -Nur a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -7,6 +7,7 @@ + + include_directories(${CMAKE_INCLUDE_CURRENT_DIR}) + include_directories(${CMAKE_CURRENT_BINARY_DIR}) ++include_directories(/usr/include/ffmpeg) + + find_package(Qt5Widgets) + find_package(Qt5DBus) +diff -Nur a/src/libdmr/CMakeLists.txt b/src/libdmr/CMakeLists.txt +--- a/src/libdmr/CMakeLists.txt ++++ b/src/libdmr/CMakeLists.txt +@@ -21,7 +21,7 @@ + ${PROJECT_SOURCE_DIR}/../common ${PROJECT_SOURCE_DIR}/../backends/mpv) + + target_link_libraries(${CMD_NAME} PkgConfig::Dtk Qt5::Widgets Qt5::Concurrent +- Qt5::Network Qt5::X11Extras Qt5::Sql Qt5::Svg Qt5::DBus PkgConfig::AV ++ Qt5::Network Qt5::X11Extras Qt5::Sql Qt5::Svg Qt5::DBus PkgConfig::AV gsettings-qt + ${FFTHUMB_LIBRARIES} GL) + #target_link_libraries(${CMD_NAME} PkgConfig::Dtk Qt5::Widgets Qt5::Concurrent + # Qt5::Network Qt5::X11Extras Qt5::Sql Qt5::DBus PkgConfig::AV GL png jpeg) + diff --git a/sources b/sources index 2ffedcd..4f29a20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c63093e86ab5ee34ccb6a23b495b42bf deepin-movie-3.2.24.3.tar.gz +SHA512 (deepin-movie-5.7.11.tar.gz) = 1710649da82caea0f70de73b7b00c48a50108ba7feb233507b8f46a33f8f3390e58beab5fc0fe4897d23bd4ff914709f29179d88fec9d50fb1ba6f1aa443706e