From d2444132b2876e94f84a7e2b1a2947c63385422b Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Sun, 12 Feb 2023 18:18:20 +0100
Subject: [PATCH] opencv: Use correct headers for videoio C interface

---
 .github/workflows/ci.yml                     | 16 ++++++++--------
 README.md                                    |  2 +-
 panda/src/vision/webcamVideoCursorOpenCV.cxx |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 872ee05741..8c42f64d74 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,10 +92,10 @@ jobs:
     - name: Install dependencies (macOS)
       if: runner.os == 'macOS'
       run: |
-        curl -O https://www.panda3d.org/download/panda3d-1.10.13/panda3d-1.10.13-tools-mac.tar.gz
-        tar -xf panda3d-1.10.13-tools-mac.tar.gz
-        mv panda3d-1.10.13/thirdparty thirdparty
-        rmdir panda3d-1.10.13
+        curl -O https://www.panda3d.org/download/panda3d-1.10.14/panda3d-1.10.14-tools-mac.tar.gz
+        tar -xf panda3d-1.10.14-tools-mac.tar.gz
+        mv panda3d-1.10.14/thirdparty thirdparty
+        rmdir panda3d-1.10.14
 
         # Temporary hack so that pzip can run, since we are about to remove Cg anyway.
         install_name_tool -id "$(pwd)/thirdparty/darwin-libs-a/nvidiacg/lib/libCg.dylib" thirdparty/darwin-libs-a/nvidiacg/lib/libCg.dylib
@@ -381,10 +381,10 @@ jobs:
     - name: Get thirdparty packages (macOS)
       if: runner.os == 'macOS'
       run: |
-        curl -O https://www.panda3d.org/download/panda3d-1.10.13/panda3d-1.10.13-tools-mac.tar.gz
-        tar -xf panda3d-1.10.13-tools-mac.tar.gz
-        mv panda3d-1.10.13/thirdparty thirdparty
-        rmdir panda3d-1.10.13
+        curl -O https://www.panda3d.org/download/panda3d-1.10.14/panda3d-1.10.14-tools-mac.tar.gz
+        tar -xf panda3d-1.10.14-tools-mac.tar.gz
+        mv panda3d-1.10.14/thirdparty thirdparty
+        rmdir panda3d-1.10.14
         (cd thirdparty/darwin-libs-a && rm -rf rocket)
 
     - name: Set up Python 3.11
diff --git a/README.md b/README.md
index 094a40b0a7..655fd305b4 100644
--- a/README.md
+++ b/README.md
@@ -136,7 +136,7 @@ macOS
 -----
 
 On macOS, you will need to download a set of precompiled thirdparty packages in order to
-compile Panda3D, which can be acquired from [here](https://www.panda3d.org/download/panda3d-1.10.13/panda3d-1.10.13-tools-mac.tar.gz).
+compile Panda3D, which can be acquired from [here](https://www.panda3d.org/download/panda3d-1.10.14/panda3d-1.10.14-tools-mac.tar.gz).
 
 After placing the thirdparty directory inside the panda3d source directory,
 you may build Panda3D using a command like the following:
diff --git a/panda/src/vision/webcamVideoCursorOpenCV.cxx b/panda/src/vision/webcamVideoCursorOpenCV.cxx
index 629cd927ae..d3134cdc56 100644
--- a/panda/src/vision/webcamVideoCursorOpenCV.cxx
+++ b/panda/src/vision/webcamVideoCursorOpenCV.cxx
@@ -20,7 +20,7 @@
 
 #include "pStatTimer.h"
 
-#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/videoio/videoio_c.h>
 
 TypeHandle WebcamVideoCursorOpenCV::_type_handle;