[arch-commits] Commit in opencv/trunk (PKGBUILD pkgconfig.patch x86_asmfix.patch)
Ray Rashif
schiv at archlinux.org
Sun Jun 28 20:56:51 UTC 2015
Date: Sunday, June 28, 2015 @ 22:56:50
Author: schiv
Revision: 241385
upgpkg: opencv 3.0.0-1
upstream major release; lots of changes
Modified:
opencv/trunk/PKGBUILD
Deleted:
opencv/trunk/pkgconfig.patch
opencv/trunk/x86_asmfix.patch
------------------+
PKGBUILD | 66 ++++++++++++++++++++++-------------------------------
pkgconfig.patch | 35 ----------------------------
x86_asmfix.patch | 46 ------------------------------------
3 files changed, 28 insertions(+), 119 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-06-28 19:23:32 UTC (rev 241384)
+++ PKGBUILD 2015-06-28 20:56:50 UTC (rev 241385)
@@ -4,29 +4,27 @@
pkgbase=opencv
pkgname=('opencv' 'opencv-samples')
-pkgver=2.4.10
-pkgrel=3
+_contrib=opencv_contrib
+pkgver=3.0.0
+pkgrel=1
pkgdesc="Open Source Computer Vision Library"
arch=('i686' 'x86_64')
license=('BSD')
url="http://opencv.org/"
-depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext')
-makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2')
+depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394'
+ 'gtkglext' 'libwebp' 'libgphoto2')
+makedepends=('cmake' 'python2-numpy' 'python-numpy' 'mesa' 'eigen' 'git')
optdepends=('opencv-samples'
'eigen2'
'libcl: For coding with OpenCL'
- 'python2-numpy: Python 2.x interface')
+ 'python2-numpy: Python 2.x interface'
+ 'python-numpy: Python 3.x interface')
source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip"
- 'pkgconfig.patch'
- 'fsh.patch'
- 'x86_asmfix.patch')
-md5sums=('ec63952d3a3dff965d5fdde765926821'
- 'c7cea48ed7d4f729ebdb9673bac41bd3'
- 'c597598d142dd34d0eb4af7d6e9779d8'
- 'b937d3589a62666f17f6dc93e0109717')
+ "$_contrib-$pkgver::git+https://github.com/Itseez/$_contrib.git#tag=$pkgver")
+md5sums=('09004c275d8092cbdf5b61675cecd399'
+ 'SKIP')
-_cmakeopts=('-D WITH_OPENCL=ON'
- '-D WITH_OPENGL=ON'
+_cmakeopts=('-D WITH_OPENGL=ON'
'-D WITH_TBB=ON'
'-D WITH_XINE=ON'
'-D WITH_GSTREAMER=OFF'
@@ -33,9 +31,10 @@
'-D BUILD_WITH_DEBUG_INFO=OFF'
'-D BUILD_TESTS=OFF'
'-D BUILD_PERF_TESTS=OFF'
- '-D BUILD_EXAMPLES=ON'
+ '-D INSTALL_TESTS=ON'
'-D INSTALL_C_EXAMPLES=ON'
'-D INSTALL_PYTHON_EXAMPLES=ON'
+ "-D OPENCV_EXTRA_MODULES_PATH=$srcdir/$_contrib/modules"
'-D CMAKE_BUILD_TYPE=Release'
'-D CMAKE_INSTALL_PREFIX=/usr'
'-D CMAKE_SKIP_RPATH=ON')
@@ -49,34 +48,25 @@
# all x64 CPUs support SSE2 but not SSE3
[[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D ENABLE_SSE3=OFF')
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
+#prepare() {
+# cd "$srcdir/$pkgname-$pkgver"
+#
+# # TODO: this is mostly upstream frei0r; they hardcode the path
+# #msg2 "Hack-fixing folder naming inconsistency (downstream)"
+# # see http://code.opencv.org/issues/2512
+# # and https://bugs.archlinux.org/task/32342
+# #patch -Np1 -i "$srcdir/fsh.patch"
+#
+# # no longer including docs, see https://bugs.archlinux.org/task/34185
+# # python2 compatibility for generating (html) docs
+# #sed -i 's/sphinx-build/sphinx-build2/' cmake/OpenCVDetectPython.cmake
+#}
- msg2 "Applying backported fix for x86 ASM breakage"
- # see https://github.com/Itseez/opencv/pull/3331
- patch -Np1 -i "$srcdir/x86_asmfix.patch"
-
- msg2 "Fixing broken pkg-config (downstream)"
- # see https://bugs.archlinux.org/task/32430
- # and http://code.opencv.org/issues/1925
- patch -Np1 -i "$srcdir/pkgconfig.patch"
-
- # TODO: this is mostly upstream frei0r; they hardcode the path
- #msg2 "Hack-fixing folder naming inconsistency (downstream)"
- # see http://code.opencv.org/issues/2512
- # and https://bugs.archlinux.org/task/32342
- #patch -Np1 -i "$srcdir/fsh.patch"
-
- # no longer including docs, see https://bugs.archlinux.org/task/34185
- # python2 compatibility for generating (html) docs
- #sed -i 's/sphinx-build/sphinx-build2/' cmake/OpenCVDetectPython.cmake
-}
-
build() {
cd "$srcdir/$pkgname-$pkgver"
+ export LDFLAGS+=",-z,noexecstack"
cmake ${_cmakeopts[@]} .
-
make
}
Deleted: pkgconfig.patch
===================================================================
--- pkgconfig.patch 2015-06-28 19:23:32 UTC (rev 241384)
+++ pkgconfig.patch 2015-06-28 20:56:50 UTC (rev 241385)
@@ -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
Deleted: x86_asmfix.patch
===================================================================
--- x86_asmfix.patch 2015-06-28 19:23:32 UTC (rev 241384)
+++ x86_asmfix.patch 2015-06-28 20:56:50 UTC (rev 241385)
@@ -1,46 +0,0 @@
-From ea50be0529c248961e1b66293f8a9e4b807294a6 Mon Sep 17 00:00:00 2001
-From: Samuel Martin <s.martin49 at gmail.com>
-Date: Sun, 12 Oct 2014 10:17:23 +0200
-Subject: [PATCH] core: fix x86 PIC code compilation
-
-This bug was triggered by Buildroot autobuilders [1,2], causing this
-kind of failures [3,4]:
-
- [ 14%] Building CXX object modules/core/CMakeFiles/opencv_core.dir/src/system.cpp.o
- /home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp: In function '(static initializers for /home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp)':
- /home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp:280:10: error: inconsistent operand constraints in an 'asm'
- make[3]: *** [modules/core/CMakeFiles/opencv_core.dir/src/system.cpp.o] Error 1
-
-[1] http://buildroot.org/
-[2] http://autobuild.buildroot.org/
-[3] http://autobuild.buildroot.org/?reason=opencv-2.4.10
-[4] http://autobuild.buildroot.org/results/483/4838285b25d6293a5cf0bb9eadd5040a7c75d766/build-end.log
-
-Signed-off-by: Samuel Martin <s.martin49 at gmail.com>
----
- modules/core/src/system.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
-index 5a970d5..e9ffdc7 100644
---- a/modules/core/src/system.cpp
-+++ b/modules/core/src/system.cpp
-@@ -267,14 +267,17 @@ struct HWFeatures
- : "cc"
- );
- #else
-+ // We need to preserve ebx since we are compiling PIC code.
-+ // This means we cannot use "=b" for the 2nd output register.
- asm volatile
- (
- "pushl %%ebx\n\t"
- "movl $7,%%eax\n\t"
- "movl $0,%%ecx\n\t"
- "cpuid\n\t"
-+ "movl %%ebx,%1\n\t"
- "popl %%ebx\n\t"
-- : "=a"(cpuid_data[0]), "=b"(cpuid_data[1]), "=c"(cpuid_data[2]), "=d"(cpuid_data[3])
-+ : "=a"(cpuid_data[0]), "=r"(cpuid_data[1]), "=c"(cpuid_data[2]), "=d"(cpuid_data[3])
- :
- : "cc"
- );
More information about the arch-commits
mailing list