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 423BD1382C5 for ; Sat, 3 Feb 2018 16:43:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 515E4E0B6F; Sat, 3 Feb 2018 16:43:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 20146E0B6F for ; Sat, 3 Feb 2018 16:43:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 6F4DD335C77 for ; Sat, 3 Feb 2018 16:43:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB3931C3 for ; Sat, 3 Feb 2018 16:43:24 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1517676175.99f327c67cf7ff29d8ef4608f21ad75285a435ad.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/, media-gfx/ufraw/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch media-gfx/ufraw/ufraw-0.22-r2.ebuild X-VCS-Directories: media-gfx/ufraw/ media-gfx/ufraw/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 99f327c67cf7ff29d8ef4608f21ad75285a435ad X-VCS-Branch: master Date: Sat, 3 Feb 2018 16:43:24 +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-Archives-Salt: 35bfa632-3b1a-4f67-b6ca-a0a8dd284ce3 X-Archives-Hash: a31967902b2495e5076fc29f3165ca38 commit: 99f327c67cf7ff29d8ef4608f21ad75285a435ad Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 3 16:42:55 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 3 16:42:55 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99f327c6 media-gfx/ufraw: Fix build w/ jpeg-9, migrate to xdg-utils Bug: https://bugs.gentoo.org/540872 Closes: https://bugs.gentoo.org/520882 Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch | 32 ++++++++++ media-gfx/ufraw/ufraw-0.22-r2.ebuild | 94 ++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) diff --git a/media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch b/media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch new file mode 100644 index 00000000000..dca3834cbe8 --- /dev/null +++ b/media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch @@ -0,0 +1,32 @@ +Fix build with >=jpeg-9 +Thanks-to: Moran Z. + +--- a/dcraw.cc 2014-09-02 07:50:38.000000000 +0300 ++++ b/dcraw.cc 2015-02-21 04:54:13.957561352 +0200 +@@ -2330,7 +2330,7 @@ + #endif + cinfo->src->next_input_byte = jpeg_buffer; + cinfo->src->bytes_in_buffer = nbytes; +- return TRUE; ++ return boolean(TRUE); + } + + void CLASS kodak_jpeg_load_raw() +@@ -2346,7 +2346,7 @@ + jpeg_create_decompress (&cinfo); + jpeg_stdio_src (&cinfo, ifp); + cinfo.src->fill_input_buffer = fill_input_buffer; +- jpeg_read_header (&cinfo, TRUE); ++ jpeg_read_header (&cinfo, boolean(TRUE)); + jpeg_start_decompress (&cinfo); + if ((cinfo.output_width != width ) || + (cinfo.output_height*2 != height ) || +@@ -2419,7 +2419,7 @@ + if (tile_length < INT_MAX) + fseek (ifp, get4(), SEEK_SET); + jpeg_stdio_src (&cinfo, ifp); +- jpeg_read_header (&cinfo, TRUE); ++ jpeg_read_header (&cinfo, boolean(TRUE)); + jpeg_start_decompress (&cinfo); + buf = (*cinfo.mem->alloc_sarray) + ((j_common_ptr) &cinfo, JPOOL_IMAGE, cinfo.output_width*3, 1); diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild b/media-gfx/ufraw/ufraw-0.22-r2.ebuild new file mode 100644 index 00000000000..4df5995e535 --- /dev/null +++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools gnome2-utils toolchain-funcs xdg-utils + +DESCRIPTION="RAW Image format viewer and GIMP plugin" +HOMEPAGE="http://ufraw.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone" + +REQUIRED_USE="gimp? ( gtk )" + +RDEPEND=" + dev-libs/glib:2= + >=media-gfx/exiv2-0.11:0= + media-libs/lcms:2= + >=media-libs/lensfun-0.2.5:= + media-libs/libpng:0= + media-libs/tiff:0= + virtual/jpeg:0= + fits? ( sci-libs/cfitsio:0= ) + gimp? ( >=media-gfx/gimp-2 ) + gnome? ( >=gnome-base/gconf-2 ) + gtk? ( + >=media-gfx/gtkimageview-1.5 + >=x11-libs/gtk+-2.6:2 + ) + jpeg2k? ( media-libs/jasper:= ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch + "${FILESDIR}"/${P}-jasper-automagic.patch + "${FILESDIR}"/${P}-crashfix.patch + "${FILESDIR}"/${P}-drop_superfluous_abs.patch + "${FILESDIR}"/${P}-fix-unsigned-char.patch + "${FILESDIR}"/${P}-jpeg9.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable contrast) \ + $(use_with fits cfitsio) \ + $(use_with gimp) \ + $(use_enable gnome mime) \ + $(use_with gtk) \ + $(use_enable jpeg2k jasper) \ + $(use_enable openmp) \ + $(use_enable timezone dst-correction) +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + emake DESTDIR="${D}" schemasdir=/etc/gconf/schemas install + einstalldocs +} + +pkg_preinst() { + if use gnome; then + gnome2_gconf_savelist + fi +} + +pkg_postinst() { + if use gnome; then + xdg_mimeinfo_database_update + xdg_desktop_database_update + gnome2_gconf_install + fi +} + +pkg_postrm() { + if use gnome; then + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +}