Merge pull request #12926 from neheb/gst12
gstreamer suite: update to 1.17.2
This commit is contained in:
commit
51947167f2
13 changed files with 81 additions and 17 deletions
|
@ -8,12 +8,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=gst1-libav
|
PKG_NAME:=gst1-libav
|
||||||
PKG_VERSION:=1.17.1
|
PKG_VERSION:=1.17.2
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=gst-libav-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=gst-libav-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-libav
|
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_BUILD_DIR:=$(BUILD_DIR)/gst-libav-$(PKG_VERSION)
|
||||||
|
|
||||||
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
|
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
|
||||||
|
|
9
multimedia/gst1-libav/patches/010-distutils.patch
Normal file
9
multimedia/gst1-libav/patches/010-distutils.patch
Normal file
|
@ -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")')
|
|
@ -8,13 +8,13 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=gst1-plugins-bad
|
PKG_NAME:=gst1-plugins-bad
|
||||||
PKG_VERSION:=1.17.1
|
PKG_VERSION:=1.17.2
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-bad-$(PKG_VERSION)
|
PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-bad-$(PKG_VERSION)
|
||||||
PKG_SOURCE:=gst-plugins-bad-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=gst-plugins-bad-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-bad/
|
PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-bad/
|
||||||
PKG_HASH:=598937c818d0955543318203faa28d826eb68d487934be4737e999ad272210d0
|
PKG_HASH:=fadbf229dbb29cae15ecb1858382aee60f2fa82067673598791c5fdfc52ad2cc
|
||||||
|
|
||||||
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
|
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
|
||||||
Ted Hess <thess@kitschensync.net>
|
Ted Hess <thess@kitschensync.net>
|
||||||
|
|
11
multimedia/gst1-plugins-bad/patches/010-distutils.patch
Normal file
11
multimedia/gst1-plugins-bad/patches/010-distutils.patch
Normal file
|
@ -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')
|
|
@ -8,12 +8,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=gst1-plugins-base
|
PKG_NAME:=gst1-plugins-base
|
||||||
PKG_VERSION:=1.17.1
|
PKG_VERSION:=1.17.2
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=gst-plugins-base-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=gst-plugins-base-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-base
|
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_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-base-$(PKG_VERSION)
|
||||||
|
|
||||||
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
|
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
|
||||||
|
@ -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,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,ivorbisdec,Integer Vorbis decoder plugin for devices without floating point,audio tag,,+libvorbisidec))
|
||||||
#$(eval $(call GstBuildPlugin,cdparanoia,cdparanoia,,+libcdparanoia))
|
#$(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,ogg,ogg parser muxer demuxer,riff tag pbutils video,,+libogg))
|
||||||
$(eval $(call GstBuildPlugin,opus,OPUS audio codec,pbutils video,,+libopus))
|
$(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,theora,Theora,tag video,,+libogg +libtheora))
|
||||||
$(eval $(call GstBuildPlugin,vorbis,Vorbis,audio tag,ogg,+libvorbis))
|
$(eval $(call GstBuildPlugin,vorbis,Vorbis,audio tag,ogg,+libvorbis))
|
||||||
|
|
||||||
|
|
11
multimedia/gst1-plugins-base/patches/010-distutils.patch
Normal file
11
multimedia/gst1-plugins-base/patches/010-distutils.patch
Normal file
|
@ -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')
|
|
@ -8,12 +8,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=gst1-plugins-good
|
PKG_NAME:=gst1-plugins-good
|
||||||
PKG_VERSION:=1.17.1
|
PKG_VERSION:=1.17.2
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=gst-plugins-good-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=gst-plugins-good-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-good/
|
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_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-good-$(PKG_VERSION)
|
||||||
|
|
||||||
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
|
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
|
||||||
|
|
11
multimedia/gst1-plugins-good/patches/010-distutils.patch
Normal file
11
multimedia/gst1-plugins-good/patches/010-distutils.patch
Normal file
|
@ -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'
|
|
@ -8,12 +8,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=gst1-plugins-ugly
|
PKG_NAME:=gst1-plugins-ugly
|
||||||
PKG_VERSION:=1.17.1
|
PKG_VERSION:=1.17.2
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=gst-plugins-ugly-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=gst-plugins-ugly-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-ugly
|
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_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-ugly-$(PKG_VERSION)
|
||||||
|
|
||||||
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
|
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
|
||||||
|
|
11
multimedia/gst1-plugins-ugly/patches/010-distutils.patch
Normal file
11
multimedia/gst1-plugins-ugly/patches/010-distutils.patch
Normal file
|
@ -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')
|
|
@ -8,12 +8,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=gstreamer1
|
PKG_NAME:=gstreamer1
|
||||||
PKG_VERSION:=1.17.1
|
PKG_VERSION:=1.17.2
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=gstreamer-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=gstreamer-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gstreamer
|
PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gstreamer
|
||||||
PKG_HASH:=f63566152755aab98414feb859ea8b00d3b07cad2486f304a8feec1265e5aa0e
|
PKG_HASH:=0163bb2c086759411b686526e7d8f4b22efc4ac02ddf3941f66b14949f106eef
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/gstreamer-$(PKG_VERSION)
|
PKG_BUILD_DIR:=$(BUILD_DIR)/gstreamer-$(PKG_VERSION)
|
||||||
|
|
||||||
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
|
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
|
||||||
|
@ -23,7 +23,7 @@ PKG_LICENSE_FILES:=COPYING
|
||||||
PKG_CPE_ID:=cpe:/a:gstreamer_project:gstreamer
|
PKG_CPE_ID:=cpe:/a:gstreamer_project:gstreamer
|
||||||
|
|
||||||
PKG_INSTALL:=1
|
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)/package.mk
|
||||||
include $(INCLUDE_DIR)/nls.mk
|
include $(INCLUDE_DIR)/nls.mk
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
--- a/gst/gstplugin.c
|
--- a/gst/gstplugin.c
|
||||||
+++ b/gst/gstplugin.c
|
+++ b/gst/gstplugin.c
|
||||||
@@ -777,15 +777,8 @@ _priv_gst_plugin_load_file_for_registry (const gchar * filename,
|
@@ -790,15 +790,8 @@ _priv_gst_plugin_load_file_for_registry (const gchar * filename,
|
||||||
goto return_error;
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
- flags = G_MODULE_BIND_LOCAL;
|
- flags = G_MODULE_BIND_LOCAL;
|
||||||
- /* libgstpython.so is the gst-python plugin loader. It needs to be loaded with
|
- /* libgstpython.so is the gst-python plugin loader. It needs to be loaded with
|
||||||
|
|
11
multimedia/gstreamer1/patches/020-distutils.patch
Normal file
11
multimedia/gstreamer1/patches/020-distutils.patch
Normal file
|
@ -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)
|
Loading…
Reference in a new issue