* [gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/, media-gfx/ufraw/
@ 2017-04-04 15:42 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2017-04-04 15:42 UTC (permalink / raw
To: gentoo-commits
commit: 2da389e51d92dbe277d6e7b5cfd8194d5cae4ec3
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be>
AuthorDate: Sun Nov 27 23:07:16 2016 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 4 15:41:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2da389e5
media-gfx/ufraw: add explicit jpeg2k support
Upstream links to libjasper when available. This commit patches
configure.ac to make libjasper support explicit and adds a jpeg2k
USE flag to enable/disable it.
Gentoo-bug: 470836
Package-Manager: portage-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/2939
.../ufraw/files/ufraw-0.22-jasper-automagic.patch | 21 +++++++++++++++++++++
media-gfx/ufraw/ufraw-0.22-r1.ebuild | 5 ++++-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch b/media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch
new file mode 100644
index 00000000000..93e1d691af1
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch
@@ -0,0 +1,21 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -159,8 +159,16 @@
+ have_jpeg=${ac_cv_lib_jpeg_jpeg_CreateCompress:-no}
+
+ # Check for libjasper.
+-AC_CHECK_LIB(jasper, jas_image_decode)
+-have_jasper=${ac_cv_lib_jasper_jas_image_decode:-no}
++AC_ARG_ENABLE([jasper],
++ AS_HELP_STRING([--enable-jasper], [enable JPEG2000 support]))
++
++have_jasper=no
++AS_IF([test "x$enable_jasper" = "xyes"], [
++ AC_SEARCH_LIBS([jas_image_decode], [jasper], [have_jasper=yes], [
++ AC_MSG_ERROR([unable to find the jas_image_decode() function])
++ ])
++])
++
+
+ # Check for tiff headers and library.
+ PKG_CHECK_MODULES(LIBTIFF, libtiff-4,
diff --git a/media-gfx/ufraw/ufraw-0.22-r1.ebuild b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
index 7f16fe8192f..225999943e4 100644
--- a/media-gfx/ufraw/ufraw-0.22-r1.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="contrast fits gimp gnome gtk openmp timezone"
+IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
REQUIRED_USE="gimp? ( gtk )"
@@ -31,12 +31,14 @@ RDEPEND="
>=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
)
@@ -52,6 +54,7 @@ src_configure() {
$(use_with gimp) \
$(use_enable gnome mime) \
$(use_with gtk) \
+ $(use_enable jpeg2k jasper) \
$(use_enable openmp) \
$(use_enable timezone dst-correction)
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/, media-gfx/ufraw/
@ 2017-04-04 15:42 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2017-04-04 15:42 UTC (permalink / raw
To: gentoo-commits
commit: d2edd6edf8547ceb157094dba0fff6d2b08588b2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 4 15:19:34 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 4 15:41:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2edd6ed
media-gfx/ufraw: Fix runtime crash
Gentoo-bug: 608100
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-gfx/ufraw/files/ufraw-0.22-crashfix.patch | 15 +++++
media-gfx/ufraw/ufraw-0.22-r1.ebuild | 87 +++++++++++++++++++++++++
2 files changed, 102 insertions(+)
diff --git a/media-gfx/ufraw/files/ufraw-0.22-crashfix.patch b/media-gfx/ufraw/files/ufraw-0.22-crashfix.patch
new file mode 100644
index 00000000000..76fe83fa8f2
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-crashfix.patch
@@ -0,0 +1,15 @@
+--- a/ufraw_ufraw.c 2015-06-16 04:58:38.000000000 +0100
++++ b/ufraw_ufraw.c 2016-12-18 00:55:45.794466747 +0000
+@@ -767,8 +767,10 @@ void ufraw_close(ufraw_data *uf)
+ g_free(uf->displayProfile);
+ g_free(uf->RawHistogram);
+ #ifdef HAVE_LENSFUN
+- lf_modifier_destroy(uf->TCAmodifier);
+- lf_modifier_destroy(uf->modifier);
++ if (uf->TCAmodifier != NULL)
++ lf_modifier_destroy(uf->TCAmodifier);
++ if (uf->modifier != NULL)
++ lf_modifier_destroy(uf->modifier);
+ #endif
+ ufobject_delete(uf->conf->ufobject);
+ g_free(uf->conf);
diff --git a/media-gfx/ufraw/ufraw-0.22-r1.ebuild b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
new file mode 100644
index 00000000000..7f16fe8192f
--- /dev/null
+++ b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools fdo-mime gnome2-utils toolchain-funcs
+
+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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="contrast fits gimp gnome gtk 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
+ )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch
+ "${FILESDIR}"/${P}-crashfix.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 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
+ fdo-mime_mime_database_update
+ fdo-mime_desktop_database_update
+ gnome2_gconf_install
+ fi
+}
+
+pkg_postrm() {
+ if use gnome; then
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+ fi
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/, media-gfx/ufraw/
@ 2017-06-18 9:51 Alexis Ballier
0 siblings, 0 replies; 8+ messages in thread
From: Alexis Ballier @ 2017-06-18 9:51 UTC (permalink / raw
To: gentoo-commits
commit: d4658e180df072cdcb4102bc79b8b5b08558df60
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 09:51:06 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 09:51:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4658e18
media-gfx/ufraw: Fix build with gcc 7.
Patch by Johannes Hirte, bug #618068
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../ufraw/files/ufraw-0.22-drop_superfluous_abs.patch | 16 ++++++++++++++++
media-gfx/ufraw/ufraw-0.22-r1.ebuild | 1 +
2 files changed, 17 insertions(+)
diff --git a/media-gfx/ufraw/files/ufraw-0.22-drop_superfluous_abs.patch b/media-gfx/ufraw/files/ufraw-0.22-drop_superfluous_abs.patch
new file mode 100644
index 00000000000..8c11f664978
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-drop_superfluous_abs.patch
@@ -0,0 +1,16 @@
+Fixes build with gcc 7, by Johannes Hirte.
+https://bugs.gentoo.org/show_bug.cgi?id=618068
+
+diff --git a/../old/dcraw.cc b/dcraw.cc
+index 88c8068..cedf86b 100644
+--- a/../old/dcraw.cc
++++ b/dcraw.cc
+@@ -9242,7 +9242,7 @@ canon_a5:
+ if (make[0] == 'O') {
+ i = find_green (12, 32, 1188864, 3576832);
+ c = find_green (12, 32, 2383920, 2387016);
+- if (abs(i) < abs(c)) {
++ if (i < c) {
+ SWAP(i,c);
+ load_flags = 24;
+ }
diff --git a/media-gfx/ufraw/ufraw-0.22-r1.ebuild b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
index 225999943e4..155af1ce170 100644
--- a/media-gfx/ufraw/ufraw-0.22-r1.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
@@ -40,6 +40,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch
"${FILESDIR}"/${P}-jasper-automagic.patch
"${FILESDIR}"/${P}-crashfix.patch
+ "${FILESDIR}"/${P}-drop_superfluous_abs.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/, media-gfx/ufraw/
@ 2018-12-29 22:02 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2018-12-29 22:02 UTC (permalink / raw
To: gentoo-commits
commit: 47eba01d3895bd74c7fffc56025c32827c817af2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 21:54:38 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 22:02:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47eba01d
media-gfx/ufraw: Fix build with exiv2-0.27
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch | 25 +++++++++++++++++++++++
media-gfx/ufraw/ufraw-0.22-r2.ebuild | 3 ++-
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch b/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
new file mode 100644
index 00000000000..b5b4140fff8
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
@@ -0,0 +1,25 @@
+--- a/ufraw_exiv2.cc 2015-06-16 05:58:38.000000000 +0200
++++ b/ufraw_exiv2.cc 2018-12-29 22:51:23.291894430 +0100
+@@ -15,9 +15,7 @@
+ #include "ufraw.h"
+
+ #ifdef HAVE_EXIV2
+-#include <exiv2/image.hpp>
+-#include <exiv2/easyaccess.hpp>
+-#include <exiv2/exif.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <sstream>
+ #include <cassert>
+
+@@ -67,7 +65,11 @@
+ if (exifData.empty()) {
+ std::string error(uf->filename);
+ error += ": No Exif data found in the file";
++#if EXIV2_TEST_VERSION(0,27,0)
++ throw Exiv2::Error(Exiv2::kerErrorMessage, error);
++#else
+ throw Exiv2::Error(1, error);
++#endif
+ }
+
+ /* List of tag names taken from exiv2's printSummary() in actions.cpp */
diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
index 53994be42a8..9bbc7e77121 100644
--- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -44,6 +44,7 @@ PATCHES=(
"${FILESDIR}"/${P}-drop_superfluous_abs.patch
"${FILESDIR}"/${P}-fix-unsigned-char.patch
"${FILESDIR}"/${P}-jpeg9.patch
+ "${FILESDIR}"/${P}-exiv2-0.27.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/, media-gfx/ufraw/
@ 2019-09-15 23:47 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2019-09-15 23:47 UTC (permalink / raw
To: gentoo-commits
commit: 35c276a51e96fd25c976d70a762e76dd2e048331
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 23:34:26 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 23:46:26 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35c276a5
media-gfx/ufraw: Fix CVE-2015-8366 and CVE-2018-19655
Thanks to openSUSE for the patches.
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../ufraw/files/ufraw-0.22-CVE-2015-8366.patch | 17 +++++++++
.../ufraw/files/ufraw-0.22-CVE-2018-19655.patch | 44 ++++++++++++++++++++++
media-gfx/ufraw/ufraw-0.22-r3.ebuild | 2 +
3 files changed, 63 insertions(+)
diff --git a/media-gfx/ufraw/files/ufraw-0.22-CVE-2015-8366.patch b/media-gfx/ufraw/files/ufraw-0.22-CVE-2015-8366.patch
new file mode 100644
index 00000000000..9d59ca413fb
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-CVE-2015-8366.patch
@@ -0,0 +1,17 @@
+Fix a buffer overflow bug. See
+https://github.com/LibRaw/LibRaw/commit/89d065424f09b788f443734d44857289489ca9e2
+
+--- a/dcraw.cc
++++ b/dcraw.cc
+@@ -3013,7 +3013,10 @@
+ diff = diff ? -diff : 0x80;
+ if (ftell(ifp) + 12 >= (int) seg[1][1])
+ diff = 0;
+- raw_image[pix] = pred[pix & 1] += diff;
++ if(pix>=raw_width*raw_height)
++ derror();
++ else
++ raw_image[pix] = pred[pix & 1] += diff;
+ if (!(pix & 1) && HOLE(pix / raw_width)) pix += 2;
+ }
+ maximum = 0xff;
diff --git a/media-gfx/ufraw/files/ufraw-0.22-CVE-2018-19655.patch b/media-gfx/ufraw/files/ufraw-0.22-CVE-2018-19655.patch
new file mode 100644
index 00000000000..78b46b4452e
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-CVE-2018-19655.patch
@@ -0,0 +1,44 @@
+Description: stack-based buffer overflow bug
+Bug-Debian: https://bugs.debian.org/890086
+Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2018-19655
+Author: Filip Hroch <hroch@physics.muni.cz>
+Reviewed-by: Salvatore Bonaccorso <carnil@debian.org>
+Last-Update: 2018-12-02
+
+--- a/dcraw.cc
++++ b/dcraw.cc
+@@ -8505,9 +8505,15 @@ float CLASS find_green (int bps, int bit
+ {
+ UINT64 bitbuf=0;
+ int vbits, col, i, c;
+- ushort img[2][2064];
++ ushort *img;
+ double sum[]={0,0};
+
++#define IMG2D(row,col) \
++ img[(row)*width+(col)]
++
++ img = (ushort *) malloc(2*width*sizeof(ushort));
++ merror (img, "find_green()");
++
+ FORC(2) {
+ fseek (ifp, c ? off1:off0, SEEK_SET);
+ for (vbits=col=0; col < width; col++) {
+@@ -8516,13 +8522,14 @@ float CLASS find_green (int bps, int bit
+ for (i=0; i < bite; i+=8)
+ bitbuf |= (unsigned) (fgetc(ifp) << i);
+ }
+- img[c][col] = bitbuf << (64-bps-vbits) >> (64-bps);
++ IMG2D(c,col) = bitbuf << (64-bps-vbits) >> (64-bps);
+ }
+ }
+ FORC(width-1) {
+- sum[ c & 1] += ABS(img[0][c]-img[1][c+1]);
+- sum[~c & 1] += ABS(img[1][c]-img[0][c+1]);
++ sum[ c & 1] += ABS(IMG2D(0,c)-IMG2D(1,c+1));
++ sum[~c & 1] += ABS(IMG2D(1,c)-IMG2D(0,c+1));
+ }
++ free(img);
+ return 100 * log(sum[0]/sum[1]);
+ }
+
diff --git a/media-gfx/ufraw/ufraw-0.22-r3.ebuild b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
index b43d97d6022..f3126840467 100644
--- a/media-gfx/ufraw/ufraw-0.22-r3.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
@@ -44,6 +44,8 @@ PATCHES=(
"${FILESDIR}"/${P}-jpeg9.patch
"${FILESDIR}"/${P}-exiv2-0.27.patch
"${FILESDIR}"/${P}-gcc9.patch
+ "${FILESDIR}"/${P}-CVE-2015-8366.patch
+ "${FILESDIR}"/${P}-CVE-2018-19655.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/, media-gfx/ufraw/
@ 2019-09-15 23:47 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2019-09-15 23:47 UTC (permalink / raw
To: gentoo-commits
commit: 12faa1f3969c1f632a6f939f46e4377c08c37fab
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 23:26:33 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 23:46:17 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12faa1f3
media-gfx/ufraw: Fix build with gcc-9, EAPI-7 bump
Thanks to openSUSE for the patch.
Closes: https://bugs.gentoo.org/685138
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/ufraw/files/ufraw-0.22-gcc9.patch | 97 +++++++++++++++++++++++++++++
media-gfx/ufraw/ufraw-0.22-r3.ebuild | 96 ++++++++++++++++++++++++++++
2 files changed, 193 insertions(+)
diff --git a/media-gfx/ufraw/files/ufraw-0.22-gcc9.patch b/media-gfx/ufraw/files/ufraw-0.22-gcc9.patch
new file mode 100644
index 00000000000..f2cf1dc88a8
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-gcc9.patch
@@ -0,0 +1,97 @@
+From ac8c74699cba65d65f918b3f4cba2de64e039ada Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
+Date: Thu, 14 Feb 2019 03:26:02 +0000
+Subject: [PATCH] Fix GCC 9 OpenMP issues by drop default(none)
+
+---
+ dcraw_api.cc | 4 ++--
+ dcraw_indi.c | 4 ----
+ ufraw_ufraw.c | 6 +++---
+ 3 files changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/dcraw_api.cc b/dcraw_api.cc
+index c3d2902..6096cb7 100644
+--- a/dcraw_api.cc
++++ b/dcraw_api.cc
+@@ -686,7 +686,7 @@ extern "C" {
+ rgbWB[3] = rgbWB[1];
+ if (dark) {
+ #ifdef _OPENMP
+- #pragma omp parallel for schedule(static) default(none) \
++ #pragma omp parallel for schedule(static) \
+ shared(h,dark,rgbWB)
+ #endif
+ for (int i = 0; i < pixels; i++) {
+@@ -699,7 +699,7 @@ extern "C" {
+ }
+ } else {
+ #ifdef _OPENMP
+- #pragma omp parallel for schedule(static) default(none) \
++ #pragma omp parallel for schedule(static) \
+ shared(h,dark,rgbWB)
+ #endif
+ for (int i = 0; i < pixels; i++) {
+diff --git a/dcraw_indi.c b/dcraw_indi.c
+index a291af2..777ce39 100644
+--- a/dcraw_indi.c
++++ b/dcraw_indi.c
+@@ -137,12 +137,10 @@ void CLASS wavelet_denoise_INDI(ushort(*image)[4], const int black,
+ #ifdef _OPENMP
+ #if defined(__sun) && !defined(__GNUC__) /* Fix bug #3205673 - NKBJ */
+ #pragma omp parallel for \
+- default(none) \
+ shared(nc,image,size,noise) \
+ private(c,i,hpass,lev,lpass,row,col,thold,fimg,temp)
+ #else
+ #pragma omp parallel for \
+- default(none) \
+ shared(nc,image,size) \
+ private(c,i,hpass,lev,lpass,row,col,thold,fimg,temp)
+ #endif
+@@ -413,7 +411,6 @@ void CLASS vng_interpolate_INDI(ushort(*image)[4], const unsigned filters,
+ progress(PROGRESS_INTERPOLATE, -height);
+ #ifdef _OPENMP
+ #pragma omp parallel \
+- default(none) \
+ shared(image,code,prow,pcol,h) \
+ private(row,col,g,brow,rowtmp,pix,ip,gval,diff,gmin,gmax,thold,sum,color,num,c,t)
+ #endif
+@@ -496,7 +493,6 @@ void CLASS ppg_interpolate_INDI(ushort(*image)[4], const unsigned filters,
+
+ #ifdef _OPENMP
+ #pragma omp parallel \
+- default(none) \
+ shared(image,dir,diff) \
+ private(row,col,i,d,c,pix,guess)
+ #endif
+diff --git a/ufraw_ufraw.c b/ufraw_ufraw.c
+index ce9d262..48a0d91 100644
+--- a/ufraw_ufraw.c
++++ b/ufraw_ufraw.c
+@@ -1043,7 +1043,7 @@ static void ufraw_shave_hotpixels(ufraw_data *uf, dcraw_image_type *img,
+ delta = rgbMax / (uf->conf->hotpixel + 1.0);
+ count = 0;
+ #ifdef _OPENMP
+- #pragma omp parallel for schedule(static) default(none) \
++ #pragma omp parallel for schedule(static) \
+ shared(uf,img,width,height,colors,rgbMax,delta) \
+ reduction(+:count) \
+ private(h,p,w,c,t,v,hi,i)
+@@ -1365,7 +1365,7 @@ static void ufraw_convert_reverse_wb(ufraw_data *uf, UFRawPhase phase)
+ mul[i] = (guint64)0x10000 * 0x10000 / uf->developer->rgbWB[i];
+ size = img->height * img->width;
+ #ifdef _OPENMP
+- #pragma omp parallel for schedule(static) default(none) \
++ #pragma omp parallel for schedule(static) \
+ shared(uf,phase,img,mul,size) \
+ private(i,p16,c,px)
+ #endif
+@@ -1390,7 +1390,7 @@ static void ufraw_convert_image_tca(ufraw_data *uf, ufraw_image_data *img,
+ return;
+ int y;
+ #ifdef _OPENMP
+- #pragma omp parallel for schedule(static) default(none) \
++ #pragma omp parallel for schedule(static) \
+ shared(uf,img,outimg,area)
+ #endif
+ for (y = area->y; y < area->y + area->height; y++) {
diff --git a/media-gfx/ufraw/ufraw-0.22-r3.ebuild b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
new file mode 100644
index 00000000000..b43d97d6022
--- /dev/null
+++ b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="contrast fits gimp gnome gtk openmp timezone"
+
+REQUIRED_USE="gimp? ( gtk )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ dev-libs/glib:2
+ media-gfx/exiv2:=
+ media-libs/lcms:2=
+ >=media-libs/lensfun-0.2.5:=
+ media-libs/libpng:0=
+ media-libs/tiff
+ virtual/jpeg:0=
+ fits? ( sci-libs/cfitsio:= )
+ gimp? ( >=media-gfx/gimp-2 )
+ gnome? ( >=gnome-base/gconf-2 )
+ gtk? (
+ >=media-gfx/gtkimageview-1.5
+ >=x11-libs/gtk+-2.6:2
+ )
+"
+DEPEND="${RDEPEND}"
+
+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
+ "${FILESDIR}"/${P}-exiv2-0.27.patch
+ "${FILESDIR}"/${P}-gcc9.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-jasper
+ $(use_enable contrast)
+ $(use_with fits cfitsio)
+ $(use_with gimp)
+ $(use_enable gnome mime)
+ $(use_with gtk)
+ $(use_enable openmp)
+ $(use_enable timezone dst-correction)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/, media-gfx/ufraw/
@ 2021-04-19 3:16 Matt Turner
0 siblings, 0 replies; 8+ messages in thread
From: Matt Turner @ 2021-04-19 3:16 UTC (permalink / raw
To: gentoo-commits
commit: dd9edb33d1b4949330bb07661f39d76df84519f3
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 19 03:16:23 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 03:16:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd9edb33
media-gfx/ufraw: Fix build with glib-2.68
Closes: https://bugs.gentoo.org/777534
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-gfx/ufraw/files/ufraw-0.22-glib-2.68.patch | 19 +++++++++++++++++++
media-gfx/ufraw/ufraw-0.22-r4.ebuild | 1 +
2 files changed, 20 insertions(+)
diff --git a/media-gfx/ufraw/files/ufraw-0.22-glib-2.68.patch b/media-gfx/ufraw/files/ufraw-0.22-glib-2.68.patch
new file mode 100644
index 00000000000..c2499fa16bf
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-glib-2.68.patch
@@ -0,0 +1,19 @@
+--- a/uf_glib.h 2021-04-18 23:14:11.346861061 -0400
++++ b/uf_glib.h 2021-04-18 23:14:20.180520873 -0400
+@@ -13,13 +13,13 @@
+ #ifndef _UF_GLIB_H
+ #define _UF_GLIB_H
+
++#include <glib.h>
++#include <glib/gstdio.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+
+-#include <glib.h>
+-#include <glib/gstdio.h>
+-
+ // g_win32_locale_filename_from_utf8 is needed only on win32
+ #ifdef _WIN32
+ #define uf_win32_locale_filename_from_utf8(__some_string__) \
diff --git a/media-gfx/ufraw/ufraw-0.22-r4.ebuild b/media-gfx/ufraw/ufraw-0.22-r4.ebuild
index 0400a1d39a7..1be3077ba8e 100644
--- a/media-gfx/ufraw/ufraw-0.22-r4.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r4.ebuild
@@ -46,6 +46,7 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc9.patch
"${FILESDIR}"/${P}-CVE-2015-8366.patch
"${FILESDIR}"/${P}-CVE-2018-19655.patch
+ "${FILESDIR}"/${P}-glib-2.68.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/, media-gfx/ufraw/
@ 2021-07-26 2:38 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-07-26 2:38 UTC (permalink / raw
To: gentoo-commits
commit: 699a7159a7d6c00cc571191e2a8ccd884e8fb670
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 26 02:33:02 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 26 02:33:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=699a7159
media-gfx/ufraw: treeclean
Bug: https://bugs.gentoo.org/312935
Bug: https://bugs.gentoo.org/341923
Bug: https://bugs.gentoo.org/629050
Bug: https://bugs.gentoo.org/739984
Bug: https://bugs.gentoo.org/775761
Bug: https://bugs.gentoo.org/777534
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/ufraw/Manifest | 1 -
.../ufraw/files/ufraw-0.17-cfitsio-automagic.patch | 28 ------
.../ufraw/files/ufraw-0.22-CVE-2015-8366.patch | 17 ----
.../ufraw/files/ufraw-0.22-CVE-2018-19655.patch | 44 ----------
media-gfx/ufraw/files/ufraw-0.22-crashfix.patch | 15 ----
.../files/ufraw-0.22-drop_superfluous_abs.patch | 16 ----
media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch | 26 ------
.../ufraw/files/ufraw-0.22-fix-unsigned-char.patch | 20 -----
media-gfx/ufraw/files/ufraw-0.22-gcc9.patch | 97 ---------------------
media-gfx/ufraw/files/ufraw-0.22-glib-2.68.patch | 19 -----
.../ufraw/files/ufraw-0.22-jasper-automagic.patch | 21 -----
media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch | 32 -------
media-gfx/ufraw/metadata.xml | 13 ---
media-gfx/ufraw/ufraw-0.22-r4.ebuild | 99 ----------------------
14 files changed, 448 deletions(-)
diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
deleted file mode 100644
index 94b0dbea86e..00000000000
--- a/media-gfx/ufraw/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ufraw-0.22.tar.gz 1103554 BLAKE2B 5ffa4c660602553853221d7b31bfb78b02644bfeb4461cf752186d83ed8087b7905e414c7d741916ca9460c05849ab679b2f3098c99e5246f54a49b6a915268f SHA512 a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2
diff --git a/media-gfx/ufraw/files/ufraw-0.17-cfitsio-automagic.patch b/media-gfx/ufraw/files/ufraw-0.17-cfitsio-automagic.patch
deleted file mode 100644
index aff7c5a2593..00000000000
--- a/media-gfx/ufraw/files/ufraw-0.17-cfitsio-automagic.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ru ufraw-0.17.orig/configure.ac ufraw-0.17/configure.ac
---- ufraw-0.17.orig/configure.ac 2010-04-02 16:16:08.000000000 +0200
-+++ ufraw-0.17/configure.ac 2010-04-02 16:19:33.000000000 +0200
-@@ -246,11 +246,19 @@
- [ have_png=no
- AC_MSG_RESULT($LIBPNG_PKG_ERRORS) ] )
-
--PKG_CHECK_MODULES(CFITSIO, cfitsio,
-- [ have_cfitsio=yes
-- AC_DEFINE(HAVE_LIBCFITSIO, 1, have the cfitsio library) ],
-- [ have_cfitsio=no
-- AC_MSG_RESULT($CFITSIO_PKG_ERRORS) ] )
-+AC_ARG_WITH([cfitsio],
-+ [AS_HELP_STRING([--with-cfitsio],
-+ [build fits support @<:@default=check@:>@])],
-+ [],
-+ [with_cfitsio=check])
-+
-+have_cfitsio=no
-+AS_IF([test "x$with_cfitsio" != xno],
-+ [PKG_CHECK_MODULES(CFITSIO, cfitsio,
-+ [ have_cfitsio=yes
-+ AC_DEFINE(HAVE_LIBCFITSIO, 1, have the cfitsio library) ],
-+ [ have_cfitsio=no
-+ AC_MSG_RESULT($CFITSIO_PKG_ERRORS) ] ) ] )
-
- PKG_CHECK_MODULES(EXIV2, exiv2 >= 0.16,
- [ have_exiv2=yes
diff --git a/media-gfx/ufraw/files/ufraw-0.22-CVE-2015-8366.patch b/media-gfx/ufraw/files/ufraw-0.22-CVE-2015-8366.patch
deleted file mode 100644
index 9d59ca413fb..00000000000
--- a/media-gfx/ufraw/files/ufraw-0.22-CVE-2015-8366.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix a buffer overflow bug. See
-https://github.com/LibRaw/LibRaw/commit/89d065424f09b788f443734d44857289489ca9e2
-
---- a/dcraw.cc
-+++ b/dcraw.cc
-@@ -3013,7 +3013,10 @@
- diff = diff ? -diff : 0x80;
- if (ftell(ifp) + 12 >= (int) seg[1][1])
- diff = 0;
-- raw_image[pix] = pred[pix & 1] += diff;
-+ if(pix>=raw_width*raw_height)
-+ derror();
-+ else
-+ raw_image[pix] = pred[pix & 1] += diff;
- if (!(pix & 1) && HOLE(pix / raw_width)) pix += 2;
- }
- maximum = 0xff;
diff --git a/media-gfx/ufraw/files/ufraw-0.22-CVE-2018-19655.patch b/media-gfx/ufraw/files/ufraw-0.22-CVE-2018-19655.patch
deleted file mode 100644
index 78b46b4452e..00000000000
--- a/media-gfx/ufraw/files/ufraw-0.22-CVE-2018-19655.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: stack-based buffer overflow bug
-Bug-Debian: https://bugs.debian.org/890086
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2018-19655
-Author: Filip Hroch <hroch@physics.muni.cz>
-Reviewed-by: Salvatore Bonaccorso <carnil@debian.org>
-Last-Update: 2018-12-02
-
---- a/dcraw.cc
-+++ b/dcraw.cc
-@@ -8505,9 +8505,15 @@ float CLASS find_green (int bps, int bit
- {
- UINT64 bitbuf=0;
- int vbits, col, i, c;
-- ushort img[2][2064];
-+ ushort *img;
- double sum[]={0,0};
-
-+#define IMG2D(row,col) \
-+ img[(row)*width+(col)]
-+
-+ img = (ushort *) malloc(2*width*sizeof(ushort));
-+ merror (img, "find_green()");
-+
- FORC(2) {
- fseek (ifp, c ? off1:off0, SEEK_SET);
- for (vbits=col=0; col < width; col++) {
-@@ -8516,13 +8522,14 @@ float CLASS find_green (int bps, int bit
- for (i=0; i < bite; i+=8)
- bitbuf |= (unsigned) (fgetc(ifp) << i);
- }
-- img[c][col] = bitbuf << (64-bps-vbits) >> (64-bps);
-+ IMG2D(c,col) = bitbuf << (64-bps-vbits) >> (64-bps);
- }
- }
- FORC(width-1) {
-- sum[ c & 1] += ABS(img[0][c]-img[1][c+1]);
-- sum[~c & 1] += ABS(img[1][c]-img[0][c+1]);
-+ sum[ c & 1] += ABS(IMG2D(0,c)-IMG2D(1,c+1));
-+ sum[~c & 1] += ABS(IMG2D(1,c)-IMG2D(0,c+1));
- }
-+ free(img);
- return 100 * log(sum[0]/sum[1]);
- }
-
diff --git a/media-gfx/ufraw/files/ufraw-0.22-crashfix.patch b/media-gfx/ufraw/files/ufraw-0.22-crashfix.patch
deleted file mode 100644
index 76fe83fa8f2..00000000000
--- a/media-gfx/ufraw/files/ufraw-0.22-crashfix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/ufraw_ufraw.c 2015-06-16 04:58:38.000000000 +0100
-+++ b/ufraw_ufraw.c 2016-12-18 00:55:45.794466747 +0000
-@@ -767,8 +767,10 @@ void ufraw_close(ufraw_data *uf)
- g_free(uf->displayProfile);
- g_free(uf->RawHistogram);
- #ifdef HAVE_LENSFUN
-- lf_modifier_destroy(uf->TCAmodifier);
-- lf_modifier_destroy(uf->modifier);
-+ if (uf->TCAmodifier != NULL)
-+ lf_modifier_destroy(uf->TCAmodifier);
-+ if (uf->modifier != NULL)
-+ lf_modifier_destroy(uf->modifier);
- #endif
- ufobject_delete(uf->conf->ufobject);
- g_free(uf->conf);
diff --git a/media-gfx/ufraw/files/ufraw-0.22-drop_superfluous_abs.patch b/media-gfx/ufraw/files/ufraw-0.22-drop_superfluous_abs.patch
deleted file mode 100644
index 8c11f664978..00000000000
--- a/media-gfx/ufraw/files/ufraw-0.22-drop_superfluous_abs.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fixes build with gcc 7, by Johannes Hirte.
-https://bugs.gentoo.org/show_bug.cgi?id=618068
-
-diff --git a/../old/dcraw.cc b/dcraw.cc
-index 88c8068..cedf86b 100644
---- a/../old/dcraw.cc
-+++ b/dcraw.cc
-@@ -9242,7 +9242,7 @@ canon_a5:
- if (make[0] == 'O') {
- i = find_green (12, 32, 1188864, 3576832);
- c = find_green (12, 32, 2383920, 2387016);
-- if (abs(i) < abs(c)) {
-+ if (i < c) {
- SWAP(i,c);
- load_flags = 24;
- }
diff --git a/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch b/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
deleted file mode 100644
index 2cd888ebc09..00000000000
--- a/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/ufraw_exiv2.cc
-+++ b/ufraw_exiv2.cc
-@@ -15,9 +15,8 @@
- #include "ufraw.h"
-
- #ifdef HAVE_EXIV2
--#include <exiv2/image.hpp>
--#include <exiv2/easyaccess.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
-+#include <iostream>
- #include <sstream>
- #include <cassert>
-
-@@ -67,7 +66,11 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf)
- if (exifData.empty()) {
- std::string error(uf->filename);
- error += ": No Exif data found in the file";
-+#if EXIV2_TEST_VERSION(0,27,0)
-+ throw Exiv2::Error(Exiv2::kerErrorMessage, error);
-+#else
- throw Exiv2::Error(1, error);
-+#endif
- }
-
- /* List of tag names taken from exiv2's printSummary() in actions.cpp */
diff --git a/media-gfx/ufraw/files/ufraw-0.22-fix-unsigned-char.patch b/media-gfx/ufraw/files/ufraw-0.22-fix-unsigned-char.patch
deleted file mode 100644
index a5397260ffb..00000000000
--- a/media-gfx/ufraw/files/ufraw-0.22-fix-unsigned-char.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix unsigned char declaration of src[]
-Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
-Last-Update: 2017-02-27
-
-https://bugs.gentoo.org/show_bug.cgi?id=622484
-https://sourceforge.net/p/ufraw/bugs/417/
-https://src.fedoraproject.org/cgit/rpms/ufraw.git/tree/05_fix_build_due_to_unsigned_char.patch
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=856227
-
---- ufraw-0.22.orig/dcraw.cc
-+++ ufraw-0.22/dcraw.cc
-@@ -2285,7 +2285,7 @@ void CLASS quicktake_100_load_raw()
-
- void CLASS kodak_radc_load_raw()
- {
-- static const char src[] = {
-+ static const signed char src[] = {
- 1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8,
- 1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8,
- 2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8,
diff --git a/media-gfx/ufraw/files/ufraw-0.22-gcc9.patch b/media-gfx/ufraw/files/ufraw-0.22-gcc9.patch
deleted file mode 100644
index f2cf1dc88a8..00000000000
--- a/media-gfx/ufraw/files/ufraw-0.22-gcc9.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From ac8c74699cba65d65f918b3f4cba2de64e039ada Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
-Date: Thu, 14 Feb 2019 03:26:02 +0000
-Subject: [PATCH] Fix GCC 9 OpenMP issues by drop default(none)
-
----
- dcraw_api.cc | 4 ++--
- dcraw_indi.c | 4 ----
- ufraw_ufraw.c | 6 +++---
- 3 files changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/dcraw_api.cc b/dcraw_api.cc
-index c3d2902..6096cb7 100644
---- a/dcraw_api.cc
-+++ b/dcraw_api.cc
-@@ -686,7 +686,7 @@ extern "C" {
- rgbWB[3] = rgbWB[1];
- if (dark) {
- #ifdef _OPENMP
-- #pragma omp parallel for schedule(static) default(none) \
-+ #pragma omp parallel for schedule(static) \
- shared(h,dark,rgbWB)
- #endif
- for (int i = 0; i < pixels; i++) {
-@@ -699,7 +699,7 @@ extern "C" {
- }
- } else {
- #ifdef _OPENMP
-- #pragma omp parallel for schedule(static) default(none) \
-+ #pragma omp parallel for schedule(static) \
- shared(h,dark,rgbWB)
- #endif
- for (int i = 0; i < pixels; i++) {
-diff --git a/dcraw_indi.c b/dcraw_indi.c
-index a291af2..777ce39 100644
---- a/dcraw_indi.c
-+++ b/dcraw_indi.c
-@@ -137,12 +137,10 @@ void CLASS wavelet_denoise_INDI(ushort(*image)[4], const int black,
- #ifdef _OPENMP
- #if defined(__sun) && !defined(__GNUC__) /* Fix bug #3205673 - NKBJ */
- #pragma omp parallel for \
-- default(none) \
- shared(nc,image,size,noise) \
- private(c,i,hpass,lev,lpass,row,col,thold,fimg,temp)
- #else
- #pragma omp parallel for \
-- default(none) \
- shared(nc,image,size) \
- private(c,i,hpass,lev,lpass,row,col,thold,fimg,temp)
- #endif
-@@ -413,7 +411,6 @@ void CLASS vng_interpolate_INDI(ushort(*image)[4], const unsigned filters,
- progress(PROGRESS_INTERPOLATE, -height);
- #ifdef _OPENMP
- #pragma omp parallel \
-- default(none) \
- shared(image,code,prow,pcol,h) \
- private(row,col,g,brow,rowtmp,pix,ip,gval,diff,gmin,gmax,thold,sum,color,num,c,t)
- #endif
-@@ -496,7 +493,6 @@ void CLASS ppg_interpolate_INDI(ushort(*image)[4], const unsigned filters,
-
- #ifdef _OPENMP
- #pragma omp parallel \
-- default(none) \
- shared(image,dir,diff) \
- private(row,col,i,d,c,pix,guess)
- #endif
-diff --git a/ufraw_ufraw.c b/ufraw_ufraw.c
-index ce9d262..48a0d91 100644
---- a/ufraw_ufraw.c
-+++ b/ufraw_ufraw.c
-@@ -1043,7 +1043,7 @@ static void ufraw_shave_hotpixels(ufraw_data *uf, dcraw_image_type *img,
- delta = rgbMax / (uf->conf->hotpixel + 1.0);
- count = 0;
- #ifdef _OPENMP
-- #pragma omp parallel for schedule(static) default(none) \
-+ #pragma omp parallel for schedule(static) \
- shared(uf,img,width,height,colors,rgbMax,delta) \
- reduction(+:count) \
- private(h,p,w,c,t,v,hi,i)
-@@ -1365,7 +1365,7 @@ static void ufraw_convert_reverse_wb(ufraw_data *uf, UFRawPhase phase)
- mul[i] = (guint64)0x10000 * 0x10000 / uf->developer->rgbWB[i];
- size = img->height * img->width;
- #ifdef _OPENMP
-- #pragma omp parallel for schedule(static) default(none) \
-+ #pragma omp parallel for schedule(static) \
- shared(uf,phase,img,mul,size) \
- private(i,p16,c,px)
- #endif
-@@ -1390,7 +1390,7 @@ static void ufraw_convert_image_tca(ufraw_data *uf, ufraw_image_data *img,
- return;
- int y;
- #ifdef _OPENMP
-- #pragma omp parallel for schedule(static) default(none) \
-+ #pragma omp parallel for schedule(static) \
- shared(uf,img,outimg,area)
- #endif
- for (y = area->y; y < area->y + area->height; y++) {
diff --git a/media-gfx/ufraw/files/ufraw-0.22-glib-2.68.patch b/media-gfx/ufraw/files/ufraw-0.22-glib-2.68.patch
deleted file mode 100644
index c2499fa16bf..00000000000
--- a/media-gfx/ufraw/files/ufraw-0.22-glib-2.68.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/uf_glib.h 2021-04-18 23:14:11.346861061 -0400
-+++ b/uf_glib.h 2021-04-18 23:14:20.180520873 -0400
-@@ -13,13 +13,13 @@
- #ifndef _UF_GLIB_H
- #define _UF_GLIB_H
-
-+#include <glib.h>
-+#include <glib/gstdio.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-
--#include <glib.h>
--#include <glib/gstdio.h>
--
- // g_win32_locale_filename_from_utf8 is needed only on win32
- #ifdef _WIN32
- #define uf_win32_locale_filename_from_utf8(__some_string__) \
diff --git a/media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch b/media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch
deleted file mode 100644
index 93e1d691af1..00000000000
--- a/media-gfx/ufraw/files/ufraw-0.22-jasper-automagic.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -159,8 +159,16 @@
- have_jpeg=${ac_cv_lib_jpeg_jpeg_CreateCompress:-no}
-
- # Check for libjasper.
--AC_CHECK_LIB(jasper, jas_image_decode)
--have_jasper=${ac_cv_lib_jasper_jas_image_decode:-no}
-+AC_ARG_ENABLE([jasper],
-+ AS_HELP_STRING([--enable-jasper], [enable JPEG2000 support]))
-+
-+have_jasper=no
-+AS_IF([test "x$enable_jasper" = "xyes"], [
-+ AC_SEARCH_LIBS([jas_image_decode], [jasper], [have_jasper=yes], [
-+ AC_MSG_ERROR([unable to find the jas_image_decode() function])
-+ ])
-+])
-+
-
- # Check for tiff headers and library.
- PKG_CHECK_MODULES(LIBTIFF, libtiff-4,
diff --git a/media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch b/media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch
deleted file mode 100644
index dca3834cbe8..00000000000
--- a/media-gfx/ufraw/files/ufraw-0.22-jpeg9.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Fix build with >=jpeg-9
-Thanks-to: Moran Z. <o542018138@gmail.com>
-
---- 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/metadata.xml b/media-gfx/ufraw/metadata.xml
deleted file mode 100644
index 6cf2734b4a8..00000000000
--- a/media-gfx/ufraw/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <use>
- <flag name="contrast">enable contrast setting option</flag>
- <flag name="fits">Enable support for the FITS image format through <pkg>sci-libs/cfitsio</pkg></flag>
- <flag name="timezone">enable DST correction for file timestamps</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">ufraw</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-gfx/ufraw/ufraw-0.22-r4.ebuild b/media-gfx/ufraw/ufraw-0.22-r4.ebuild
deleted file mode 100644
index 1be3077ba8e..00000000000
--- a/media-gfx/ufraw/ufraw-0.22-r4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="contrast fits gimp gnome gtk openmp timezone"
-
-REQUIRED_USE="gimp? ( gtk )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
- dev-libs/glib:2
- media-gfx/exiv2:=
- media-libs/lcms:2=
- >=media-libs/lensfun-0.2.5:=
- media-libs/libpng:0=
- media-libs/tiff
- virtual/jpeg:0=
- fits? ( sci-libs/cfitsio:= )
- gimp? ( media-gfx/gimp:0/2 )
- gnome? ( >=gnome-base/gconf-2 )
- gtk? (
- >=media-gfx/gtkimageview-1.5
- >=x11-libs/gtk+-2.6:2
- )
-"
-DEPEND="${RDEPEND}"
-
-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
- "${FILESDIR}"/${P}-exiv2-0.27.patch
- "${FILESDIR}"/${P}-gcc9.patch
- "${FILESDIR}"/${P}-CVE-2015-8366.patch
- "${FILESDIR}"/${P}-CVE-2018-19655.patch
- "${FILESDIR}"/${P}-glib-2.68.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-jasper
- $(use_enable contrast)
- $(use_with fits cfitsio)
- $(use_with gimp)
- $(use_enable gnome mime)
- $(use_with gtk)
- $(use_enable openmp)
- $(use_enable timezone dst-correction)
- )
- econf "${myeconfargs[@]}"
-}
-
-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
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-07-26 2:38 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-04 15:42 [gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/, media-gfx/ufraw/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-07-26 2:38 Sam James
2021-04-19 3:16 Matt Turner
2019-09-15 23:47 Andreas Sturmlechner
2019-09-15 23:47 Andreas Sturmlechner
2018-12-29 22:02 Andreas Sturmlechner
2017-06-18 9:51 Alexis Ballier
2017-04-04 15:42 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox