update by lilac

2 files changed, 28 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 862f1e38dc0e..32fa9094f2cb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,17 @@
 pkgbase = vlfeat
 	pkgdesc = An open library of computer vision algorithms
 	pkgver = 0.9.21
-	pkgrel = 4
+	pkgrel = 6
 	url = https://www.vlfeat.org/
 	arch = x86_64
 	license = BSD
 	makedepends = clang
+	makedepends = git
 	makedepends = octave
 	makedepends = patchelf
 	depends = openmp
-	source = vlfeat-0.9.21.tar.gz::https://github.com/vlfeat/vlfeat/archive/v0.9.21.tar.gz
-	sha512sums = ba7f83392d778a4a8c121aed10ae98693d8d61ae127e627322324c245cd1984ab8c0c3e3afe743075e7c022b3efb78e7dfc653bc488c8f19c93b3aa0f87e803e
+	source = vlfeat::git+https://github.com/vlfeat/vlfeat.git
+	sha512sums = SKIP
 
 pkgname = vlfeat
 
diff --git a/PKGBUILD b/PKGBUILD
index 64fe831e13a8..fe5347b806fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname=vlfeat
 pkgname=(vlfeat octave-vlfeat)
 pkgver=0.9.21
-pkgrel=4
+pkgrel=6
 pkgdesc='An open library of computer vision algorithms'
 arch=('x86_64')
 url='https://www.vlfeat.org/'
@@ -13,45 +13,46 @@ depends=(
 )
 makedepends=(
   clang
+  git
   octave
   patchelf
 )
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/vlfeat/vlfeat/archive/v${pkgver}.tar.gz")
-sha512sums=('ba7f83392d778a4a8c121aed10ae98693d8d61ae127e627322324c245cd1984ab8c0c3e3afe743075e7c022b3efb78e7dfc653bc488c8f19c93b3aa0f87e803e')
+source=("${_pkgname}::git+https://github.com/vlfeat/vlfeat.git")
+sha512sums=('SKIP')
 
 prepare() {
   # fix https://github.com/vlfeat/vlfeat/issues/168
-  sed -i "s,if(! (max_value >= 65536)),if(max_value >= 65536)," "${srcdir}/${pkgname}-${pkgver}/vl/pgm.c"
+  sed -i "s,if(! (max_value >= 65536)),if(max_value >= 65536)," "${srcdir}/${_pkgname}/vl/pgm.c"
   # fix octave building, see https://github.com/vlfeat/vlfeat/issues/188
-  mkdir -p "${srcdir}/${pkgname}-${pkgver}/toolbox/mex/octave/mexa64"
-  sed -i '32,35d' "${srcdir}/${pkgname}-${pkgver}/toolbox/mexutils.h"
+  mkdir -p "${srcdir}/${_pkgname}/toolbox/mex/octave/mexa64"
+  sed -i '32,35d' "${srcdir}/${_pkgname}/toolbox/mexutils.h"
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${_pkgname}"
   make CC=clang CXX=clang++ DISABLE_OPENMP=no MKOCTFILE=mkoctfile
 }
 
 package_vlfeat() {
   # delete unneeded files and install binary & libs to correct location
-  find "${srcdir}/${_pkgname}-${pkgver}/bin" -type f -perm 0755 -name "test_*" -delete
-  install -Dm755 "${srcdir}/${_pkgname}-${pkgver}/bin/glnxa64/libvl.so" -t "${pkgdir}/usr/lib"
-  install -Dm755 "${srcdir}/${_pkgname}-${pkgver}/bin/glnxa64/aib" -t "${pkgdir}/usr/bin"
-  install -Dm755 "${srcdir}/${_pkgname}-${pkgver}/bin/glnxa64/mser" -t "${pkgdir}/usr/bin"
-  install -Dm755 "${srcdir}/${_pkgname}-${pkgver}/bin/glnxa64/sift" -t "${pkgdir}/usr/bin"
+  find "${srcdir}/${_pkgname}/bin" -type f -perm 0755 -name "test_*" -delete
+  install -Dm755 "${srcdir}/${_pkgname}/bin/glnxa64/libvl.so" -t "${pkgdir}/usr/lib"
+  install -Dm755 "${srcdir}/${_pkgname}/bin/glnxa64/aib" -t "${pkgdir}/usr/bin"
+  install -Dm755 "${srcdir}/${_pkgname}/bin/glnxa64/mser" -t "${pkgdir}/usr/bin"
+  install -Dm755 "${srcdir}/${_pkgname}/bin/glnxa64/sift" -t "${pkgdir}/usr/bin"
   # patch rpath
   find "${pkgdir}/usr" -type f -perm 0755 -exec patchelf --remove-rpath {} \;
   # install headers
-  find "${srcdir}/${_pkgname}-${pkgver}/vl" -type f -name "*.h" -exec install -Dm644 {} -t "${pkgdir}/usr/include/vl" \;
+  find "${srcdir}/${_pkgname}/vl" -type f -name "*.h" -exec install -Dm644 {} -t "${pkgdir}/usr/include/vl" \;
   # install manpages
   for manfile in mser.1 sift.1 vlfeat.7; do
-    gzip "${srcdir}/${_pkgname}-${pkgver}/src/${manfile}"
+    gzip "${srcdir}/${_pkgname}/src/${manfile}"
   done
-  install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/src/mser.1.gz" -t "${pkgdir}/usr/share/man/man1"
-  install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/src/sift.1.gz" -t "${pkgdir}/usr/share/man/man1"
-  install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/src/vlfeat.7.gz" -t "${pkgdir}/usr/share/man/man7"
+  install -Dm644 "${srcdir}/${_pkgname}/src/mser.1.gz" -t "${pkgdir}/usr/share/man/man1"
+  install -Dm644 "${srcdir}/${_pkgname}/src/sift.1.gz" -t "${pkgdir}/usr/share/man/man1"
+  install -Dm644 "${srcdir}/${_pkgname}/src/vlfeat.7.gz" -t "${pkgdir}/usr/share/man/man7"
 
-  install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/COPYING" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -Dm644 "${srcdir}/${_pkgname}/COPYING" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 
 package_octave-vlfeat() {
@@ -59,15 +60,16 @@ package_octave-vlfeat() {
   depends+=(vlfeat octave)
 
   install -d "${pkgdir}/usr/share/octave/packages/${_pkgname}-${pkgver}"
-  find "${srcdir}/${_pkgname}-${pkgver}/toolbox" -type f -perm 0755 -name "*.mex" -exec install -Dm755 {} -t "${pkgdir}/usr/lib/octave/packages/${_pkgname}-${pkgver}" \;
-  cp -a "${srcdir}/${_pkgname}-${pkgver}/toolbox" "${pkgdir}/usr/share/octave/packages/${_pkgname}-${pkgver}"
-  cp -a "${srcdir}/${_pkgname}-${pkgver}/data" "${pkgdir}/usr/share/octave/packages/${_pkgname}-${pkgver}"
+  find "${srcdir}/${_pkgname}/toolbox" -type f -perm 0755 -name "*.mex" -exec install -Dm755 {} -t "${pkgdir}/usr/lib/octave/packages/${_pkgname}-${pkgver}" \;
+  cp -a "${srcdir}/${_pkgname}/toolbox" "${pkgdir}/usr/share/octave/packages/${_pkgname}-${pkgver}"
+  cp -a "${srcdir}/${_pkgname}/data" "${pkgdir}/usr/share/octave/packages/${_pkgname}-${pkgver}"
+  rm -vf "${pkgdir}/usr/share/octave/packages/${_pkgname}-${pkgver}/toolbox/mex/octave/mexa64/libvl.so"
   for mexfile in $(ls "${pkgdir}/usr/share/octave/packages/${_pkgname}-${pkgver}/toolbox/mex/octave/mexa64/"); do
     ln -sf "/usr/lib/octave/packages/${_pkgname}-${pkgver}/${mexfile}" "${pkgdir}/usr/share/octave/packages/${_pkgname}-${pkgver}/toolbox/mex/octave/mexa64/${mexfile}"
   done
   # patch rpath
   find "${pkgdir}/usr/lib" -type f -perm 0755 -exec patchelf --remove-rpath {} \;
 
-  install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/COPYING" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -Dm644 "${srcdir}/${_pkgname}/COPYING" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 # vim:set ts=2 sw=2 et: