diff --git a/0001-add-user-guide-for-kylin-recorder.patch b/0001-add-user-guide-for-kylin-recorder.patch deleted file mode 100644 index bf7076b43ae23c5ce006f0644210261ea92af353..0000000000000000000000000000000000000000 --- a/0001-add-user-guide-for-kylin-recorder.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c048f5c63360fb0070068543c57537d3aaa83cb0 Mon Sep 17 00:00:00 2001 -From: peijiankang -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 - diff --git a/0001-kylin-recorder-fix-build-error.patch b/0001-kylin-recorder-fix-build-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..6c94617049126857fba0e71fd347fabc9df847ff --- /dev/null +++ b/0001-kylin-recorder-fix-build-error.patch @@ -0,0 +1,41 @@ +From fe0c21e9287cd8a478bf143f218e37ac37a85207 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= +Date: Wed, 10 Apr 2024 09:26:33 +0800 +Subject: [PATCH] kylin-recorder: fix build error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: 侯红勋 +--- + kylin-recorder.pro | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/kylin-recorder.pro b/kylin-recorder.pro +index bba5f3f..e6cf53a 100755 +--- a/kylin-recorder.pro ++++ b/kylin-recorder.pro +@@ -15,7 +15,7 @@ QT += multimedia multimediawidgets + TARGET = kylin-recorder + TEMPLATE = app + +-INCLUDEPATH += /usr/include/mpv/ ++INCLUDEPATH += /usr/include/mpv/ /usr/include/ffmpeg/ + LIBS += -lmpv + + PKGCONFIG += kysdk-kabase +@@ -57,7 +57,10 @@ schemes.files += \ + schemes.path = /usr/share/glib-2.0/schemas/ + LIBS += -L/usr/lib/libukui-log4qt.so.1.0.0 -lukui-log4qt + +-INSTALLS += target desktop appdesktop icons schemes qm_files ++guide.files += $$PWD/data/kylin-recorder ++guide.path = /usr/share/kylin-user-guide/data/guide/ ++ ++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 + diff --git a/0002-fix-build-error-of-kylin-recorder.patch b/0002-fix-build-error-of-kylin-recorder.patch deleted file mode 100644 index a01db3e3553fbd454ecaa7975a4bc22e3f9fff99..0000000000000000000000000000000000000000 --- a/0002-fix-build-error-of-kylin-recorder.patch +++ /dev/null @@ -1,63 +0,0 @@ -From f30bed9e983be7aa406349db351442bb33b2c5f1 Mon Sep 17 00:00:00 2001 -From: peijiankang -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 - -+#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 - diff --git a/kylin-recorder-1.3.0.2.tar.gz b/kylin-recorder-1.3.0.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e17caa403f3681ab1938371ac52e2f8d8ec70c9e Binary files /dev/null and b/kylin-recorder-1.3.0.2.tar.gz differ diff --git a/kylin-recorder-1.3.0.tar.gz b/kylin-recorder-1.3.0.tar.gz deleted file mode 100644 index 0c1104fc1c7a0288466ab7241a46785f97599f02..0000000000000000000000000000000000000000 Binary files a/kylin-recorder-1.3.0.tar.gz and /dev/null differ diff --git a/kylin-recorder.spec b/kylin-recorder.spec index 98805545eccd6c0959fee4c921c3c086d51d5c25..34d287edde0b0a5eae58993e393596b64c2282d1 100644 --- a/kylin-recorder.spec +++ b/kylin-recorder.spec @@ -1,12 +1,11 @@ Name: kylin-recorder -Version: 1.3.0 -Release: 5 +Version: 1.3.0.2 +Release: 1 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 +Patch01: 0001-kylin-recorder-fix-build-error.patch BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtscript-devel @@ -28,6 +27,11 @@ BuildRequires: gstreamer1-devel BuildRequires: gstreamer1-plugins-bad-free-devel BuildRequires: gstreamer1-plugins-good BuildRequires: kf5-kwindowsystem-devel +BuildRequires: opencv +BuildRequires: libkysdk-kabase-devel +BuildRequires: libkysdk-qtwidgets-devel +BuildRequires: libkysdk-waylandhelper-devel +BuildRequires: ukui-interface Requires: ffmpeg @@ -41,7 +45,6 @@ kylin-recording %prep %setup -q %patch01 -p1 -%patch02 -p1 %build @@ -68,6 +71,9 @@ popd %{_datadir}/kylin-user-guide/data/guide/kylin-recorder %changelog +* Tue Apr 09 2024 houhongxun - 1.3.0.2-1 +- upgrade to upstream version 1.3.0.2.0k3.3-ok1.1 + * Fri Mar 29 2024 peijiankang - 1.3.0-5 - add 0002-fix-build-error-of-kylin-recorder.patch