Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 graphics-libs/opencv/DEPENDS         |    2 +-
 graphics-libs/opencv/DETAILS         |    4 ++--
 graphics-libs/opencv/HISTORY         |    5 +++++
 graphics-libs/opencv/PRE_BUILD       |    5 -----
 graphics-libs/opencv/pkgconfig.patch |   35 
-----------------------------------
 5 files changed, 8 insertions(+), 43 deletions(-)

New commits:
commit 54ec35b3a4f154817eb2b737be20a351fc7bd80b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    opencv: => 2.4.11

diff --git a/graphics-libs/opencv/DEPENDS b/graphics-libs/opencv/DEPENDS
index 210108e..fb5a0f4 100755
--- a/graphics-libs/opencv/DEPENDS
+++ b/graphics-libs/opencv/DEPENDS
@@ -5,7 +5,7 @@ depends  cmake      &&
 if [[ $FFM = ffmpeg ]];then
   depends LIBAVCODEC
 elif [[ $FFM = gstreamer ]]; then
-  depends gstreamer
+  depends gstreamer-1.0
 elif [[ $FFM = libquicktime ]];then
   depends libquicktime
 fi &&
diff --git a/graphics-libs/opencv/DETAILS b/graphics-libs/opencv/DETAILS
index cb1132f..11201ef 100755
--- a/graphics-libs/opencv/DETAILS
+++ b/graphics-libs/opencv/DETAILS
@@ -1,6 +1,6 @@
            SPELL=opencv
-         VERSION=2.4.9
-    
SOURCE_HASH=sha512:a24b4bc0f7e58246e55370cdacd161f54b282d71a4ffbd654dd4b158031c9f8f93b8cb5a171f8266d4a776375573eff6b6b88793a812df99b3f516176e7a55b1
+         VERSION=2.4.11
+    
SOURCE_HASH=sha512:aba74b47f6009e2db60db2af5cfad323a487029ed8cbf4e42b89babc9006ad1fa4edb53210c1faf7e6e63156e5d75fd0ea3cb5f24fe8af650ed302c6fffef72d
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
    SOURCE_URL[0]=https://github.com/Itseez/opencv/archive/$VERSION.tar.gz
diff --git a/graphics-libs/opencv/HISTORY b/graphics-libs/opencv/HISTORY
index 5a58d80..a715e51 100644
--- a/graphics-libs/opencv/HISTORY
+++ b/graphics-libs/opencv/HISTORY
@@ -1,3 +1,8 @@
+2015-05-30 Treeve Jelbert <treeve AT sourcemage.org> 
+       * DETAILS: version 2.4.11
+       * DEPENDS: gstreamer-1.0
+       * PRE_BUILD, pkgconfig.patch: deleted
+
 2014-12-26 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: Fix SOURCE to make it a proper tarball name
 
diff --git a/graphics-libs/opencv/PRE_BUILD b/graphics-libs/opencv/PRE_BUILD
deleted file mode 100755
index e5dd5dd..0000000
--- a/graphics-libs/opencv/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build     &&
-cd $SOURCE_DIRECTORY  &&
-
-patch -p1 < $SCRIPT_DIRECTORY/pkgconfig.patch
-
diff --git a/graphics-libs/opencv/pkgconfig.patch 
b/graphics-libs/opencv/pkgconfig.patch
deleted file mode 100644
index 5626eb6..0000000
--- a/graphics-libs/opencv/pkgconfig.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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