commit: 644e75b4dd33d890841d51cf8ccef4c16c96e217 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Wed Aug 28 08:19:30 2019 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Wed Aug 28 08:19:30 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=644e75b4
x11-libs/gdk-pixbuf: [QA] Remove media-libs/jasper dep Bug: https://bugs.gentoo.org/689784 Package-Manager: Portage-2.3.68, Repoman-2.3.16 Signed-off-by: David Seifert <soap <AT> gentoo.org> x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild | 5 ++--- x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild index fba332527c1..abf08b26b45 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"; LICENSE="LGPL-2+" SLOT="2" KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="X debug +introspection jpeg jpeg2k tiff test" +IUSE="X debug +introspection jpeg tiff test" # Remove SRC_URI when gnome bug #795069 is fixed SRC_URI="${SRC_URI} test? ( https://git.gnome.org/browse/gdk-pixbuf/plain/tests/bug753605-atsize.jpg?h=2.36.12 -> ${PN}-2.36.12-bug753605-atsize.jpg )" @@ -22,7 +22,6 @@ COMMON_DEPEND=" >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) - jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] ) tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) " @@ -74,7 +73,7 @@ multilib_src_configure() { gnome2_src_configure \ $(usex debug --enable-debug=yes "") \ $(use_with jpeg libjpeg) \ - $(use_with jpeg2k libjasper) \ + --without-libjasper \ $(use_with tiff libtiff) \ $(multilib_native_use_enable introspection) \ $(use_with X x11) \ diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild index feca458cf8d..8a883eb57ee 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"; LICENSE="LGPL-2+" SLOT="2" KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="X gtk-doc +introspection jpeg jpeg2k tiff" +IUSE="X gtk-doc +introspection jpeg tiff" # TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review COMMON_DEPEND=" @@ -20,7 +20,6 @@ COMMON_DEPEND=" >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] ) - jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) " @@ -64,9 +63,9 @@ src_prepare() { multilib_src_configure() { local emesonargs=( -Dpng=true + -Djasper=false $(meson_use tiff) $(meson_use jpeg) - $(meson_use jpeg2k jasper) $(meson_use X x11) -Dbuiltin_loaders=png -Drelocatable=false
