From: not-chicken <not-chicken@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Gstreamer 1.18.0
Date: Fri, 16 Oct 2020 13:20:15 +0200 [thread overview]
Message-ID: <20201016112015.7D6ZJKRCsrGZ3pFGiBePS7zCFZMWaVZdcw3Y2Ty8y4Q@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25313@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 989 bytes --]
There is an updated pull request by not-chicken against master on the void-packages repository
https://github.com/not-chicken/void-packages gst
https://github.com/void-linux/void-packages/pull/25313
Gstreamer 1.18.0
- Removed patches that are no longer needed.
- Sndio plugin split as subpackage of `gst-plugins-base1`( related #25044 )
- Dropped `gst1-python` as upstream no longer supports Python 2( related #12810 )
- Documentation disabled as:
>"API and plugin documentation are no longer built with gtk_doc. The gtk_doc documentation has been removed in favour of a new unified documentation module built with hotdoc (also see "Documentation improvements" section below).
Distributors should use the documentation release tarball instead of trying to package hotdoc and building the documentation from scratch."
[Release notes](https://gstreamer.freedesktop.org/releases/1.18/)
A patch file from https://github.com/void-linux/void-packages/pull/25313.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gst-25313.patch --]
[-- Type: text/x-diff, Size: 27750 bytes --]
From 6eca7026472056396d9c8c28d44a563b10691937 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sat, 3 Oct 2020 14:11:43 +0530
Subject: [PATCH 01/11] gstreamer1: update to 1.18.0.
---
.../gstreamer1/patches/no-gir-automagic.patch | 13 ------------
srcpkgs/gstreamer1/template | 20 +++++--------------
2 files changed, 5 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/gstreamer1/patches/no-gir-automagic.patch
diff --git a/srcpkgs/gstreamer1/patches/no-gir-automagic.patch b/srcpkgs/gstreamer1/patches/no-gir-automagic.patch
deleted file mode 100644
index c0135214edd..00000000000
--- a/srcpkgs/gstreamer1/patches/no-gir-automagic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/meson.build b/meson.build
-index e738c55..e1b8d93 100644
---- meson.build
-+++ meson.build
-@@ -451,7 +451,7 @@ rt_lib = cc.find_library('rt', required : false)
- 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_DISABLE", "yes", TRUE);' + \
diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template
index 16f7379fc93..9faf0dd1b40 100644
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@@ -1,16 +1,15 @@
# Template file for 'gstreamer1'
pkgname=gstreamer1
-version=1.16.2
+version=1.18.0
revision=1
wrksrc="gstreamer-${version}"
build_style=meson
build_helper="gir"
configure_args="-Dptp-helper-permissions=capabilities
-Dpackage-origin=https://www.voidlinux.org -Ddbghelp=disabled
- -Dintrospection=$(vopt_if gir enabled disabled)
- -Dgtk_doc=$(vopt_if gtk_doc enabled disabled)"
+ -Dintrospection=$(vopt_if gir enabled disabled) -Ddoc=disabled"
hostmakedepends="gettext pkg-config flex python docbook-xsl glib-devel
- libcap-progs $(vopt_if gtk_doc gtk-doc)"
+ libcap-progs"
makedepends="libxml2-devel libglib-devel gtk+3-devel libcap-devel libunwind-devel
bash-completion"
short_desc="Core GStreamer libraries and elements (1.x)"
@@ -18,18 +17,12 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/gstreamer/gstreamer-${version}.tar.xz"
-checksum=e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e
+checksum=0ff09245b06c0aeb5d9a156edcab088a7e8213a0bf9c84a1ff0318f9c00c7805
# Package build options
-build_options="gir gtk_doc"
+build_options="gir"
build_options_default="gir"
-desc_option_gtk_doc="Build GTK Documentation with gtk-doc"
-
-if [ -z "$CROSS_BUILD" ]; then
- build_options_default+=" gtk_doc"
-fi
-
gstreamer1-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
@@ -37,9 +30,6 @@ gstreamer1-devel_package() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- if [ "$build_option_gtk_doc" ]; then
- vmove usr/share/gtk-doc
- fi
vmove usr/share/aclocal
if [ "$build_option_gir" ]; then
vmove "usr/share/gir*"
From b68f57863b61dc3b9f12057b905ed5e927b79841 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sat, 3 Oct 2020 14:12:23 +0530
Subject: [PATCH 02/11] gst-plugins-base1: update to 1.18.0.
- split sndio plugin into a subpackage
---
.../patches/no-gir-automagic.patch | 11 -----------
srcpkgs/gst-plugins-base1/template | 18 ++++++++++++++----
srcpkgs/gst-sndio | 1 +
3 files changed, 15 insertions(+), 15 deletions(-)
delete mode 100644 srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch
create mode 120000 srcpkgs/gst-sndio
diff --git a/srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch b/srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch
deleted file mode 100644
index f1226041ae6..00000000000
--- a/srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- meson.build 2019-06-09 10:53:06.607859182 +0200
-+++ meson.build 2019-06-09 10:53:24.953088389 +0200
-@@ -356,7 +356,7 @@
-
- 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_DISABLE", "yes", TRUE);' + \
- 'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index e5e3e8ccb6a..0723b08b066 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -1,15 +1,15 @@
# Template file for 'gst-plugins-base1'
pkgname=gst-plugins-base1
-version=1.16.2
+version=1.18.0
revision=1
wrksrc="${pkgname/1/}-${version}"
build_style=meson
build_helper="gir"
-configure_args="-Dtremor=disabled -Dexamples=disabled -Dgtk_doc=disabled
+configure_args="-Dtremor=disabled -Dexamples=disabled -Ddoc=disabled
-Dcdparanoia=$(vopt_if cdparanoia enabled disabled)
-Dintrospection=$(vopt_if gir enabled disabled)
-Dsndio=$(vopt_if sndio enabled disabled)"
-hostmakedepends="gettext pkg-config glib-devel orc"
+hostmakedepends="gettext pkg-config glib-devel orc gstreamer1"
makedepends="gstreamer1-devel glib-devel libxml2-devel pango-devel
cairo-devel liboil-devel alsa-lib-devel libXv-devel libXext-devel
libvisual-devel libgudev-devel libtheora-devel libvorbis-devel
@@ -21,12 +21,14 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=b13e73e2fe74a4166552f9577c3dcb24bed077021b9c7fa600d910ec6987816a
+checksum=762abdd1a950809a1cea62fff7f86b5f7d6bd5f6841e3e585c700b823cdb7897
# Package build options
build_options="cdparanoia gir sndio"
build_options_default="cdparanoia gir sndio"
+subpackages="gst-plugins-base1-devel $(vopt_if sndio gst-sndio)"
+
case "$XBPS_TARGET_MACHINE" in
mips*) # XXX: work around assembler "Error: branch out of range"
CFLAGS=" -Os"
@@ -45,3 +47,11 @@ gst-plugins-base1-devel_package() {
fi
}
}
+
+gst-sndio_package() {
+ depends="gstreamer1"
+ short_desc="GStreamer Sndio plugin (v1.X)"
+ pkg_install() {
+ vmove usr/lib/gstreamer-1.0/libgstsndio.so
+ }
+}
diff --git a/srcpkgs/gst-sndio b/srcpkgs/gst-sndio
new file mode 120000
index 00000000000..ada48a8a5d1
--- /dev/null
+++ b/srcpkgs/gst-sndio
@@ -0,0 +1 @@
+gst-plugins-base1
\ No newline at end of file
From 91f29d306fcae9f87678888f9918221ce5f2ed9d Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sat, 3 Oct 2020 14:19:31 +0530
Subject: [PATCH 03/11] gst-plugins-good1: update to 1.18.0.
---
srcpkgs/gst-plugins-good1/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index b6dfc687207..37ad1c888b4 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,13 +1,13 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
-version=1.16.2
-revision=2
+version=1.18.0
+revision=1
wrksrc="${pkgname/1/}-${version}"
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
- -Dgtk3=$(vopt_if gtk3 enabled disabled)"
+ -Dgtk3=$(vopt_if gtk3 enabled disabled) -Drpicamsrc=disabled -Ddoc=disabled"
# XXX: libdv, dv1394 and shout2 modules.
-hostmakedepends="pkg-config intltool glib-devel orc qt5-qmake qt5-host-tools"
+hostmakedepends="pkg-config intltool glib-devel orc qt5-qmake qt5-host-tools nasm"
makedepends="
libpng-devel libxml2-devel libgudev-devel libflac-devel
libXdamage-devel aalib-devel libcaca-devel
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319
+checksum=6329bc377a3afea5cf1ab329a91cc4a906f075781780d1edc59e8bea8c1a8bac
lib32disabled=yes
build_options="gtk3"
From d796af98062eee13052e51bf5696b503e576664f Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sat, 3 Oct 2020 14:19:51 +0530
Subject: [PATCH 04/11] gst-plugins-bad1: update to 1.18.0.
---
.../patches/faac_cfg_105.patch | 12 -----
.../gst-plugins-bad1/patches/libressl.patch | 11 -----
.../patches/no-gir-automagic.patch | 11 -----
...an-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch | 48 -------------------
srcpkgs/gst-plugins-bad1/template | 19 ++++----
5 files changed, 10 insertions(+), 91 deletions(-)
delete mode 100644 srcpkgs/gst-plugins-bad1/patches/faac_cfg_105.patch
delete mode 100644 srcpkgs/gst-plugins-bad1/patches/libressl.patch
delete mode 100644 srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch
delete mode 100644 srcpkgs/gst-plugins-bad1/patches/vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch
diff --git a/srcpkgs/gst-plugins-bad1/patches/faac_cfg_105.patch b/srcpkgs/gst-plugins-bad1/patches/faac_cfg_105.patch
deleted file mode 100644
index adef2d40cb5..00000000000
--- a/srcpkgs/gst-plugins-bad1/patches/faac_cfg_105.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ext/faac/gstfaac.c 2017-05-15 17:46:30.000000000 +0200
-+++ ext/faac/gstfaac.c 2017-11-06 11:40:30.458137107 +0100
-@@ -490,7 +490,9 @@
- conf = faacEncGetCurrentConfiguration (faac->handle);
- conf->mpegVersion = (faac->mpegversion == 4) ? MPEG4 : MPEG2;
- conf->aacObjectType = faac->profile;
-+#if FAAC_CFG_VERSION < 105
- conf->allowMidside = faac->midside;
-+#endif
- conf->useLfe = 0;
- conf->useTns = faac->tns;
-
diff --git a/srcpkgs/gst-plugins-bad1/patches/libressl.patch b/srcpkgs/gst-plugins-bad1/patches/libressl.patch
deleted file mode 100644
index b0921ee7721..00000000000
--- a/srcpkgs/gst-plugins-bad1/patches/libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/dtls/gstdtlsagent.c 2018-03-23 21:45:15.000000000 +0100
-+++ - 2018-09-09 14:05:57.663350425 +0200
-@@ -176,7 +176,7 @@
-
- ERR_clear_error ();
-
--#if OPENSSL_VERSION_NUMBER >= 0x1000200fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(LIBRESSL_VERSION_NUMBER)
- priv->ssl_context = SSL_CTX_new (DTLS_method ());
- #else
- priv->ssl_context = SSL_CTX_new (DTLSv1_method ());
diff --git a/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch b/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch
deleted file mode 100644
index 68c74ee18e5..00000000000
--- a/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- meson.build 2019-06-09 12:56:31.309473261 +0200
-+++ meson.build 2019-06-09 12:56:46.166649265 +0200
-@@ -405,7 +405,7 @@
-
- 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/srcpkgs/gst-plugins-bad1/patches/vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch b/srcpkgs/gst-plugins-bad1/patches/vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch
deleted file mode 100644
index 30271438d8e..00000000000
--- a/srcpkgs/gst-plugins-bad1/patches/vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-uptream: yes (master)
-
-From 29bf8d8528ec694f65c8fae310adac996322cc74 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@ltnglobal.com>
-Date: Sat, 9 May 2020 19:59:46 +0200
-Subject: [PATCH] vulkan: Drop use of VK_RESULT_BEGIN_RANGE
-
-This was removed in Vulkan 1.2.140.
-
-> Shortly after 2020-04-24, we will be removing the automatically
-> generated `VK_*_BEGIN_RANGE`, `VK_*_END_RANGE`, and `VK_*_RANGE_SIZE`
-> tokens from the Vulkan headers. These tokens are currently defined for
-> some enumerated types, but are explicitly not part of the Vulkan API.
-> They existed only to support some Vulkan implementation internals,
-> which no longer require them. We will be accepting comments on this
-> topic in [#1230], but we strongly suggest any external projects using
-> these tokens immediately migrate away from them.
-
-[#1230]: https://github.com/KhronosGroup/Vulkan-Docs/issues/1230
----
- ext/vulkan/vkerror.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/ext/vulkan/vkerror.c b/ext/vulkan/vkerror.c
-index 3fec27e4d..c91589d9b 100644
---- ext/vulkan/vkerror.c
-+++ ext/vulkan/vkerror.c
-@@ -27,7 +27,7 @@
- #include "vkerror.h"
-
- /* *INDENT-OFF* */
--static const struct
-+static const struct
- {
- VkResult result;
- const char *str;
-@@ -63,8 +63,6 @@ _vk_result_to_string (VkResult result)
-
- if (result >= 0)
- return NULL;
-- if (result < VK_RESULT_BEGIN_RANGE)
-- return "Unknown Error";
-
- for (i = 0; i < G_N_ELEMENTS (vk_result_string_map); i++) {
- if (result == vk_result_string_map[i].result)
---
-2.26.2
-
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 212203c24a1..eb528134b55 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,22 +1,23 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
-version=1.16.2
-revision=10
+version=1.18.0
+revision=1
wrksrc="${pkgname/1/}-${version}"
build_helper="gir"
build_style=meson
-configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
+configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
-Dopencv=disabled -Dmsdk=disabled -Dopensles=disabled -Dtinyalsa=disabled
-Dwasapi=disabled -Dnvenc=disabled -Dnvdec=disabled -Ddc1394=disabled
-Diqa=disabled -Dkate=disabled -Dlibde265=disabled -Dmpeg2enc=disabled
-Dmplex=disabled -Dmusepack=disabled -Dofa=disabled -Dopenexr=disabled
-Dopenh264=disabled -Dopenmpt=disabled -Dopenni2=disabled -Dsctp=disabled
-Dsrt=disabled -Dteletext=disabled -Dvoaacenc=disabled -Dvoamrwbenc=disabled
- -Dwildmidi=disabled -Dwpe=disabled -Ddirectfb=disabled
- -Dgme=$(vopt_if gme enabled disabled)
- -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
+ -Dwildmidi=disabled -Dwpe=disabled -Ddirectfb=disabled -Dmagicleap=disabled
+ -Dgme=$(vopt_if gme enabled disabled) -Dwasapi2=disabled -Davtp=disabled
+ -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled
+ -Dsvthevcenc=disabled -Dzxing=disabled -Dexamples=disabled"
hostmakedepends="automake gettext libtool pkg-config python glib-devel
- orc wayland-devel"
+ orc wayland-devel shaderc"
makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
@@ -29,14 +30,14 @@ makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
fdk-aac-devel flite-devel fluidsynth-devel liblrdf-devel ladspa-sdk
lilv-devel lv2 libopenjpeg2-devel sbc-devel spandsp-devel vulkan-loader
Vulkan-Headers webrtc-audio-processing-devel libzbar-devel ffmpeg-devel
- $(vopt_if gme libgme-devel)"
+ libva-devel $(vopt_if gme libgme-devel) libmicrodns-devel"
depends="gst-plugins-base1>=${version}"
short_desc="GStreamer plugins from the bad set (v1.x)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74
+checksum=f382ab1caddd64aaa7acb7c4787487f63fd39bd0fde9c757655cbaa457c1185f
build_options="gir gme"
build_options_default="gir"
From dfdba3e5b0e10dcd30bbec82fbb692d71768d9db Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sat, 3 Oct 2020 14:20:05 +0530
Subject: [PATCH 05/11] gst-plugins-ugly1: update to 1.18.0.
---
srcpkgs/gst-plugins-ugly1/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template
index c4661f69138..2eb5dfc33f8 100644
--- a/srcpkgs/gst-plugins-ugly1/template
+++ b/srcpkgs/gst-plugins-ugly1/template
@@ -1,10 +1,11 @@
# Template file for 'gst-plugins-ugly1'
pkgname=gst-plugins-ugly1
-version=1.16.2
-revision=2
+version=1.18.0
+revision=1
wrksrc="${pkgname/1/}-${version}"
build_style=meson
-configure_args="-Damrnb=disabled -Damrwbdec=disabled -Dsidplay=disabled"
+configure_args="-Damrnb=disabled -Damrwbdec=disabled -Dsidplay=disabled
+ -Ddoc=disabled"
# XXX add required pkgs for the amr, sid plugins.
hostmakedepends="pkg-config intltool python"
makedepends="glib-devel libxml2-devel gst-plugins-base1-devel
@@ -16,5 +17,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=5500415b865e8b62775d4742cbb9f37146a50caecfc0e7a6fc0160d3c560fbca
+checksum=686644e45e08258ae240c4519376668ad8d34ea6d0f6ab556473c317bfb7e082
lib32disabled=yes
From 6170d04cd6157f37c7cf4eb171c8d826aedbb16d Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sat, 3 Oct 2020 14:20:35 +0530
Subject: [PATCH 06/11] gstreamer-vaapi: update to 1.18.0.
---
srcpkgs/gstreamer-vaapi/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template
index 3c3ed86673a..57e51e59f37 100644
--- a/srcpkgs/gstreamer-vaapi/template
+++ b/srcpkgs/gstreamer-vaapi/template
@@ -1,8 +1,9 @@
# Template file for 'gstreamer-vaapi'
pkgname=gstreamer-vaapi
-version=1.16.2
+version=1.18.0
revision=1
build_style=meson
+configure_args="-Ddoc=disabled"
hostmakedepends="pkg-config"
makedepends="libXrandr-devel libva-devel MesaLib-devel gst-plugins-bad1-devel"
short_desc="VA-API plugins for GStreamer 1.x"
@@ -11,4 +12,4 @@ license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
changelog="https://raw.githubusercontent.com/GStreamer/gstreamer-vaapi/master/ChangeLog"
distfiles="${homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"
-checksum=191de7b0ab64a85dd0875c990721e7be95518f60e2a9106beca162004ed7c601
+checksum=c6efeb8c736f75bb1b53ab18413c60c4321300e7aee66641bcc07d59c2fe9e31
From 887e2a6ed9aa85ab3d8794896e43f161daed84bb Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sat, 3 Oct 2020 14:23:09 +0530
Subject: [PATCH 07/11] gst1-python: drop
- Upstream dropped Python 2 support in 1.18
---
srcpkgs/gst1-python/template | 23 -----------------------
srcpkgs/gst1-python/update | 2 --
2 files changed, 25 deletions(-)
delete mode 100644 srcpkgs/gst1-python/template
delete mode 100644 srcpkgs/gst1-python/update
diff --git a/srcpkgs/gst1-python/template b/srcpkgs/gst1-python/template
deleted file mode 100644
index 7242b212a37..00000000000
--- a/srcpkgs/gst1-python/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gst1-python'
-pkgname=gst1-python
-version=1.16.2
-revision=1
-wrksrc="gst-python-${version}"
-build_style=gnu-configure
-configure_args="--disable-static"
-pycompile_module="gi/overrides"
-hostmakedepends="pkg-config python"
-makedepends="libglib-devel python-gobject-devel gst-plugins-base1-devel"
-depends="python-gobject"
-short_desc="Python bindings for GStreamer 1.x"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://gstreamer.freedesktop.org"
-distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz"
-checksum=208df3148d73d9f416d016564737585d8ea763d91201732d44b5fe688c6288a8
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- sed -i -e "s,PYTHON_INCLUDES=.*,PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/usr/include/python2.7,g" configure
- fi
-}
diff --git a/srcpkgs/gst1-python/update b/srcpkgs/gst1-python/update
deleted file mode 100644
index bfef6c041a7..00000000000
--- a/srcpkgs/gst1-python/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pkgname=${pkgname/1/}
-ignore="1.*[13579].*"
From ee6d8fcdef31a0602af00fb8681a8ae07b374a71 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sat, 3 Oct 2020 14:24:04 +0530
Subject: [PATCH 08/11] gst-libav: update to 1.18.0.
---
srcpkgs/gst-libav/template | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template
index 715637e6d99..8788bb5159a 100644
--- a/srcpkgs/gst-libav/template
+++ b/srcpkgs/gst-libav/template
@@ -1,9 +1,9 @@
# Template file for 'gst-libav'
pkgname=gst-libav
-version=1.16.2
+version=1.18.0
revision=1
-wrksrc="${pkgname}-${version}"
build_style=meson
+configure_args="-Ddoc=disabled"
hostmakedepends="pkg-config yasm"
makedepends="orc-devel gst-plugins-base1-devel ffmpeg-devel"
depends="orc>=0.4.18 gst-plugins-base1>=${version}"
@@ -12,18 +12,10 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2
+checksum=42f93f5ce9a3fc22051e5f783a4574b56ebf213f331f75dcbc3552459bd3a06a
case "$XBPS_TARGET_MACHINE" in
*-musl) # Required by musl for M_SQRT1_2
CFLAGS="-D_XOPEN_SOURCE"
;;
esac
-
-post_configure() {
- case "$XBPS_TARGET_MACHINE" in
- x86_64-musl) # compiling with -O3 triggers a gcc bug
- sed -i 's/-O3/-O2/g' gst-libs/ext/libav/config.mak
- ;;
- esac
-}
From 6a20c102c76e7f3b751362ce97999416cc7a5071 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sat, 3 Oct 2020 14:24:23 +0530
Subject: [PATCH 09/11] gst1-python3: update to 1.18.0.
---
srcpkgs/gst1-python3/patches/python-3.8.patch | 11 -----------
srcpkgs/gst1-python3/template | 7 +++----
2 files changed, 3 insertions(+), 15 deletions(-)
delete mode 100644 srcpkgs/gst1-python3/patches/python-3.8.patch
diff --git a/srcpkgs/gst1-python3/patches/python-3.8.patch b/srcpkgs/gst1-python3/patches/python-3.8.patch
deleted file mode 100644
index cbf1a58ea51..00000000000
--- a/srcpkgs/gst1-python3/patches/python-3.8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- meson.build
-+++ meson.build
-@@ -24,7 +24,7 @@ pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_d
-
- pymod = import('python')
- python = pymod.find_installation(get_option('python'))
--python_dep = python.dependency(required : true)
-+python_dep = dependency('python3-embed', required : true)
-
- python_abi_flags = python.get_variable('ABIFLAGS', '')
- pylib_loc = get_option('libpython-dir')
diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template
index 402018c0476..cf0b1944241 100644
--- a/srcpkgs/gst1-python3/template
+++ b/srcpkgs/gst1-python3/template
@@ -1,10 +1,9 @@
# Template file for 'gst1-python3'
pkgname=gst1-python3
-version=1.16.2
-revision=3
+version=1.18.0
+revision=1
wrksrc="gst-python-${version}"
build_style=meson
-pycompile_module="gi/overrides"
hostmakedepends="pkg-config python3"
makedepends="libglib-devel python3-devel python3-gobject-devel gst-plugins-base1-devel"
depends="python3-gobject"
@@ -13,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz"
-checksum=208df3148d73d9f416d016564737585d8ea763d91201732d44b5fe688c6288a8
+checksum=76bfe8b85a9c4a6ddfb81874f2635fd0da38c3f39d9d2a0b175213218516dd45
From 40e02741809ce6b748f7452fc039bda0742bfad2 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sat, 3 Oct 2020 14:24:39 +0530
Subject: [PATCH 10/11] gst1-editing-services: update to 1.18.0.
---
srcpkgs/gst1-editing-services/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index a23f876d84b..d78d177be4d 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -1,20 +1,20 @@
# Template file for 'gst1-editing-services'
pkgname=gst1-editing-services
-version=1.16.2
+version=1.18.0
revision=1
-wrksrc="${pkgname/gst1/gstreamer}-${version}"
+wrksrc="${pkgname/gst1/gst}-${version}"
build_style=meson
build_helper="gir"
-configure_args="-Dgtk_doc=disabled"
+configure_args="-Ddoc=disabled -Dvalidate=disabled"
hostmakedepends="flex perl pkg-config gobject-introspection"
makedepends="glib-devel gst-plugins-base1-devel gst-plugins-bad1-devel"
short_desc="GStreamer 1.x Editing Services"
maintainer="Toyam Cox <Vaelatern@gmail.com>"
license="LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
-distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gstreamer}-${version}.tar.xz"
-checksum=0e06a6191a0c6c16e16272bf2573cecaeb245f10629486ad940a299bef700c16
-python_version=2 #unverified
+distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gst}-${version}.tar.xz"
+checksum=4daef0d4875415ea262f7fb1287d4a33939a9594f3c1e661f8587ab00f7000a8
+python_version=3
gst1-editing-services-devel_package() {
short_desc+=" - development files"
@@ -23,5 +23,6 @@ gst1-editing-services-devel_package() {
vmove usr/include
vmove usr/lib/*.so
vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
}
}
From fbbeb63c0b82e98e27052f4adfb1d782c29c3458 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sat, 3 Oct 2020 14:25:18 +0530
Subject: [PATCH 11/11] gst-omx: update to 1.18.0.
---
srcpkgs/gst-omx/template | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/gst-omx/template b/srcpkgs/gst-omx/template
index d3200f0432e..45b9a7043c2 100644
--- a/srcpkgs/gst-omx/template
+++ b/srcpkgs/gst-omx/template
@@ -1,9 +1,9 @@
# Template file for 'gst-omx'
pkgname=gst-omx
-version=1.16.2
+version=1.18.0
revision=1
-build_style=gnu-configure
-configure_args="--disable-examples"
+build_style=meson
+configure_args="-Ddoc=disabled"
hostmakedepends="pkg-config python glib-devel"
makedepends="gst-plugins-base1-devel"
short_desc="GStreamer OpenMAX IL wrapper plugin (1.x)"
@@ -11,18 +11,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-only"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=11ed411a2eba75610d72331eeb14ff05e2df28f4fd05cb69225a88bec6d27439
+checksum=302c65e04578991364f7605e04cfb54dfd75268d51080d35f221ee1a8b341fad
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|aarch64*|ppc*)
# XXX bellagio target
- configure_args+=" --with-omx-target=generic"
+ configure_args+=" -Dtarget=generic"
;;
armv[67]*)
- configure_args+=" --with-omx-target=rpi"
+ configure_args+=" -Dtarget=rpi \
+ -Dheader_path=${XBPS_CROSS_BASE}/opt/vc/include/IL"
makedepends+=" rpi-firmware rpi-userland-devel"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/IL"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos/pthreads"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vmcs_host/linux"
;;
esac
next prev parent reply other threads:[~2020-10-16 11:20 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-03 12:32 [PR PATCH] " not-chicken
2020-10-03 12:44 ` [PR REVIEW] " ericonr
2020-10-03 12:55 ` not-chicken
2020-10-03 12:55 ` not-chicken
2020-10-03 13:05 ` ericonr
2020-10-16 11:20 ` not-chicken [this message]
2020-10-16 11:22 ` not-chicken
2020-10-16 11:23 ` not-chicken
2020-10-21 5:56 ` not-chicken
2020-10-28 8:28 ` [PR PATCH] [Updated] " not-chicken
2020-10-30 8:45 ` [PR PATCH] [Updated] Gstreamer 1.18.1 not-chicken
2020-11-16 9:00 ` not-chicken
2020-11-16 9:00 ` [PR PATCH] [Closed]: " not-chicken
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201016112015.7D6ZJKRCsrGZ3pFGiBePS7zCFZMWaVZdcw3Y2Ty8y4Q@z \
--to=not-chicken@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).