3 files changed, 35 insertions, 6 deletions

diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_0.8.1.bb b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_0.8.1.bb
index dc43bed63b..e1c903f6ed 100644
--- a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_0.8.1.bb
+++ b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_0.8.1.bb
@@ -15,11 +15,10 @@ SRCREV_common = "b64f03f6090245624608beb5d2fff335e23a01c0"
 SRCREV_FORMAT = "default_common"
 SRC_URI = " \
     git://github.com/RidgeRun/gst-shark.git;protocol=https;branch=${SRCBRANCH} \
-    git://gitlab.freedesktop.org/gstreamer/common.git;protocol=https;branch=master;destsuffix=git/common;name=common \
+    git://gitlab.freedesktop.org/gstreamer/common.git;protocol=https;branch=master;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/common;name=common \
     file://0001-tracers-Fix-buffer-overflow.patch \
 "
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECONF += " \
     --disable-graphviz \
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-Remove-redundant-rpaths.patch b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-Remove-redundant-rpaths.patch
new file mode 100644
index 0000000000..b1e1e897bf
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-Remove-redundant-rpaths.patch
@@ -0,0 +1,26 @@
+From c183aae97728e25e0822b14f5093f60cb4331207 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 12 Oct 2024 10:48:01 -0700
+Subject: [PATCH] gstd: Remove redundant rpaths
+
+This emits /usr/lib into binaries which are redundant
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gstd/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gstd/meson.build b/gstd/meson.build
+index b6aa588..8cdf810 100644
+--- a/gstd/meson.build
++++ b/gstd/meson.build
+@@ -18,7 +18,7 @@ executable(exe_name,
+   include_directories : [configinc, libgstd_inc_dir],
+   dependencies : [gstd_deps, lib_gstd_dep],
+   c_args: gst_c_args,
+-  install_rpath: get_option('prefix') + '/' + get_option('libdir'),
++  #install_rpath: get_option('prefix') + '/' + get_option('libdir'),
+ )
+ lib_gstd_dir = meson.current_build_dir()
+ 
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb
index 87792491ae..d068d66bb6 100644
--- a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb
+++ b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb
@@ -8,15 +8,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c71b653a0f608a58cdc5693ae57126bc"
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon libsoup-2.4 jansson"
 
 SRCBRANCH ?= "master"
-SRCREV = "a011affa67f240cbc7aaff5b00fdfd6124bdaece"
-SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SRCBRANCH}"
-S = "${WORKDIR}/git"
+SRCREV = "dac03d5e4102080a8f3ef274a6a6583455962095"
+SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SRCBRANCH} \
+           file://0001-gstd-Remove-redundant-rpaths.patch"
 
 # Remove the +really when upstream version is > 1.0
-PV = "1.0+really0.15.0"
+PV = "1.0+really0.15.2"
 
 GTKDOC_MESON_OPTION = "enable-gtk-doc"
 
+# Documentation doesn't currently build:
+# gtkdoc-mkhtml: error: unrecognized arguments: ../gstd-docs.xml
+GTKDOC_ENABLED = "False"
+
 inherit meson pkgconfig gettext gtk-doc python3native python3-dir python3targetconfig
 
 do_install:append() {