fix error of libkysdk-kabase undefined reference
This commit is contained in:
parent
5fe7456763
commit
d50951825d
52
0002-fix-error-of-libkysdk-kabase-undefined-reference.patch
Normal file
52
0002-fix-error-of-libkysdk-kabase-undefined-reference.patch
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
From 015431686de628651a2ae8aed564dbbbe5b37b0c Mon Sep 17 00:00:00 2001
|
||||||
|
From: peijiankang <peijiankang@kylinos.cn>
|
||||||
|
Date: Mon, 27 May 2024 16:18:02 +0800
|
||||||
|
Subject: [PATCH] fix error of libkysdk-kabase undefined reference
|
||||||
|
|
||||||
|
---
|
||||||
|
kysdk-kabase/kabase/kabase.pro | 2 +-
|
||||||
|
.../kabase/kylin_image_codec/image_load/image_load.cpp | 3 ++-
|
||||||
|
.../kabase/kylin_image_codec/image_save/image_save.cpp | 1 +
|
||||||
|
3 files changed, 4 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/kysdk-kabase/kabase/kabase.pro b/kysdk-kabase/kabase/kabase.pro
|
||||||
|
index 07df867..92e0adc 100644
|
||||||
|
--- a/kysdk-kabase/kabase/kabase.pro
|
||||||
|
+++ b/kysdk-kabase/kabase/kabase.pro
|
||||||
|
@@ -11,7 +11,7 @@ TEMPLATE = lib
|
||||||
|
|
||||||
|
CONFIG += c++11 console link_pkgconfig no_keywords
|
||||||
|
|
||||||
|
-LIBS += -ldl -lpthread -lsystemd -lkylog -lkyconf -L/usr/lib/kysdk/kysdk-base
|
||||||
|
+LIBS += -ldl -lpthread -lsystemd -lgif -lkylog -lkyconf -L/usr/lib/kysdk/kysdk-base
|
||||||
|
|
||||||
|
greaterThan(QT_VER_MAJ , 4) {
|
||||||
|
LIBS += -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -lfreeimage -lfreeimageplus
|
||||||
|
diff --git a/kysdk-kabase/kabase/kylin_image_codec/image_load/image_load.cpp b/kysdk-kabase/kabase/kylin_image_codec/image_load/image_load.cpp
|
||||||
|
index 1520a2c..6bb8b88 100644
|
||||||
|
--- a/kysdk-kabase/kabase/kylin_image_codec/image_load/image_load.cpp
|
||||||
|
+++ b/kysdk-kabase/kabase/kylin_image_codec/image_load/image_load.cpp
|
||||||
|
@@ -1,3 +1,4 @@
|
||||||
|
+#define STB_IMAGE_IMPLEMENTATION
|
||||||
|
#include "kylin_image_codec/kylinimagecodec.hpp"
|
||||||
|
|
||||||
|
namespace kdk
|
||||||
|
@@ -379,4 +380,4 @@ FREE_IMAGE_FORMAT KylinImageCodec::get_real_format(const QString &path)
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace kabase
|
||||||
|
-} // namespace kdk
|
||||||
|
\ No newline at end of file
|
||||||
|
+} // namespace kdk
|
||||||
|
diff --git a/kysdk-kabase/kabase/kylin_image_codec/image_save/image_save.cpp b/kysdk-kabase/kabase/kylin_image_codec/image_save/image_save.cpp
|
||||||
|
index ce1b927..b01014c 100644
|
||||||
|
--- a/kysdk-kabase/kabase/kylin_image_codec/image_save/image_save.cpp
|
||||||
|
+++ b/kysdk-kabase/kabase/kylin_image_codec/image_save/image_save.cpp
|
||||||
|
@@ -1,3 +1,4 @@
|
||||||
|
+#define STB_IMAGE_WRITE_IMPLEMENTATION
|
||||||
|
#include "kylin_image_codec/kylinimagecodec.hpp"
|
||||||
|
|
||||||
|
namespace kdk
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
@ -1,12 +1,14 @@
|
|||||||
Name: libkysdk-applications
|
Name: libkysdk-applications
|
||||||
Version: 2.0.0.0
|
Version: 2.0.0.0
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: Kylin Software Development Kit - Applications Layer Kit
|
Summary: Kylin Software Development Kit - Applications Layer Kit
|
||||||
License: GPL-2+
|
License: GPL-2+
|
||||||
URL: http://www.ukui.org
|
URL: http://www.ukui.org
|
||||||
Source0: %{name}-%{version}.tar.xz
|
Source0: %{name}-%{version}.tar.xz
|
||||||
Patch01: 0001-fix-compile-error-of-libkysdk-applications.patch
|
Patch01: 0001-fix-compile-error-of-libkysdk-applications.patch
|
||||||
Patch02: 0011-update-changelog.patch
|
Patch02: 0011-update-changelog.patch
|
||||||
|
Patch03: 0002-fix-error-of-libkysdk-kabase-undefined-reference.patch
|
||||||
|
|
||||||
BuildRequires: freeimage-devel
|
BuildRequires: freeimage-devel
|
||||||
BuildRequires: giflib-devel
|
BuildRequires: giflib-devel
|
||||||
BuildRequires: glib2-devel
|
BuildRequires: glib2-devel
|
||||||
@ -163,9 +165,7 @@ Requires: libkysdk-notification
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -n %{name}-%{version} -p1
|
||||||
%patch01 -p1
|
|
||||||
%patch02 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
@ -296,6 +296,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_includedir}/kysdk/applications/knotifier.h
|
%{_includedir}/kysdk/applications/knotifier.h
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon May 27 2024 peijiankang <peijiankang@kylinos.cn> - 2.0.0.0-3
|
||||||
|
- add 0002-fix-error-of-libkysdk-kabase-undefined-reference.patch
|
||||||
|
|
||||||
* Wed Apr 24 2024 peijiankang <peijiankang@kylinos.cn> - 2.0.0.0-2
|
* Wed Apr 24 2024 peijiankang <peijiankang@kylinos.cn> - 2.0.0.0-2
|
||||||
- add 0011-update-changelog.patch
|
- add 0011-update-changelog.patch
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user