diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-04-23 09:26:30 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-04-25 17:37:41 +0200 |
| commit | 12cc032d319165a5b38cb8594c8c72b93489483d (patch) | |
| tree | 3cd3c9f549fcb0c2ce1639203c55b9f756671247 /patches | |
| parent | 20252072ffd347e83cb20e9ce561b573d5f1a436 (diff) | |
| download | ptxdist-12cc032d319165a5b38cb8594c8c72b93489483d.tar.gz ptxdist-12cc032d319165a5b38cb8594c8c72b93489483d.tar.xz | |
gst-plugins-bad1: version bump 1.14.4 -> 1.16.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
3 files changed, 48 insertions, 0 deletions
diff --git a/patches/gst-plugins-bad-1.16.0/0001-meson-allow-enabling-gir-when-cross-compiling.patch b/patches/gst-plugins-bad-1.16.0/0001-meson-allow-enabling-gir-when-cross-compiling.patch new file mode 100644 index 000000000..4568c95af --- /dev/null +++ b/patches/gst-plugins-bad-1.16.0/0001-meson-allow-enabling-gir-when-cross-compiling.patch @@ -0,0 +1,22 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Tue, 23 Apr 2019 09:59:31 +0200 +Subject: [PATCH] meson: allow enabling gir when cross-compiling + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 31fa173d042e..ca8527950d8d 100644 +--- a/meson.build ++++ b/meson.build +@@ -405,7 +405,7 @@ python3 = import('python').find_installation() + + gir = find_program('g-ir-scanner', required : get_option('introspection')) + gnome = import('gnome') +-build_gir = gir.found() and not meson.is_cross_build() ++build_gir = gir.found() + gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \ + 'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \ + 'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \ diff --git a/patches/gst-plugins-bad-1.16.0/0002-fix-building-with-Dhls-crypto-openssl.patch b/patches/gst-plugins-bad-1.16.0/0002-fix-building-with-Dhls-crypto-openssl.patch new file mode 100644 index 000000000..9686d80e4 --- /dev/null +++ b/patches/gst-plugins-bad-1.16.0/0002-fix-building-with-Dhls-crypto-openssl.patch @@ -0,0 +1,21 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Tue, 23 Apr 2019 10:00:38 +0200 +Subject: [PATCH] fix building with -Dhls-crypto=openssl + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + ext/hls/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ext/hls/meson.build b/ext/hls/meson.build +index 1f5f58d42b97..25c552fdedd2 100644 +--- a/ext/hls/meson.build ++++ b/ext/hls/meson.build +@@ -15,6 +15,7 @@ hls_option = get_option('hls') + + have_hls_crypto = false + if not hls_option.disabled() ++ hls_crypto_dep = disabler() + if ['auto', 'nettle'].contains(hls_crypto) + hls_crypto_dep = dependency('nettle', required : false) + if hls_crypto_dep.found() diff --git a/patches/gst-plugins-bad-1.16.0/series b/patches/gst-plugins-bad-1.16.0/series new file mode 100644 index 000000000..3aeea917b --- /dev/null +++ b/patches/gst-plugins-bad-1.16.0/series @@ -0,0 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-meson-allow-enabling-gir-when-cross-compiling.patch +0002-fix-building-with-Dhls-crypto-openssl.patch +# c05de5c0f7a5ed2922c3f205512a6af9 - git-ptx-patches magic |