diff --git a/0001-fix-C-linkage.patch b/0001-fix-C-linkage.patch deleted file mode 100644 index fcf5d7e..0000000 --- a/0001-fix-C-linkage.patch +++ /dev/null @@ -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 - #include --- -2.27.0 - diff --git a/0002-fix-compilation-failed.patch b/0002-fix-compilation-failed.patch deleted file mode 100644 index e889e2f..0000000 --- a/0002-fix-compilation-failed.patch +++ /dev/null @@ -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); diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..57eaf40 --- /dev/null +++ b/baselibs.conf @@ -0,0 +1 @@ +libgegl-0_4-0 diff --git a/gegl-0.4.34.tar.xz b/gegl-0.4.34.tar.xz new file mode 100644 index 0000000..a90cfdc Binary files /dev/null and b/gegl-0.4.34.tar.xz differ diff --git a/gegl-0.4.8.tar.bz2 b/gegl-0.4.8.tar.bz2 deleted file mode 100644 index 9e88bee..0000000 Binary files a/gegl-0.4.8.tar.bz2 and /dev/null differ diff --git a/gegl04.spec b/gegl04.spec index 2c624a7..6be4ea1 100644 --- a/gegl04.spec +++ b/gegl04.spec @@ -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 -Version: 0.4.8 -Release: 5 +Version: 0.4.34 +Release: 1 Summary: Generic Graphics Library -License: LGPLv3+ -URL: http://www.gegl.org/ -Source0: http://download.gimp.org/pub/gegl/0.4/gegl-%{version}.tar.bz2 +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 -Patch0000: 0001-fix-C-linkage.patch -Patch0001: 0002-fix-compilation-failed.patch - -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 +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 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 +%package -n libgegl-0_4-0 +Summary: Generic Graphics Library +Group: System/Libraries +Requires: gegl04 >= %{version} +%requires_file %{_libdir}/libbabl-0.1.so -%description devel -This package includes development files for %{name}. +%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 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 -%autosetup -n gegl-%{version} -p1 +%autosetup -p1 -n gegl-%{version} %build -%configure --disable-static CFLAGS="${CFLAGS}" -%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 - 0.4.34-1 +- update to 0.4.34 + * Mon Aug 2 2021 Haiwei Li - 0.4.8.5 - Fix complication failed due to gcc upgrade