> This patch makes sure that libraw does not pick up OpenMP.
> Package version bumped for safety.
>
> Also this enables warnings so build logs become more useful.
> Patches regen'ed while there, too. Added SEPARATE_BUILD=Yes,
> tested on i386.
>
> okay?
Oops, now bump for real...
--
WBR,
Vadim Zhukov
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/libraw/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 18 Jun 2013 18:39:58 -0000 1.8
+++ Makefile 2 Jul 2013 21:16:46 -0000
@@ -3,13 +3,13 @@
COMMENT = library for reading RAW files
V = 0.14.8
-REVISION = 0
+REVISION = 1
DISTNAME = LibRaw-${V}
PKGNAME = ${DISTNAME:L}
CATEGORIES = graphics
-SHARED_LIBS += raw 0.0 # 5.0
-SHARED_LIBS += raw_r 0.0 # 5.0
+SHARED_LIBS += raw 0.1 # 5.0
+SHARED_LIBS += raw_r 0.1 # 5.0
HOMEPAGE = http://www.libraw.org/
@@ -25,9 +25,11 @@ LIB_DEPENDS = graphics/jasper \
graphics/lcms2
+SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS = ${CONFIGURE_SHARED}
+ LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS = ${CONFIGURE_SHARED} \
+ --disable-openmp
.include <bsd.port.mk>
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in 2 Jul 2013 21:16:46 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+--- Makefile.in.orig Sat May 18 00:09:26 2013
++++ Makefile.in Wed Jul 3 01:01:03 2013
+@@ -393,7 +393,7 @@ pkgconfig_DATA = libraw.pc libraw_r.pc
+
+ # Libraries
+ lib_LTLIBRARIES = lib/libraw.la lib/libraw_r.la
+-lib_libraw_a_CPPFLAGS = -DLIBRAW_NOTHREADS -w
++lib_libraw_a_CPPFLAGS = -DLIBRAW_NOTHREADS
+ lib_libraw_a_SOURCES = internal/dcraw_common.cpp \
+ internal/dcraw_fileio.cpp \
+ internal/demosaic_packs.cpp \
+@@ -401,8 +401,8 @@ lib_libraw_a_SOURCES = internal/dcraw_common.cpp \
+ src/libraw_datastream.cpp \
+ src/libraw_c_api.cpp
+
+-lib_libraw_r_a_CXXFLAGS = -pthread -w
+-lib_libraw_r_a_CFLAGS = -pthread -w
++lib_libraw_r_a_CXXFLAGS = -pthread
++lib_libraw_r_a_CFLAGS = -pthread
+ lib_libraw_la_SOURCES = $(lib_libraw_a_SOURCES)
+ lib_libraw_r_la_SOURCES = $(lib_libraw_a_SOURCES)
+ lib_libraw_la_LDFLAGS = -no-undefined -version-info $(LIBRAW_SHLIB_VER)
Index: patches/patch-src_libraw_cxx_cpp
===================================================================
RCS file: /cvs/ports/graphics/libraw/patches/patch-src_libraw_cxx_cpp,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_libraw_cxx_cpp
--- patches/patch-src_libraw_cxx_cpp 18 Jun 2013 18:39:58 -0000 1.4
+++ patches/patch-src_libraw_cxx_cpp 2 Jul 2013 21:16:46 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_libraw_cxx_cpp,v 1.4 2013/06/18 18:39:58 sthen Exp $
---- src/libraw_cxx.cpp.orig Tue Jun 18 19:23:59 2013
-+++ src/libraw_cxx.cpp Tue Jun 18 19:35:38 2013
-@@ -798,8 +798,8 @@ int LibRaw::unpack(void)
+--- src/libraw_cxx.cpp.orig Fri May 17 23:54:17 2013
++++ src/libraw_cxx.cpp Wed Jul 3 01:01:03 2013
+@@ -796,8 +796,8 @@ int LibRaw::unpack(void)
S.iheight= S.height;
IO.shrink = 0;
// allocate image as temporary buffer, size
@@ -12,7 +12,7 @@ $OpenBSD: patch-src_libraw_cxx_cpp,v 1.4
}
-@@ -809,8 +809,8 @@ int LibRaw::unpack(void)
+@@ -807,8 +807,8 @@ int LibRaw::unpack(void)
// recover saved
if( decoder_info.decoder_flags & LIBRAW_DECODER_LEGACY)
{
