diff options
| author | Andreas Müller <schnitzeltony@gmail.com> | 2020-02-09 16:10:49 +0100 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2020-02-09 22:31:31 -0800 |
| commit | d55b2dca5f8116eb3e2e230994ba0a0abcf36b3a (patch) | |
| tree | 480d212d144b648f5884bac01d9277fef69bdaca /meta-oe/recipes-graphics/gegl | |
| parent | c23165fe1704d2bee66f4503355fe56071eb7f88 (diff) | |
| download | meta-openembedded-d55b2dca5f8116eb3e2e230994ba0a0abcf36b3a.tar.gz | |
gegl: upgrade 0.3.18 -> 0.4.20
* gegl is GPLv3 now
* gegl moved to meson build
* move to meta-gnome: latest gimp requires gexiv2 and nothing but gimp depends
on gegl
* add more PACKAGECONFIGs and change defaults slightly: sdl->sdl2 / add gexiv2
by default because gimp requires it anyway
* extend to native: latest gimp requires gegl for manipulation of pngs during
build
* get sources from location gimp's homepage suggests
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics/gegl')
| -rw-r--r-- | meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch | 21 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb | 34 |
2 files changed, 0 insertions, 55 deletions
diff --git a/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch b/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch deleted file mode 100644 index d145b625f6..0000000000 --- a/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | Index: gegl-0.2.0/configure.ac | ||
| 2 | =================================================================== | ||
| 3 | --- gegl-0.2.0.orig/configure.ac 2012-04-02 21:56:49.000000000 +0000 | ||
| 4 | +++ gegl-0.2.0/configure.ac 2014-07-17 21:34:15.312546602 +0000 | ||
| 5 | @@ -765,15 +765,7 @@ | ||
| 6 | |||
| 7 | have_sdl="no" | ||
| 8 | if test "x$with_sdl" != "xno"; then | ||
| 9 | - AC_PATH_PROG(SDL_CONFIG, sdl-config, no) | ||
| 10 | - if test "$SDL_CONFIG" = "no"; then | ||
| 11 | - have_sdl="no (SDL library not found)" | ||
| 12 | - AC_MSG_RESULT([*** Check for SDL library failed.]) | ||
| 13 | - else | ||
| 14 | - have_sdl="yes" | ||
| 15 | - SDL_CFLAGS=`$SDL_CONFIG --cflags` | ||
| 16 | - SDL_LIBS=`$SDL_CONFIG --libs` | ||
| 17 | - fi | ||
| 18 | + PKG_CHECK_MODULES([SDL], [sdl], [have_sdl="yes"], [have_sdl="no (SDL library not found)"]) | ||
| 19 | fi | ||
| 20 | |||
| 21 | AM_CONDITIONAL(HAVE_SDL, test "$have_sdl" = "yes") | ||
diff --git a/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb b/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb deleted file mode 100644 index 0db0f793d5..0000000000 --- a/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | SUMMARY = "GEGL (Generic Graphics Library) is a graph based image processing framework" | ||
| 2 | LICENSE = "LGPL-3.0" | ||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | ||
| 4 | DEPENDS = "babl librsvg glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual/libsdl json-glib intltool-native" | ||
| 5 | |||
| 6 | EXTRA_OECONF = "--disable-docs" | ||
| 7 | |||
| 8 | inherit features_check gnomebase vala gobject-introspection | ||
| 9 | |||
| 10 | REQUIRED_DISTRO_FEATURES = "x11" | ||
| 11 | |||
| 12 | PACKAGECONFIG ??= "" | ||
| 13 | PACKAGECONFIG[jasper] = "--with-jasper,--without-jasper,jasper" | ||
| 14 | PACKAGECONFIG[avformat] = "--with-libavformat,--without-libavformat,libav" | ||
| 15 | PACKAGECONFIG[lcms] = "--with-lcms,--without-lcms,lcms" | ||
| 16 | PACKAGECONFIG[tiff] = "--with-libtiff,--without-libtiff,tiff" | ||
| 17 | PACKAGECONFIG[webp] = "--with-webp,--without-webp,webp" | ||
| 18 | |||
| 19 | SRC_URI = "http://ftp.gimp.org/pub/${BPN}/0.3/${BP}.tar.bz2 \ | ||
| 20 | file://pkgconfig.patch " | ||
| 21 | SRC_URI[md5sum] = "6e5c6f229261478dc436a38c84405b2a" | ||
| 22 | SRC_URI[sha256sum] = "d7858ef26ede136d14e3de188a9e9c0de7707061a9fb96d7d615fab4958491fb" | ||
| 23 | |||
| 24 | LDFLAGS += "-lm" | ||
| 25 | |||
| 26 | # There are a couple of non-symlink .so files installed into libdir, which need to go into main package | ||
| 27 | FILES_${PN}_append = " ${libdir}/gegl-0.3/*.so ${libdir}/gegl-0.3/*.json ${libdir}/libgegl-npd-0.3.so ${libdir}/libgegl-sc-0.3.so" | ||
| 28 | FILES_${PN}-dev_append = " ${libdir}/gegl-0.3/*.la ${libdir}/libgegl-0.3.so" | ||
| 29 | FILES_${PN}-dev_remove = "${libdir}/lib*.so" | ||
| 30 | |||
| 31 | # Fails to build with thumb-1 (qemuarm) | ||
| 32 | # gegl-0.2.0/operations/common/matting-global.c: In function 'matting_process': | ||
| 33 | # gegl-0.2.0/operations/common/matting-global.c:463:1: internal compiler error: in patch_jump_insn, at cfgrtl.c:1275 | ||
| 34 | ARM_INSTRUCTION_SET = "arm" | ||
