Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-24 10:02:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libraries/opencv: Updated for version 2.4.8.

Browse source 
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Matteo Bernardini 2014-02-13 16:02:24 +07:00 committed by Willy Sudiarto Raharjo
parent 4aab0d9021
commit 32271d2d7d
4 changed files with 45 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/opencv/README
View file

@ -3,7 +3,5 @@ OpenCV (Open Source Computer Vision)
OpenCV is a library of programming functions mainly
aimed at real-time computer vision.
numpy (for the python bindings) and ffmpeg are optional dependencies.
*NOTE*
If compiling with ffmpeg you must use 0.8.7 or newer.
numpy (for the python bindings), ffmpeg and qt5 are
optional dependencies.

35
libraries/opencv/opencv-2.4.7-pkgconfig.patch Normal file
View file

@ -0,0 +1,35 @@
diff -baur opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake
--- opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:31:27.253763202 +0000
+++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:41:48.936262732 +0000
@@ -10,7 +10,7 @@
# -------------------------------------------------------------------------------------------
set(prefix "${CMAKE_INSTALL_PREFIX}")
set(exec_prefix "\${prefix}")
-set(libdir "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS
+set(libdir "\${prefix}/${OPENCV_LIB_INSTALL_PATH}")
set(includedir "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}")
if(CMAKE_BUILD_TYPE MATCHES "Release")
@@ -35,10 +35,11 @@
ocv_list_reverse(OpenCV_EXTRA_COMPONENTS)
#build the list of components
-set(OpenCV_LIB_COMPONENTS_ "")
+set(OpenCV_LIB_COMPONENTS_ "-L\${libdir}")
foreach(CVLib ${OpenCV_LIB_COMPONENTS})
get_target_property(libpath ${CVLib} LOCATION_${CMAKE_BUILD_TYPE})
get_filename_component(libname "${libpath}" NAME)
+ get_filename_component(lname "${libpath}" NAME_WE)
if(INSTALL_TO_MANGLED_PATHS)
set(libname "${libname}.${OPENCV_VERSION}")
@@ -51,7 +52,8 @@
set(installDir "${OPENCV_LIB_INSTALL_PATH}")
endif()
- set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} \${exec_prefix}/${installDir}/${libname}")
+ string(REPLACE "libopencv" "-lopencv" lname "${lname}")
+ set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} ${lname}")
endforeach()
# add extra dependencies required for OpenCV

7
libraries/opencv/opencv.SlackBuild
View file

@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=opencv
VERSION=${VERSION:-2.4.7}
VERSION=${VERSION:-2.4.8}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@ -60,7 +60,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@ -72,6 +72,9 @@ find -L . \
# http://code.opencv.org/issues/2512
patch -p1 < $CWD/opencv-2.4.7-fsh.patch
# https://bugzilla.novell.com/show_bug.cgi?id=853036
patch -p1 < $CWD/opencv-2.4.7-pkgconfig.patch
mkdir -p build
cd build
cmake \

6
libraries/opencv/opencv.info
View file

@ -1,8 +1,8 @@
PRGNAM="opencv"
VERSION="2.4.7"
VERSION="2.4.8"
HOMEPAGE="http://opencv.willowgarage.com/wiki/"
DOWNLOAD="http://downloads.sourceforge.net/opencvlibrary/opencv-2.4.7.tar.gz"
MD5SUM="33a12a8bba6e6dc32c97298c99b083b2"
DOWNLOAD="https://github.com/Itseez/opencv/archive/2.4.8.tar.gz"
MD5SUM="9b8f1426bc01a1ae1e8b3bce11dc1e1c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""