Date: Saturday, August 27, 2011 @ 15:45:15 Author: schiv Revision: 136363
upgpkg: opencv 2.3.1-1 upstream release Modified: opencv/trunk/PKGBUILD opencv/trunk/opencv.install Deleted: opencv/trunk/pypkgpath_nondebian.patch ---------------------------+ PKGBUILD | 26 ++++++++++++++------------ opencv.install | 7 +++---- pypkgpath_nondebian.patch | 16 ---------------- 3 files changed, 17 insertions(+), 32 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-08-27 15:46:49 UTC (rev 136362) +++ PKGBUILD 2011-08-27 19:45:15 UTC (rev 136363) @@ -5,7 +5,7 @@ pkgbase=opencv pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV -pkgver=2.3.0 +pkgver=2.3.1 pkgrel=1 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') @@ -17,10 +17,8 @@ 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') +source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2") +md5sums=('827c9f8aa14384c531c73aa165f9b777') _cmakeopts=('-D CMAKE_BUILD_TYPE=Release' '-D CMAKE_INSTALL_PREFIX=/usr' @@ -49,9 +47,6 @@ 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} @@ -72,13 +67,20 @@ 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 "$pkgdir/usr/share/opencv/doc" ] && \ - mv "$pkgdir/usr/share/opencv/doc" "$srcdir/opencv-doc" + [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc" # separate samples package - [ -d "$pkgdir/usr/share/opencv/samples" ] && \ - mv "$pkgdir/usr/share/opencv/samples" "$srcdir/opencv-samples" + [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples" } package_opencv-docs() { Modified: opencv.install =================================================================== --- opencv.install 2011-08-27 15:46:49 UTC (rev 136362) +++ opencv.install 2011-08-27 19:45:15 UTC (rev 136363) @@ -1,8 +1,7 @@ post_install() { - echo "==> Documentation and samples are in separate packages:" - echo - echo "* opencv-docs" - echo "* opencv-samples" + echo " Documentation and samples are in separate packages:" + echo " * opencv-docs" + echo " * opencv-samples" } post_upgrade() { Deleted: pypkgpath_nondebian.patch =================================================================== --- pypkgpath_nondebian.patch 2011-08-27 15:46:49 UTC (rev 136362) +++ pypkgpath_nondebian.patch 2011-08-27 19:45:15 UTC (rev 136363) @@ -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)