Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-movie for openSUSE:Factory checked in at 2021-02-16 22:36:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-movie (Old) and /work/SRC/openSUSE:Factory/.deepin-movie.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-movie" Tue Feb 16 22:36:30 2021 rev:5 rq:870086 version:5.7.6.165 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-movie/deepin-movie.changes 2020-06-25 15:08:19.821535152 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-movie.new.28504/deepin-movie.changes 2021-02-16 22:42:26.630107287 +0100 @@ -1,0 +2,22 @@ +Tue Feb 2 13:05:19 UTC 2021 - Hillwood Yang <[email protected]> + +- Update version to 5.7.6.165 + * Opimize ui +- Drop deepin-movie-reborn-add-pkgconfig-check.patch, fixed by upsteam +- Add libavformat-version-check.patch, fixed build on new ffmpeg +- Add Fix-library-link.patch, fix library link error and add this + includedir for ffmpeg + +------------------------------------------------------------------- +Sat Jan 30 15:25:19 UTC 2021 - Hillwood Yang <[email protected]> + +- Drop deepin-movie-Qt-5_15.patch + +------------------------------------------------------------------- +Thu Jun 25 02:33:24 UTC 2020 - Hillwood Yang <[email protected]> + +- Update version to 5.7.6.29 + * Fix bug on aarch64 + * Fix bug(24212) + +------------------------------------------------------------------- @@ -5,0 +28,6 @@ + +------------------------------------------------------------------- +Tue May 5 10:31:24 UTC 2020 - Hillwood Yang <[email protected]> + +- Update version to 5.7.6.28 + * Use new dtk apis Old: ---- deepin-movie-Qt-5_15.patch deepin-movie-reborn-3.2.24.3.tar.gz deepin-movie-reborn-add-pkgconfig-check.patch New: ---- Fix-library-link.patch deepin-movie-reborn-5.7.6.165.tar.gz libavformat-version-check.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-movie.spec ++++++ --- /var/tmp/diff_new_pack.D3fmWa/_old 2021-02-16 22:42:27.298108088 +0100 +++ /var/tmp/diff_new_pack.D3fmWa/_new 2021-02-16 22:42:27.302108093 +0100 @@ -19,21 +19,22 @@ %define sover 0_1 Name: deepin-movie -Version: 3.2.24.3 +Version: 5.7.6.165 Release: 0 Summary: Deepin Video Players License: GPL-3.0-or-later AND OpenSSL Group: Productivity/Multimedia/Video/Players URL: https://github.com/linuxdeepin/deepin-movie-reborn Source: https://github.com/linuxdeepin/deepin-movie-reborn/archive/%{version}/%{name}-reborn-%{version}.tar.gz -# PATCH-FIX-UPSTEAM deepin-movie-reborn-add-pkgconfig-check.patch [email protected] - fix lost pkgconfig check -Patch0: %{name}-reborn-add-pkgconfig-check.patch +# PATCH-FIX-UPSTEAM Fix-library-link.patch [email protected] +# fix library link error and add this includedir for ffmpeg +Patch0: Fix-library-link.patch # PATCH-FIX-UPSTEAM deepin-movie-add-qthelper.patch [email protected] # qthelper.hpp was removed from mpv project, move this api in this project. -Patch1: %{name}-add-qthelper.patch -# PATCH-FIX-UPSTEAM deepin-movie-qt-5_15.patch [email protected] - Support Qt 5.15 -Patch2: %{name}-Qt-5_15.patch -BuildRequires: dtkcore +Patch1: deepin-movie-add-qthelper.patch +# PATCH-FIX-UPSTEAM libavformat-version-check.patch [email protected] - fix build on new ffmpeg +Patch2: libavformat-version-check.patch +BuildRequires: dtkcore >= 5.0.0 BuildRequires: fdupes BuildRequires: glslang-devel BuildRequires: cmake(Qt5LinguistTools) @@ -43,10 +44,12 @@ BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) -BuildRequires: pkgconfig(dtkcore) -BuildRequires: pkgconfig(dtkwidget) +BuildRequires: pkgconfig(dtkcore) >= 5.0.0 +BuildRequires: pkgconfig(dtkgui) >= 5.0.0 +BuildRequires: pkgconfig(dtkwidget) >= 5.0.0 BuildRequires: pkgconfig(dvdnav) BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(gsettings-qt) BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavresample) @@ -92,13 +95,9 @@ %lang_package %prep -%setup -q -n %{name}-reborn-%{version} -%patch0 -p1 -%patch1 -p1 -%if 0%{?suse_version} > 1500 -%patch2 -p1 -%endif -sed -i 's,/usr/lib/dtk2/dtk-settings-tool,/usr/bin/dtk-settings-tool,g' src/CMakeLists.txt +%autosetup -p1 -n %{name}-reborn-%{version} +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' src/%{name}.desktop %build %cmake -DCMAKE_BUILD_TYPE=Release @@ -124,6 +123,7 @@ %dir %{_datadir}/icons/hicolor/scalable %dir %{_datadir}/icons/hicolor/scalable/apps %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%{_datadir}/glib-2.0/schemas/com.deepin.deepin-movie.gschema.xml %files -n libdmr%{sover} %defattr(-,root,root) ++++++ Fix-library-link.patch ++++++ diff -Nur deepin-movie-reborn-5.7.6.165/src/CMakeLists.txt deepin-movie-reborn-5.7.6.165-new/src/CMakeLists.txt --- deepin-movie-reborn-5.7.6.165/src/CMakeLists.txt 2020-11-17 13:48:27.000000000 +0800 +++ deepin-movie-reborn-5.7.6.165-new/src/CMakeLists.txt 2021-02-02 20:59:40.266718557 +0800 @@ -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 deepin-movie-reborn-5.7.6.165/src/libdmr/CMakeLists.txt deepin-movie-reborn-5.7.6.165-new/src/libdmr/CMakeLists.txt --- deepin-movie-reborn-5.7.6.165/src/libdmr/CMakeLists.txt 2020-11-17 13:48:27.000000000 +0800 +++ deepin-movie-reborn-5.7.6.165-new/src/libdmr/CMakeLists.txt 2021-02-02 20:57:55.399161779 +0800 @@ -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::DBus PkgConfig::AV + Qt5::Network Qt5::X11Extras Qt5::Sql 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) ++++++ deepin-movie-add-qthelper.patch ++++++ ++++ 863 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/deepin-movie/deepin-movie-add-qthelper.patch ++++ and /work/SRC/openSUSE:Factory/.deepin-movie.new.28504/deepin-movie-add-qthelper.patch ++++++ deepin-movie-reborn-3.2.24.3.tar.gz -> deepin-movie-reborn-5.7.6.165.tar.gz ++++++ ++++ 101564 lines of diff (skipped) ++++++ libavformat-version-check.patch ++++++ >From 7bff486b84a6c9e8602ef2fb201cfa602d6ca1d8 Mon Sep 17 00:00:00 2001 From: justforlxz <[email protected]> Date: Thu, 26 Nov 2020 16:53:44 +0800 Subject: [PATCH] fix: wrong ffmpeg version check It seems that the version should not be restricted Log: Issue: Closes #59 --- src/libdmr/playlist_model.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libdmr/playlist_model.cpp b/src/libdmr/playlist_model.cpp index 1d3b5c64..c552f739 100644 --- a/src/libdmr/playlist_model.cpp +++ b/src/libdmr/playlist_model.cpp @@ -1700,7 +1700,7 @@ static int open_codec_context(int *stream_idx, stream_index = ret; st = fmt_ctx->streams[stream_index]; -#if LIBAVFORMAT_VERSION_MAJOR >= 57 && LIBAVFORMAT_VERSION_MINOR <= 25 +#if LIBAVFORMAT_VERSION_MAJOR >= 57 *dec_ctx = st->codecpar; dec = avcodec_find_decoder((*dec_ctx)->codec_id); #else
