diff --git a/0001-Fix-build-failure-with-gcc-10.patch b/0001-Fix-build-failure-with-gcc-10.patch deleted file mode 100644 index ae8b482dcc461342e340a71aaf49b785e2e27fc3..0000000000000000000000000000000000000000 --- a/0001-Fix-build-failure-with-gcc-10.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 668d4917a443d5197bc3d26894ac5f0a0b62ff5c Mon Sep 17 00:00:00 2001 -From: loong_C -Date: Wed, 20 Jul 2022 10:32:33 +0800 -Subject: [PATCH] Fix-build-failure-with-gcc-10 - ---- - src/event_monitor.cpp | 4 ++++ - src/screen_shot_event.cpp | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/src/event_monitor.cpp b/src/event_monitor.cpp -index 5fb2d83..caaab95 100755 ---- a/src/event_monitor.cpp -+++ b/src/event_monitor.cpp -@@ -23,6 +23,10 @@ - #include "keydefine.h" - - #include -+// gcc 版本大于10时，取消min 宏定义 -+#if __GNUC__ == 10 -+#undef min -+#endif - #include - #include - #include -diff --git a/src/screen_shot_event.cpp b/src/screen_shot_event.cpp -index 2ff3134..28d1360 100755 ---- a/src/screen_shot_event.cpp -+++ b/src/screen_shot_event.cpp -@@ -23,6 +23,10 @@ - #include "keydefine.h" - - #include -+// gcc 版本大于10时，取消min 宏定义 -+#if __GNUC__ == 10 -+#undef min -+#endif - #include - #include - #include --- -2.20.1 - diff --git a/0001-delete-proc-readproc.h.patch b/0001-delete-proc-readproc.h.patch new file mode 100644 index 0000000000000000000000000000000000000000..700c5b04f10e8ae0c03093c4e7b936aa0c6ce428 --- /dev/null +++ b/0001-delete-proc-readproc.h.patch @@ -0,0 +1,39 @@ +From 560cf079f03b8b2ebb5ef03cd654a632b50553eb Mon Sep 17 00:00:00 2001 +From: leeffo +Date: Wed, 16 Nov 2022 17:39:22 +0800 +Subject: [PATCH] delete + +--- + src/process_tree.h | 2 +- + src/voice_record_process.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/process_tree.h b/src/process_tree.h +index b156911..32acff6 100755 +--- a/src/process_tree.h ++++ b/src/process_tree.h +@@ -8,7 +8,7 @@ + + #include + #include +-#include ++//#include + #include + + class ProcessTree : public QObject +diff --git a/src/voice_record_process.h b/src/voice_record_process.h +index c021f20..b17375c 100755 +--- a/src/voice_record_process.h ++++ b/src/voice_record_process.h +@@ -9,7 +9,7 @@ + #include + #include + #include +-#include ++//#include + #include + #include + #include +-- +2.20.1 + diff --git a/0002-modify-QPainterPath-error.patch b/0002-modify-QPainterPath-error.patch deleted file mode 100644 index 87efb36f0443d26bc768db0d294c2b216e52ab94..0000000000000000000000000000000000000000 --- a/0002-modify-QPainterPath-error.patch +++ /dev/null @@ -1,24 +0,0 @@ -From caad1908caff790a0aee2ebb47843af40b2ea7cc Mon Sep 17 00:00:00 2001 -From: loong_C -Date: Wed, 20 Jul 2022 10:42:30 +0800 -Subject: [PATCH] modify-QPainterPath-error - ---- - src/dde-dock-plugins/recordtime/timewidget.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/dde-dock-plugins/recordtime/timewidget.cpp b/src/dde-dock-plugins/recordtime/timewidget.cpp -index 977df67..935a1ec 100644 ---- a/src/dde-dock-plugins/recordtime/timewidget.cpp -+++ b/src/dde-dock-plugins/recordtime/timewidget.cpp -@@ -27,6 +27,7 @@ - - #include - #include -+#include - #include - #include - #include --- -2.20.1 - diff --git a/deepin-screen-recorder_5.9.13.orig.tar.xz b/deepin-screen-recorder-5.11.12.tar.gz similarity index 37% rename from deepin-screen-recorder_5.9.13.orig.tar.xz rename to deepin-screen-recorder-5.11.12.tar.gz index 0ac56d5c5801bfb364b506498601f8291debbfe5..3bde61ed1fc66ad4b7a468e8ce921bd524e9a949 100644 Binary files a/deepin-screen-recorder_5.9.13.orig.tar.xz and b/deepin-screen-recorder-5.11.12.tar.gz differ diff --git a/deepin-screen-recorder.spec b/deepin-screen-recorder.spec index 4a7e4e525d9b763807ca36bf301bb913b3e2e535..0eb58a1c6c6d6ba2dded1a8ee6b60dc8c2ccf7f4 100644 --- a/deepin-screen-recorder.spec +++ b/deepin-screen-recorder.spec @@ -1,19 +1,16 @@ Name: deepin-screen-recorder -Version: 5.9.13 -Release: 2 +Version: 5.11.12 +Release: 1 Summary: Deepin Screen Recorder License: GPLv3+ URL: https://github.com/linuxdeepin/deepin-screen-recorder -Source0: %{name}_%{version}.orig.tar.xz -Patch0: 0001-Fix-build-failure-with-gcc-10.patch -Patch1: 0002-modify-QPainterPath-error.patch +Source0: https://github.com/linuxdeepin/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: 0001-delete-proc-readproc.h.patch BuildRequires: qt5-devel BuildRequires: dtkcore-devel BuildRequires: qt5-linguist BuildRequires: dtkwidget-devel -#BuildRequires: pkgconfig(dtkwm) -#BuildRequires: pkgconfig(libprocps) BuildRequires: procps-ng-devel BuildRequires: qt5-qtmultimedia-devel BuildRequires: pkgconfig(Qt5Core) @@ -35,6 +32,14 @@ BuildRequires: gcc-c++ BuildRequires: gcc BuildRequires: dde-dock-devel BuildRequires: qt5-qtbase-private-devel +BuildRequires: libusbx-devel +BuildRequires: gstreamer1-plugins-base-devel +BuildRequires: v4l-utils-devel +BuildRequires: systemd-devel +BuildRequires: ffmpeg-devel +BuildRequires: portaudio-devel +BuildRequires: ffmpegthumbnailer-devel +BuildRequires: libimagevisualresult-devel Requires: byzanz Requires: ffmpeg Requires: hicolor-icon-theme @@ -51,9 +56,12 @@ Recommends: gstreamer1-plugins-ugly-free %autosetup -p1 sed -i 's|/lib|/%{_lib}|' src/dde-dock-plugins/recordtime/recordtime.pro +sed -i 's|/lib|/%{_lib}|' src/dde-dock-plugins/shotstart/shotstart.pro %build export PATH=%{_qt5_bindir}:$PATH +CFLAGS="${CFLAGS:-%optflags} -I/usr/include/ffmpeg" +CXXFLAGS="${CXXFLAGS:-%optflags} -I/usr/include/ffmpeg" %qmake_qt5 PREFIX=%{_prefix} %make_build @@ -65,6 +73,7 @@ export PATH=%{_qt5_bindir}:$PATH %doc README.md %license LICENSE %{_bindir}/%{name} +%{_bindir}/deepin-pin-screenshots %{_datadir}/%{name}/ %{_datadir}/deepin-manual/manual-assets/application/%{name}/ @@ -72,11 +81,16 @@ export PATH=%{_qt5_bindir}:$PATH %{_datadir}/icons/hicolor/*/apps/%{name}.svg %{_datadir}/icons/hicolor/scalable/apps/deepin-screenshot.svg %{_datadir}/dbus-1/services/com.deepin.ScreenRecorder.service +%{_datadir}/dbus-1/services/com.deepin.PinScreenShots.service %{_libdir}/dde-dock/plugins/libdeepin-screen-recorder-plugin.so -%{_sysconfdir}/due-shell/json/screenRecorder.json +%{_libdir}/dde-dock/plugins/libshot-start-plugin.so %{_datadir}/dbus-1/services/com.deepin.Screenshot.service +%{_datadir}/glib-2.0/schemas/com.deepin.dde.dock.module.shot-start-plugin.gschema.xml %changelog +* Wed Nov 16 2022 liweiganga - 5.11.12-1 +- update to 5.11.12 + * Wed Aug 03 2022 liweiganga - 5.9.13-2 - modify installation dependency type