commit: b09793443c40700a4503be856a21696b4793aa91 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> AuthorDate: Sun Oct 27 22:54:44 2019 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Sun Oct 27 23:01:36 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0979344
media-libs/gegl: 0.4.18 with meson + sync 9999 Closes: https://bugs.gentoo.org/694506 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> Package-Manager: Portage-2.3.78, Repoman-2.3.16 media-libs/gegl/Manifest | 1 + .../files/gegl-0.4.18-drop-failing-tests.patch | 43 +++++++ .../gegl/files/gegl-0.4.18-program-suffix.patch | 39 +++++++ .../gegl/{gegl-9999.ebuild => gegl-0.4.18.ebuild} | 125 +++++++++------------ media-libs/gegl/gegl-9999.ebuild | 125 +++++++++------------ 5 files changed, 191 insertions(+), 142 deletions(-) diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest index 3966857bd80..9a9f3f3851c 100644 --- a/media-libs/gegl/Manifest +++ b/media-libs/gegl/Manifest @@ -3,3 +3,4 @@ DIST gegl-0.3.0.tar.bz2 5463571 BLAKE2B 7ac52fb22bab3b84068e10610d8681a5bcf56f6c DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350db3062019f3889b8cdb8d222f6e436ccfc845b61fdf425a1634698a7a6963702a29bb1666f515b1395c50dc99f SHA512 a7a394dcce4137d5224163ca324f1585e64d1cc797e77d452ba444afe2bff39aa2e2d5d040d07b394697b75162bc310bc51490a5af80240b26aac14b6e7abe02 DIST gegl-0.4.14.tar.bz2 7209142 BLAKE2B a056f02c3fa9e075aa62cb8cb0d8183560ac66ffed68072add3ea6afc9da3b47c9854eb4e1799c61f451287b244bee4dfc8942365f556a0e820dd7485b9fc305 SHA512 1fcec83a961c0b9c98487de99d26893f98a5401816fa6d7238af4c645672d0eb0474cdb7251b8ebcd344aff589e8979bee0304b50fcfae9513fdbf8a02068e3b DIST gegl-0.4.16.tar.bz2 7304904 BLAKE2B a3f6021ed7b9d8b784b909057fcdc39e73b6b8b811009adae3c4a6805263e9a887e874ad662d8cd5c673ae324fe39e8f0299651139783fd3ece08675b70896fd SHA512 38eacbd53d9993ca99d061bf6f80553a86ff06bf42d1710403ac5f15629ccc9b1f4395ee7700a04cebc954ed7fe8745c5bef85453c9c56d89681dd53a1552b27 +DIST gegl-0.4.18.tar.xz 4812756 BLAKE2B b8e5902b62c3549f57dd0ce52a0a406974bf8664d5b85389b79f7d698bcf2643d19861add3d8a9bd5c99036aba4da97b70884dcaacf2cb89170b995f1d1497a0 SHA512 e79874cd50e9f0c27c7dc9d9b952545c31d0a48e2b158aa54b92c3e933267877222f86ede7256f2528f18985dc85d6eadbcd809f7a3563efc4449ec7634f15fd diff --git a/media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch b/media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch new file mode 100644 index 00000000000..4be09057d89 --- /dev/null +++ b/media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch @@ -0,0 +1,43 @@ +From a1dd28e7e7c022c4e887006311c916fe5d9e4c0e Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebast...@pipping.org> +Date: Sun, 27 Oct 2019 21:55:03 +0100 +Subject: [PATCH] Drop failing tests + +--- + tests/compositions/meson.build | 2 ++ + tests/python/meson.build | 2 -- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/compositions/meson.build b/tests/compositions/meson.build +index 8699e7c..5e76e8c 100644 +--- a/tests/compositions/meson.build ++++ b/tests/compositions/meson.build +@@ -87,6 +87,7 @@ test('compositions_with_opencl', + ) + endif + ++if false + test('compositions_without_opencl', + python, + args: [ +@@ -100,3 +101,4 @@ test('compositions_without_opencl', + suite: 'compositions', + is_parallel: false, + ) ++endif +diff --git a/tests/python/meson.build b/tests/python/meson.build +index c6782e6..47a160b 100644 +--- a/tests/python/meson.build ++++ b/tests/python/meson.build +@@ -2,8 +2,6 @@ + testnames = [ + 'gegl-buffer', + 'gegl-color', +- 'gegl-format', +- 'gegl-node', + 'gegl', + ] + +-- +2.23.0 + diff --git a/media-libs/gegl/files/gegl-0.4.18-program-suffix.patch b/media-libs/gegl/files/gegl-0.4.18-program-suffix.patch new file mode 100644 index 00000000000..be4498ccee4 --- /dev/null +++ b/media-libs/gegl/files/gegl-0.4.18-program-suffix.patch @@ -0,0 +1,39 @@ +From eeecf286efb312709e43341eaadc64eb006bc6bf Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebast...@pipping.org> +Date: Sun, 27 Oct 2019 22:05:58 +0100 +Subject: [PATCH] Add suffix "-0.4" to installed programs + +--- + bin/meson.build | 2 +- + tools/meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/bin/meson.build b/bin/meson.build +index 4daf6cb..b77b692 100644 +--- a/bin/meson.build ++++ b/bin/meson.build +@@ -42,7 +42,7 @@ if libspiro.found() + gegl_deps += [ libspiro, ] + endif + +-gegl_bin = executable('gegl', ++gegl_bin = executable('gegl-0.4', + gegl_sources, + include_directories: [ rootInclude, geglInclude, ], + dependencies: gegl_deps, +diff --git a/tools/meson.build b/tools/meson.build +index 43c5495..c1b0d63 100644 +--- a/tools/meson.build ++++ b/tools/meson.build +@@ -19,7 +19,7 @@ detect_opencl = executable( + install: false, + ) + gegl_imgcmp = executable( +- 'gegl-imgcmp', ++ 'gegl-imgcmp-0.4', + 'gegl-imgcmp.c', + include_directories: [ rootInclude, geglInclude, ], + dependencies: [ tools_deps, ], +-- +2.23.0 + diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild similarity index 57% copy from media-libs/gegl/gegl-9999.ebuild copy to media-libs/gegl/gegl-0.4.18.ebuild index ec1e63cf3a0..9083a3b08f6 100644 --- a/media-libs/gegl/gegl-9999.ebuild +++ b/media-libs/gegl/gegl-0.4.18.ebuild @@ -2,20 +2,20 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) # vala and introspection support is broken, bug #468208 VALA_USE_DEPEND=vapigen -inherit autotools gnome2-utils python-any-r1 vala +inherit meson gnome2-utils python-any-r1 vala if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"; SRC_URI="" else - SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"; + KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi DESCRIPTION="A graph based image processing framework" @@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/"; LICENSE="|| ( GPL-3+ LGPL-3 )" SLOT="0.4" -IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib" +IUSE="cairo debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp" REQUIRED_USE=" svg? ( cairo ) vala? ( introspection ) @@ -35,12 +35,13 @@ REQUIRED_USE=" # If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks! RDEPEND=" >=dev-libs/glib-2.44:2 - dev-libs/json-glib - >=media-libs/babl-0.1.62 + >=dev-libs/json-glib-1.2.6 + >=media-libs/babl-0.1.72[introspection?] + media-libs/libnsgif >=media-libs/libpng-1.6.0:0= virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 - x11-libs/pango + >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( libav? ( media-video/libav:0= ) @@ -49,7 +50,7 @@ RDEPEND=" introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) - openexr? ( >=media-libs/openexr-2.2.0:= ) + openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) @@ -58,7 +59,7 @@ RDEPEND=" umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) - zlib? ( >=sys-libs/zlib-1.2.0 ) + >=sys-libs/zlib-1.2.0 " DEPEND="${RDEPEND} dev-lang/perl @@ -74,6 +75,13 @@ DEPEND="${RDEPEND} vala? ( $(vala_depend) ) " +DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch + "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch +) + pkg_setup() { use test && use introspection && python-any-r1_pkg_setup } @@ -81,9 +89,6 @@ pkg_setup() { src_prepare() { default - # FIXME: the following should be proper patch sent to upstream - # fix OSX loadable module filename extension - sed -i -e 's/\.dylib/.bundle/' configure.ac || die # don't require Apple's OpenCL on versions of OSX that don't have it if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die @@ -92,9 +97,7 @@ src_prepare() { # commit 7c78497b : tests that use gegl.png are broken on non-amd64 sed -e '/clones.xml/d' \ -e '/composite-transform.xml/d' \ - -i tests/compositions/Makefile.am || die - - eautoreconf + -i tests/compositions/meson.build || die gnome2_environment_reset @@ -102,67 +105,47 @@ src_prepare() { } src_configure() { - local myeconfargs=( + local emesonargs=( # disable documentation as the generating is bit automagic # if anyone wants to work on it just create bug with patch - --disable-docs - # never enable altering of CFLAGS via profile option - --disable-profile - --disable-silent-rules - # - Parameter --disable-workshop disables any use of Lua, effectivly - --disable-workshop - --program-suffix=-${SLOT} - --with-gdk-pixbuf - --with-pango + -Ddocs=false + # - Parameter -Dworkshop=false disables any use of Lua, effectivly + -Dworkshop=false + $(meson_use introspection) + + -Dexiv2=disabled + -Dgdk-pixbuf=enabled + -Dgexiv2=disabled # - There are two checks for dot, one controllable by --with(out)-graphviz # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes. - --without-graphviz + -Dgraphviz=disabled + -Djasper=disabled + $(meson_feature lcms) + $(meson_feature lensfun) + $(meson_feature ffmpeg libav) + -Dlibjpeg=enabled + -Dlibpng=enabled + $(meson_feature raw libraw) + $(meson_feature svg librsvg) # libspiro: not in portage main tree - --without-libspiro - --without-lua - --without-mrg - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable debug) - $(use_enable introspection) - $(use_with cairo) - $(use_with cairo pangocairo) - $(use_with ffmpeg libavformat) - --without-jasper - $(use_with lcms) - $(use_with lensfun) - $(use_with openexr) - $(use_with pdf popplerglib) - $(use_with raw libraw) - $(use_with sdl) - $(use_with svg librsvg) - $(use_with tiff libtiff) - $(use_with umfpack) + -Dlibspiro=disabled + $(meson_feature tiff libtiff) # - v4l support does not work with our media-libs/libv4l-0.8.9, # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675 - $(use_with v4l libv4l) - $(use_with v4l libv4l2) - $(use_with vala) - $(use_with webp) - $(use_with zlib) + $(meson_feature v4l libv4l) + $(meson_feature v4l libv4l2) + -Dlua=disabled + -Dmrg=disabled + $(meson_feature openexr) + $(meson_feature cairo) + -Dpango=enabled + $(meson_feature cairo pangocairo) + $(meson_feature introspection pygobject) + $(meson_feature sdl sdl1) + -Dsdl2=disabled + $(meson_feature umfpack) + $(meson_feature vala vapigen) + $(meson_feature webp) ) - - if use test; then - myeconfargs+=( $(use_with ffmpeg gexiv2) ) - else - myeconfargs+=( --without-gexiv2 ) - fi - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped." -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die + meson_src_configure } diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild index ec1e63cf3a0..9083a3b08f6 100644 --- a/media-libs/gegl/gegl-9999.ebuild +++ b/media-libs/gegl/gegl-9999.ebuild @@ -2,20 +2,20 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) # vala and introspection support is broken, bug #468208 VALA_USE_DEPEND=vapigen -inherit autotools gnome2-utils python-any-r1 vala +inherit meson gnome2-utils python-any-r1 vala if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"; SRC_URI="" else - SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"; + KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi DESCRIPTION="A graph based image processing framework" @@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/"; LICENSE="|| ( GPL-3+ LGPL-3 )" SLOT="0.4" -IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib" +IUSE="cairo debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp" REQUIRED_USE=" svg? ( cairo ) vala? ( introspection ) @@ -35,12 +35,13 @@ REQUIRED_USE=" # If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks! RDEPEND=" >=dev-libs/glib-2.44:2 - dev-libs/json-glib - >=media-libs/babl-0.1.62 + >=dev-libs/json-glib-1.2.6 + >=media-libs/babl-0.1.72[introspection?] + media-libs/libnsgif >=media-libs/libpng-1.6.0:0= virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 - x11-libs/pango + >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( libav? ( media-video/libav:0= ) @@ -49,7 +50,7 @@ RDEPEND=" introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) - openexr? ( >=media-libs/openexr-2.2.0:= ) + openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) @@ -58,7 +59,7 @@ RDEPEND=" umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) - zlib? ( >=sys-libs/zlib-1.2.0 ) + >=sys-libs/zlib-1.2.0 " DEPEND="${RDEPEND} dev-lang/perl @@ -74,6 +75,13 @@ DEPEND="${RDEPEND} vala? ( $(vala_depend) ) " +DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch + "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch +) + pkg_setup() { use test && use introspection && python-any-r1_pkg_setup } @@ -81,9 +89,6 @@ pkg_setup() { src_prepare() { default - # FIXME: the following should be proper patch sent to upstream - # fix OSX loadable module filename extension - sed -i -e 's/\.dylib/.bundle/' configure.ac || die # don't require Apple's OpenCL on versions of OSX that don't have it if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die @@ -92,9 +97,7 @@ src_prepare() { # commit 7c78497b : tests that use gegl.png are broken on non-amd64 sed -e '/clones.xml/d' \ -e '/composite-transform.xml/d' \ - -i tests/compositions/Makefile.am || die - - eautoreconf + -i tests/compositions/meson.build || die gnome2_environment_reset @@ -102,67 +105,47 @@ src_prepare() { } src_configure() { - local myeconfargs=( + local emesonargs=( # disable documentation as the generating is bit automagic # if anyone wants to work on it just create bug with patch - --disable-docs - # never enable altering of CFLAGS via profile option - --disable-profile - --disable-silent-rules - # - Parameter --disable-workshop disables any use of Lua, effectivly - --disable-workshop - --program-suffix=-${SLOT} - --with-gdk-pixbuf - --with-pango + -Ddocs=false + # - Parameter -Dworkshop=false disables any use of Lua, effectivly + -Dworkshop=false + $(meson_use introspection) + + -Dexiv2=disabled + -Dgdk-pixbuf=enabled + -Dgexiv2=disabled # - There are two checks for dot, one controllable by --with(out)-graphviz # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes. - --without-graphviz + -Dgraphviz=disabled + -Djasper=disabled + $(meson_feature lcms) + $(meson_feature lensfun) + $(meson_feature ffmpeg libav) + -Dlibjpeg=enabled + -Dlibpng=enabled + $(meson_feature raw libraw) + $(meson_feature svg librsvg) # libspiro: not in portage main tree - --without-libspiro - --without-lua - --without-mrg - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable debug) - $(use_enable introspection) - $(use_with cairo) - $(use_with cairo pangocairo) - $(use_with ffmpeg libavformat) - --without-jasper - $(use_with lcms) - $(use_with lensfun) - $(use_with openexr) - $(use_with pdf popplerglib) - $(use_with raw libraw) - $(use_with sdl) - $(use_with svg librsvg) - $(use_with tiff libtiff) - $(use_with umfpack) + -Dlibspiro=disabled + $(meson_feature tiff libtiff) # - v4l support does not work with our media-libs/libv4l-0.8.9, # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675 - $(use_with v4l libv4l) - $(use_with v4l libv4l2) - $(use_with vala) - $(use_with webp) - $(use_with zlib) + $(meson_feature v4l libv4l) + $(meson_feature v4l libv4l2) + -Dlua=disabled + -Dmrg=disabled + $(meson_feature openexr) + $(meson_feature cairo) + -Dpango=enabled + $(meson_feature cairo pangocairo) + $(meson_feature introspection pygobject) + $(meson_feature sdl sdl1) + -Dsdl2=disabled + $(meson_feature umfpack) + $(meson_feature vala vapigen) + $(meson_feature webp) ) - - if use test; then - myeconfargs+=( $(use_with ffmpeg gexiv2) ) - else - myeconfargs+=( --without-gexiv2 ) - fi - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped." -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die + meson_src_configure }
