!16 修复build阶段报错

From: @starlet-dx 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2023-01-13 07:47:18 +00:00 committed by Gitee
commit 3b51cb9e1e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 40 additions and 1 deletions

View File

@ -0,0 +1,34 @@
From 16f9716bb9232fb9dc983bea7056c6cfaed25523 Mon Sep 17 00:00:00 2001
From: starlet-dx <15929766099@163.com>
Date: Fri, 13 Jan 2023 11:34:09 +0800
Subject: [PATCH 1/1] Include opencl_dep as a dependency in gegl_lib target
---
gegl/meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gegl/meson.build b/gegl/meson.build
index 86c7a6f..5f45949 100644
--- a/gegl/meson.build
+++ b/gegl/meson.build
@@ -92,8 +92,7 @@ install_headers(gegl_headers,
gegl_ldflags = os_osx ? ['-framework', 'OpenCL'] : []
opencl_dep = declare_dependency(
- sources : [opencl_headers],
- link_with : [gegl_sources],
+ sources : [opencl_headers],
)
gegl_lib = library(api_name,
@@ -105,6 +104,7 @@ gegl_lib = library(api_name,
gio,
math,
gmodule,
+ opencl_dep,
],
c_args: gegl_cflags,
link_args: gegl_ldflags,
--
2.30.0

View File

@ -2,7 +2,7 @@
Name: gegl04 Name: gegl04
Version: 0.4.34 Version: 0.4.34
Release: 1 Release: 2
Summary: Generic Graphics Library Summary: Generic Graphics Library
License: GPL-3.0-or-later AND LGPL-3.0-or-later License: GPL-3.0-or-later AND LGPL-3.0-or-later
Group: Productivity/Graphics/Other Group: Productivity/Graphics/Other
@ -10,6 +10,8 @@ URL: http://gegl.org/
Source0: https://download.gimp.org/pub/gegl/0.4/gegl-%{version}.tar.xz Source0: https://download.gimp.org/pub/gegl/0.4/gegl-%{version}.tar.xz
Source99: baselibs.conf Source99: baselibs.conf
Patch0: Include-opencl_dep-as-a-dependency-in-gegl_lib-targe.patch
BuildRequires: ImageMagick BuildRequires: ImageMagick
BuildRequires: asciidoc BuildRequires: asciidoc
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -148,6 +150,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_datadir}/vala/vapi/gegl-0.4.vapi %{_datadir}/vala/vapi/gegl-0.4.vapi
%changelog %changelog
* Fri Jan 13 2023 yaoxin <yaoxin30@h-partners.com> - 0.4.34-2
- Fix build error
* Thu Mar 31 2022 wangkai <wangkai385@huawei.com> - 0.4.34-1 * Thu Mar 31 2022 wangkai <wangkai385@huawei.com> - 0.4.34-1
- Update to 0.4.34 - Update to 0.4.34