From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 163CF138334 for ; Wed, 28 Aug 2019 08:20:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8718E0870; Wed, 28 Aug 2019 08:19:55 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 92997E0870 for ; Wed, 28 Aug 2019 08:19:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 639BB34A4D6 for ; Wed, 28 Aug 2019 08:19:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E20B7CD for ; Wed, 28 Aug 2019 08:19:50 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1566980370.644e75b4dd33d890841d51cf8ccef4c16c96e217.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/gdk-pixbuf/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild X-VCS-Directories: x11-libs/gdk-pixbuf/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 644e75b4dd33d890841d51cf8ccef4c16c96e217 X-VCS-Branch: master Date: Wed, 28 Aug 2019 08:19:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3e82419b-767a-4f4c-8b18-5c9422cd69e2 X-Archives-Hash: 06ecb4dd6fe1eb6ee2c66fcc99b19617 commit: 644e75b4dd33d890841d51cf8ccef4c16c96e217 Author: David Seifert gentoo org> AuthorDate: Wed Aug 28 08:19:30 2019 +0000 Commit: David Seifert gentoo 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 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