!28 sync by openEuler-22.03-LTS-SP3

From: @DustMerlin Reviewed-by: @xzyangha Signed-off-by: @xzyangha
update deepin-screen-recorder package
2024-06-19 06:52:21 +00:00 · 2024-06-18 18:24:20 +08:00 · 2022-11-23 07:55:16 +00:00 · 2022-11-23 09:30:27 +08:00 · 2022-10-27 06:43:16 +00:00 · 2022-10-20 14:01:01 +08:00
8 changed files with 117 additions and 146 deletions
--- a/0001-delete-proc-readproc.h.patch
+++ b/0001-delete-proc-readproc.h.patch
@ -0,0 +1,39 @@
+From 560cf079f03b8b2ebb5ef03cd654a632b50553eb Mon Sep 17 00:00:00 2001
+From: leeffo <leeffo@yeah.net>
+Date: Wed, 16 Nov 2022 17:39:22 +0800
+Subject: [PATCH] delete <proc/readproc.h>
+
+---
+ 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 <QMap>
+ #include <QObject>
+-#include <proc/readproc.h>
+//#include <proc/readproc.h>
+ #include <proc/sysinfo.h>
+ 
+ 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 <QProcess>
+ #include <QThread>
+ #include <QRect>
+-#include <proc/readproc.h>
+//#include <proc/readproc.h>
+ #include <proc/sysinfo.h>
+ #include <QAudioProbe>
+ #include <QAudioRecorder>
+-- 
+2.20.1
+
--- a/Fix-build-failure-with-gcc-10.patch
+++ b/Fix-build-failure-with-gcc-10.patch
@ -1,52 +0,0 @@
-From 3f17a452b635bae79ceff14a8a66cdf433fe8626 Mon Sep 17 00:00:00 2001
-From: weidong <weidong@uniontech.com>
-Date: Wed, 11 Aug 2021 13:57:28 +0800
-Subject: [PATCH] Fix build failure with gcc-10
-
---
- src/event_monitor.cpp     | 7 ++++++-
- src/screen_shot_event.cpp | 4 ++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/src/event_monitor.cpp b/src/event_monitor.cpp
-index 2b72f18..95c4259 100755
--- a/src/event_monitor.cpp
-+++ b/src/event_monitor.cpp
-@@ -22,14 +22,19 @@
-  */
- 
- #include "event_monitor.h"
-+#include "keydefine.h"
- #include <X11/Xlibint.h>
-+// gcc 版本大于10时，取消min 宏定义
-+#if __GNUC__ == 10
-+#undef min
-+#endif
- #include <X11/Xutil.h>
- #include <X11/cursorfont.h>
- #include <X11/keysymdef.h>
- #include <X11/keysym.h>
- #include <X11/extensions/XTest.h>
-#include "keydefine.h"
- #include <iostream>
-+#include <dlfcn.h>
- 
- EventMonitor::EventMonitor(QObject *parent) : QThread(parent)
- {
-diff --git a/src/screen_shot_event.cpp b/src/screen_shot_event.cpp
-index 05dfbb5..02e9ab8 100755
--- a/src/screen_shot_event.cpp
-+++ b/src/screen_shot_event.cpp
-@@ -1,5 +1,9 @@
- #include "screen_shot_event.h"
- #include <X11/Xlibint.h>
-+// gcc 版本大于10时，取消min 宏定义
-+#if __GNUC__ == 10
-+#undef min
-+#endif
- #include <X11/Xutil.h>
- #include <X11/cursorfont.h>
- #include <X11/keysymdef.h>
-- 
-2.20.1
-
--- a/README.en.md
+++ b/README.en.md
@ -1,36 +0,0 @@
-# deepin-screen-recorder
-
-#### Description
-Deepin Screen Recorder
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Contribution
-
-1.  Fork the repository
-2.  Create Feat_xxx branch
-3.  Commit your code
-4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
--- a/README.md
+++ b/README.md
@ -1,37 +0,0 @@
-# deepin-screen-recorder
-
-#### 介绍
-Deepin Screen Recorder
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 使用说明
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 参与贡献
-
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码
-4.  新建 Pull Request
-
-
-#### 特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
-5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
--- a/deepin-screen-recorder-5.11.15.tar.gz
+++ b/deepin-screen-recorder-5.11.15.tar.gz
--- a/deepin-screen-recorder.spec
+++ b/deepin-screen-recorder.spec
@ -1,21 +1,53 @@
 Name:           deepin-screen-recorder
-Version:        5.8.0.52
-Release:        2
+Version:        5.11.15
+Release:        1
 Summary:        Deepin Screen Recorder
 License:        GPLv3+
 URL:            https://github.com/linuxdeepin/deepin-screen-recorder
-Source0:        %{name}_%{version}.orig.tar.xz
-Patch0:		Fix-build-failure-with-gcc-10.patch
+Source0:        https://github.com/linuxdeepin/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
+Patch0:         0001-delete-proc-readproc.h.patch

-BuildRequires:  gcc-c++ qt5-devel dtkwidget-devel dtkcore-devel procps-ng-devel
-BuildRequires:  pkgconfig(dframeworkdbus) pkgconfig(x11) pkgconfig(xext)  pkgconfig(xtst) pkgconfig(xcb) pkgconfig(xcb-util) pkgconfig(xcursor)
-BuildRequires:  desktop-file-utils libappstream-glib
+BuildRequires:  qt5-devel
+BuildRequires:  dtkcore-devel
+BuildRequires:  qt5-linguist
+BuildRequires:  dtkwidget-devel
+BuildRequires:  procps-ng-devel
+BuildRequires:  qt5-qtmultimedia-devel
+BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5DBus)
+BuildRequires:  pkgconfig(Qt5Gui)
+BuildRequires:  pkgconfig(Qt5Network)
+BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  pkgconfig(Qt5X11Extras)
+BuildRequires:  pkgconfig(dframeworkdbus)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xtst)
+BuildRequires:  pkgconfig(xcb)
+BuildRequires:  pkgconfig(xcb-util)
+BuildRequires:  pkgconfig(xcursor)
+BuildRequires:  desktop-file-utils
+BuildRequires:  libappstream-glib
+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
+Requires:       dbus
+Requires:       gstreamer1-plugins-good
+Requires:       deepin-turbo
+Recommends:     gstreamer1-plugins-ugly-free

-Requires:       byzanz ffmpeg
-Requires:       hicolor-icon-theme dbus deepin-turbo
-
-Provides:       deepin-screenshot
-Obsoletes:      deepin-screenshot

 %description
 %{summary}.
@ -23,33 +55,54 @@ Obsoletes:      deepin-screenshot
 %prep
 %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
-mkdir build && pushd build
-%qmake_qt5 ../ VERSION=%{version} DEFINES+="VERSION=%{version}"
+CFLAGS="${CFLAGS:-%optflags} -I/usr/include/ffmpeg"
+CXXFLAGS="${CXXFLAGS:-%optflags} -I/usr/include/ffmpeg"
+%qmake_qt5 PREFIX=%{_prefix}
 %make_build
-popd

 %install
-%make_install -C build INSTALL_ROOT="%buildroot"
+%make_install INSTALL_ROOT=%{buildroot}


 %files
 %doc README.md
 %license LICENSE
 %{_bindir}/%{name}
+%{_bindir}/deepin-pin-screenshots
 %{_datadir}/%{name}/
-%{_datadir}/dman/%{name}/
+%{_datadir}/deepin-manual/manual-assets/application/%{name}/

 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.svg
+%{_datadir}/icons/hicolor/scalable/apps/deepin-screenshot.svg
 %{_datadir}/dbus-1/services/com.deepin.ScreenRecorder.service
-
-%{_sysconfdir}/modprobe.d/deepin-screen-recorder.conf
-%{_sysconfdir}/modules-load.d/deepin-screen-recorder.conf
-%{_datarootdir}/dbus-1/services/com.deepin.Screenshot.service
+%{_datadir}/dbus-1/services/com.deepin.PinScreenShots.service
+%{_libdir}/dde-dock/plugins/libdeepin-screen-recorder-plugin.so
+%{_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
+* Tue Jul 25 2023 leeffo <liweiganga@uniontech.com> - 5.11.15-1
+- upgrade to version 5.11.15
+
+* Wed Nov 16 2022 liweiganga <liweiganga@uniontech.com> - 5.11.12-1
+- update to 5.11.12
+
+* Wed Aug 03 2022 liweiganga <liweiganga@uniontech.com> - 5.9.13-2
+- modify installation dependency type
+
+* Tue Jul 19 2022 loong_C <loong_c@yeah.net> - 5.9.13-1
+- update to 5.9.13
+
+* Tue Feb 08 2022 liweigang <liweiganga@uniontech.com> - 5.8.0.52-3
+- fix build error
+
 * Wed Aug 11 2021 weidong <weidong@uniontech.com> - 5.8.0.52-2
 - Fix build failure with gcc-10.

--- a/deepin-screen-recorder.yaml
+++ b/deepin-screen-recorder.yaml
@ -0,0 +1,4 @@
+version_control: github
+src_repo: linuxdeepin/deepin-screen-recorder
+tag_prefix: ^v
+seperator: .
--- a/deepin-screen-recorder_5.8.0.52.orig.tar.xz
+++ b/deepin-screen-recorder_5.8.0.52.orig.tar.xz
Author	SHA1	Message	Date
openeuler-ci-bot	909d53aabf	!28 sync by openEuler-22.03-LTS-SP3 From: @DustMerlin Reviewed-by: @xzyangha Signed-off-by: @xzyangha	2024-06-19 06:52:21 +00:00
liuzhilin	64bae7fb95	update deepin-screen-recorder package	2024-06-18 18:24:20 +08:00
openeuler-ci-bot	4074ae02c2	!16 update to 5.11.12 From: @leeffo Reviewed-by: @yeqinglong01 Signed-off-by: @yeqinglong01	2022-11-23 07:55:16 +00:00
liweiganga	43d10d6366	update to 5.11.12	2022-11-23 09:30:27 +08:00
openeuler-ci-bot	bd2abcee96	!15 update to upstream 5.9.13-2 From: @xzyangha Reviewed-by: @weidongkl Signed-off-by: @weidongkl	2022-10-27 06:43:16 +00:00
yangxianzhao	0d30e5d73c	update to upstream 5.9.13-2	2022-10-20 14:01:01 +08:00
openeuler-ci-bot	71cbac716f	!13 [sync] PR-7: 【轻量级 PR】：add yaml file From: @openeuler-sync-bot Reviewed-by: @panchenbo Signed-off-by: @panchenbo	2022-08-04 03:49:46 +00:00
wangxiaorou	e7cbfe5bef	add yaml file (cherry picked from commit a7764e899af5c6f332bb049eec08d09f31ccfb3f)	2022-08-04 11:00:14 +08:00
openeuler-ci-bot	7020114a36	!5 fix build error Merge pull request !5 from liweiganga/openEuler-22.03-LTS-Next	2022-02-10 03:39:04 +00:00
liweiganga	b91178ec88	fix build error	2022-02-08 14:42:31 +08:00