Attachment #204334 for bug #237847

Lines 2-8 Link Here

(-)graphics/caffe/Makefile (-5 / +7 lines)
2		2
3	PORTNAME= caffe	3	PORTNAME= caffe
4	PORTVERSION= 1.0	4	PORTVERSION= 1.0
5	PORTREVISION= 22	5	PORTREVISION= 23
6	CATEGORIES= graphics	6	CATEGORIES= graphics
7		7
8	MAINTAINER= eric@camachat.org	8	MAINTAINER= eric@camachat.org
Lines 15-21 Link Here
15		15
16	BUILD_DEPENDS= ${PYNUMPY} \	16	BUILD_DEPENDS= ${PYNUMPY} \
17	${LOCALBASE}/include/cblas.h:math/cblas \	17	${LOCALBASE}/include/cblas.h:math/cblas \
18	bash:shells/bash	18	bash:shells/bash \
		19	${LOCALBASE}/lib/opencv4/libopencv_highgui.so:graphics/opencv \
		20	${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core
19	LIB_DEPENDS= libsnappy.so:archivers/snappy \	21	LIB_DEPENDS= libsnappy.so:archivers/snappy \
20	libleveldb.so:databases/leveldb \	22	libleveldb.so:databases/leveldb \
21	liblmdb.so:databases/lmdb \	23	liblmdb.so:databases/lmdb \
Lines 24-31 Link Here
24	libgflags.so:devel/gflags \	26	libgflags.so:devel/gflags \
25	libglog.so:devel/glog \	27	libglog.so:devel/glog \
26	libprotobuf.so:devel/protobuf \	28	libprotobuf.so:devel/protobuf \
27	libopencv_highgui.so:graphics/opencv \
28	libopencv_core.so:graphics/opencv-core \
29	libopenblas.so:math/openblas \	29	libopenblas.so:math/openblas \
30	libhdf5.so:science/hdf5	30	libhdf5.so:science/hdf5
31	RUN_DEPENDS= ${PYNUMPY} \	31	RUN_DEPENDS= ${PYNUMPY} \
Lines 34-40 Link Here
34	${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR} \	34	${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR} \
35	${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx@${PY_FLAVOR} \	35	${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx@${PY_FLAVOR} \
36	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib@${PY_FLAVOR} \	36	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib@${PY_FLAVOR} \
37	${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets@${PY_FLAVOR}	37	${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets@${PY_FLAVOR} \
		38	${LOCALBASE}/lib/opencv4/libopencv_highgui.so:graphics/opencv \
		39	${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core
38		40
39	USES= compiler:c++11-lib fortran gmake pkgconfig python:2.7	41	USES= compiler:c++11-lib fortran gmake pkgconfig python:2.7
40	USE_CXXSTD= c++11	42	USE_CXXSTD= c++11

Lines 7-9 Link Here

(-)graphics/caffe/files/Makefile.config (+1 lines)
7	INCLUDE_DIRS := $(PYTHON_INCLUDE) %%LOCALBASE%%/include	7	INCLUDE_DIRS := $(PYTHON_INCLUDE) %%LOCALBASE%%/include
8	LIBRARY_DIRS := $(PYTHON_LIB) %%LOCALBASE%%/lib /usr/lib	8	LIBRARY_DIRS := $(PYTHON_LIB) %%LOCALBASE%%/lib /usr/lib
9	USE_PKG_CONFIG := 1	9	USE_PKG_CONFIG := 1
		10	OPENCV_VERSION := 3

Lines 1-7 Link Here

(-)graphics/caffe/files/patch-Makefile (-3 / +12 lines)
1	--- Makefile.orig 2017-02-21 04:06:19 UTC	1	--- Makefile.orig 2017-04-15 16:17:48 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -316,10 +316,10 @@ endif	3	@@ -192,6 +192,8 @@ ifeq ($(USE_LMDB), 1)
		4	LIBRARIES += lmdb
		5	endif
		6	ifeq ($(USE_OPENCV), 1)
		7	+ INCLUDE_DIRS+= %%LOCALBASE%%/include/opencv4
		8	+ LIBRARY_DIRS+= %%LOCALBASE%%/lib/opencv4
		9	LIBRARIES += opencv_core opencv_highgui opencv_imgproc
4		10
		11	ifeq ($(OPENCV_VERSION), 3)
		12	@@ -316,10 +318,10 @@ endif
		13
5	# Debugging	14	# Debugging
6	ifeq ($(DEBUG), 1)	15	ifeq ($(DEBUG), 1)
7	- COMMON_FLAGS += -DDEBUG -g -O0	16	- COMMON_FLAGS += -DDEBUG -g -O0
Lines 13-19 Link Here
13	endif	22	endif
14		23
15	# cuDNN acceleration configuration.	24	# cuDNN acceleration configuration.
16	@@ -681,19 +681,18 @@ $(DIST_ALIASES): $(DISTRIBUTE_DIR)	25	@@ -681,19 +683,18 @@ $(DIST_ALIASES): $(DISTRIBUTE_DIR)
17		26
18	$(DISTRIBUTE_DIR): all py \| $(DISTRIBUTE_SUBDIRS)	27	$(DISTRIBUTE_DIR): all py \| $(DISTRIBUTE_SUBDIRS)
19	# add proto	28	# add proto

Line 0 Link Here

(-)graphics/caffe/files/patch-src_caffe_layers_window__data__layer.cpp (+10 lines)
	1	--- src/caffe/layers/window_data_layer.cpp.orig 2019-05-07 22:24:14 UTC
	2	+++ src/caffe/layers/window_data_layer.cpp
	3	@@ -11,6 +11,7 @@
	4	#include "opencv2/core/core.hpp"
	5	#include "opencv2/highgui/highgui.hpp"
	6	#include "opencv2/imgproc/imgproc.hpp"
	7	+#include "opencv2/imgcodecs/legacy/constants_c.h"
	8
	9	#include "caffe/data_transformer.hpp"
	10	#include "caffe/internal_thread.hpp"

Line 0 Link Here

(-)graphics/caffe/files/patch-src_caffe_util_io.cpp (+10 lines)
	1	--- src/caffe/util/io.cpp.orig 2019-05-07 22:19:49 UTC
	2	+++ src/caffe/util/io.cpp
	3	@@ -7,6 +7,7 @@
	4	#include <opencv2/highgui/highgui.hpp>
	5	#include <opencv2/highgui/highgui_c.h>
	6	#include <opencv2/imgproc/imgproc.hpp>
	7	+#include <opencv2/imgcodecs/legacy/constants_c.h>
	8	#endif // USE_OPENCV
	9	#include <stdint.h>
	10

Return to bug 237847