diff options
| -rw-r--r-- | .SRCINFO | 38 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | ChangeLog | 34 | ||||
| -rw-r--r-- | PKGBUILD | 96 | ||||
| -rw-r--r-- | fsh.patch | 86 | ||||
| -rw-r--r-- | pkgconfig.patch | 49 |
6 files changed, 304 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..d25d2ca5d22c --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,38 @@ +pkgbase = opencv-git + pkgdesc = Open Source Computer Vision Library + pkgver = 3.0.0.r1.g424c2bd + pkgrel = 1 + url = http://opencv.org/ + changelog = ChangeLog + arch = i686 + arch = x86_64 + arch = armv7h + license = BSD + makedepends = git + makedepends = cmake + makedepends = python2-numpy + makedepends = python-numpy + makedepends = mesa + makedepends = eigen + depends = gstreamer0.10-base + depends = intel-tbb + depends = openexr + depends = xine-lib + depends = libdc1394 + depends = gtkglext + optdepends = eigen + optdepends = libcl: For coding with OpenCL + optdepends = python-numpy: Python 3 interface + optdepends = python2-numpy: Python 2 interface + provides = opencv + conflicts = opencv + options = staticlibs + source = opencv::git+http://github.com/Itseez/opencv.git + source = pkgconfig.patch + source = fsh.patch + md5sums = SKIP + md5sums = 8226678a6f11ddd9d7163f079108d6cc + md5sums = 67f341ed6b0f007caab518fe24816026 + +pkgname = opencv-git + diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..941a6ff1dc29 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +opencv/ diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 000000000000..4e5d99084882 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,34 @@ +2015-06-09 Valentin Churavy <v.churavy@gmail.com> + + * 3.0.0.r1.g424c2bd : + Adapt patches to upstream changes + +2015-03-27 Valentin Churavy <v.churavy@gmail.com> + + * 3.0.0.beta.r896.g77cbddf : + Adapt patches to upstream changes + +2015-03-13 Fabien Dubosson <fabien.dubosson@gmail.com> + + * 3.0.0.beta.r681.g74e88cc-1 : + Adapt patches to upstream changes + +2015-02-24 Fabien Dubosson <fabien.dubosson@gmail.com> + + * 3.0.0.beta.r557.gbdb088d-1 : + Adapt patches to upstream changes + +2015-01-14 Fabien Dubosson <fabien.dubosson@gmail.com> + + * 3.0.0.beta.r273.gb2a5e66-1 : + Adapt fsh.patch to upstream changes + +2014-12-24 Fabien Dubosson <fabien.dubosson@gmail.com> + + * 3.0.0.beta.r156.gfd6ef87-1 : + Add BUILD_NEW_PYTHON_SUPPORT flag + +2014-02-10 Fabien Dubosson <fabien.dubosson@gmail.com> + + * 3.0.ocl.tp2.r27.g86b6c48-1 : + Adapt package to new VCS guidelines, based on [extra] `opencv` PKGBUILD diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..42085bc1fb42 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,96 @@ +# Maintainer: Valentin Churavy <v.churavy@gmail.com> +# Contributor: Fabien Dubosson <fabien.dubosson@gmail.com> +# Contributor: David Manouchehri <david@davidmanouchehri.com> +# Contributor: CHEN Xing <cxcxcxcx@gmail.com> +# Contributor: Martin Imobersteg <martin.imobersteg@gmail.com> +# Contributor: Artyom Smirnov <smirnoffjr@gmail.com> +# Also largely inspired by `opencv` in extra, so including contributors too: +# Contributor: Ray Rashif <schiv@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> + +pkgname="opencv-git" +pkgver=3.0.0.r1.g424c2bd +pkgrel=1 +pkgdesc="Open Source Computer Vision Library" +url="http://opencv.org/" +license=('BSD') +arch=('i686' 'x86_64' 'armv7h') +depends=('gstreamer0.10-base' 'intel-tbb' 'openexr' + 'xine-lib' 'libdc1394' 'gtkglext') +makedepends=('git' 'cmake' 'python2-numpy' 'python-numpy' 'mesa' 'eigen') +optdepends=('eigen' + 'libcl: For coding with OpenCL' + 'python-numpy: Python 3 interface' + 'python2-numpy: Python 2 interface') +options=('staticlibs') +provides=("${pkgname%-git}") +conflicts=("${pkgname%-git}") +changelog="ChangeLog" +source=("${pkgname%-git}::git+http://github.com/Itseez/opencv.git" + 'pkgconfig.patch' + 'fsh.patch') +md5sums=('SKIP' + '8226678a6f11ddd9d7163f079108d6cc' + '67f341ed6b0f007caab518fe24816026') + +_cmakeopts=('-D WITH_OPENCL=ON' + '-D WITH_OPENGL=ON' + '-D WITH_TBB=ON' + '-D WITH_XINE=ON' + '-D BUILD_WITH_DEBUG_INFO=OFF' + '-D BUILD_TESTS=OFF' + '-D BUILD_PERF_TESTS=OFF' + '-D BUILD_EXAMPLES=ON' + '-D INSTALL_C_EXAMPLES=ON' + '-D INSTALL_PYTHON_EXAMPLES=ON' + '-D CMAKE_BUILD_TYPE=Release' + '-D CMAKE_INSTALL_PREFIX=/usr' + '-D CMAKE_SKIP_RPATH=ON' + '-D BUILD_NEW_PYTHON_SUPPORT=ON') + +# SSE only available from Pentium 3 onwards (i686 is way older) +[[ "$CARCH" = 'i686' ]] && \ + _cmakeopts+=('-D ENABLE_SSE=OFF' + '-D ENABLE_SSE2=OFF' + '-D ENABLE_SSE3=OFF') + +# all x64 CPUs support SSE2 but not SSE3 +[[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D ENABLE_SSE3=OFF') + +pkgver() { + cd "${srcdir}/${pkgname%-git}" + git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g' +} + +prepare() { + cd "${srcdir}/${pkgname%-git}" + + # hack-fix pkg-config mess + # see https://bugs.archlinux.org/task/32430 + # and http://code.opencv.org/issues/1925 + patch -p1 -i "${srcdir}/pkgconfig.patch" + + # hack-fix folder naming inconsistency that they won't fix + # see http://code.opencv.org/issues/2512 + # and https://bugs.archlinux.org/task/32342 + patch -p1 -i "${srcdir}/fsh.patch" +} + +build() { + cd "${srcdir}/${pkgname%-git}" + + cmake ${_cmakeopts[@]} . + + make +} + +package() { + cd "${srcdir}/${pkgname%-git}" + + make DESTDIR="${pkgdir}" install + + # install LICENSE file + install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname%-git}/LICENSE" +} + +# vim:set ts=4 sw=4 et: diff --git a/fsh.patch b/fsh.patch new file mode 100644 index 000000000000..ef1d1a998bb9 --- /dev/null +++ b/fsh.patch @@ -0,0 +1,86 @@ +From 4e24953da4569ffcefdecae8543168850f70e21b Mon Sep 17 00:00:00 2001 +From: Valentin Churavy <v.churavy@gmail.com> +Date: Sat, 28 Mar 2015 01:30:01 +0900 +Subject: [PATCH 2/2] fsh.patch + +--- + CMakeLists.txt | 14 +++++++------- + cmake/OpenCVGenPkgconfig.cmake | 2 +- + cmake/templates/opencv_run_all_tests_unix.sh.in | 2 +- + 3 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d06ef1a..ece2dc3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -276,7 +276,7 @@ endif() + if(ANDROID OR WIN32) + set(OPENCV_DOC_INSTALL_PATH doc) + else() +- set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc) ++ set(OPENCV_DOC_INSTALL_PATH share/doc/opencv) + endif() + + if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows) +@@ -318,7 +318,7 @@ if(OPENCV_TEST_DATA_PATH AND NOT OPENCV_TEST_DATA_INSTALL_PATH) + elseif(WIN32) + set(OPENCV_TEST_DATA_INSTALL_PATH "testdata") + else() +- set(OPENCV_TEST_DATA_INSTALL_PATH "share/OpenCV/testdata") ++ set(OPENCV_TEST_DATA_INSTALL_PATH "share/opencv/testdata") + endif() + endif() + +@@ -347,10 +347,10 @@ else() + set(OPENCV_OTHER_INSTALL_PATH etc) + else() + set(OPENCV_LIB_INSTALL_PATH lib${LIB_SUFFIX}) +- set(OPENCV_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}) +- set(OPENCV_SAMPLES_SRC_INSTALL_PATH share/OpenCV/samples) +- set(OPENCV_JAR_INSTALL_PATH share/OpenCV/java) +- set(OPENCV_OTHER_INSTALL_PATH share/OpenCV) ++ set(OPENCV_3P_LIB_INSTALL_PATH share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}) ++ set(OPENCV_SAMPLES_SRC_INSTALL_PATH share/opencv/samples) ++ set(OPENCV_JAR_INSTALL_PATH share/opencv/java) ++ set(OPENCV_OTHER_INSTALL_PATH share/opencv) + endif() + set(OPENCV_INCLUDE_INSTALL_PATH "include") + +@@ -358,7 +358,7 @@ else() + if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX) + set(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv) + else() +- set(OPENCV_CONFIG_INSTALL_PATH share/OpenCV) ++ set(OPENCV_CONFIG_INSTALL_PATH share/opencv) + endif() + endif() + +diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake +index ac42445..7e0c319 100644 +--- a/cmake/OpenCVGenPkgconfig.cmake ++++ b/cmake/OpenCVGenPkgconfig.cmake +@@ -48,7 +48,7 @@ foreach(CVLib ${OpenCV_LIB_COMPONENTS}) + + #need better solution.... + if(libpath MATCHES "3rdparty") +- set(installDir "share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}") ++ set(installDir "share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}") + else() + set(installDir "${OPENCV_LIB_INSTALL_PATH}") + endif() +diff --git a/cmake/templates/opencv_run_all_tests_unix.sh.in b/cmake/templates/opencv_run_all_tests_unix.sh.in +index 7b946af..82370dc 100644 +--- a/cmake/templates/opencv_run_all_tests_unix.sh.in ++++ b/cmake/templates/opencv_run_all_tests_unix.sh.in +@@ -53,7 +53,7 @@ fi + + OPENCV_TEST_PATH=@CMAKE_INSTALL_PREFIX@/@OPENCV_TEST_INSTALL_PATH@ + OPENCV_PYTHON_TESTS=@OPENCV_PYTHON_TESTS_LIST@ +-export OPENCV_TEST_DATA_PATH=@CMAKE_INSTALL_PREFIX@/share/OpenCV/testdata ++export OPENCV_TEST_DATA_PATH=@CMAKE_INSTALL_PREFIX@/share/opencv/testdata + + # Run tests + +-- +2.3.4 + diff --git a/pkgconfig.patch b/pkgconfig.patch new file mode 100644 index 000000000000..c2f147139fce --- /dev/null +++ b/pkgconfig.patch @@ -0,0 +1,49 @@ +From 2c09e55ce124390d6ab905d2c8b15084b032f759 Mon Sep 17 00:00:00 2001 +From: Valentin Churavy <v.churavy@gmail.com> +Date: Sat, 28 Mar 2015 01:27:16 +0900 +Subject: [PATCH 1/2] pkgconfig.patch + +--- + cmake/OpenCVGenPkgconfig.cmake | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake +index a8686e8..ac42445 100644 +--- a/cmake/OpenCVGenPkgconfig.cmake ++++ b/cmake/OpenCVGenPkgconfig.cmake +@@ -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,11 +35,12 @@ ocv_list_reverse(OpenCV_LIB_COMPONENTS) + 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}) + if (TARGET ${CVLib}) + 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}") +@@ -52,7 +53,8 @@ foreach(CVLib ${OpenCV_LIB_COMPONENTS}) + 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}") + endif() + endforeach() + +-- +2.3.4 + |