!14 gegl04在22.03-lts-next分支升级到社区最新版本0.4.34

Merge pull request !14 from xu_ping/openEuler-22.03-LTS-Next
This commit is contained in:
openeuler-ci-bot 2022-01-19 04:10:36 +00:00 committed by Gitee
commit 6314e47544
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 126 additions and 99 deletions

View File

@ -1,26 +0,0 @@
From 8208e9f61bb0d5688abcfe4fc94439219ee1c2f8 Mon Sep 17 00:00:00 2001
From: caodongxia <315816521@qq.com>
Date: Wed, 21 Jul 2021 17:40:49 +0800
Subject: [PATCH] fix
---
operations/external/exr-load.cpp | 2 --
1 file changed, 2 deletions(-)
diff --git a/operations/external/exr-load.cpp b/operations/external/exr-load.cpp
index e3a2538..96f1653 100644
--- a/operations/external/exr-load.cpp
+++ b/operations/external/exr-load.cpp
@@ -29,9 +29,7 @@ property_file_path (path, "File", "")
#define GEGL_OP_NAME exr_load
#define GEGL_OP_C_FILE "exr-load.cpp"
-extern "C" {
#include "gegl-op.h"
-}
#include <ImfInputFile.h>
#include <ImfChannelList.h>
--
2.27.0

View File

@ -1,12 +0,0 @@
diff -Nur a/gcut/gcut.h b/gcut/gcut.h
--- a/gcut/gcut.h 2018-05-13 19:48:27.000000000 +0800
+++ b/gcut/gcut.h 2021-08-04 11:14:47.869520800 +0800
@@ -234,7 +234,7 @@
char *clip_query;
int clip_query_edited;
int filter_edited;
-} _GeglEDL;
+};
void update_size (GeglEDL *edl, Clip *clip);
void remove_in_betweens (GeglNode *nop_scaled, GeglNode *nop_filtered);

1
baselibs.conf Normal file
View File

@ -0,0 +1 @@
libgegl-0_4-0

BIN
gegl-0.4.34.tar.xz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,92 +1,156 @@
%define requires_file() %( readlink -f '%*' | LC_ALL=C xargs -r rpm -q --qf 'Requires: %%{name} >= %%{epoch}:%%{version}\\n' -f | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
Name: gegl04 Name: gegl04
Version: 0.4.8 Version: 0.4.34
Release: 5 Release: 1
Summary: Generic Graphics Library Summary: Generic Graphics Library
License: LGPLv3+ License: GPL-3.0-or-later AND LGPL-3.0-or-later
URL: http://www.gegl.org/ Group: Productivity/Graphics/Other
Source0: http://download.gimp.org/pub/gegl/0.4/gegl-%{version}.tar.bz2 URL: http://gegl.org/
Source0: https://download.gimp.org/pub/gegl/0.4/gegl-%{version}.tar.xz
Source1: baselibs.conf
Patch0000: 0001-fix-C-linkage.patch BuildRequires: ImageMagick
Patch0001: 0002-fix-compilation-failed.patch BuildRequires: asciidoc
BuildRequires: gcc-c++
BuildRequires: chrpath, enscript, gcc-c++, gettext-devel >= 0.19.8, gobject-introspection-devel >= 1.32.0, libspiro-devel, perl-interpreter BuildRequires: graphviz
BuildRequires: ruby, SDL-devel >= 1.2.0, suitesparse-devel, vala-tools, pkgconfig(babl) >= 0.1.56, pkgconfig(cairo) >= 1.12.2, pkgconfig(exiv2) >= 0.25 BuildRequires: gtk-doc
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.32.0, pkgconfig(glib-2.0) >= 2.44.0, libjpeg-devel, pkgconfig(json-glib-1.0), pkgconfig(lcms2) >= 2.8 BuildRequires: libstdc++-devel
BuildRequires: pkgconfig(lensfun) >= 0.2.5, pkgconfig(libraw) >= 0.15.4, pkgconfig(libpng) >= 1.6.0, pkgconfig(librsvg-2.0) >= 2.40.6, pkgconfig(libv4l2) >= 1.0.1 BuildRequires: meson >= 0.50.0
BuildRequires: pkgconfig(libwebp) >= 0.5.0, pkgconfig(lua) >= 5.1.0, pkgconfig(OpenEXR) >= 1.6.1, pkgconfig(pango) >= 1.38.0, pkgconfig(pangocairo) >= 1.38.0 BuildRequires: pkgconfig
BuildRequires: pkgconfig(pygobject-3.0) >= 3.2, pkgconfig(vapigen) >= 0.20.0, pkgconfig(libtiff-4) >= 4.0.0 BuildRequires: ruby
%ifarch x86_64 BuildRequires: suitesparse-devel
BuildRequires: pkgconfig(luajit) >= 2.0.4 BuildRequires: pkgconfig(OpenEXR) >= 1.6.1
%endif BuildRequires: pkgconfig(babl) >= 0.1.76
Requires: /usr/bin/convert BuildRequires: pkgconfig(cairo) >= 1.12.2
Provides: bundled(poly2tri-c) BuildRequires: pkgconfig(exiv2) >= 0.25
Provides: %{name}-tools%{?_isa} %{name}-tools BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.32.0
Obsoletes: %{name}-tools BuildRequires: pkgconfig(gexiv2)
Conflicts: gegl < 0.4 BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(glib-2.0) >= 2.44.0
BuildRequires: pkgconfig(gmodule-2.0) >= 2.44.0
BuildRequires: pkgconfig(gobject-2.0) >= 2.44.0
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gthread-2.0) >= 2.44.0
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(lcms2) >= 2.8
BuildRequires: pkgconfig(lensfun) >= 0.2.5
BuildRequires: pkgconfig(libpng) >= 1.6.0
BuildRequires: pkgconfig(libraw) >= 0.15.4
BuildRequires: pkgconfig(librsvg-2.0) >= 2.40.6
BuildRequires: pkgconfig(sdl2) >= 2.0.5
BuildRequires: pkgconfig(libtiff-4) >= 4.0.0
BuildRequires: pkgconfig(libv4l1) >= 1.0.1
BuildRequires: pkgconfig(libv4l2) >= 1.0.1
BuildRequires: pkgconfig(libwebp) >= 0.5.0
BuildRequires: pkgconfig(luajit)
BuildRequires: babl-vala
BuildRequires: pkgconfig(pango) >= 1.38.0
BuildRequires: pkgconfig(pangocairo) >= 1.38.0
BuildRequires: pkgconfig(poppler-glib) >= 0.71.0
BuildRequires: pkgconfig(pygobject-3.0) >= 3.2.0
BuildRequires: pkgconfig(libspiro)
BuildRequires: pkgconfig(vapigen) >= 0.20.0
BuildRequires: pkgconfig(libavcodec) >= 55.69.100
BuildRequires: pkgconfig(libavformat) >= 55.48.100
BuildRequires: pkgconfig(libavutil) >= 55.92.100
BuildRequires: pkgconfig(libswscale) >= 2.6.100
Provides: %{name}-0_3-orig-addon = %{version}
Obsoletes: %{name}-0_3-orig-addon < 0.3.5
Provides: gegl-unstable = %{version}
Obsoletes: gegl-unstable < 0.3.28
Requires: libgegl-0_4-0 >= %{version}
Conflicts: gegl04-tools
Provides: gegl04-tools = %{version}-%{release}
%description %description
GEGL (Generic Graphics Library) is a data flow based image processing framework, providing floating point processing GEGL provides infrastructure to do demand based cached non destructive
and non-destructive image processing capabilities to GNU Image Manipulation Program and other projects image editing on larger than RAM buffers. Through babl, it provides
(imgflo, GNOME Photos, gcut, iconographer, …) support for a wide range of color models and pixel storage formats for
With GEGL you chain together processing operations to represent the desired image processing pipeline. GEGL provides input and output.
operations for image loading and storing, color adjustments, GIMPs artistic filters and more forms of image processing
GEGL can also be used from the commandline.
The primary repository for the GEGL source code in GNOME git, and at GIMPs download site tarball releases.
GEGL is Free Software, and both new functionality in new operations as well as relevant development, enhancement requests,
patches and bug reports for GEGL at gitlab.gnome.org/GNOME/gegl ,
Finanical support for fun new filters and capabilities as well as gardening/janitor bits and offshoot new color related
infrastructure as part of project maintainership is welcome through the patreon campaign at GIMPs donation page.
%package devel %package -n libgegl-0_4-0
Summary: Development files for %{name} Summary: Generic Graphics Library
Requires: %{name}%{?_isa} = %{version}-%{release} Group: System/Libraries
Obsoletes: %{name}-devel < 0.4.2 Requires: gegl04 >= %{version}
Conflicts: %{name}-devel < 0.4.2, gegl-devel < 0.4 %requires_file %{_libdir}/libbabl-0.1.so
Provides: %{name}-devel-docs%{?_isa} %{name}-devel-docs
Obsoletes: %{name}-devel-docs
%description devel %description -n libgegl-0_4-0
This package includes development files for %{name}. GEGL provides infrastructure to do demand based cached non destructive
image editing on larger than RAM buffers. Through babl, it provides
support for a wide range of color models and pixel storage formats for
input and output.
%package devel
Summary: Development files for the GEGL "Generic Graphics Library"
Group: Development/Libraries/C and C++
Requires: libgegl-0_4-0 = %{version}
%description devel
GEGL provides infratructure to do demand based cached non destructive
image editing on larger than RAM buffers. Through babl, it provides
support for a wide range of color models and pixel storage formats for
input and output.
%prep %prep
%autosetup -n gegl-%{version} -p1 %autosetup -p1 -n gegl-%{version}
%build %build
%configure --disable-static CFLAGS="${CFLAGS}" %meson \
%make_build -Dmrg=disabled \
-Dmaxflow=disabled \
-Dlibav=enabled \
-Dworkshop=true \
-Djasper=disabled \
-Ddocs=false \
%{nil}
%meson_build
%install %install
%make_install %meson_install
find %{buildroot} -type f -name "*.la" -delete -print
chrpath -d $RPM_BUILD_ROOT%{_bindir}/*
chrpath -d $RPM_BUILD_ROOT%{_libdir}/*.so*
chrpath -d $RPM_BUILD_ROOT%{_libdir}/gegl-0.4/*.so
%delete_la
%find_lang gegl-0.4 %find_lang gegl-0.4
%ldconfig_scriptlets %post -n gegl04 -p /sbin/ldconfig
%postun -n gegl04 -p /sbin/ldconfig
%post -n libgegl-0_4-0 -p /sbin/ldconfig
%postun -n libgegl-0_4-0 -p /sbin/ldconfig
%files -f gegl-0.4.lang %files -f gegl-0.4.lang
%license COPYING.LESSER COPYING %{_bindir}/gegl
%{_libdir}/gegl-0.4/ %{_bindir}/gegl-imgcmp
%dir %{_libdir}/gegl-0.4/
%{_libdir}/gegl-0.4/*.so
%{_libdir}/libgegl-sc-0.4.so
%{_libdir}/libgegl-npd-0.4.so
%{_libdir}/gegl-0.4/grey2.json
%{_libdir}/gegl-0.4/dropshadow2.json
%dir %{_datadir}/gegl-0.4/
%{_datadir}/gegl-0.4/lua/
%files -n libgegl-0_4-0
%license COPYING COPYING.LESSER
%{_libdir}/libgegl-0.4.so.* %{_libdir}/libgegl-0.4.so.*
%{_libdir}/libgegl-*-0.4.so
%{_libdir}/girepository-1.0/Gegl-0.4.typelib %{_libdir}/girepository-1.0/Gegl-0.4.typelib
%{_bindir}/*
%files devel %files devel
%{_includedir}/gegl-0.4/ %{_includedir}/gegl-0.4/
%{_libdir}/libgegl-0.4.so %{_libdir}/libgegl-0.4.so
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/gegl-0.4.pc
%dir %{_datadir}/gir-1.0 %{_libdir}/pkgconfig/gegl-sc-0.4.pc
%{_datadir}/gir-1.0/Gegl-0.4.gir %{_datadir}/gir-1.0/Gegl-0.4.gir
%dir %{_datadir}/vala %dir %{_datadir}/vala
%dir %{_datadir}/vala/vapi %dir %{_datadir}/vala/vapi
%{_datadir}/vala/vapi/gegl-0.4.* %{_datadir}/vala/vapi/gegl-0.4.deps
%doc %{_datadir}/gtk-doc/ %{_datadir}/vala/vapi/gegl-0.4.vapi
%changelog %changelog
* Thu Dec 30 2021 xu_ping <xuping33@huawei.com> - 0.4.34-1
- update to 0.4.34
* Mon Aug 2 2021 Haiwei Li <lihaiwei8@huawei.com> - 0.4.8.5 * Mon Aug 2 2021 Haiwei Li <lihaiwei8@huawei.com> - 0.4.8.5
- Fix complication failed due to gcc upgrade - Fix complication failed due to gcc upgrade