Attachment 204334 Details for Bug 237847 – patch to graphics/caffe

[patch] patch to graphics/caffe

caffe-ver1.diff (text/plain), 4.97 KB, created by Hiroo Ono on 2019-05-12 07:57:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hiroo Ono

Created: 2019-05-12 07:57:04 UTC

Size: 4.97 KB

patch

obsolete

>Index: graphics/caffe/Makefile
>===================================================================
>--- graphics/caffe/Makefile	(revision 500577)
>+++ graphics/caffe/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	caffe
> PORTVERSION=	1.0
>-PORTREVISION=	22
>+PORTREVISION=	23
> CATEGORIES=	graphics
> 
> MAINTAINER=	eric@camachat.org
>@@ -15,7 +15,9 @@
> 
> BUILD_DEPENDS=	${PYNUMPY} \
> 		${LOCALBASE}/include/cblas.h:math/cblas \
>-		bash:shells/bash
>+		bash:shells/bash \
>+		${LOCALBASE}/lib/opencv4/libopencv_highgui.so:graphics/opencv \
>+		${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core
> LIB_DEPENDS=	libsnappy.so:archivers/snappy \
> 		libleveldb.so:databases/leveldb \
> 		liblmdb.so:databases/lmdb \
>@@ -24,8 +26,6 @@
> 		libgflags.so:devel/gflags \
> 		libglog.so:devel/glog \
> 		libprotobuf.so:devel/protobuf \
>-		libopencv_highgui.so:graphics/opencv \
>-		libopencv_core.so:graphics/opencv-core \
> 		libopenblas.so:math/openblas \
> 		libhdf5.so:science/hdf5
> RUN_DEPENDS=	${PYNUMPY} \
>@@ -34,7 +34,9 @@
> 		${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets@${PY_FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets@${PY_FLAVOR} \
>+		${LOCALBASE}/lib/opencv4/libopencv_highgui.so:graphics/opencv \
>+		${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core
> 
> USES=		compiler:c++11-lib fortran gmake pkgconfig python:2.7
> USE_CXXSTD=	c++11
>Index: graphics/caffe/files/Makefile.config
>===================================================================
>--- graphics/caffe/files/Makefile.config	(revision 500577)
>+++ graphics/caffe/files/Makefile.config	(working copy)
>@@ -7,3 +7,4 @@
> INCLUDE_DIRS := $(PYTHON_INCLUDE) %%LOCALBASE%%/include
> LIBRARY_DIRS := $(PYTHON_LIB) %%LOCALBASE%%/lib /usr/lib
> USE_PKG_CONFIG := 1
>+OPENCV_VERSION := 3
>Index: graphics/caffe/files/patch-Makefile
>===================================================================
>--- graphics/caffe/files/patch-Makefile	(revision 500577)
>+++ graphics/caffe/files/patch-Makefile	(working copy)
>@@ -1,7 +1,16 @@
>---- Makefile.orig	2017-02-21 04:06:19 UTC
>+--- Makefile.orig	2017-04-15 16:17:48 UTC
> +++ Makefile
>-@@ -316,10 +316,10 @@ endif
>+@@ -192,6 +192,8 @@ ifeq ($(USE_LMDB), 1)
>+ 	LIBRARIES += lmdb
>+ endif
>+ ifeq ($(USE_OPENCV), 1)
>++	INCLUDE_DIRS+= %%LOCALBASE%%/include/opencv4
>++	LIBRARY_DIRS+= %%LOCALBASE%%/lib/opencv4
>+ 	LIBRARIES += opencv_core opencv_highgui opencv_imgproc
>  
>+ 	ifeq ($(OPENCV_VERSION), 3)
>+@@ -316,10 +318,10 @@ endif
>+ 
>  # Debugging
>  ifeq ($(DEBUG), 1)
> -	COMMON_FLAGS += -DDEBUG -g -O0
>@@ -13,7 +22,7 @@
>  endif
>  
>  # cuDNN acceleration configuration.
>-@@ -681,19 +681,18 @@ $(DIST_ALIASES): $(DISTRIBUTE_DIR)
>+@@ -681,19 +683,18 @@ $(DIST_ALIASES): $(DISTRIBUTE_DIR)
>  
>  $(DISTRIBUTE_DIR): all py | $(DISTRIBUTE_SUBDIRS)
>  	# add proto
>Index: graphics/caffe/files/patch-src_caffe_layers_window__data__layer.cpp
>===================================================================
>--- graphics/caffe/files/patch-src_caffe_layers_window__data__layer.cpp	(nonexistent)
>+++ graphics/caffe/files/patch-src_caffe_layers_window__data__layer.cpp	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/caffe/layers/window_data_layer.cpp.orig	2019-05-07 22:24:14 UTC
>++++ src/caffe/layers/window_data_layer.cpp
>+@@ -11,6 +11,7 @@
>+ #include "opencv2/core/core.hpp"
>+ #include "opencv2/highgui/highgui.hpp"
>+ #include "opencv2/imgproc/imgproc.hpp"
>++#include "opencv2/imgcodecs/legacy/constants_c.h"
>+ 
>+ #include "caffe/data_transformer.hpp"
>+ #include "caffe/internal_thread.hpp"
>
>Property changes on: graphics/caffe/files/patch-src_caffe_layers_window__data__layer.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/caffe/files/patch-src_caffe_util_io.cpp
>===================================================================
>--- graphics/caffe/files/patch-src_caffe_util_io.cpp	(nonexistent)
>+++ graphics/caffe/files/patch-src_caffe_util_io.cpp	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/caffe/util/io.cpp.orig	2019-05-07 22:19:49 UTC
>++++ src/caffe/util/io.cpp
>+@@ -7,6 +7,7 @@
>+ #include <opencv2/highgui/highgui.hpp>
>+ #include <opencv2/highgui/highgui_c.h>
>+ #include <opencv2/imgproc/imgproc.hpp>
>++#include <opencv2/imgcodecs/legacy/constants_c.h>
>+ #endif  // USE_OPENCV
>+ #include <stdint.h>
>+ 
>
>Property changes on: graphics/caffe/files/patch-src_caffe_util_io.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 237847: 204333 | 204334 | 204542 | 204543 | 204544