summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeel Gandhi <neel.gandhi@amd.com>2024-05-30 19:37:27 +0530
committerMark Hatle <mark.hatle@amd.com>2024-05-31 10:09:16 -0600
commit4263b59c128dae032148acc4951e511be9a6081c (patch)
tree08f0eba08bd7912cc86797535727fa88529caebf
parent96f1ba4799f0a1ba1822fec75ad39626f844762a (diff)
downloadmeta-xilinx-4263b59c128dae032148acc4951e511be9a6081c.tar.gz
gstreamer: Updated recipes and commitIDs based on newer gstreamer 1.22.11
Signed-off-by: Neel Gandhi <neel.gandhi@amd.com> Disable mediasrcbin, fails to configure. Signed-off-by: Mark Hatle <mark.hatle@amd.com>
-rw-r--r--meta-xilinx-multimedia/recipes-multimedia/gstreamer/gst-devtools_1.22.11.bbappend (renamed from meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gst-devtools_1.20.5.bbappend)2
-rw-r--r--meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer-xilinx-1.22.11.inc (renamed from meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer-xilinx-1.20.5.inc)6
-rw-r--r--meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.11.bbappend (renamed from meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-libav_1.20.5.bbappend)2
-rw-r--r--meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.11.bbappend (renamed from meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-omx_1.20.5.bbappend)2
-rw-r--r--meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.11.bbappend (renamed from meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-plugins-bad_1.20.5.bbappend)4
-rw-r--r--meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.11.bbappend (renamed from meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-plugins-base_1.20.5.bbappend)2
-rw-r--r--meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bbappend (renamed from meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-plugins-good_1.20.5.bbappend)7
-rw-r--r--meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bbappend (renamed from meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-plugins-ugly_1.20.5.bbappend)2
-rw-r--r--meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.11.bbappend (renamed from meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-python_1.20.5.bbappend)2
-rw-r--r--meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.11.bbappend (renamed from meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-rtsp-server_1.20.5.bbappend)2
-rw-r--r--meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.11.bbappend (renamed from meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-vaapi_1.20.5.bbappend)2
-rw-r--r--meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0_1.22.11.bbappend (renamed from meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0_1.20.5.bbappend)11
12 files changed, 22 insertions, 22 deletions
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gst-devtools_1.20.5.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gst-devtools_1.22.11.bbappend
index 13f7a700..797b582f 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gst-devtools_1.20.5.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gst-devtools_1.22.11.bbappend
@@ -1,4 +1,4 @@
1require gstreamer-xilinx-1.20.5.inc 1require gstreamer-xilinx-1.22.11.inc
2 2
3SRC_URI:append = " \ 3SRC_URI:append = " \
4 file://0001-connect-has-a-different-signature-on-musl.patch \ 4 file://0001-connect-has-a-different-signature-on-musl.patch \
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer-xilinx-1.20.5.inc b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer-xilinx-1.22.11.inc
index 04c025fc..c53ffeff 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer-xilinx-1.20.5.inc
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer-xilinx-1.22.11.inc
@@ -1,9 +1,9 @@
1BRANCH ?= "xlnx-rebase-v1.20.5" 1BRANCH ?= "xlnx-rebase-v1.22.11"
2REPO ?= "git://github.com/Xilinx/gstreamer.git;protocol=https" 2REPO ?= "git://github.com/Xilinx/gstreamer.git;protocol=https"
3 3
4BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" 4BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}"
5 5
6PV = "1.20.5+git" 6PV = "1.22.11+git"
7 7
8# We need a common PRSERV_PV_AUTOINC for all variations of gstreamer packages 8# We need a common PRSERV_PV_AUTOINC for all variations of gstreamer packages
9# Need to inject a custom setting, so based on package.bbclass version 9# Need to inject a custom setting, so based on package.bbclass version
@@ -24,5 +24,5 @@ SRC_URI = " \
24 ${REPO};${BRANCHARG};name=gstreamer-xlnx \ 24 ${REPO};${BRANCHARG};name=gstreamer-xlnx \
25" 25"
26 26
27SRCREV_gstreamer-xlnx = "5126254d77401b9673602ddcb617ff9e958dd295" 27SRCREV_gstreamer-xlnx = "35b7316e6d323a46668967d54e68a9036e6cd9c2"
28SRCREV_FORMAT = "gstreamer-xlnx" 28SRCREV_FORMAT = "gstreamer-xlnx"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-libav_1.20.5.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.11.bbappend
index 180f25c2..b2579ec4 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-libav_1.20.5.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.11.bbappend
@@ -1,3 +1,3 @@
1require gstreamer-xilinx-1.20.5.inc 1require gstreamer-xilinx-1.22.11.inc
2 2
3S = "${WORKDIR}/git/subprojects/gst-libav" 3S = "${WORKDIR}/git/subprojects/gst-libav"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-omx_1.20.5.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.11.bbappend
index fc6f9b5f..4ce29ff8 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-omx_1.20.5.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.11.bbappend
@@ -1,4 +1,4 @@
1require gstreamer-xilinx-1.20.5.inc 1require gstreamer-xilinx-1.22.11.inc
2 2
3S = "${WORKDIR}/git/subprojects/gst-omx" 3S = "${WORKDIR}/git/subprojects/gst-omx"
4 4
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-plugins-bad_1.20.5.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.11.bbappend
index 7c503292..151fe060 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-plugins-bad_1.20.5.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.11.bbappend
@@ -1,4 +1,4 @@
1require gstreamer-xilinx-1.20.5.inc 1require gstreamer-xilinx-1.22.11.inc
2 2
3SRC_URI:append = " \ 3SRC_URI:append = " \
4 file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \ 4 file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \
@@ -7,6 +7,6 @@ SRC_URI:append = " \
7 " 7 "
8 8
9PACKAGECONFIG[mediasrcbin] = "-Dmediasrcbin=enabled,-Dmediasrcbin=disabled,media-ctl" 9PACKAGECONFIG[mediasrcbin] = "-Dmediasrcbin=enabled,-Dmediasrcbin=disabled,media-ctl"
10PACKAGECONFIG:append = " faac kms faad opusparse mediasrcbin" 10PACKAGECONFIG:append = " faac kms faad opusparse"
11 11
12S = "${WORKDIR}/git/subprojects/gst-plugins-bad" 12S = "${WORKDIR}/git/subprojects/gst-plugins-bad"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-plugins-base_1.20.5.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.11.bbappend
index 18e43bca..8eda6f2e 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-plugins-base_1.20.5.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.11.bbappend
@@ -1,4 +1,4 @@
1require gstreamer-xilinx-1.20.5.inc 1require gstreamer-xilinx-1.22.11.inc
2 2
3SRC_URI:append = " \ 3SRC_URI:append = " \
4 file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch \ 4 file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch \
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-plugins-good_1.20.5.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bbappend
index b5db44a6..6af32a9f 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-plugins-good_1.20.5.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bbappend
@@ -1,9 +1,10 @@
1PACKAGECONFIG:append = " vpx" 1require gstreamer-xilinx-1.22.11.inc
2
3require gstreamer-xilinx-1.20.5.inc
4 2
5SRC_URI:append = " \ 3SRC_URI:append = " \
6 file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ 4 file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \
5 file://0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch \
7 " 6 "
8 7
8PACKAGECONFIG:append = " vpx"
9
9S = "${WORKDIR}/git/subprojects/gst-plugins-good" 10S = "${WORKDIR}/git/subprojects/gst-plugins-good"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-plugins-ugly_1.20.5.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bbappend
index 349efb29..079969ae 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-plugins-ugly_1.20.5.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bbappend
@@ -1,3 +1,3 @@
1require gstreamer-xilinx-1.20.5.inc 1require gstreamer-xilinx-1.22.11.inc
2 2
3S = "${WORKDIR}/git/subprojects/gst-plugins-ugly" 3S = "${WORKDIR}/git/subprojects/gst-plugins-ugly"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-python_1.20.5.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.11.bbappend
index 11253676..7de8de42 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-python_1.20.5.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.11.bbappend
@@ -1,4 +1,4 @@
1require gstreamer-xilinx-1.20.5.inc 1require gstreamer-xilinx-1.22.11.inc
2 2
3S = "${WORKDIR}/git/subprojects/gst-python" 3S = "${WORKDIR}/git/subprojects/gst-python"
4 4
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-rtsp-server_1.20.5.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.11.bbappend
index a32f9d5b..4212b5e6 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-rtsp-server_1.20.5.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.11.bbappend
@@ -1,3 +1,3 @@
1require gstreamer-xilinx-1.20.5.inc 1require gstreamer-xilinx-1.22.11.inc
2 2
3S = "${WORKDIR}/git/subprojects/gst-rtsp-server" 3S = "${WORKDIR}/git/subprojects/gst-rtsp-server"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-vaapi_1.20.5.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.11.bbappend
index f468e94f..152f6349 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0-vaapi_1.20.5.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.11.bbappend
@@ -1,3 +1,3 @@
1require gstreamer-xilinx-1.20.5.inc 1require gstreamer-xilinx-1.22.11.inc
2 2
3S = "${WORKDIR}/git/subprojects/gstreamer-vaapi" 3S = "${WORKDIR}/git/subprojects/gstreamer-vaapi"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0_1.20.5.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0_1.22.11.bbappend
index d26d567b..743b2c41 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/FIXME/gstreamer1.0_1.20.5.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0_1.22.11.bbappend
@@ -1,12 +1,11 @@
1require gstreamer-xilinx-1.20.5.inc 1require gstreamer-xilinx-1.22.11.inc
2 2
3SRC_URI:append = " \ 3SRC_URI:append = " \
4 file://run-ptest \ 4 file://run-ptest \
5 file://0001-tests-respect-the-idententaion-used-in-meson.patch;striplevel=3 \ 5 file://0001-tests-respect-the-idententaion-used-in-meson.patch \
6 file://0002-tests-add-support-for-install-the-tests.patch;striplevel=3 \ 6 file://0002-tests-add-support-for-install-the-tests.patch \
7 file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \ 7 file://0003-tests-use-a-dictionaries-for-environment.patch \
8 file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \ 8 file://0004-tests-add-helper-script-to-run-the-installed_tests.patch \
9 file://0005-bin-Fix-race-conditions-in-tests.patch;striplevel=3 \
10 " 9 "
11 10
12PACKAGECONFIG:append = " tracer-hooks coretracers" 11PACKAGECONFIG:append = " tracer-hooks coretracers"