diff --git a/deepin-movie-3.2.24.3.tar.gz b/deepin-movie-3.2.24.3.tar.gz deleted file mode 100644 index dce5e28..0000000 Binary files a/deepin-movie-3.2.24.3.tar.gz and /dev/null differ diff --git a/deepin-movie-5.7.11.tar.gz b/deepin-movie-5.7.11.tar.gz new file mode 100644 index 0000000..4dcb533 Binary files /dev/null and b/deepin-movie-5.7.11.tar.gz differ diff --git a/deepin-movie.spec b/deepin-movie.spec index 6c57938..ed27f07 100644 --- a/deepin-movie.spec +++ b/deepin-movie.spec @@ -1,24 +1,29 @@ +%undefine __cmake_in_source_build +%global _lto_cflags %{nil} + Name: deepin-movie -Version: 3.2.24.3 -Release: 2 +Version: 5.7.11 +Release: 1 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: modify-QPainterPath-error.patch +Patch0: fix_linking.patch BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: cmake(Qt5LinguistTools) BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5Sql) +BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) -BuildRequires: dtkcore2-devel -BuildRequires: dtkwidget2-devel +BuildRequires: dtkcore-devel +BuildRequires: dtkwidget-devel BuildRequires: pkgconfig(dvdnav) +BuildRequires: pkgconfig(gsettings-qt) BuildRequires: pkgconfig(libffmpegthumbnailer) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) @@ -26,7 +31,8 @@ BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavresample) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse-simple) -BuildRequires: pkgconfig(mpv) +BuildRequires: pkgconfig(mpris-qt5) +BuildRequires: mpv-libs-devel BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(xcb-aux) @@ -36,7 +42,10 @@ BuildRequires: pkgconfig(xcb-shape) BuildRequires: libappstream-glib BuildRequires: gcc BuildRequires: desktop-file-utils -BuildRequires: qt5-qtbase-private-devel + +Requires: dde-qt5integration +Requires: dtkcore-devel +Requires: dtkwidget-devel %description Deepin movie for deepin desktop environment. @@ -52,12 +61,13 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Header files and libraries for %{name}. %prep -%setup -q -n %{name}-reborn-%{version} -%patch0 -p1 +%autosetup -p1 -n %{name}-reborn-%{version} sed -i '/dtk2/s|lib|libexec|' src/CMakeLists.txt +sed -i '/#include /a #include ' src/widgets/{tip,toolbutton}.h +sed -i 's/Exec=deepin-movie/Exec=env QT_QPA_PLATFORMTHEME=deepin deepin-movie/g' ./%{name}.desktop %build -%cmake -DCMAKE_BUILD_TYPE=Release +%cmake3 -DCMAKE_BUILD_TYPE=Release %make_build %install @@ -66,6 +76,8 @@ install -Dm644 %SOURCE1 %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop +rm -rf %{buildroot}/%{_datadir}/deepin-manual/ + %find_lang %{name} --with-qt %files @@ -76,20 +88,22 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_libdir}/libdmr.so.0.1.0 %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/%{name} -%{_datadir}/%{name}/translations -%{_datadir}/%{name}/translations/%{name}*.qm %{_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 +* Wed Dec 07 2022 liweiganga - 5.7.11-1 +- update: update to 5.7.11 + * Mon Feb 07 2022 haomimi - 3.2.24.3-2 - fix build error * Tue Aug 03 2021 weidong - 3.2.24.3-1 - Init packages + 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/modify-QPainterPath-error.patch b/modify-QPainterPath-error.patch deleted file mode 100644 index 3fcfa0c..0000000 --- a/modify-QPainterPath-error.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --color -Naur a/src/widgets/tip.cpp b/src/widgets/tip.cpp ---- a/src/widgets/tip.cpp 2022-02-07 16:53:24.830095286 +0800 -+++ b/src/widgets/tip.cpp 2022-02-07 16:53:58.998123545 +0800 -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include - #include - #include