From 0001f9fcf60932ee22f1070212616e570029b52e Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 25 Jul 2020 00:58:40 -0700 Subject: [PATCH 1/6] gstreamer1: update to 1.17.2 Added gettext-full host dependency. Normally it comes wth glib2, but in the update to 2.65, it goes away. Add it here. Refresh patch. Add one for systems lacking distutils. Signed-off-by: Rosen Penev --- multimedia/gstreamer1/Makefile | 6 +++--- .../010-gstplugin-use-lazy-symbol-binding.patch | 4 ++-- multimedia/gstreamer1/patches/020-distutils.patch | 11 +++++++++++ 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 multimedia/gstreamer1/patches/020-distutils.patch diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile index a33c36091..4425c6915 100644 --- a/multimedia/gstreamer1/Makefile +++ b/multimedia/gstreamer1/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gstreamer1 -PKG_VERSION:=1.17.1 +PKG_VERSION:=1.17.2 PKG_RELEASE:=1 PKG_SOURCE:=gstreamer-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gstreamer -PKG_HASH:=f63566152755aab98414feb859ea8b00d3b07cad2486f304a8feec1265e5aa0e +PKG_HASH:=0163bb2c086759411b686526e7d8f4b22efc4ac02ddf3941f66b14949f106eef PKG_BUILD_DIR:=$(BUILD_DIR)/gstreamer-$(PKG_VERSION) PKG_MAINTAINER:=W. Michael Petullo \ @@ -23,7 +23,7 @@ PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:gstreamer_project:gstreamer PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=meson/host glib2/host +PKG_BUILD_DEPENDS:=meson/host glib2/host gettext-full/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk diff --git a/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch b/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch index ab72a4ffa..11ea46556 100644 --- a/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch +++ b/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch @@ -1,8 +1,8 @@ --- a/gst/gstplugin.c +++ b/gst/gstplugin.c -@@ -777,15 +777,8 @@ _priv_gst_plugin_load_file_for_registry (const gchar * filename, - goto return_error; +@@ -790,15 +790,8 @@ _priv_gst_plugin_load_file_for_registry (const gchar * filename, } + #endif - flags = G_MODULE_BIND_LOCAL; - /* libgstpython.so is the gst-python plugin loader. It needs to be loaded with diff --git a/multimedia/gstreamer1/patches/020-distutils.patch b/multimedia/gstreamer1/patches/020-distutils.patch new file mode 100644 index 000000000..d072c11bf --- /dev/null +++ b/multimedia/gstreamer1/patches/020-distutils.patch @@ -0,0 +1,11 @@ +--- a/meson.build ++++ b/meson.build +@@ -505,7 +505,7 @@ if get_option('default_library') == 'static' + endif + + # Used in gst/parse/meson.build and below +-python3 = import('python').find_installation() ++python3 = 'python3' + + bashcomp_option = get_option('bash-completion') + bashcomp_dep = dependency('bash-completion', version : '>= 2.0', required : bashcomp_option) From dad781503042b3ac8a9506e50c9ce9f0fd32f8b3 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 25 Jul 2020 01:04:33 -0700 Subject: [PATCH 2/6] gst1-plugins-base: update to 1.17.2 Fixed some typos. Added patch to fix compilation without distutils. Signed-off-by: Rosen Penev --- multimedia/gst1-plugins-base/Makefile | 8 ++++---- .../gst1-plugins-base/patches/010-distutils.patch | 11 +++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 multimedia/gst1-plugins-base/patches/010-distutils.patch diff --git a/multimedia/gst1-plugins-base/Makefile b/multimedia/gst1-plugins-base/Makefile index 624ba9937..30cb4cb1d 100644 --- a/multimedia/gst1-plugins-base/Makefile +++ b/multimedia/gst1-plugins-base/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-base -PKG_VERSION:=1.17.1 +PKG_VERSION:=1.17.2 PKG_RELEASE:=1 PKG_SOURCE:=gst-plugins-base-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-base -PKG_HASH:=c0d8a84e3262e706ebc88831ca7349e5ae221274ef362599734573b3d3c028f3 +PKG_HASH:=30bfdaad8faa380fd74c3e74261748e218649786939ad10edfe067a39d4c4996 PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-base-$(PKG_VERSION) PKG_MAINTAINER:=W. Michael Petullo \ @@ -310,10 +310,10 @@ $(eval $(call GstBuildPlugin,volume,volume,audio controller,,+liboil)) $(eval $(call GstBuildPlugin,alsa,ALSA audio source/sink,audio tag,,+alsa-lib)) $(eval $(call GstBuildPlugin,ivorbisdec,Integer Vorbis decoder plugin for devices without floating point,audio tag,,+libvorbisidec)) #$(eval $(call GstBuildPlugin,cdparanoia,cdparanoia,,+libcdparanoia)) -#$(eval $(call GstBuildPlugin,libvisual,libvisual audio visualization,,+alsa-lib)) +#$(eval $(call GstBuildPlugin,libvisual,libvisual audio visualization,,+libvisual)) $(eval $(call GstBuildPlugin,ogg,ogg parser muxer demuxer,riff tag pbutils video,,+libogg)) $(eval $(call GstBuildPlugin,opus,OPUS audio codec,pbutils video,,+libopus)) -#$(eval $(call GstBuildPlugin,pango,Pango text rendering and overlay plugin,,+libopus)) +#$(eval $(call GstBuildPlugin,pango,Pango text rendering and overlay plugin,,+pango)) $(eval $(call GstBuildPlugin,theora,Theora,tag video,,+libogg +libtheora)) $(eval $(call GstBuildPlugin,vorbis,Vorbis,audio tag,ogg,+libvorbis)) diff --git a/multimedia/gst1-plugins-base/patches/010-distutils.patch b/multimedia/gst1-plugins-base/patches/010-distutils.patch new file mode 100644 index 000000000..a7276e26e --- /dev/null +++ b/multimedia/gst1-plugins-base/patches/010-distutils.patch @@ -0,0 +1,11 @@ +--- a/meson.build ++++ b/meson.build +@@ -400,7 +400,7 @@ if get_option('default_library') == 'shared' + plugins_pkgconfig_install_dir = disabler() + endif + +-python3 = import('python').find_installation() ++python3 = 'python3' + subdir('gst-libs') + subdir('gst') + subdir('ext') From b3f9abfa71cce686aa26f363ea2e7d31a3f78a0c Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 25 Jul 2020 01:09:38 -0700 Subject: [PATCH 3/6] gst1-plugins-good: update to 1.17.2 Added patch to fix compilation without distutils. Signed-off-by: Rosen Penev --- multimedia/gst1-plugins-good/Makefile | 4 ++-- .../gst1-plugins-good/patches/010-distutils.patch | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 multimedia/gst1-plugins-good/patches/010-distutils.patch diff --git a/multimedia/gst1-plugins-good/Makefile b/multimedia/gst1-plugins-good/Makefile index 07f4d6018..7c6d2cdc5 100644 --- a/multimedia/gst1-plugins-good/Makefile +++ b/multimedia/gst1-plugins-good/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-good -PKG_VERSION:=1.17.1 +PKG_VERSION:=1.17.2 PKG_RELEASE:=1 PKG_SOURCE:=gst-plugins-good-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-good/ -PKG_HASH:=ea8957460ed38261e5c4bf6a8bf98d946298b756a695b27c9b1209aa7b76b0d7 +PKG_HASH:=4278ebd32383d1e26219e6bb9ae492fe5dc7d3246ba8570a192e9dc98e2a436a PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-good-$(PKG_VERSION) PKG_MAINTAINER:=W. Michael Petullo \ diff --git a/multimedia/gst1-plugins-good/patches/010-distutils.patch b/multimedia/gst1-plugins-good/patches/010-distutils.patch new file mode 100644 index 000000000..713c1a535 --- /dev/null +++ b/multimedia/gst1-plugins-good/patches/010-distutils.patch @@ -0,0 +1,11 @@ +--- a/meson.build ++++ b/meson.build +@@ -400,7 +400,7 @@ endif + + presetdir = join_paths(get_option('datadir'), 'gstreamer-' + api_version, 'presets') + +-python3 = import('python').find_installation() ++python3 = 'python3' + pkgconfig = import('pkgconfig') + plugins_pkgconfig_install_dir = join_paths(plugins_install_dir, 'pkgconfig') + if get_option('default_library') == 'shared' From 349f0e6b17925dba52587009ac4df09448586a16 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 25 Jul 2020 01:13:21 -0700 Subject: [PATCH 4/6] gst1-plugins-bad: update to 1.17.2 Added patch to fix compilation without distutils. Signed-off-by: Rosen Penev --- multimedia/gst1-plugins-bad/Makefile | 4 ++-- .../gst1-plugins-bad/patches/010-distutils.patch | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 multimedia/gst1-plugins-bad/patches/010-distutils.patch diff --git a/multimedia/gst1-plugins-bad/Makefile b/multimedia/gst1-plugins-bad/Makefile index 227b74beb..5c818095e 100644 --- a/multimedia/gst1-plugins-bad/Makefile +++ b/multimedia/gst1-plugins-bad/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-bad -PKG_VERSION:=1.17.1 +PKG_VERSION:=1.17.2 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-bad-$(PKG_VERSION) PKG_SOURCE:=gst-plugins-bad-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-bad/ -PKG_HASH:=598937c818d0955543318203faa28d826eb68d487934be4737e999ad272210d0 +PKG_HASH:=fadbf229dbb29cae15ecb1858382aee60f2fa82067673598791c5fdfc52ad2cc PKG_MAINTAINER:=W. Michael Petullo \ Ted Hess diff --git a/multimedia/gst1-plugins-bad/patches/010-distutils.patch b/multimedia/gst1-plugins-bad/patches/010-distutils.patch new file mode 100644 index 000000000..d7a17667d --- /dev/null +++ b/multimedia/gst1-plugins-bad/patches/010-distutils.patch @@ -0,0 +1,11 @@ +--- a/meson.build ++++ b/meson.build +@@ -417,7 +417,7 @@ gst_plugins_bad_args = ['-DHAVE_CONFIG_H'] + configinc = include_directories('.') + libsinc = include_directories('gst-libs') + +-python3 = import('python').find_installation() ++python3 = 'python3' + + gir = find_program('g-ir-scanner', required : get_option('introspection')) + gnome = import('gnome') From 87c1f2b8b4ed7e3478e8e761f549cf98a2a9c113 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 25 Jul 2020 01:15:46 -0700 Subject: [PATCH 5/6] gst1-plugins-ugly: update to 1.17.2 Added patch to fix compilation without distutils. Signed-off-by: Rosen Penev --- multimedia/gst1-plugins-ugly/Makefile | 4 ++-- .../gst1-plugins-ugly/patches/010-distutils.patch | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 multimedia/gst1-plugins-ugly/patches/010-distutils.patch diff --git a/multimedia/gst1-plugins-ugly/Makefile b/multimedia/gst1-plugins-ugly/Makefile index 0d9347381..fb0eaaaff 100644 --- a/multimedia/gst1-plugins-ugly/Makefile +++ b/multimedia/gst1-plugins-ugly/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-ugly -PKG_VERSION:=1.17.1 +PKG_VERSION:=1.17.2 PKG_RELEASE:=1 PKG_SOURCE:=gst-plugins-ugly-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-ugly -PKG_HASH:=a5e564107120b5b27c48709c5dfdb266737def5b3eb7aaabaddd304d425d8f21 +PKG_HASH:=af32ea2ca43e6e3199c0b3f71942838bbf5e08c15f69f26db5d81a8ea85a88ad PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-ugly-$(PKG_VERSION) PKG_MAINTAINER:=W. Michael Petullo \ diff --git a/multimedia/gst1-plugins-ugly/patches/010-distutils.patch b/multimedia/gst1-plugins-ugly/patches/010-distutils.patch new file mode 100644 index 000000000..1460bb3d2 --- /dev/null +++ b/multimedia/gst1-plugins-ugly/patches/010-distutils.patch @@ -0,0 +1,11 @@ +--- a/meson.build ++++ b/meson.build +@@ -257,7 +257,7 @@ if get_option('default_library') == 'shared' + plugins_pkgconfig_install_dir = disabler() + endif + +-python3 = import('python').find_installation() ++python3 = 'python3' + subdir('gst') + subdir('ext') + subdir('tests') From 38281b4f06e09d81277e3a32cce2408603dbb944 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 25 Jul 2020 01:23:11 -0700 Subject: [PATCH 6/6] gst1-libav: update to 1.17.2 Added patch to fix compilation without distutils. Signed-off-by: Rosen Penev --- multimedia/gst1-libav/Makefile | 4 ++-- multimedia/gst1-libav/patches/010-distutils.patch | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 multimedia/gst1-libav/patches/010-distutils.patch diff --git a/multimedia/gst1-libav/Makefile b/multimedia/gst1-libav/Makefile index b4ae09a7d..dce722c93 100644 --- a/multimedia/gst1-libav/Makefile +++ b/multimedia/gst1-libav/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-libav -PKG_VERSION:=1.17.1 +PKG_VERSION:=1.17.2 PKG_RELEASE:=1 PKG_SOURCE:=gst-libav-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-libav -PKG_HASH:=9d8d73a7944f776199c7648b3b7330f940b10dc4e08a6509185ae43cb456cb1f +PKG_HASH:=5c8768e308b547b237700d4003c3a5622eb361914d69ec43b480f1c23ea31752 PKG_BUILD_DIR:=$(BUILD_DIR)/gst-libav-$(PKG_VERSION) PKG_MAINTAINER:=W. Michael Petullo \ diff --git a/multimedia/gst1-libav/patches/010-distutils.patch b/multimedia/gst1-libav/patches/010-distutils.patch new file mode 100644 index 000000000..2ad4627c0 --- /dev/null +++ b/multimedia/gst1-libav/patches/010-distutils.patch @@ -0,0 +1,9 @@ +--- a/meson.build ++++ b/meson.build +@@ -188,5 +188,5 @@ plugins = [] + subdir('ext/libav') + subdir('docs') + +-python3 = import('python').find_installation() ++python3 = 'python3' + run_command(python3, '-c', 'import shutil; shutil.copy("hooks/pre-commit.hook", ".git/hooks/pre-commit")')