libraries/opencv: Updated for version 2.3.0.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

7 files changed, 116 insertions, 202 deletions

diff --git a/libraries/opencv/README b/libraries/opencv/README
index ee009baf4e..42b7a6e961 100644
--- a/libraries/opencv/README
+++ b/libraries/opencv/README
@@ -1,6 +1,6 @@
-OpenCV (Open Source Computer Vision) 
+OpenCV (Open Source Computer Vision)
 
-OpenCV is a library of programming functions mainly aimed at real 
-opencv: time computer vision. 
- 
-FFmpeg is an optional runtime dependency (available here at SBo)
+OpenCV is a library of programming functions mainly aimed at real
+time computer vision.
+
+FFmpeg and Numpy are optional runtime dependencies (available here at SBo)
diff --git a/libraries/opencv/libopencv-2.1.0-libdir.patch b/libraries/opencv/libopencv-2.1.0-libdir.patch
deleted file mode 100644
index 1e1600c1c6..0000000000
--- a/libraries/opencv/libopencv-2.1.0-libdir.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-diff -Naur OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt
---- OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt	2010-04-11 10:51:39.694283320 +0200
-+++ OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt	2010-04-11 10:56:06.674279640 +0200
-@@ -89,8 +89,8 @@
- INSTALL (
-     TARGETS flann  # flann_s
-     RUNTIME DESTINATION bin
--    LIBRARY DESTINATION lib
--    ARCHIVE DESTINATION lib
-+    LIBRARY DESTINATION lib${LIB_SUFFIX}
-+    ARCHIVE DESTINATION lib${LIB_SUFFIX}
- )
- 
- # INSTALL (
-diff -Naur OpenCV-2.1.0.orig/CMakeLists.txt OpenCV-2.1.0/CMakeLists.txt
---- OpenCV-2.1.0.orig/CMakeLists.txt	2010-04-11 10:51:39.564279640 +0200
-+++ OpenCV-2.1.0/CMakeLists.txt	2010-04-11 10:55:04.824279480 +0200
-@@ -467,8 +467,8 @@
- 

-     string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")

-     if(UNIX)

--        set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)

--        set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)

-+        set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)

-+        set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)

-     endif()

-     if(WIN32)

-         get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)

-@@ -895,7 +895,7 @@
- #                       PROCESS SUBDIRECTORIES:

- # ----------------------------------------------------------------------------

- # Save libs and executables in the same place

--set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE PATH "Output directory for libraries" )

-+set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX} CACHE PATH "Output directory for libraries" )

- set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE PATH "Output directory for applications" )

- 

- if(WIN32)

-@@ -965,19 +965,19 @@
- #  Part 2/2: ${BIN_DIR}/unix-install/opencv.pc -> For use *with* "make install"

- # prefix=/usr

- # exec_prefix=${prefix}

--# libdir=${exec_prefix}/lib

-+# libdir=${exec_prefix}/lib${LIB_SUFFIX}

- # includedir=${prefix}/include/opencv

- # -------------------------------------------------------------------------------------------

- set(prefix      ${CMAKE_INSTALL_PREFIX})

- set(exec_prefix     "\${prefix}")

--set(libdir      "\${exec_prefix}/lib")

-+set(libdir      "\${exec_prefix}/lib${LIB_SUFFIX}")

- set(includedir      "\${prefix}/include")

- set(VERSION             ${OPENCV_VERSION})

- 

- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/opencv.pc.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/opencv.pc" @ONLY IMMEDIATE)

- 

- if(UNIX)

--    install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib/pkgconfig)

-+    install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)

- endif()

- 

- 

-diff -Naur OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt
---- OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt	2010-04-11 10:51:39.634281600 +0200
-+++ OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt	2010-04-11 10:56:58.114279520 +0200
-@@ -40,6 +40,6 @@
- 
- install(TARGETS ${the_target}
- 	RUNTIME DESTINATION bin COMPONENT main
--	ARCHIVE DESTINATION lib COMPONENT main
--	LIBRARY DESTINATION lib COMPONENT main
-+	ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+	LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-     )
-diff -Naur OpenCV-2.1.0.orig/src/cv/CMakeLists.txt OpenCV-2.1.0/src/cv/CMakeLists.txt
---- OpenCV-2.1.0.orig/src/cv/CMakeLists.txt	2010-04-11 10:51:39.644283200 +0200
-+++ OpenCV-2.1.0/src/cv/CMakeLists.txt	2010-04-11 10:58:19.664279600 +0200
-@@ -71,8 +71,8 @@
- 

- install(TARGETS ${the_target}

-     RUNTIME DESTINATION bin COMPONENT main

--    LIBRARY DESTINATION lib COMPONENT main

--    ARCHIVE DESTINATION lib COMPONENT main)

-+    LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main

-+    ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)

- 

- install(FILES ${lib_hdrs}

-     DESTINATION include/opencv

-diff -Naur OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt OpenCV-2.1.0/src/cvaux/CMakeLists.txt
---- OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt	2010-04-11 10:51:39.634281600 +0200
-+++ OpenCV-2.1.0/src/cvaux/CMakeLists.txt	2010-04-11 10:58:43.064279480 +0200
-@@ -76,8 +76,8 @@
- 
- install(TARGETS ${the_target}
- 	RUNTIME DESTINATION bin COMPONENT main
--	LIBRARY DESTINATION lib COMPONENT main
--	ARCHIVE DESTINATION lib COMPONENT main)
-+	LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+	ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
- 
- install(FILES ${aux_hdrs_ext}
-         DESTINATION include/opencv
-diff -Naur OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt OpenCV-2.1.0/src/cxcore/CMakeLists.txt
---- OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt	2010-04-11 10:51:39.654284200 +0200
-+++ OpenCV-2.1.0/src/cxcore/CMakeLists.txt	2010-04-11 10:59:19.454279800 +0200
-@@ -71,8 +71,8 @@
- 

- install(TARGETS ${the_target}

-     RUNTIME DESTINATION bin COMPONENT main

--    LIBRARY DESTINATION lib COMPONENT main

--    ARCHIVE DESTINATION lib COMPONENT main)

-+    LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main

-+    ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)

- 

- # install each module headers separately

- install(FILES ${lib_hdrs}

-diff -Naur OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt OpenCV-2.1.0/src/highgui/CMakeLists.txt
---- OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt	2010-04-11 10:51:39.634281600 +0200
-+++ OpenCV-2.1.0/src/highgui/CMakeLists.txt	2010-04-11 11:00:25.174279600 +0200
-@@ -282,8 +282,8 @@
- 
- install(TARGETS ${the_target}
- 	RUNTIME DESTINATION bin COMPONENT main
--	LIBRARY DESTINATION lib COMPONENT main
--	ARCHIVE DESTINATION lib COMPONENT main)
-+	LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+	ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
- 
- install(FILES ${highgui_ext_hdrs}
-         DESTINATION include/opencv
-diff -Naur OpenCV-2.1.0.orig/src/ml/CMakeLists.txt OpenCV-2.1.0/src/ml/CMakeLists.txt
---- OpenCV-2.1.0.orig/src/ml/CMakeLists.txt	2010-04-11 10:51:39.654284200 +0200
-+++ OpenCV-2.1.0/src/ml/CMakeLists.txt	2010-04-11 11:00:43.714279320 +0200
-@@ -61,8 +61,8 @@
- 

- install(TARGETS ${the_target}

- 	RUNTIME DESTINATION bin COMPONENT main

--	LIBRARY DESTINATION lib COMPONENT main

--	ARCHIVE DESTINATION lib COMPONENT main)

-+	LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main

-+	ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)

- 

- install(FILES ${lib_hdrs}

-         DESTINATION include/opencv

-diff -Naur OpenCV-2.1.0.orig/tests/cxts/CMakeLists.txt OpenCV-2.1.0/tests/cxts/CMakeLists.txt
---- OpenCV-2.1.0.orig/tests/cxts/CMakeLists.txt	2010-04-11 10:51:39.724279600 +0200
-+++ OpenCV-2.1.0/tests/cxts/CMakeLists.txt	2010-04-11 11:01:36.324279440 +0200
-@@ -63,6 +63,6 @@
- if(WIN32)
- install(TARGETS ${the_target}
-     RUNTIME DESTINATION bin COMPONENT main
--	LIBRARY DESTINATION lib COMPONENT main
--	ARCHIVE DESTINATION lib COMPONENT main)
-+	LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+	ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
- endif()
diff --git a/libraries/opencv/libopencv-2.3.0-libdir.patch b/libraries/opencv/libopencv-2.3.0-libdir.patch
new file mode 100644
index 0000000000..ef63fa5587
--- /dev/null
+++ b/libraries/opencv/libopencv-2.3.0-libdir.patch
@@ -0,0 +1,90 @@
+diff -up OpenCV-2.3.0/3rdparty/CMakeLists.txt.00 OpenCV-2.3.0/3rdparty/CMakeLists.txt
+diff -up OpenCV-2.3.0/CMakeLists.txt.00 OpenCV-2.3.0/CMakeLists.txt
+--- OpenCV-2.3.0/CMakeLists.txt.00	2011-07-13 23:38:23.168999995 -0500
++++ OpenCV-2.3.0/CMakeLists.txt	2011-07-14 11:44:13.217000018 -0500
+@@ -621,9 +621,9 @@ string(REGEX MATCH "[0-9].[0-9]" PYTHON_
+ if(UNIX)
+     set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
+     if(APPLE)
+-        set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
++        set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
+     else() #debian based assumed, install to the dist-packages.
+-       set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
++       set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
+     endif()
+ endif()
+ if(WIN32)
+@@ -1191,7 +1191,7 @@ endif("${CMAKE_CONFIGURE_LDFLAGS}")
+ #                       PROCESS SUBDIRECTORIES:
+ # ----------------------------------------------------------------------------
+ # Save libs and executables in the same place
+-set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE PATH "Output directory for libraries" )
++set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX} CACHE PATH "Output directory for libraries" )
+ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE PATH "Output directory for applications" )
+ 
+ if(WIN32)
+@@ -1322,19 +1322,19 @@ endif(ANDROID)
+ #  Part 2/2: ${BIN_DIR}/unix-install/opencv.pc -> For use *with* "make install"
+ # prefix=/usr
+ # exec_prefix=${prefix}
+-# libdir=${exec_prefix}/lib
++# libdir=${exec_prefix}/lib${LIB_SUFFIX}
+ # includedir=${prefix}/include/opencv
+ # -------------------------------------------------------------------------------------------
+ set(prefix      ${CMAKE_INSTALL_PREFIX})
+ set(exec_prefix     "\${prefix}")
+-set(libdir      "\${exec_prefix}/lib")
++set(libdir      "\${exec_prefix}/lib${LIB_SUFFIX}")
+ set(includedir      "\${prefix}/include")
+ set(VERSION             ${OPENCV_VERSION})
+ 
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/opencv.pc.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/opencv.pc" @ONLY IMMEDIATE)
+ 
+ if(UNIX)
+-    install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib/pkgconfig)
++    install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+ endif()
+ 
+ 
+diff -up OpenCV-2.3.0/OpenCVModule.cmake.00 OpenCV-2.3.0/OpenCVModule.cmake
+--- OpenCV-2.3.0/OpenCVModule.cmake.00	2011-07-14 11:27:32.563000017 -0500
++++ OpenCV-2.3.0/OpenCVModule.cmake	2011-07-14 11:27:57.963000018 -0500
+@@ -97,8 +97,8 @@ macro(define_opencv_module name)
+ 
+     install(TARGETS ${the_target}
+         RUNTIME DESTINATION bin COMPONENT main
+-        LIBRARY DESTINATION lib COMPONENT main
+-        ARCHIVE DESTINATION lib COMPONENT main)
++        LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++        ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+ 
+     install(FILES ${lib_hdrs}
+         DESTINATION include/opencv2/${name}
+diff -up OpenCV-2.3.0/modules/gpu/CMakeLists.txt.00 OpenCV-2.3.0/modules/gpu/CMakeLists.txt
+--- OpenCV-2.3.0/modules/gpu/CMakeLists.txt.00	2011-07-14 11:17:29.914000015 -0500
++++ OpenCV-2.3.0/modules/gpu/CMakeLists.txt	2011-07-14 11:18:25.774000018 -0500
+@@ -149,8 +149,8 @@ add_dependencies(${the_target} ${DEPS})
+ 
+ install(TARGETS ${the_target}
+ 	RUNTIME DESTINATION bin COMPONENT main
+-	LIBRARY DESTINATION lib COMPONENT main
+-	ARCHIVE DESTINATION lib COMPONENT main)
++	LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++	ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+ 
+ install(FILES ${lib_hdrs}
+ 	DESTINATION include/opencv2/${name}
+diff -up OpenCV-2.3.0/modules/highgui/CMakeLists.txt.00 OpenCV-2.3.0/modules/highgui/CMakeLists.txt
+--- OpenCV-2.3.0/modules/highgui/CMakeLists.txt.00	2011-07-14 11:25:22.909000017 -0500
++++ OpenCV-2.3.0/modules/highgui/CMakeLists.txt	2011-07-14 11:25:53.793000017 -0500
+@@ -362,8 +362,8 @@ endif()
+ 
+ install(TARGETS ${the_target}
+     RUNTIME DESTINATION bin COMPONENT main
+-    LIBRARY DESTINATION lib COMPONENT main
+-    ARCHIVE DESTINATION lib COMPONENT main)
++    LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++    ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+ 
+ install(FILES ${highgui_ext_hdrs}
+         DESTINATION include/opencv2/highgui
diff --git a/libraries/opencv/libpng-1.4.patch b/libraries/opencv/libpng-1.4.patch
deleted file mode 100644
index 8756f324c0..0000000000
--- a/libraries/opencv/libpng-1.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur OpenCV-2.0.0-orig/src/highgui/grfmt_png.cpp 
---- OpenCV-2.0.0-orig/src/highgui/grfmt_png.cpp        2010-01-21 01:08:46.000000000 -0500
-+++ OpenCV-2.0.0/src/highgui/grfmt_png.cpp     2010-01-21 01:13:11.000000000 -0500
-@@ -223,7 +223,7 @@
-                 png_set_palette_to_rgb( png_ptr );
- 
-             if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 )
--                png_set_gray_1_2_4_to_8( png_ptr );
-+                png_set_expand_gray_1_2_4_to_8( png_ptr );
- 
-             if( CV_MAT_CN(m_type) > 1 && color )
-                 png_set_bgr( png_ptr ); // convert RGB to BGR
diff --git a/libraries/opencv/opencv.SlackBuild b/libraries/opencv/opencv.SlackBuild
index 27a795be87..fdb800d220 100644
--- a/libraries/opencv/opencv.SlackBuild
+++ b/libraries/opencv/opencv.SlackBuild
@@ -1,22 +1,19 @@
 #!/bin/sh
 
-# Slackware build script for cwp (customizable weather plasmoid)
+# Slackware build script for opencv (Open Source Computer Vision)
 
 # Written by M.Dinslage  contact: daedra1980@gmail.com
-# Big thanks to ponce for the patches.
 
 PRGNAM=opencv
 SRCNAM=OpenCV
-VERSION=${VERSION:-2.1.0}
+VERSION=${VERSION:-2.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -29,19 +26,15 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
-  SLKLDFLAGS="-L/usr/lib -L/lib"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
-  SLKLDFLAGS="-L/usr/lib -L/lib"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  SLKLDFLAGS="-L/usr/lib64 -L/lib64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
-  SLKLDFLAGS="-L/usr/lib -L/lib"
 fi
 
 set -e
@@ -59,16 +52,13 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# patch for libpng-1.4
-patch -p1 < $CWD/libpng-1.4.patch
-
-# Honor LIB_SUFFIX http://sourceforge.net/tracker/index.php?func=detail&aid=2876292&group_id=22870&atid=376679
-# rewritten by ponce for 2.1.0
-patch -p1 < $CWD/libopencv-2.1.0-libdir.patch
+# Honor LIB_SUFFIX
+# rewritten for slackware
+patch -p1 < $CWD/libopencv-2.3.0-libdir.patch
 
 mkdir -p build
 cd build
-  LDFLAGS=$SLKLDFLAGS cmake \
+  cmake \
     -DCMAKE_C_FLAGS="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
     -DCMAKE_BUILD_TYPE="Release" \
@@ -89,7 +79,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir $PKG/usr/doc
 mv $PKG/usr/share/$PRGNAM/doc $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README doc/opencv.pdf $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README doc/*.pdf $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/opencv/opencv.info b/libraries/opencv/opencv.info
index cc20d37486..35bf249727 100644
--- a/libraries/opencv/opencv.info
+++ b/libraries/opencv/opencv.info
@@ -1,8 +1,8 @@
 PRGNAM="opencv"
-VERSION="2.1.0"
+VERSION="2.3.0"
 HOMEPAGE="http://opencv.willowgarage.com/wiki/"
-DOWNLOAD="http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.1/OpenCV-2.1.0.tar.bz2"
-MD5SUM="1d71584fb4e04214c0085108f95e24c8"
+DOWNLOAD="http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.3/OpenCV-2.3.0.tar.bz2"
+MD5SUM="dea5e9df241ac37f4439da16559e420d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="M.Dinslage"
diff --git a/libraries/opencv/slack-desc b/libraries/opencv/slack-desc
index 39785c44f6..298e2f4a25 100644
--- a/libraries/opencv/slack-desc
+++ b/libraries/opencv/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-opencv: OpenCV (Open Source Computer Vision) 
-opencv: 
-opencv: OpenCV is a library of programming functions mainly aimed at real 
-opencv: time computer vision. 
-opencv: 
-opencv: 
-opencv:  
-opencv: Homepage: http://opencv.willowgarage.com 
-opencv:  
-opencv:   
-opencv: 
+opencv: OpenCV (Open Source Computer Vision)
+opencv:
+opencv: OpenCV is a library of programming functions mainly aimed at real
+opencv: time computer vision.
+opencv:
+opencv:
+opencv:
+opencv: Homepage: http://opencv.willowgarage.com
+opencv:
+opencv:
+opencv: