Date: Saturday, August 27, 2011 @ 15:56:26 Author: schiv Revision: 136364
archrelease: copy trunk to extra-i686, extra-x86_64 Added: opencv/repos/extra-i686/PKGBUILD (from rev 136363, opencv/trunk/PKGBUILD) opencv/repos/extra-i686/opencv.install (from rev 136363, opencv/trunk/opencv.install) opencv/repos/extra-x86_64/PKGBUILD (from rev 136363, opencv/trunk/PKGBUILD) opencv/repos/extra-x86_64/opencv.install (from rev 136363, opencv/trunk/opencv.install) Deleted: opencv/repos/extra-i686/PKGBUILD opencv/repos/extra-i686/opencv.install opencv/repos/extra-i686/pypkgpath_nondebian.patch opencv/repos/extra-x86_64/PKGBUILD opencv/repos/extra-x86_64/opencv.install opencv/repos/extra-x86_64/pypkgpath_nondebian.patch ----------------------------------------+ extra-i686/PKGBUILD | 220 +++++++++++++++---------------- extra-i686/opencv.install | 23 +-- extra-i686/pypkgpath_nondebian.patch | 16 -- extra-x86_64/PKGBUILD | 220 +++++++++++++++---------------- extra-x86_64/opencv.install | 23 +-- extra-x86_64/pypkgpath_nondebian.patch | 16 -- 6 files changed, 242 insertions(+), 276 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-08-27 19:45:15 UTC (rev 136363) +++ extra-i686/PKGBUILD 2011-08-27 19:56:26 UTC (rev 136364) @@ -1,110 +0,0 @@ -# $Id$ -# Maintainer: Ray Rashif <sc...@archlinux.org> -# Contributor: Tobias Powalowski <tp...@archlinux.org> - -pkgbase=opencv -pkgname=('opencv' 'opencv-docs' 'opencv-samples') -_realname=OpenCV -pkgver=2.3.0 -pkgrel=1 -pkgdesc="Open Source Computer Vision Library" -arch=('i686' 'x86_64') -license=('BSD') -url="http://opencv.willowgarage.com/" -depends=('jasper' 'gstreamer0.10-base' 'openexr' - 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils') -makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2') -optdepends=('python2-numpy: Python 2.x interface' - 'eigen2') -options=('!libtool') -source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2" - 'pypkgpath_nondebian.patch') -md5sums=('dea5e9df241ac37f4439da16559e420d' - 'eb884bad665047276e80556e44043a43') - -_cmakeopts=('-D CMAKE_BUILD_TYPE=Release' - '-D CMAKE_INSTALL_PREFIX=/usr' - '-D CMAKE_SKIP_RPATH=ON' - '-D BUILD_TESTS=OFF' - '-D ENABLE_SSE=ON' - '-D ENABLE_SSE2=ON' - '-D ENABLE_SSE3=OFF' - '-D ENABLE_SSSE3=OFF' - '-D ENABLE_SSE41=OFF' - '-D ENABLE_SSE42=OFF' - '-D BUILD_EXAMPLES=ON' - '-D INSTALL_C_EXAMPLES=ON' - '-D INSTALL_PYTHON_EXAMPLES=ON' - '-D WITH_XINE=ON' - '-D WITH_QT=OFF' - '-D WITH_QT_OPENGL=OFF' - '-D WITH_UNICAP=OFF' - '-D WITH_PVAPI=OFF' - '-D WITH_OPENNI=OFF' - '-D WITH_TBB=OFF' - '-D WITH_IPP=OFF' - '-D WITH_CUDA=OFF' - '-D USE_FAST_MATH=ON') - -build() { - cd "$srcdir/$_realname-$pkgver" - - # fix upstream's assumption of "debian-based" - patch -Np1 -i "$srcdir/pypkgpath_nondebian.patch" - - # x64, i.e "Athlon64" and upwards, can use SSE3 - [ $CARCH = x86_64 ] && \ - _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON} - - cmake ${_cmakeopts[@]} . - - make -} - -package_opencv() { - install=$pkgname.install - - cd "$srcdir/$_realname-$pkgver" - - make DESTDIR="$pkgdir" install - - # install license file - install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - # separate docs package; also be -R friendly - [ -d "$pkgdir/usr/share/opencv/doc" ] && \ - mv "$pkgdir/usr/share/opencv/doc" "$srcdir/opencv-doc" - - # separate samples package - [ -d "$pkgdir/usr/share/opencv/samples" ] && \ - mv "$pkgdir/usr/share/opencv/samples" "$srcdir/opencv-samples" -} - -package_opencv-docs() { - pkgdesc+=" (documentation)" - #arch=('any') - depends=() - optdepends=() - options=('docs') - - cd "$srcdir" - - mkdir -p "$pkgdir/usr/share/doc" - cp -r opencv-doc "$pkgdir/usr/share/doc/opencv" -} - -package_opencv-samples() { - pkgdesc+=" (samples)" - #arch=('any') - depends=() - optdepends=() - options=() - - cd "$srcdir" - - mkdir -p "$pkgdir/usr/share/opencv" - cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" -} - -# vim:set ts=2 sw=2 et: Copied: opencv/repos/extra-i686/PKGBUILD (from rev 136363, opencv/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2011-08-27 19:56:26 UTC (rev 136364) @@ -0,0 +1,110 @@ +# $Id$ +# Maintainer: Ray Rashif <sc...@archlinux.org> +# Contributor: Tobias Powalowski <tp...@archlinux.org> + +pkgbase=opencv +pkgname=('opencv' 'opencv-docs' 'opencv-samples') +_realname=OpenCV +pkgver=2.3.1 +pkgrel=1 +pkgdesc="Open Source Computer Vision Library" +arch=('i686' 'x86_64') +license=('BSD') +url="http://opencv.willowgarage.com/" +depends=('jasper' 'gstreamer0.10-base' 'openexr' + 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils') +makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2') +optdepends=('python2-numpy: Python 2.x interface' + 'eigen2') +options=('!libtool') +source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2") +md5sums=('827c9f8aa14384c531c73aa165f9b777') + +_cmakeopts=('-D CMAKE_BUILD_TYPE=Release' + '-D CMAKE_INSTALL_PREFIX=/usr' + '-D CMAKE_SKIP_RPATH=ON' + '-D BUILD_TESTS=OFF' + '-D ENABLE_SSE=ON' + '-D ENABLE_SSE2=ON' + '-D ENABLE_SSE3=OFF' + '-D ENABLE_SSSE3=OFF' + '-D ENABLE_SSE41=OFF' + '-D ENABLE_SSE42=OFF' + '-D BUILD_EXAMPLES=ON' + '-D INSTALL_C_EXAMPLES=ON' + '-D INSTALL_PYTHON_EXAMPLES=ON' + '-D WITH_XINE=ON' + '-D WITH_QT=OFF' + '-D WITH_QT_OPENGL=OFF' + '-D WITH_UNICAP=OFF' + '-D WITH_PVAPI=OFF' + '-D WITH_OPENNI=OFF' + '-D WITH_TBB=OFF' + '-D WITH_IPP=OFF' + '-D WITH_CUDA=OFF' + '-D USE_FAST_MATH=ON') + +build() { + cd "$srcdir/$_realname-$pkgver" + + # x64, i.e "Athlon64" and upwards, can use SSE3 + [ $CARCH = x86_64 ] && \ + _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON} + + cmake ${_cmakeopts[@]} . + + make +} + +package_opencv() { + install=$pkgname.install + + cd "$srcdir/$_realname-$pkgver" + + make DESTDIR="$pkgdir" install + + # install license file + install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + cd "$pkgdir/usr/share" + + # prepare FSH-friendly dirs + if [ -d OpenCV ]; then + mv opencv/samples OpenCV/ + rm -r opencv + mv OpenCV opencv + fi + + # separate docs package; also be -R friendly + [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc" + + # separate samples package + [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples" +} + +package_opencv-docs() { + pkgdesc+=" (documentation)" + depends=() + optdepends=() + options=('docs') + + cd "$srcdir" + + mkdir -p "$pkgdir/usr/share/doc" + cp -r opencv-doc "$pkgdir/usr/share/doc/opencv" +} + +package_opencv-samples() { + pkgdesc+=" (samples)" + depends=() + optdepends=() + options=() + + cd "$srcdir" + + mkdir -p "$pkgdir/usr/share/opencv" + cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" +} + +# vim:set ts=2 sw=2 et: Deleted: extra-i686/opencv.install =================================================================== --- extra-i686/opencv.install 2011-08-27 19:45:15 UTC (rev 136363) +++ extra-i686/opencv.install 2011-08-27 19:56:26 UTC (rev 136364) @@ -1,12 +0,0 @@ -post_install() { - echo "==> Documentation and samples are in separate packages:" - echo - echo "* opencv-docs" - echo "* opencv-samples" -} - -post_upgrade() { - post_install -} - -# vim:set ts=2 sw=2 et: Copied: opencv/repos/extra-i686/opencv.install (from rev 136363, opencv/trunk/opencv.install) =================================================================== --- extra-i686/opencv.install (rev 0) +++ extra-i686/opencv.install 2011-08-27 19:56:26 UTC (rev 136364) @@ -0,0 +1,11 @@ +post_install() { + echo " Documentation and samples are in separate packages:" + echo " * opencv-docs" + echo " * opencv-samples" +} + +post_upgrade() { + post_install +} + +# vim:set ts=2 sw=2 et: Deleted: extra-i686/pypkgpath_nondebian.patch =================================================================== --- extra-i686/pypkgpath_nondebian.patch 2011-08-27 19:45:15 UTC (rev 136363) +++ extra-i686/pypkgpath_nondebian.patch 2011-08-27 19:56:26 UTC (rev 136364) @@ -1,16 +0,0 @@ -diff -aur OpenCV-2.3.0.orig/CMakeLists.txt OpenCV-2.3.0/CMakeLists.txt ---- OpenCV-2.3.0.orig/CMakeLists.txt 2011-07-07 17:31:35.656946629 +0800 -+++ OpenCV-2.3.0/CMakeLists.txt 2011-07-07 17:40:34.110696242 +0800 -@@ -620,11 +620,7 @@ - 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) -- if(APPLE) -- set(PYTHON_PACKAGES_PATH lib/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.") -- endif() -+ set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.") - endif() - if(WIN32) - get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE) Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2011-08-27 19:45:15 UTC (rev 136363) +++ extra-x86_64/PKGBUILD 2011-08-27 19:56:26 UTC (rev 136364) @@ -1,110 +0,0 @@ -# $Id$ -# Maintainer: Ray Rashif <sc...@archlinux.org> -# Contributor: Tobias Powalowski <tp...@archlinux.org> - -pkgbase=opencv -pkgname=('opencv' 'opencv-docs' 'opencv-samples') -_realname=OpenCV -pkgver=2.3.0 -pkgrel=1 -pkgdesc="Open Source Computer Vision Library" -arch=('i686' 'x86_64') -license=('BSD') -url="http://opencv.willowgarage.com/" -depends=('jasper' 'gstreamer0.10-base' 'openexr' - 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils') -makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2') -optdepends=('python2-numpy: Python 2.x interface' - 'eigen2') -options=('!libtool') -source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2" - 'pypkgpath_nondebian.patch') -md5sums=('dea5e9df241ac37f4439da16559e420d' - 'eb884bad665047276e80556e44043a43') - -_cmakeopts=('-D CMAKE_BUILD_TYPE=Release' - '-D CMAKE_INSTALL_PREFIX=/usr' - '-D CMAKE_SKIP_RPATH=ON' - '-D BUILD_TESTS=OFF' - '-D ENABLE_SSE=ON' - '-D ENABLE_SSE2=ON' - '-D ENABLE_SSE3=OFF' - '-D ENABLE_SSSE3=OFF' - '-D ENABLE_SSE41=OFF' - '-D ENABLE_SSE42=OFF' - '-D BUILD_EXAMPLES=ON' - '-D INSTALL_C_EXAMPLES=ON' - '-D INSTALL_PYTHON_EXAMPLES=ON' - '-D WITH_XINE=ON' - '-D WITH_QT=OFF' - '-D WITH_QT_OPENGL=OFF' - '-D WITH_UNICAP=OFF' - '-D WITH_PVAPI=OFF' - '-D WITH_OPENNI=OFF' - '-D WITH_TBB=OFF' - '-D WITH_IPP=OFF' - '-D WITH_CUDA=OFF' - '-D USE_FAST_MATH=ON') - -build() { - cd "$srcdir/$_realname-$pkgver" - - # fix upstream's assumption of "debian-based" - patch -Np1 -i "$srcdir/pypkgpath_nondebian.patch" - - # x64, i.e "Athlon64" and upwards, can use SSE3 - [ $CARCH = x86_64 ] && \ - _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON} - - cmake ${_cmakeopts[@]} . - - make -} - -package_opencv() { - install=$pkgname.install - - cd "$srcdir/$_realname-$pkgver" - - make DESTDIR="$pkgdir" install - - # install license file - install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - # separate docs package; also be -R friendly - [ -d "$pkgdir/usr/share/opencv/doc" ] && \ - mv "$pkgdir/usr/share/opencv/doc" "$srcdir/opencv-doc" - - # separate samples package - [ -d "$pkgdir/usr/share/opencv/samples" ] && \ - mv "$pkgdir/usr/share/opencv/samples" "$srcdir/opencv-samples" -} - -package_opencv-docs() { - pkgdesc+=" (documentation)" - #arch=('any') - depends=() - optdepends=() - options=('docs') - - cd "$srcdir" - - mkdir -p "$pkgdir/usr/share/doc" - cp -r opencv-doc "$pkgdir/usr/share/doc/opencv" -} - -package_opencv-samples() { - pkgdesc+=" (samples)" - #arch=('any') - depends=() - optdepends=() - options=() - - cd "$srcdir" - - mkdir -p "$pkgdir/usr/share/opencv" - cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" -} - -# vim:set ts=2 sw=2 et: Copied: opencv/repos/extra-x86_64/PKGBUILD (from rev 136363, opencv/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2011-08-27 19:56:26 UTC (rev 136364) @@ -0,0 +1,110 @@ +# $Id$ +# Maintainer: Ray Rashif <sc...@archlinux.org> +# Contributor: Tobias Powalowski <tp...@archlinux.org> + +pkgbase=opencv +pkgname=('opencv' 'opencv-docs' 'opencv-samples') +_realname=OpenCV +pkgver=2.3.1 +pkgrel=1 +pkgdesc="Open Source Computer Vision Library" +arch=('i686' 'x86_64') +license=('BSD') +url="http://opencv.willowgarage.com/" +depends=('jasper' 'gstreamer0.10-base' 'openexr' + 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils') +makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2') +optdepends=('python2-numpy: Python 2.x interface' + 'eigen2') +options=('!libtool') +source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2") +md5sums=('827c9f8aa14384c531c73aa165f9b777') + +_cmakeopts=('-D CMAKE_BUILD_TYPE=Release' + '-D CMAKE_INSTALL_PREFIX=/usr' + '-D CMAKE_SKIP_RPATH=ON' + '-D BUILD_TESTS=OFF' + '-D ENABLE_SSE=ON' + '-D ENABLE_SSE2=ON' + '-D ENABLE_SSE3=OFF' + '-D ENABLE_SSSE3=OFF' + '-D ENABLE_SSE41=OFF' + '-D ENABLE_SSE42=OFF' + '-D BUILD_EXAMPLES=ON' + '-D INSTALL_C_EXAMPLES=ON' + '-D INSTALL_PYTHON_EXAMPLES=ON' + '-D WITH_XINE=ON' + '-D WITH_QT=OFF' + '-D WITH_QT_OPENGL=OFF' + '-D WITH_UNICAP=OFF' + '-D WITH_PVAPI=OFF' + '-D WITH_OPENNI=OFF' + '-D WITH_TBB=OFF' + '-D WITH_IPP=OFF' + '-D WITH_CUDA=OFF' + '-D USE_FAST_MATH=ON') + +build() { + cd "$srcdir/$_realname-$pkgver" + + # x64, i.e "Athlon64" and upwards, can use SSE3 + [ $CARCH = x86_64 ] && \ + _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON} + + cmake ${_cmakeopts[@]} . + + make +} + +package_opencv() { + install=$pkgname.install + + cd "$srcdir/$_realname-$pkgver" + + make DESTDIR="$pkgdir" install + + # install license file + install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + cd "$pkgdir/usr/share" + + # prepare FSH-friendly dirs + if [ -d OpenCV ]; then + mv opencv/samples OpenCV/ + rm -r opencv + mv OpenCV opencv + fi + + # separate docs package; also be -R friendly + [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc" + + # separate samples package + [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples" +} + +package_opencv-docs() { + pkgdesc+=" (documentation)" + depends=() + optdepends=() + options=('docs') + + cd "$srcdir" + + mkdir -p "$pkgdir/usr/share/doc" + cp -r opencv-doc "$pkgdir/usr/share/doc/opencv" +} + +package_opencv-samples() { + pkgdesc+=" (samples)" + depends=() + optdepends=() + options=() + + cd "$srcdir" + + mkdir -p "$pkgdir/usr/share/opencv" + cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" +} + +# vim:set ts=2 sw=2 et: Deleted: extra-x86_64/opencv.install =================================================================== --- extra-x86_64/opencv.install 2011-08-27 19:45:15 UTC (rev 136363) +++ extra-x86_64/opencv.install 2011-08-27 19:56:26 UTC (rev 136364) @@ -1,12 +0,0 @@ -post_install() { - echo "==> Documentation and samples are in separate packages:" - echo - echo "* opencv-docs" - echo "* opencv-samples" -} - -post_upgrade() { - post_install -} - -# vim:set ts=2 sw=2 et: Copied: opencv/repos/extra-x86_64/opencv.install (from rev 136363, opencv/trunk/opencv.install) =================================================================== --- extra-x86_64/opencv.install (rev 0) +++ extra-x86_64/opencv.install 2011-08-27 19:56:26 UTC (rev 136364) @@ -0,0 +1,11 @@ +post_install() { + echo " Documentation and samples are in separate packages:" + echo " * opencv-docs" + echo " * opencv-samples" +} + +post_upgrade() { + post_install +} + +# vim:set ts=2 sw=2 et: Deleted: extra-x86_64/pypkgpath_nondebian.patch =================================================================== --- extra-x86_64/pypkgpath_nondebian.patch 2011-08-27 19:45:15 UTC (rev 136363) +++ extra-x86_64/pypkgpath_nondebian.patch 2011-08-27 19:56:26 UTC (rev 136364) @@ -1,16 +0,0 @@ -diff -aur OpenCV-2.3.0.orig/CMakeLists.txt OpenCV-2.3.0/CMakeLists.txt ---- OpenCV-2.3.0.orig/CMakeLists.txt 2011-07-07 17:31:35.656946629 +0800 -+++ OpenCV-2.3.0/CMakeLists.txt 2011-07-07 17:40:34.110696242 +0800 -@@ -620,11 +620,7 @@ - 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) -- if(APPLE) -- set(PYTHON_PACKAGES_PATH lib/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.") -- endif() -+ set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.") - endif() - if(WIN32) - get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)