Changeset 138063


Ignore:
Timestamp:
Jun 27, 2015, 9:59:08 AM (4 years ago)
Author:
hum@…
Message:

caffe: update to 20150624; add -lopencv_imgcodecs to Makefile to link with OpenCV 3.0; see https://github.com/BVLC/caffe/issues/1276

Location:
trunk/dports/math/caffe
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/math/caffe/Portfile

    r137358 r138063  
    55PortGroup           github 1.0
    66
    7 github.setup        BVLC caffe 2f4a9e40af0c0d08c7b130f4e5091f39a1d33b5a
    8 version             20150605
     7github.setup        BVLC caffe af37efdae91744fba989a17419521dbcae126992
     8version             20150624
    99categories          math science
    1010maintainers         hum openmaintainer
     
    1717license             BSD
    1818
    19 checksums           rmd160  19a2d570c32ec63d6b197bf908958dcdf87165ef \
    20                     sha256  d2ec224ef837764747e41e274a45f24a77c2226056f4bd45d25ffa29a5135833
     19checksums           rmd160  fc86b19e76f2a6020fb213a26d98f28d43111c04 \
     20                    sha256  02f53b05a2a5fe46cfd6415a5a23101b6b64fc288fcc63a98d4b60def76a6eb5
    2121
    2222depends_lib-append  port:google-glog \
  • trunk/dports/math/caffe/files/patch-Makefile.diff

    r135284 r138063  
    1 --- Makefile.orig       2015-04-18 04:26:48.000000000 +0900
    2 +++ Makefile    2015-04-18 21:21:56.000000000 +0900
    3 @@ -162,9 +162,9 @@
     1--- Makefile.orig       2015-06-24 06:48:24.000000000 +0900
     2+++ Makefile    2015-06-27 18:51:14.000000000 +0900
     3@@ -170,9 +170,9 @@
    44        LIBRARIES := cudart cublas curand
    55 endif
    66 LIBRARIES += glog gflags protobuf leveldb snappy \
    77-       lmdb boost_system hdf5_hl hdf5 m \
     8-       opencv_core opencv_highgui opencv_imgproc
     9-PYTHON_LIBRARIES := boost_python python2.7
    810+       lmdb boost_system-mt hdf5_hl hdf5 m \
    9         opencv_core opencv_highgui opencv_imgproc
    10 -PYTHON_LIBRARIES := boost_python python2.7
     11+       opencv_core opencv_highgui opencv_imgproc opencv_imgcodecs
    1112+PYTHON_LIBRARIES := boost_python-mt python2.7
    1213 WARNINGS := -Wall -Wno-sign-compare
    1314 
    1415 ##############################
    15 @@ -232,7 +232,7 @@
     16@@ -240,7 +240,7 @@
    1617 # clang++ instead of g++
    1718 # libstdc++ for NVCC compatibility on OS X >= 10.9 with CUDA < 7.0
     
    2223                CUDA_VERSION := $(shell $(CUDA_DIR)/bin/nvcc -V | grep -o 'release \d' | grep -o '\d')
    2324                ifeq ($(shell echo $(CUDA_VERSION) \< 7.0 | bc), 1)
    24 @@ -341,7 +341,7 @@
     25@@ -349,7 +349,7 @@
    2526 
    2627 # Complete build flags.
     
    3132 # mex may invoke an older gcc that is too liberal with -Wuninitalized
    3233 MATLAB_CXXFLAGS := $(CXXFLAGS) -Wno-uninitialized
    33 @@ -540,7 +540,7 @@
     34@@ -554,7 +554,7 @@
    3435 # Target for extension-less symlinks to tool binaries with extension '*.bin'.
    3536 $(TOOL_BUILD_DIR)/%: $(TOOL_BUILD_DIR)/%.bin | $(TOOL_BUILD_DIR)
Note: See TracChangeset for help on using the changeset viewer.