!10 [sync] PR-9: update: update to 5.7.11

From: @openeuler-sync-bot 
Reviewed-by: @yeqinglong01 
Signed-off-by: @yeqinglong01
This commit is contained in:
openeuler-ci-bot 2022-12-07 06:32:01 +00:00 committed by Gitee
commit fc1f3b466e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 52 additions and 25 deletions

Binary file not shown.

BIN
deepin-movie-5.7.11.tar.gz Normal file

Binary file not shown.

View File

@ -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 <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
%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 <liweiganga@uniontech.com> - 5.7.11-1
- update: update to 5.7.11
* Mon Feb 07 2022 haomimi <haomimi@uniontech.com> - 3.2.24.3-2
- fix build error
* Tue Aug 03 2021 weidong <weidong@uniontech.com> - 3.2.24.3-1
- Init packages

24
fix_linking.patch Normal file
View File

@ -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)

View File

@ -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 <QHBoxLayout>
#include <QLabel>
#include <QPainter>
+#include <QPainterPath>
#include <QGraphicsDropShadowEffect>
#include <QPropertyAnimation>
#include <QGraphicsOpacityEffect>