Import of pkgsrc-2014Q1

This commit is contained in:
2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions

View File

@@ -1,17 +1,17 @@
$NetBSD: patch-src_develop_blend.c,v 1.3 2012/12/08 00:15:26 jakllsch Exp $
$NetBSD: patch-src_develop_blend.c,v 1.4 2013/12/04 13:02:08 drochner Exp $
--- src/develop/blend.c.orig 2012-11-23 23:23:21.000000000 +0000
--- src/develop/blend.c.orig 2013-06-24 18:35:28.000000000 +0000
+++ src/develop/blend.c
@@ -1718,7 +1718,7 @@ void dt_develop_blend_process (struct dt
@@ -1758,7 +1758,7 @@ void dt_develop_blend_process (struct dt
if(self->suppress_mask && self->dev->gui_attached && self == self->dev->gui_module && piece->pipe == self->dev->pipe && (d->blendif & (1<<31)))
{
#ifdef _OPENMP
-#if !defined(__SUNOS__)
+#if !defined(__SUNOS__) && !defined(__NetBSD__)
#pragma omp parallel for default(none) shared(roi_out,mask,stderr)
#pragma omp parallel for default(none) shared(roi_out,mask,stderr)
#else
#pragma omp parallel for shared(roi_out,mask)
@@ -1733,7 +1733,7 @@ void dt_develop_blend_process (struct dt
#pragma omp parallel for shared(roi_out,mask)
@@ -1773,7 +1773,7 @@ void dt_develop_blend_process (struct dt
#ifdef _OPENMP