[138063] trunk/dports/math/caffe

[hum at macports.org]

Revision: 138063
          https://trac.macports.org/changeset/138063
Author:   hum at macports.org
Date:     2015-06-27 02:59:08 -0700 (Sat, 27 Jun 2015)
Log Message:
-----------
caffe: update to 20150624; add -lopencv_imgcodecs to Makefile to link with OpenCV 3.0; see https://github.com/BVLC/caffe/issues/1276

Modified Paths:
--------------
    trunk/dports/math/caffe/Portfile
    trunk/dports/math/caffe/files/patch-Makefile.diff

Modified: trunk/dports/math/caffe/Portfile
===================================================================
--- trunk/dports/math/caffe/Portfile	2015-06-27 08:06:25 UTC (rev 138062)
+++ trunk/dports/math/caffe/Portfile	2015-06-27 09:59:08 UTC (rev 138063)
@@ -4,8 +4,8 @@
 PortSystem          1.0
 PortGroup           github 1.0
 
-github.setup        BVLC caffe 2f4a9e40af0c0d08c7b130f4e5091f39a1d33b5a
-version             20150605
+github.setup        BVLC caffe af37efdae91744fba989a17419521dbcae126992
+version             20150624
 categories          math science
 maintainers         hum openmaintainer
 
@@ -16,8 +16,8 @@
 platforms           darwin
 license             BSD
 
-checksums           rmd160  19a2d570c32ec63d6b197bf908958dcdf87165ef \
-                    sha256  d2ec224ef837764747e41e274a45f24a77c2226056f4bd45d25ffa29a5135833
+checksums           rmd160  fc86b19e76f2a6020fb213a26d98f28d43111c04 \
+                    sha256  02f53b05a2a5fe46cfd6415a5a23101b6b64fc288fcc63a98d4b60def76a6eb5
 
 depends_lib-append  port:google-glog \
                     port:gflags \

Modified: trunk/dports/math/caffe/files/patch-Makefile.diff
===================================================================
--- trunk/dports/math/caffe/files/patch-Makefile.diff	2015-06-27 08:06:25 UTC (rev 138062)
+++ trunk/dports/math/caffe/files/patch-Makefile.diff	2015-06-27 09:59:08 UTC (rev 138063)
@@ -1,18 +1,19 @@
---- Makefile.orig	2015-04-18 04:26:48.000000000 +0900
-+++ Makefile	2015-04-18 21:21:56.000000000 +0900
-@@ -162,9 +162,9 @@
+--- Makefile.orig	2015-06-24 06:48:24.000000000 +0900
++++ Makefile	2015-06-27 18:51:14.000000000 +0900
+@@ -170,9 +170,9 @@
  	LIBRARIES := cudart cublas curand
  endif
  LIBRARIES += glog gflags protobuf leveldb snappy \
 -	lmdb boost_system hdf5_hl hdf5 m \
+-	opencv_core opencv_highgui opencv_imgproc
+-PYTHON_LIBRARIES := boost_python python2.7
 +	lmdb boost_system-mt hdf5_hl hdf5 m \
- 	opencv_core opencv_highgui opencv_imgproc
--PYTHON_LIBRARIES := boost_python python2.7
++	opencv_core opencv_highgui opencv_imgproc opencv_imgcodecs
 +PYTHON_LIBRARIES := boost_python-mt python2.7
  WARNINGS := -Wall -Wno-sign-compare
  
  ##############################
-@@ -232,7 +232,7 @@
+@@ -240,7 +240,7 @@
  # clang++ instead of g++
  # libstdc++ for NVCC compatibility on OS X >= 10.9 with CUDA < 7.0
  ifeq ($(OSX), 1)
@@ -21,7 +22,7 @@
  	ifneq ($(CPU_ONLY), 1)
  		CUDA_VERSION := $(shell $(CUDA_DIR)/bin/nvcc -V | grep -o 'release \d' | grep -o '\d')
  		ifeq ($(shell echo $(CUDA_VERSION) \< 7.0 | bc), 1)
-@@ -341,7 +341,7 @@
+@@ -349,7 +349,7 @@
  
  # Complete build flags.
  COMMON_FLAGS += $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir))
@@ -30,7 +31,7 @@
  NVCCFLAGS += -ccbin=$(CXX) -Xcompiler -fPIC $(COMMON_FLAGS)
  # mex may invoke an older gcc that is too liberal with -Wuninitalized
  MATLAB_CXXFLAGS := $(CXXFLAGS) -Wno-uninitialized
-@@ -540,7 +540,7 @@
+@@ -554,7 +554,7 @@
  # Target for extension-less symlinks to tool binaries with extension '*.bin'.
  $(TOOL_BUILD_DIR)/%: $(TOOL_BUILD_DIR)/%.bin | $(TOOL_BUILD_DIR)
  	@ $(RM) $@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150627/ad31ade6/attachment.html>