[gentoo-commits] repo/gentoo:master commit in: media-gfx/dcraw/

[David Seifert]

commit:     41f2a2f94fb9a6f8c259dc59c356f51ee904fe1b
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 28 08:18:43 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 08:18:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41f2a2f9

media-gfx/dcraw: [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>

 media-gfx/dcraw/dcraw-9.28.0-r1.ebuild | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
index 0ec0faab0d9..6f0ec1521e6 100644
--- a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
+++ b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
@@ -14,12 +14,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
-IUSE="nls gimp jpeg jpeg2k lcms"
+IUSE="nls gimp jpeg lcms"
 
 COMMON_DEPEND="
 	jpeg? ( virtual/jpeg:0 )
 	lcms? ( media-libs/lcms:2 )
-	jpeg2k? ( media-libs/jasper:= )
 	gimp? ( media-gfx/gimp )
 "
 DEPEND="${COMMON_DEPEND}"
@@ -61,12 +60,11 @@ src_prepare() {
 }
 
 src_compile() {
-	local ECFLAGS="-O2" # Without optimisation build fails
+	local ECFLAGS="-O2 -DNO_JASPER=yes" # Without optimisation build fails
 	local ELIBS="-lm"
 
 	use lcms && ELIBS="-llcms2 ${ELIBS}" || ECFLAGS+=" -DNO_LCMS=yes"
 	use jpeg && ELIBS="-ljpeg ${ELIBS}" || ECFLAGS+=" -DNO_JPEG=yes"
-	use jpeg2k && ELIBS="-ljasper ${ELIBS}" || ECFLAGS+=" -DNO_JASPER=yes"
 	use nls && ECFLAGS+=" -DLOCALEDIR=\"/usr/share/locale/\""
 
 	run_build $(tc-getCC) ${ECFLAGS} ${CFLAGS} ${LDFLAGS} -o dcraw dcraw.c ${ELIBS}