From a753a868447526a8c503a19484f60091cffb68f7 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Wed, 22 May 2024 17:26:45 +1200 Subject: [PATCH] VideoReceiver: bump gstreamer version Otherwise it is not found for Android. --- src/VideoReceiver/README.md | 6 +++--- src/VideoReceiver/VideoReceiver.pri | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/VideoReceiver/README.md b/src/VideoReceiver/README.md index 0649fe900a9..1e55fd4a15d 100644 --- a/src/VideoReceiver/README.md +++ b/src/VideoReceiver/README.md @@ -93,12 +93,12 @@ The installer places them under ~/Library/Developer/GStreamer/iPhone.sdk/GStream ### Android -Download the gstreamer from here: [gstreamer-1.0-android-universal-1.18.5.tar.xz](https://gstreamer.freedesktop.org/data/pkg/android/1.18.5/gstreamer-1.0-android-universal-1.18.5.tar.xz) +Download the gstreamer from here: [gstreamer-1.0-android-universal-1.18.6.tar.xz](https://gstreamer.freedesktop.org/data/pkg/android/1.18.6/gstreamer-1.0-android-universal-1.18.6.tar.xz) -Create a directory named "gstreamer-1.0-android-universal-1.18.5" under the root qgroundcontrol directory (the same directory qgroundcontrol.pro is located). Extract the downloaded archive under this directory. That's where the build system will look for it. Make sure your archive tool doesn't create any additional top level directories. The structure after extracting the archive should look like this: +Create a directory named "gstreamer-1.0-android-universal-1.18.6" under the root qgroundcontrol directory (the same directory qgroundcontrol.pro is located). Extract the downloaded archive under this directory. That's where the build system will look for it. Make sure your archive tool doesn't create any additional top level directories. The structure after extracting the archive should look like this: ``` qgroundcontrol -├── gstreamer-1.0-android-universal-1.18.5 +├── gstreamer-1.0-android-universal-1.18.6 │ │ │   ├──armv7 │   │   ├── bin diff --git a/src/VideoReceiver/VideoReceiver.pri b/src/VideoReceiver/VideoReceiver.pri index 4d51aa902c1..02aec0bd84e 100644 --- a/src/VideoReceiver/VideoReceiver.pri +++ b/src/VideoReceiver/VideoReceiver.pri @@ -68,16 +68,16 @@ LinuxBuild { QMAKE_POST_LINK += $$escape_expand(\\n) xcopy \"$$GST_ROOT_WIN\\lib\\gstreamer-1.0\\*.dll\" \"$$DESTDIR_WIN\\gstreamer-plugins\\\" /Y $$escape_expand(\\n) } } else:AndroidBuild { - #- gstreamer assumed to be installed in $$PWD/../../gstreamer-1.0-android-universal-1.18.5/*** + #- gstreamer assumed to be installed in $$PWD/../../gstreamer-1.0-android-universal-1.18.6/*** contains(ANDROID_TARGET_ARCH, armeabi-v7a) { - GST_ROOT = $$PWD/../../gstreamer-1.0-android-universal-1.18.5/armv7 + GST_ROOT = $$PWD/../../gstreamer-1.0-android-universal-1.18.6/armv7 } else:contains(ANDROID_TARGET_ARCH, arm64-v8a) { - GST_ROOT = $$PWD/../../gstreamer-1.0-android-universal-1.18.5/arm64 + GST_ROOT = $$PWD/../../gstreamer-1.0-android-universal-1.18.6/arm64 } else:contains(ANDROID_TARGET_ARCH, x86_64) { - GST_ROOT = $$PWD/../../gstreamer-1.0-android-universal-1.18.5/x86_64 + GST_ROOT = $$PWD/../../gstreamer-1.0-android-universal-1.18.6/x86_64 } else { message(Unknown ANDROID_TARGET_ARCH $$ANDROID_TARGET_ARCH) - GST_ROOT = $$PWD/../../gstreamer-1.0-android-universal-1.18.5/x86 + GST_ROOT = $$PWD/../../gstreamer-1.0-android-universal-1.18.6/x86 } exists($$GST_ROOT) { QMAKE_CXXFLAGS += -pthread