diff options
author | Steve Sakoman <steve@sakoman.com> | 2021-11-02 04:45:10 -1000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-11 10:54:32 +0000 |
commit | 07be05c69896b6d9f4da4b3ba122a1668c8c1200 (patch) | |
tree | 9774f6d61564d917c78f33faf08386a776b9daf7 /meta/recipes-multimedia | |
parent | afe0ef0a074b23fc5f1c39ed7fd345f7b75973c7 (diff) | |
download | poky-07be05c69896b6d9f4da4b3ba122a1668c8c1200.tar.gz |
meta: Add explict branch to git SRC_URIs, handle github url changes
This update was made with the convert-scruri.py script in scripts/contrib
This script handles two emerging issues:
1. There is uncertainty about the default branch name in git going forward.
To try and cover the different possible outcomes, add branch names to all
git:// and gitsm:// SRC_URI entries.
2. Github are dropping support for git:// protocol fetching, so remap github
urls as needed. For more details see:
https://github.blog/2021-09-01-improving-git-protocol-security-github/
(From OE-Core rev: 827a805349f9732b2a5fa9184dc7922af36de327)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-examples_1.16.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-multimedia/x264/x264_git.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-examples_1.16.0.bb b/meta/recipes-multimedia/gstreamer/gst-examples_1.16.0.bb index af79a6f952..6494013e3f 100644 --- a/meta/recipes-multimedia/gstreamer/gst-examples_1.16.0.bb +++ b/meta/recipes-multimedia/gstreamer/gst-examples_1.16.0.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://playback/player/gtk/gtk-play.c;beginline=1;endline=20 | |||
7 | 7 | ||
8 | DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gtk+3 glib-2.0-native" | 8 | DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gtk+3 glib-2.0-native" |
9 | 9 | ||
10 | SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gst-examples.git;protocol=https \ | 10 | SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gst-examples.git;protocol=https;branch=master \ |
11 | file://0001-Make-player-examples-installable.patch \ | 11 | file://0001-Make-player-examples-installable.patch \ |
12 | file://gst-player.desktop \ | 12 | file://gst-player.desktop \ |
13 | " | 13 | " |
diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb index 39429a8809..6789646833 100644 --- a/meta/recipes-multimedia/x264/x264_git.bb +++ b/meta/recipes-multimedia/x264/x264_git.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | |||
8 | 8 | ||
9 | DEPENDS = "nasm-native" | 9 | DEPENDS = "nasm-native" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/mirror/x264;branch=stable \ | 11 | SRC_URI = "git://github.com/mirror/x264;branch=stable;protocol=https \ |
12 | file://don-t-default-to-cortex-a9-with-neon.patch \ | 12 | file://don-t-default-to-cortex-a9-with-neon.patch \ |
13 | file://Fix-X32-build-by-disabling-asm.patch \ | 13 | file://Fix-X32-build-by-disabling-asm.patch \ |
14 | " | 14 | " |