summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAchmad fathoni2022-03-19 11:08:52 +0700
committerAchmad fathoni2022-03-19 11:08:52 +0700
commit302eb509e4a7b00ed0157cdac38b8893dab8024b (patch)
treeba5c1ec5215b934f9ecdef403d510283d75c93fb
parentf23cb1a5dfaf9137da933bbc21f3e0e4b2155aff (diff)
downloadaur-302eb509e4a7b00ed0157cdac38b8893dab8024b.tar.gz
fix ffmpeg
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
2 files changed, 6 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 75befdef4d03..4b85a06b10bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = cloudcompare-git
pkgdesc = A 3D point cloud (and triangular mesh) processing software
- pkgver = 2.10.2.r1025.g08b7ae9a
+ pkgver = 2.10.2.r1076.g541800c9
pkgrel = 1
url = http://www.danielgm.net/cc/
arch = i686
@@ -17,7 +17,7 @@ pkgbase = cloudcompare-git
makedepends = python
depends = cgal
depends = fbx-sdk
- depends = ffmpeg
+ depends = ffmpeg4.4
depends = glew
depends = glu
depends = mesa
diff --git a/PKGBUILD b/PKGBUILD
index a24f5efdc7a7..1c7bb8ee61d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,13 +8,13 @@ name=cloudcompare
#_fragment="#branch="
options=('!strip') # strip would also remove plugins, for some reason
pkgname=${name}-git
-pkgver=2.10.2.r1025.g08b7ae9a
+pkgver=2.10.2.r1076.g541800c9
pkgrel=1
pkgdesc="A 3D point cloud (and triangular mesh) processing software"
arch=('i686' 'x86_64')
url="http://www.danielgm.net/cc/"
license=('GPL2')
-depends=('cgal' 'fbx-sdk' 'ffmpeg' 'glew' 'glu' 'mesa' 'mpir' 'pcl' 'pdal' 'qt5-base' 'qt5-tools' 'qt5-svg' 'qt5-websockets' 'shapelib' 'tbb' 'opencascade' 'opencv' 'gdal')
+depends=('cgal' 'fbx-sdk' 'ffmpeg4.4' 'glew' 'glu' 'mesa' 'mpir' 'pcl' 'pdal' 'qt5-base' 'qt5-tools' 'qt5-svg' 'qt5-websockets' 'shapelib' 'tbb' 'opencascade' 'opencv' 'gdal')
#fix pcl:>vtk:>vtkm:>openmp missing deps
depends+=(openmp)
makedepends=('clang' 'cmake' 'doxygen' 'git' 'laz-perf' 'libharu' 'ninja' 'proj' 'python')
@@ -85,6 +85,8 @@ build() {
-DPLUGIN_STANDARD_QCORK:BOOL=ON # require mpir, cork (cork-git is not enough)
-DMPIR_INCLUDE_DIR:PATH=/usr/include # required by qcork plugin
-DCORK_INCLUDE_DIR:PATH="${srcdir}/${name}-cork/src" # required by qcork plugin
+ -DFFMPEG_INCLUDE_DIR:PATH=/usr/include/ffmpeg4.4 # required by qAnimation plugin
+ -DFFMPEG_LIBRARY_DIR:PATH=/usr/lib/ffmpeg4.4 # required by qAnimation plugin
-DCORK_RELEASE_LIBRARY_FILE:FILEPATH="${srcdir}/${name}-cork/lib/libcork.a" # required by qcork plugin
-DMPIR_RELEASE_LIBRARY_FILE:FILEPATH=/usr/lib/libmpir.so # require by qcork plugin
-DPLUGIN_STANDARD_QCSF:BOOL=ON