Compare commits
10 Commits
dda27f2653
...
54e467c93b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
54e467c93b | ||
|
|
76855badbe | ||
|
|
3d2086be25 | ||
|
|
bca95315d2 | ||
|
|
7671f8faf0 | ||
|
|
a3d46560f7 | ||
|
|
0bc0bcdef6 | ||
|
|
0bfbf30808 | ||
|
|
98bf32bc65 | ||
|
|
8ee1918e74 |
29
0001-add-user-guide-for-kylin-recorder.patch
Normal file
29
0001-add-user-guide-for-kylin-recorder.patch
Normal file
@ -0,0 +1,29 @@
|
||||
From c048f5c63360fb0070068543c57537d3aaa83cb0 Mon Sep 17 00:00:00 2001
|
||||
From: peijiankang <peijiankang@kylinos.cn>
|
||||
Date: Mon, 6 Mar 2023 15:50:33 +0800
|
||||
Subject: [PATCH] add user-guide for kylin-recorder
|
||||
|
||||
---
|
||||
kylin-recorder.pro | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/kylin-recorder.pro b/kylin-recorder.pro
|
||||
index 558eee9..a63ff9d 100644
|
||||
--- a/kylin-recorder.pro
|
||||
+++ b/kylin-recorder.pro
|
||||
@@ -56,9 +56,11 @@ schemes.path = /usr/share/glib-2.0/schemas/
|
||||
|
||||
# LIBS += -L/usr/lib/libukui-log4qt.so.1.0.0 -lukui-log4qt
|
||||
|
||||
+guide.files += $$PWD/data/kylin-recorder
|
||||
+guide.path = /usr/share/kylin-user-guide/data/guide/
|
||||
|
||||
|
||||
-INSTALLS += target desktop appdesktop icons schemes qm_files
|
||||
+INSTALLS += target desktop appdesktop icons schemes qm_files guide
|
||||
|
||||
# The following define makes your compiler emit warnings if you use
|
||||
# any feature of Qt which as been marked as deprecated (the exact warnings
|
||||
--
|
||||
2.33.0
|
||||
|
||||
46
0001-kylin-recorder-fix-build-warning.patch
Normal file
46
0001-kylin-recorder-fix-build-warning.patch
Normal file
@ -0,0 +1,46 @@
|
||||
From 21962cc2bdffdb840b2eb63159aa8ac959c190da Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= <houhongxun@kylinos.cn>
|
||||
Date: Fri, 19 Apr 2024 10:54:10 +0800
|
||||
Subject: [PATCH] kylin-recorder: fix build warning
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
variable "padding" not uninitiallized, and in fact no effect
|
||||
|
||||
Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
|
||||
---
|
||||
src/clipbutton.cpp | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/clipbutton.cpp b/src/clipbutton.cpp
|
||||
index bc3cecc..d6731c8 100644
|
||||
--- a/src/clipbutton.cpp
|
||||
+++ b/src/clipbutton.cpp
|
||||
@@ -57,21 +57,20 @@ void ClipButton::mouseReleaseEvent(QMouseEvent *event)
|
||||
int rightButton_absolutePos = 0;
|
||||
|
||||
// qDebug()<<"ClipButton的个数:"<<this->parent()->findChildren<ClipButton*>().count();
|
||||
- int padding;//滑块内距
|
||||
if(event->button() == Qt::LeftButton){
|
||||
|
||||
if(this->objectName() == "leftBtn")
|
||||
{
|
||||
qDebug()<<"左按钮的相对位置:"<<this->pos().rx();
|
||||
leftButton_absolutePos = this->pos().rx();
|
||||
- qDebug()<<"左滑块的左边界的位置:"<<leftButton_absolutePos<<"两滑块内距离:"<<padding;
|
||||
+ qDebug()<<"左滑块的左边界的位置:"<<leftButton_absolutePos;
|
||||
//发送左滑块左边界的相对位置的信号
|
||||
emit leftBtn_ReleaseStartPlayer_Signal(leftButton_absolutePos);
|
||||
}
|
||||
else if(this->objectName() == "rightBtn")
|
||||
{
|
||||
rightButton_absolutePos = this->pos().rx() + this->width();
|
||||
- qDebug()<<"右滑块的右边界的位置:"<<rightButton_absolutePos<<"两滑块内距离:"<<padding;
|
||||
+ qDebug()<<"右滑块的右边界的位置:"<<rightButton_absolutePos;
|
||||
qDebug()<<"当前按钮的位置:"<<this->pos().rx();
|
||||
emit rightBtn_ReleaseGetEndPositon_Signal(rightButton_absolutePos);
|
||||
}
|
||||
--
|
||||
2.43.0
|
||||
|
||||
63
0002-fix-build-error-of-kylin-recorder.patch
Normal file
63
0002-fix-build-error-of-kylin-recorder.patch
Normal file
@ -0,0 +1,63 @@
|
||||
From f30bed9e983be7aa406349db351442bb33b2c5f1 Mon Sep 17 00:00:00 2001
|
||||
From: peijiankang <peijiankang@kylinos.cn>
|
||||
Date: Fri, 29 Mar 2024 17:21:37 +0800
|
||||
Subject: [PATCH] fix build error of kylin-recorder
|
||||
|
||||
---
|
||||
src/ffutil.cpp | 4 ++++
|
||||
src/ffutil.h | 9 ++++++++-
|
||||
2 files changed, 12 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/ffutil.cpp b/src/ffutil.cpp
|
||||
index f824db5..2b0cd77 100644
|
||||
--- a/src/ffutil.cpp
|
||||
+++ b/src/ffutil.cpp
|
||||
@@ -17,14 +17,18 @@ extern "C"
|
||||
|
||||
FFUtil::FFUtil(QObject *parent) : QObject(parent)
|
||||
{
|
||||
+#if !AVFORMAT_STATIC_REGISTER
|
||||
av_register_all();
|
||||
+#endif
|
||||
}
|
||||
|
||||
int FFUtil::getDuration(QString path)
|
||||
{
|
||||
int64_t duration = 0;
|
||||
|
||||
+#if !AVFORMAT_STATIC_REGISTER
|
||||
av_register_all();
|
||||
+#endif
|
||||
AVFormatContext *pFormatCtx = avformat_alloc_context();
|
||||
avformat_open_input(&pFormatCtx, path.toStdString().c_str(), NULL, NULL);
|
||||
|
||||
diff --git a/src/ffutil.h b/src/ffutil.h
|
||||
index 65461a5..12473a8 100644
|
||||
--- a/src/ffutil.h
|
||||
+++ b/src/ffutil.h
|
||||
@@ -3,6 +3,13 @@
|
||||
|
||||
#include <QObject>
|
||||
|
||||
+#define QTAV_USE_FFMPEG(MODULE) (MODULE##_VERSION_MICRO >= 100)
|
||||
+#define QTAV_USE_LIBAV(MODULE) !QTAV_USE_FFMPEG(MODULE)
|
||||
+#define FFMPEG_MODULE_CHECK(MODULE, MAJOR, MINOR, MICRO) \
|
||||
+ (QTAV_USE_FFMPEG(MODULE) && MODULE##_VERSION_INT >= AV_VERSION_INT(MAJOR, MINOR, MICRO))
|
||||
+
|
||||
+#define AVFORMAT_STATIC_REGISTER FFMPEG_MODULE_CHECK(LIBAVFORMAT, 58, 9, 100)
|
||||
+
|
||||
struct AVCodec;
|
||||
struct AVCodecContext;
|
||||
struct AVFormatContext;
|
||||
@@ -32,7 +39,7 @@ private:
|
||||
AVOutputFormat *pOutputFormat = nullptr;
|
||||
AVFormatContext *pFormatCtx = nullptr;
|
||||
AVCodecContext *pCodecCtx = nullptr;
|
||||
- AVCodec *pCodec = nullptr;
|
||||
+ const AVCodec *pCodec = nullptr;
|
||||
int audioStream;
|
||||
int audioDuration;
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
Binary file not shown.
@ -1,11 +1,13 @@
|
||||
%define debug_package %{nil}
|
||||
Name: kylin-recorder
|
||||
Version: 1.3.0
|
||||
Release: 1
|
||||
Release: 6
|
||||
Summary: kylin-recorder
|
||||
License: GPL-3.0-or-later
|
||||
URL: https://github.com/UbuntuKylin/kylin-recorder
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Patch01: 0001-add-user-guide-for-kylin-recorder.patch
|
||||
Patch02: 0002-fix-build-error-of-kylin-recorder.patch
|
||||
Patch03: 0001-kylin-recorder-fix-build-warning.patch
|
||||
|
||||
BuildRequires: qt5-qtbase-devel
|
||||
BuildRequires: qt5-qtscript-devel
|
||||
@ -38,8 +40,11 @@ Requires: gstreamer1-plugins-good
|
||||
kylin-recording
|
||||
|
||||
%prep
|
||||
|
||||
%setup -q
|
||||
%patch01 -p1
|
||||
%patch02 -p1
|
||||
%patch03 -p1
|
||||
|
||||
%build
|
||||
|
||||
export PATH=%{_qt5_bindir}:$PATH
|
||||
@ -62,8 +67,24 @@ popd
|
||||
%{_datadir}/pixmaps/recording_128.svg
|
||||
%{_datadir}/glib-2.0/schemas/*
|
||||
%{_datadir}/kylin-recorder/translations/*
|
||||
%{_datadir}/kylin-user-guide/data/guide/kylin-recorder
|
||||
|
||||
%changelog
|
||||
* Fri Apr 19 2024 houhongxun <houhongxun@kylinos.cn> - 1.3.0-6
|
||||
- fix a build warning that variable used uninitialized
|
||||
|
||||
* Fri Mar 29 2024 peijiankang <peijiankang@kylinos.cn> - 1.3.0-5
|
||||
- add 0002-fix-build-error-of-kylin-recorder.patch
|
||||
|
||||
* Wed Mar 22 2023 peijiankang <peijiankang@kylinos.cn> - 1.3.0-4
|
||||
- fix user-guide for kylin-recorder in English
|
||||
|
||||
* Mon Mar 06 2023 peijiankang <peijiankang@kylinos.cn> - 1.3.0-3
|
||||
- add user-guide for kylin-recorder
|
||||
|
||||
* Mon Feb 06 2023 peijiankang <peijiankang@kylinos.cn> - 1.3.0-2
|
||||
- add build debuginfo and debugsource
|
||||
|
||||
* Mon Oct 24 2022 tanyulong<tanyulong@kylinos.cn> - 1.3.0-1
|
||||
- update upstream version 1.3.0
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user