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

Merge pull request !14 from xu_ping/openEuler-22.03-LTS-Next
upgrade gegl04 0.4.8 to 0.4.34
2022-01-19 04:10:36 +00:00 · 2022-01-07 19:11:34 +08:00 · 2021-08-04 10:01:50 +00:00 · 2021-08-04 11:47:23 +08:00 · 2021-08-02 10:54:53 +00:00 · 2021-08-02 11:24:16 +08:00
5 changed files with 138 additions and 60 deletions
--- a/baselibs.conf
+++ b/baselibs.conf
@ -0,0 +1 @@
+libgegl-0_4-0
--- a/gegl-0.4.34.tar.xz
+++ b/gegl-0.4.34.tar.xz
--- a/gegl-0.4.8.tar.bz2
+++ b/gegl-0.4.8.tar.bz2
--- a/gegl04.spec
+++ b/gegl04.spec
@ -1,89 +1,162 @@
-Name:           gegl04
-Version:        0.4.8
-Release:        3
-Summary:        Generic Graphics Library
-License:        LGPLv3+
-URL:            http://www.gegl.org/
-Source0:        http://download.gimp.org/pub/gegl/0.4/gegl-%{version}.tar.bz2
+%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")

-BuildRequires:  chrpath, enscript, gcc-c++, gettext-devel >= 0.19.8, gobject-introspection-devel >= 1.32.0, libspiro-devel, perl-interpreter
-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:  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:  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:  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(pygobject-3.0) >= 3.2, pkgconfig(vapigen) >= 0.20.0, pkgconfig(libtiff-4) >= 4.0.0
-%ifarch x86_64
-BuildRequires:  pkgconfig(luajit) >= 2.0.4
-%endif
-Requires:       /usr/bin/convert
-Provides:       bundled(poly2tri-c)
-Provides:       %{name}-tools%{?_isa} %{name}-tools
-Obsoletes:      %{name}-tools
-Conflicts:      gegl < 0.4
+Name:           gegl04
+Version:        0.4.34
+Release:        1
+Summary:        Generic Graphics Library
+License:        GPL-3.0-or-later AND LGPL-3.0-or-later
+Group:          Productivity/Graphics/Other
+URL:            http://gegl.org/
+Source0:        https://download.gimp.org/pub/gegl/0.4/gegl-%{version}.tar.xz
+Source1:        baselibs.conf
+
+BuildRequires:  ImageMagick
+BuildRequires:  asciidoc
+BuildRequires:  gcc-c++
+BuildRequires:  graphviz
+BuildRequires:  gtk-doc
+BuildRequires:  libstdc++-devel
+BuildRequires:  meson >= 0.50.0
+BuildRequires:  pkgconfig
+BuildRequires:  ruby
+BuildRequires:  suitesparse-devel
+BuildRequires:  pkgconfig(OpenEXR) >= 1.6.1
+BuildRequires:  pkgconfig(babl) >= 0.1.76
+BuildRequires:  pkgconfig(cairo) >= 1.12.2
+BuildRequires:  pkgconfig(exiv2) >= 0.25
+BuildRequires:  pkgconfig(gdk-pixbuf-2.0) >= 2.32.0
+BuildRequires:  pkgconfig(gexiv2)
+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
-GEGL (Generic Graphics Library) is a data flow based image processing framework, providing floating point processing
-and non-destructive image processing capabilities to GNU Image Manipulation Program and other projects
-(imgflo, GNOME Photos, gcut, iconographer, …)
-With GEGL you chain together processing operations to represent the desired image processing pipeline. GEGL provides
-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.
+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 -n libgegl-0_4-0
+Summary:        Generic Graphics Library
+Group:          System/Libraries
+Requires:       gegl04 >= %{version}
+%requires_file  %{_libdir}/libbabl-0.1.so
+
+%description -n libgegl-0_4-0
+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 %{name}
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-Obsoletes:      %{name}-devel < 0.4.2
-Conflicts:      %{name}-devel < 0.4.2, gegl-devel < 0.4
-Provides:       %{name}-devel-docs%{?_isa} %{name}-devel-docs
-Obsoletes:      %{name}-devel-docs
+Summary:        Development files for the GEGL "Generic Graphics Library"
+Group:          Development/Libraries/C and C++
+Requires:       libgegl-0_4-0 = %{version}

 %description devel
-This package includes development files for %{name}.
+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
-%autosetup -n gegl-%{version} -p1
+%autosetup -p1 -n gegl-%{version}

 %build
-%configure --disable-static
-%make_build
+%meson \
+	-Dmrg=disabled \
+	-Dmaxflow=disabled \
+	-Dlibav=enabled \
+	-Dworkshop=true \
+	-Djasper=disabled \
+	-Ddocs=false \
+	%{nil}
+%meson_build

 %install
-%make_install
-
-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
-
+%meson_install
+find %{buildroot} -type f -name "*.la" -delete -print
 %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
-%license COPYING.LESSER COPYING
-%{_libdir}/gegl-0.4/
+%{_bindir}/gegl
+%{_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}/girepository-1.0/Gegl-0.4.typelib
-%{_bindir}/*

 %files devel
 %{_includedir}/gegl-0.4/
 %{_libdir}/libgegl-0.4.so
-%{_libdir}/pkgconfig/*.pc
-%dir %{_datadir}/gir-1.0
+%{_libdir}/pkgconfig/gegl-0.4.pc
+%{_libdir}/pkgconfig/gegl-sc-0.4.pc
 %{_datadir}/gir-1.0/Gegl-0.4.gir
 %dir %{_datadir}/vala
 %dir %{_datadir}/vala/vapi
-%{_datadir}/vala/vapi/gegl-0.4.*
-%doc %{_datadir}/gtk-doc/
+%{_datadir}/vala/vapi/gegl-0.4.deps
+%{_datadir}/vala/vapi/gegl-0.4.vapi

 %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
+- Fix complication failed due to gcc upgrade
+
+* Wed Jul 21 2021 caodongxia <caodongxia@huawei.com> - 0.4.8-4
+- Fix C linkage
+
 * Thu Jan 23 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.4.8-3
 - Type:bugfix
 - Id:NA
--- a/gegl04.yaml
+++ b/gegl04.yaml
@ -0,0 +1,4 @@
+version_control: gitlab.gnome
+src_repo: gegl
+tag_prefix: GEGL_
+seperator: _
Author	SHA1	Message	Date
openeuler-ci-bot	6314e47544	!14 gegl04在22.03-lts-next分支升级到社区最新版本0.4.34 Merge pull request !14 from xu_ping/openEuler-22.03-LTS-Next	2022-01-19 04:10:36 +00:00
cherry530	51e4564523	upgrade gegl04 0.4.8 to 0.4.34 Signed-off-by: cherry530 <xuping33@huawei.com>	2022-01-07 19:11:34 +08:00
openeuler-ci-bot	f37d036cc1	!6 修改由于gcc升级导致编译失败问题。 From: @liheavy Reviewed-by: @small_leek Signed-off-by: @small_leek	2021-08-04 10:01:50 +00:00
liheavy	d0358934aa	fix complication failed due to gcc upgrade	2021-08-04 11:47:23 +08:00
openeuler-ci-bot	9f4db7205c	!5 修改由于gcc升级导致编译失败问题。 From: @liheavy Reviewed-by: @small_leek Signed-off-by: @small_leek	2021-08-02 10:54:53 +00:00
liheavy	acf4ef7c5e	fix complication failed due to gcc upgrade	2021-08-02 11:24:16 +08:00
openeuler-ci-bot	1315da985b	!4 修复master分支编译失败 From: @caodongxia Reviewed-by: @small_leek Signed-off-by: @small_leek	2021-07-22 00:45:08 +00:00
caodongxia	3e250b2954	Fix C linkage	2021-07-21 18:18:15 +08:00
openeuler-ci-bot	f36b838656	!3 Add gegl04 yaml file Merge pull request !3 from 雷炬/master	2020-05-19 14:57:35 +08:00
lei_ju	6f234dd79f	Increase gegl04 yaml	2020-05-07 17:58:21 +08:00