From: ndowens <ndowens@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH]  gstreamer1: update to 1.18.1
Date: Sun, 15 Nov 2020 21:28:00 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26411@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 399 bytes --]
There is a new pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages gstreamer1
https://github.com/void-linux/void-packages/pull/26411
 gstreamer1: update to 1.18.1
gst1-python version 1.18.1 doesn't support python2 anymore so can not update it
A patch file from https://github.com/void-linux/void-packages/pull/26411.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gstreamer1-26411.patch --]
[-- Type: text/x-diff, Size: 25732 bytes --]
From 93e2e1ce745a47b11819a46ca8027a23bb47ad2a Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:56:23 -0600
Subject: [PATCH 01/10] gst-libav: update to 1.18.1
---
srcpkgs/gst-libav/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template
index 715637e6d99..a48cdbe29c1 100644
--- a/srcpkgs/gst-libav/template
+++ b/srcpkgs/gst-libav/template
@@ -1,6 +1,6 @@
# Template file for 'gst-libav'
pkgname=gst-libav
-version=1.16.2
+version=1.18.1
revision=1
wrksrc="${pkgname}-${version}"
build_style=meson
@@ -12,7 +12,7 @@ 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=39a717bc2613efbbba19df3cf5cacff0987471fc8281ba2c5dcdeaded79c2ed8
case "$XBPS_TARGET_MACHINE" in
*-musl) # Required by musl for M_SQRT1_2
@@ -23,7 +23,7 @@ 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
+ vsed -i 's/-O3/-O2/g' gst-libs/ext/libav/config.mak
;;
esac
}
From 5ede0dd64ecd97ae78691bf32b1a78094e241243 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 13:59:27 -0600
Subject: [PATCH 02/10] gst-omx: update to 1.18.1
---
srcpkgs/gst-omx/patches/0001-ARM-build.patch | 120 +++++++++++++++++++
srcpkgs/gst-omx/template | 13 +-
2 files changed, 127 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/gst-omx/patches/0001-ARM-build.patch
diff --git a/srcpkgs/gst-omx/patches/0001-ARM-build.patch b/srcpkgs/gst-omx/patches/0001-ARM-build.patch
new file mode 100644
index 00000000000..2cca104e1c2
--- /dev/null
+++ b/srcpkgs/gst-omx/patches/0001-ARM-build.patch
@@ -0,0 +1,120 @@
+From edbc89c33db360cd9cf27ea2231aba8ea0d8095d Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Sun, 15 Nov 2020 13:34:42 -0600
+Subject: [PATCH] ARM build
+
+---
+ omx/openmax/OMX_IndexExt.h | 3 ++-
+ omx/openmax/OMX_VideoExt.h | 4 ++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git omx/openmax/OMX_IndexExt.h omx/openmax/OMX_IndexExt.h
+index 8d05faa..b6d2a48 100644
+--- omx/openmax/OMX_IndexExt.h
++++ omx/openmax/OMX_IndexExt.h
+@@ -44,6 +44,7 @@ extern "C" {
+
+ This enum lists the current Khronos extension indices to OpenMAX IL.
+ */
++#ifdef NON_ARM
+ typedef enum OMX_INDEXEXTTYPE {
+
+ /* Component parameters and configurations */
+@@ -78,7 +79,7 @@ typedef enum OMX_INDEXEXTTYPE {
+
+ OMX_IndexExtMax = 0x7FFFFFFF
+ } OMX_INDEXEXTTYPE;
+-
++#endif
+ #ifdef __cplusplus
+ }
+ #endif /* __cplusplus */
+diff --git omx/openmax/OMX_VideoExt.h omx/openmax/OMX_VideoExt.h
+index a9b5d45..b743528 100644
+--- omx/openmax/OMX_VideoExt.h
++++ omx/openmax/OMX_VideoExt.h
+@@ -39,7 +39,7 @@ extern "C" {
+ * for this header file to compile successfully
+ */
+ #include <OMX_Core.h>
+-
++#ifdef NON_ARM
+ /** NALU Formats */
+ typedef enum OMX_NALUFORMATSTYPE {
+ OMX_NaluFormatStartCodes = 1,
+@@ -58,7 +58,7 @@ typedef struct OMX_NALSTREAMFORMATTYPE{
+ OMX_U32 nPortIndex;
+ OMX_NALUFORMATSTYPE eNaluFormat;
+ } OMX_NALSTREAMFORMATTYPE;
+-
++#endif
+
+
+ #ifdef __cplusplus
+--
+2.29.2
+The following defines were found from
+https://github.com/raspberrypi/firmware
+---
+diff --git omx/gstomxvideoenc.c omx/gstomxvideoenc.c
+index 6dbfb41..1f307f7 100644
+--- omx/gstomxvideoenc.c
++++ omx/gstomxvideoenc.c
+@@ -35,6 +35,12 @@
+ #ifdef USE_OMX_TARGET_RPI
+ #include <OMX_Broadcom.h>
+ #include <OMX_Index.h>
++#ifndef OMX_IndexParamBrcmPixelAspectRatio
++#define OMX_IndexParamBrcmPixelAspectRatio 0x7f000040
++#endif
++#ifndef OMX_IndexConfigBrcmVideoRequestIFrame
++#define OMX_IndexConfigBrcmVideoRequestIFrame 0x7f000070
++#endif
+ #endif
+
+ GST_DEBUG_CATEGORY_STATIC (gst_omx_video_enc_debug_category);
+diff --git omx/gstomxh264enc.c omx/gstomxh264enc.c
+index 51d84a8..92e1697 100644
+--- omx/gstomxh264enc.c
++++ omx/gstomxh264enc.c
+@@ -30,6 +30,12 @@
+ #ifdef USE_OMX_TARGET_RPI
+ #include <OMX_Broadcom.h>
+ #include <OMX_Index.h>
++#ifndef QMX_IndexConfigBrcmVideoIntraPeriod
++#define OMX_IndexConfigBrcmVideoIntraPeriod 0x7f000050
++#endif
++#ifndef OMX_IndexParamBrcmVideoAVCInlineHeaderEnable
++#define OMX_IndexParamBrcmVideoAVCInlineHeaderEnable 0x7f0000d0
++#endif
+ #endif
+
+ GST_DEBUG_CATEGORY_STATIC (gst_omx_h264_enc_debug_category);
+diff --git omx/gstomxaudiosink.c omx/gstomxaudiosink.c
+index d4e684f..5f00766 100644
+--- omx/gstomxaudiosink.c
++++ omx/gstomxaudiosink.c
+@@ -643,7 +643,10 @@ gst_omx_audio_sink_prepare (GstAudioSink * audiosink,
+ GST_OBJECT_UNLOCK (self);
+
+ #if defined (USE_OMX_TARGET_RPI)
+- {
++#ifndef OMX_IndexConfigBrcmAudioDestination
++#define OMX_IndexConfigBrcmAudioDestination 0x7f000070
++#endif
++ {
+ GstOMXAudioSinkClass *klass = GST_OMX_AUDIO_SINK_GET_CLASS (self);
+ OMX_ERRORTYPE err;
+ OMX_CONFIG_BRCMAUDIODESTINATIONTYPE param;
+@@ -887,7 +890,10 @@ static guint
+ gst_omx_audio_sink_delay (GstAudioSink * audiosink)
+ {
+ #if defined (USE_OMX_TARGET_RPI)
+- GstOMXAudioSink *self = GST_OMX_AUDIO_SINK (audiosink);
++#ifndef OMX_IndexConfigAudioRenderingLatency
++#define OMX_IndexConfigAudioRenderingLatency 0x7f000030
++#endif
++ GstOMXAudioSink *self = GST_OMX_AUDIO_SINK (audiosink);
+ OMX_PARAM_U32TYPE param;
+ OMX_ERRORTYPE err;
+
diff --git a/srcpkgs/gst-omx/template b/srcpkgs/gst-omx/template
index a4d2fad7609..ea028871317 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.1
revision=1
-build_style=gnu-configure
-configure_args="--disable-examples"
+build_style=meson
+configure_args="-Dexamples=disabled"
hostmakedepends="pkg-config python glib-devel"
makedepends="gst-plugins-base1-devel"
short_desc="GStreamer OpenMAX IL wrapper plugin (1.x)"
@@ -11,15 +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=42a8e0f9518b94655981ede441638f9f9395f4b1b9a4b329f068ee793975a965
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|aarch64*|ppc*)
# XXX bellagio target
- configure_args+=" --with-omx-target=generic"
+ configure_args+=" -Dtarget=generic"
+ CFLAGS="-DNON_ARM"
;;
armv[67]*)
- configure_args+=" --with-omx-target=rpi"
+ configure_args+=" -Dtarget=rpi"
makedepends+=" rpi-firmware rpi-userland-devel"
export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/opt/vc/lib/pkgconfig"
CFLAGS="-I${XBPS_CROSS_BASE}/opt/vc/include/IL"
From 33cd376fae0c878606f430f2001a21aa7c823418 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 14:01:55 -0600
Subject: [PATCH 03/10] gstreamer-vaapi: update to 1.18.1
---
srcpkgs/gstreamer-vaapi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template
index 3c3ed86673a..fd8d96ef21e 100644
--- a/srcpkgs/gstreamer-vaapi/template
+++ b/srcpkgs/gstreamer-vaapi/template
@@ -1,6 +1,6 @@
# Template file for 'gstreamer-vaapi'
pkgname=gstreamer-vaapi
-version=1.16.2
+version=1.18.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -11,4 +11,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=400d3c42810b50b4566df03f37319a6bdd758f969560c40147e7d9a3b0e8a6ea
From 12bd5bf9ac3b35f896419ae96987f1657a8f69bd Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 14:09:41 -0600
Subject: [PATCH 04/10] gst1-python3: update to 1.18.1
---
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..eb6759c3798 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.1
+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=42b289422f7ab32757670848cf2245c5a8a8b08a665a9cab65ded8d69364f6f6
From 907612685c849b799d31014fb6b99e3f43b0f849 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 14:26:13 -0600
Subject: [PATCH 05/10] gst1-editing-services: update to 1.18.1
---
srcpkgs/gst1-editing-services/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index a23f876d84b..4353084d233 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -1,8 +1,8 @@
# Template file for 'gst1-editing-services'
pkgname=gst1-editing-services
-version=1.16.2
+version=1.18.1
revision=1
-wrksrc="${pkgname/gst1/gstreamer}-${version}"
+wrksrc="${pkgname/gst1/gst}-${version}"
build_style=meson
build_helper="gir"
configure_args="-Dgtk_doc=disabled"
@@ -12,16 +12,15 @@ 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=e93cb3f1896565c57defa72758e49b6eb6685e0f804abd184f395c94822a3927
gst1-editing-services-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove usr/lib/*.so
+ vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
}
}
From 067117aadbbd60677a3f18dd2a61bc39eb7c71b2 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:46:22 -0600
Subject: [PATCH 06/10] gst-plugins-bad1: update to 1.18.1
---
.../patches/no-gir-automagic.patch | 24 ++++++++--
...an-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch | 48 -------------------
srcpkgs/gst-plugins-bad1/template | 8 ++--
3 files changed, 23 insertions(+), 57 deletions(-)
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/no-gir-automagic.patch b/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch
index 68c74ee18e5..38cc2f5edc1 100644
--- a/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch
+++ b/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch
@@ -1,11 +1,25 @@
---- meson.build 2019-06-09 12:56:31.309473261 +0200
-+++ meson.build 2019-06-09 12:56:46.166649265 +0200
-@@ -405,7 +405,7 @@
+From d4cba6b214ff9a631cdfb845c07101f97510abff Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Sun, 15 Nov 2020 10:33:52 -0600
+Subject: [PATCH] no-gir-automatic
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git meson.build meson.build
+index 5d52ea9..4b2b5ea 100644
+--- meson.build
++++ meson.build
+@@ -445,7 +445,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()
+-build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
++build_gir = gir.found() or get_option('introspection').enabled()
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);' + \
+--
+2.29.2
+
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..5f4bce7a5d5 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,10 +1,10 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
-version=1.16.2
-revision=10
+version=1.18.1
+revision=1
wrksrc="${pkgname/1/}-${version}"
-build_helper="gir"
build_style=meson
+build_helper="gir"
configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
-Dopencv=disabled -Dmsdk=disabled -Dopensles=disabled -Dtinyalsa=disabled
-Dwasapi=disabled -Dnvenc=disabled -Dnvdec=disabled -Ddc1394=disabled
@@ -36,7 +36,7 @@ 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=c195978c85d97406c05eb9d43ac54b9ab35eda6ffdae32b3ed597b8f1743c1b2
build_options="gir gme"
build_options_default="gir"
From 5706ce646c28a0eb41a3fe441c65343a2585490d Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:52:30 -0600
Subject: [PATCH 07/10] gst-plugins-good1: update to 1.18.1
---
srcpkgs/gst-plugins-good1/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index ba326be3f1d..65b773ef0f1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
-version=1.16.2
-revision=3
+version=1.18.1
+revision=1
wrksrc="${pkgname/1/}-${version}"
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
@@ -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=e210e91a5590ecb6accc9d06c949a58ca6897d8edb3b3d55828e424c624f626c
build_options="gtk3"
build_options_default="gtk3"
From e018cbee933913603b3bbaae8c2c842c85987351 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:54:53 -0600
Subject: [PATCH 08/10] gst-plugins-ugly1: update to 1.18.1
---
srcpkgs/gst-plugins-ugly1/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template
index c4661f69138..ebc010bf15b 100644
--- a/srcpkgs/gst-plugins-ugly1/template
+++ b/srcpkgs/gst-plugins-ugly1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-ugly1'
pkgname=gst-plugins-ugly1
-version=1.16.2
-revision=2
+version=1.18.1
+revision=1
wrksrc="${pkgname/1/}-${version}"
build_style=meson
configure_args="-Damrnb=disabled -Damrwbdec=disabled -Dsidplay=disabled"
@@ -16,5 +16,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=18cd6cb829eb9611ca63cbcbf46aca0f0de1dd28b2df18caa2834326a75ff725
lib32disabled=yes
From 7d6ad72fde63fdf7f95f0f77ae751cf34f4e70dd Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:31:16 -0600
Subject: [PATCH 09/10] gst-plugins-base1: update to 1.18.1
---
.../patches/no-gir-automagic.patch | 24 +++++++++++++++----
srcpkgs/gst-plugins-base1/template | 4 ++--
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch b/srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch
index f1226041ae6..36483a10e06 100644
--- a/srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch
+++ b/srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch
@@ -1,11 +1,25 @@
---- meson.build 2019-06-09 10:53:06.607859182 +0200
-+++ meson.build 2019-06-09 10:53:24.953088389 +0200
-@@ -356,7 +356,7 @@
+From 0d734eb2314fc60deee59de5f1440617e04e5125 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Sun, 15 Nov 2020 10:25:30 -0600
+Subject: [PATCH] no-gir-automatic
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git meson.build meson.build
+index 5ecce7f..98f8113 100644
+--- meson.build
++++ meson.build
+@@ -416,7 +416,7 @@ endif
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()
+-build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
++build_gir = gir.found() or get_option('introspection').enabled()
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') + \
+--
+2.29.2
+
diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index e5e3e8ccb6a..dbba9c02c4f 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -1,6 +1,6 @@
# Template file for 'gst-plugins-base1'
pkgname=gst-plugins-base1
-version=1.16.2
+version=1.18.1
revision=1
wrksrc="${pkgname/1/}-${version}"
build_style=meson
@@ -21,7 +21,7 @@ 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=1ba654d7de30f7284b4c7071b32f881b609733ce02ab6d9d9ea29386a036c641
# Package build options
build_options="cdparanoia gir sndio"
From 9b509f3c010a869ad7695884cebc37aeb60e441f Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:21:10 -0600
Subject: [PATCH 10/10] gstreamer1: update to 1.18.1
---
.../gstreamer1/patches/no-gir-automagic.patch | 22 ++++++++++++++-----
srcpkgs/gstreamer1/template | 21 +++++-------------
2 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/srcpkgs/gstreamer1/patches/no-gir-automagic.patch b/srcpkgs/gstreamer1/patches/no-gir-automagic.patch
index c0135214edd..53740b4bb04 100644
--- a/srcpkgs/gstreamer1/patches/no-gir-automagic.patch
+++ b/srcpkgs/gstreamer1/patches/no-gir-automagic.patch
@@ -1,13 +1,25 @@
-diff --git a/meson.build b/meson.build
-index e738c55..e1b8d93 100644
+From 225e87688f21a817224655372004eb512f862d43 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Sun, 15 Nov 2020 10:04:50 -0600
+Subject: [PATCH] no-gir-automatic
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git meson.build meson.build
+index 5a21823..5d1db37 100644
--- meson.build
+++ meson.build
-@@ -451,7 +451,7 @@ rt_lib = cc.find_library('rt', required : false)
+@@ -503,7 +503,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()
+-build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
++build_gir = gir.found() or get_option('introspection').enabled()
gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
+--
+2.29.2
+
diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template
index 16f7379fc93..fe8dde181b0 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.1
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)"
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,11 @@ 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=79df8de21f284a105a5c1568527f8c559c583c85c0f2bd7bdb5b0372b8beecba
-# 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 +29,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*"
next reply other threads:[~2020-11-15 20:28 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-15 20:28 ndowens [this message]
2020-11-15 20:53 ` [PR PATCH] [Updated] " ndowens
2020-11-15 20:53 ` ndowens
2020-11-15 21:20 ` ndowens
2020-11-15 22:40 ` [PR REVIEW] " fosslinux
2020-11-15 22:47 ` ericonr
2020-11-15 22:47 ` ericonr
2020-11-15 22:47 ` ericonr
2020-11-15 22:57 ` ndowens
2020-11-15 22:57 ` q66
2020-11-15 22:58 ` ericonr
2020-11-15 23:00 ` q66
2020-11-15 23:55 ` ndowens
2020-11-15 23:57 ` [PR PATCH] [Updated] " ndowens
2020-11-16 0:04 ` [PR REVIEW] " ndowens
2020-11-16 0:54 ` q66
2020-11-16 0:58 ` ndowens
2020-11-16 0:59 ` [PR PATCH] [Updated] " ndowens
2020-11-16 1:18 ` [PR REVIEW] " ericonr
2020-11-16 1:24 ` q66
2020-11-16 13:30 ` ericonr
2020-11-16 15:22 ` [PR PATCH] [Updated] " ndowens
2020-12-17 9:00 ` lane-brain
2020-12-17 9:00 ` lane-brain
2020-12-17 20:23 ` ndowens
2020-12-17 20:28 ` fosslinux
2020-12-19 18:15 ` the-eater
2020-12-19 20:17 ` ndowens
2020-12-19 23:28 ` fosslinux
2020-12-19 23:42 ` ericonr
2020-12-20 16:12 ` the-eater
2020-12-20 17:03 ` q66
2020-12-20 17:46 ` [PR PATCH] [Updated] " ndowens
2020-12-20 17:46 ` ndowens
2020-12-20 17:48 ` [PR PATCH] [Updated] " ndowens
2020-12-20 17:49 ` ndowens
2020-12-20 17:56 ` ndowens
2020-12-20 18:03 ` ericonr
2020-12-20 18:10 ` q66
2020-12-20 18:11 ` q66
2020-12-21 1:31 `  gstreamer1: update to 1.18.2 fosslinux
2020-12-21 1:40 ` q66
2020-12-21 2:09 ` ericonr
2020-12-21 2:14 ` ericonr
2020-12-21 2:15 ` ericonr
2020-12-21 2:19 ` ericonr
2020-12-21 2:47 ` travankor
2020-12-21 2:47 ` travankor
2020-12-21 2:47 ` q66
2020-12-21 2:47 ` travankor
2020-12-21 2:48 ` q66
2020-12-21 2:52 ` q66
2020-12-21 2:55 ` ericonr
2020-12-21 2:57 ` ericonr
2020-12-21 2:57 ` q66
2020-12-21 2:58 ` q66
2020-12-21 2:58 ` q66
2020-12-21 2:59 ` q66
2020-12-21 3:03 ` ericonr
2020-12-21 3:13 ` q66
2020-12-21 15:40 ` ndowens
2020-12-21 15:41 ` ndowens
2020-12-21 20:36 ` ericonr
2020-12-21 21:06 ` [PR PATCH] [Updated] " ndowens
2020-12-21 21:28 ` [PR REVIEW] " ericonr
2020-12-21 21:31 ` ndowens
2020-12-22 0:12 ` [PR PATCH] [Updated] " ndowens
2020-12-22 0:14 ` ndowens
2020-12-22 0:22 ` ndowens
2020-12-22 0:30 ` ndowens
2020-12-22 1:03 ` ndowens
2020-12-22 1:46 ` ndowens
2020-12-22 2:43 ` ndowens
2020-12-30 9:57 ` [PR REVIEW] " travankor
2020-12-30 12:05 ` [PR PATCH] [Updated] " ndowens
2020-12-30 12:07 ` [PR REVIEW] " ndowens
2021-01-10 7:46 ` travankor
2021-01-17 2:38 ` travankor
2021-01-17 3:08 ` ndowens
2021-01-17 3:08 ` [PR PATCH] [Closed]: " ndowens
2021-01-17 23:01 ` travankor
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26411@inbox.vuxu.org \
--to=ndowens@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).