aboutsummaryrefslogtreecommitdiff
path: root/multimedia/QtAV
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2020-08-26 17:36:55 +0000
committerTobias C. Berner <tcberner@FreeBSD.org>2020-08-26 17:36:55 +0000
commit510d291e8a25331cfe36aafee681343afd0b732e (patch)
treebde492f46a9c1538fe8babc615d817f73d6fedee /multimedia/QtAV
parent9ffbfa1efaabd82f276c165e2ea1db991e95223e (diff)
downloadports-510d291e8a25331cfe36aafee681343afd0b732e.tar.gz
ports-510d291e8a25331cfe36aafee681343afd0b732e.zip
multimedia/QtAV: fix build on current
Notes
Notes: svn path=/head/; revision=546296
Diffstat (limited to 'multimedia/QtAV')
-rw-r--r--multimedia/QtAV/files/patch-src_codec_video_SurfaceInteropCUDA.cpp20
1 files changed, 20 insertions, 0 deletions
diff --git a/multimedia/QtAV/files/patch-src_codec_video_SurfaceInteropCUDA.cpp b/multimedia/QtAV/files/patch-src_codec_video_SurfaceInteropCUDA.cpp
new file mode 100644
index 000000000000..738ea50c67a8
--- /dev/null
+++ b/multimedia/QtAV/files/patch-src_codec_video_SurfaceInteropCUDA.cpp
@@ -0,0 +1,20 @@
+--- src/codec/video/SurfaceInteropCUDA.cpp.orig 2020-08-26 17:34:29 UTC
++++ src/codec/video/SurfaceInteropCUDA.cpp
+@@ -132,7 +132,7 @@ bool HostInteropResource::map(int picIndex, const CUVI
+ if (!ensureResource(pitch, H)) //copy height is coded height
+ return false;
+ // the same thread (context) as cuMemAllocHost, so no ccontext switch is needed
+- CUDA_ENSURE(cuMemcpyDtoH(host_mem.data, devptr, pitch*H*3/2), NULL);
++ CUDA_ENSURE(cuMemcpyDtoH(host_mem.data, devptr, pitch*H*3/2), false);
+ host_mem.index = picIndex;
+ }
+ // map to texture
+@@ -173,7 +173,7 @@ bool HostInteropResource::ensureResource(int pitch, in
+ if (!share_ctx) // cuMemFreeHost will be called in dtor which is not the current thread.
+ CUDA_WARN(cuCtxPushCurrent(ctx));
+ // NV12
+- CUDA_ENSURE(cuMemAllocHost((void**)&host_mem.data, pitch*height*3/2), NULL);
++ CUDA_ENSURE(cuMemAllocHost((void**)&host_mem.data, pitch*height*3/2), false);
+ if (!share_ctx)
+ CUDA_WARN(cuCtxPopCurrent(NULL)); //can be null or &ctx
+ return true;