mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 21:59:10 +08:00
401578455f
* [OpenCV4] update to v4.5.5 * [OpenCV] bump version * [gstreamer] fix build for opencv * fix references * [vcpkg-tool-meson] fix nuget packaging * fix references * [gstreamer] fix references * [ogre] update vcpkg tools * fix references * [OpenCV4] fixes from CI runs * fix references * [OpenCV4] force python module also in debug builds * fix references * [harfbuzz] fix cmake config * harfbuzz fixes * fix references * [OpenCV4] remove unnecessary lines from patches * fix references * fix references * [harfbuzz] bump version * [harfbuzz] fix for single config builds * fix references * freetype fixes * fix references * fix ogre references * fix references, again * python when building static windows opencv libraries is unsupported * fix references * fix * refs * use required when necessary * fix references * do not use config for hdf5, use internal module * fix references * use proper spelling for freetype config cmake * fix references * [OpenCV] restore versions after merge * fix references * [leptonica] fix building * fix references * do not require package in optional features * £fix references * fix python feat * update version * update version * [ffmpeg] remove opengl feat on arm64-windows * format manifest * fix references * fix cuda/nvidia features compatibility matrix * fix manifest * fix * fix * fix references * fix references, again * move CONTROL to manifest * [gstreamer] bump versions * fix references Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
--- a/modules/videoio/cmake/detect_gstreamer.cmake
|
|
+++ b/modules/videoio/cmake/detect_gstreamer.cmake
|
|
@@ -44,6 +44,10 @@ if(NOT HAVE_GSTREAMER AND WIN32)
|
|
NAMES gstvideo gstvideo-1.0
|
|
PATHS ${env_paths}
|
|
PATH_SUFFIXES "lib")
|
|
+ find_library(GSTREAMER_audio_LIBRARY
|
|
+ NAMES gstvideo gstaudio-1.0
|
|
+ PATHS ${env_paths}
|
|
+ PATH_SUFFIXES "lib")
|
|
|
|
find_library(GSTREAMER_glib_LIBRARY
|
|
NAMES glib-2.0
|
|
@@ -63,6 +67,7 @@ if(NOT HAVE_GSTREAMER AND WIN32)
|
|
AND GSTREAMER_pbutils_LIBRARY
|
|
AND GSTREAMER_riff_LIBRARY
|
|
AND GSTREAMER_video_LIBRARY
|
|
+ AND GSTREAMER_audio_LIBRARY
|
|
AND GSTREAMER_glib_LIBRARY
|
|
AND GSTREAMER_gobject_LIBRARY)
|
|
file(STRINGS "${GSTREAMER_gst_INCLUDE_DIR}/gst/gstversion.h" ver_strings REGEX "#define +GST_VERSION_(MAJOR|MINOR|MICRO|NANO).*")
|
|
@@ -77,6 +82,7 @@ if(NOT HAVE_GSTREAMER AND WIN32)
|
|
${GSTREAMER_app_LIBRARY}
|
|
${GSTREAMER_riff_LIBRARY}
|
|
${GSTREAMER_video_LIBRARY}
|
|
+ ${GSTREAMER_audio_LIBRARY}
|
|
${GSTREAMER_pbutils_LIBRARY}
|
|
${GSTREAMER_glib_LIBRARY}
|
|
${GSTREAMER_gobject_LIBRARY})
|