vtk: Fix detection of ffmpeg. Fixes #2301 (#4432)

It was searching (for some reason) for stdint.h in <prefixes..>/include/
which doesn't exist. It only happenend to work in case msys2-runtime-devel
was installed which installs /usr/include/stdint.h.

There is no need to check for stdint.h since it's always there anyway, so
remove the check.
This commit is contained in:
Christoph Reiter
2018-09-24 07:31:34 +02:00
committed by Алексей
parent e5ab22e896
commit cd38ade701
2 changed files with 18 additions and 3 deletions

View File

@@ -0,0 +1,11 @@
--- VTK-8.1.1/CMake/FindFFMPEG.cmake.orig 2018-09-20 21:20:30.374287300 +0200
+++ VTK-8.1.1/CMake/FindFFMPEG.cmake 2018-09-20 22:29:52.930584400 +0200
@@ -113,7 +113,7 @@
# Note we don't check FFMPEG_LIBSWSCALE_FOUND, FFMPEG_LIBAVDEVICE_FOUND,
# and FFMPEG_LIBAVUTIL_FOUND as they are optional.
-IF (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVCODEC_FOUND AND STDINT_OK)
+IF (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVCODEC_FOUND)
SET(FFMPEG_FOUND "YES")

View File

@@ -5,7 +5,7 @@ _realname=vtk
pkgbase="mingw-w64-${_realname}"
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=8.1.1
pkgrel=1
pkgrel=2
pkgdesc="A software system for 3D computer graphics, image processing and visualization (mingw-w64)"
arch=('any')
url="https://www.vtk.org/"
@@ -45,12 +45,14 @@ source=(https://www.vtk.org/files/release/${pkgver%.*}/VTK-${pkgver}.tar.gz
"001-vtk-mingw-w64.patch"
"002-libharu-linking.patch"
"003-post-tcl-world.patch"
"004-fix-linking-rendering-tk.patch")
"004-fix-linking-rendering-tk.patch"
"005-remove-bogus-stdint-check.patch")
sha256sums=('71a09b4340f0a9c58559fe946dc745ab68a866cf20636a41d97b6046cb736324'
'db3163012fc7d90f6ffd8300a7a306a609e7c69a88a1dcfb9cb5b5df4391e3ad'
'5b0b82f3219a2a7a3d554b24fecbe59c516abfebd0d354e6288b62f9b0e2d30e'
'a39551b84d52ba65a1bbf7c316bb35251da7ffe4bba8f970728d02b8bbafd735'
'7f428a9c15b2dfc23fff2a19a11c48a628c9b52f82ec0d1dca37d0a5cffc9aef')
'7f428a9c15b2dfc23fff2a19a11c48a628c9b52f82ec0d1dca37d0a5cffc9aef'
'769e28e106e612671433eb2f84ab6c0c9ef676109d690f6fe330641631c1fd2b')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"
@@ -59,6 +61,8 @@ prepare() {
patch -Np1 -i "${srcdir}/002-libharu-linking.patch"
patch -Np1 -i "${srcdir}/003-post-tcl-world.patch"
patch -Np1 -i "${srcdir}/004-fix-linking-rendering-tk.patch"
# it will find stdint from msys2-runtime-devel, but that's useless
patch -Np1 -i "${srcdir}/005-remove-bogus-stdint-check.patch"
}
build() {