Buildroot 2018-11 (#258)
* Update to buildroot 2018.11 * containerd update * runc update * runc docker engine * runc docker proxy * update rpi firmware * update network manager * update dhcpd * update wait on network * update rpi wifi * revert glibc
This commit is contained in:
Pascal Vizeli
@@ -1,2 +1,3 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.12.4.tar.xz.sha256sum
|
||||
sha256 a025fa24242ec868fe0ff1e66d806a1070bcbc7c14a987a89cdc3395d0d56d5f gst-omx-1.12.4.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.14.4.tar.xz.sha256sum
|
||||
sha256 969870e75c1f75c96f8783530e2c2932fc3afbfd976eb0c466f51dae268ea3d4 gst-omx-1.14.4.tar.xz
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST_OMX_VERSION = 1.12.4
|
||||
GST_OMX_VERSION = 1.14.4
|
||||
GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz
|
||||
GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx
|
||||
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# locally computed hash
|
||||
sha256 3fcf1046ab8c6c7cd94218f4d2bc31ad7b5efa8a6b8f9fd5d93dc182f98ce026 gst1-imx-0.13.0.tar.gz
|
||||
sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 LICENSE
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.12.4.tar.xz.sha256sum
|
||||
sha256 2a56aa5d2d8cd912f2bce17f174713d2c417ca298f1f9c28ee66d4aa1e1d9e62 gst-libav-1.12.4.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.14.4.tar.xz.sha256sum
|
||||
sha256 dfd78591901df7853eab7e56a86c34a1b03635da0d3d56b89aa577f1897865da gst-libav-1.14.4.tar.xz
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_LIBAV_VERSION = 1.12.4
|
||||
GST1_LIBAV_VERSION = 1.14.4
|
||||
GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz
|
||||
GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav
|
||||
GST1_LIBAV_CONF_OPTS = --with-system-libav
|
||||
|
||||
@@ -9,134 +9,6 @@ menuconfig BR2_PACKAGE_GST1_PLUGINS_BAD
|
||||
|
||||
if BR2_PACKAGE_GST1_PLUGINS_BAD
|
||||
|
||||
comment "libraries with external dependencies"
|
||||
|
||||
menuconfig BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL
|
||||
bool "opengl"
|
||||
depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES
|
||||
|
||||
if BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_HAS_LIB_OPENGL
|
||||
def_bool BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_WINDOW
|
||||
|
||||
comment "The opengl library needs an API, a platform and a window system"
|
||||
depends on !BR2_PACKAGE_GST1_PLUGINS_BAD_HAS_LIB_OPENGL
|
||||
|
||||
comment "APIs"
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_API
|
||||
bool
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL
|
||||
bool "opengl"
|
||||
default y
|
||||
depends on BR2_PACKAGE_HAS_LIBGL
|
||||
select BR2_PACKAGE_LIBGLU
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_API
|
||||
|
||||
comment "opengl needs an OpenGL backend"
|
||||
depends on !BR2_PACKAGE_HAS_LIBGL
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLES2
|
||||
bool "gles2"
|
||||
default y
|
||||
depends on BR2_PACKAGE_HAS_LIBGLES
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_API
|
||||
|
||||
comment "gles2 needs an OpenGL ES backend"
|
||||
depends on !BR2_PACKAGE_HAS_LIBGLES
|
||||
|
||||
comment "Platforms"
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_PLATFORM
|
||||
bool
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLX
|
||||
bool "glx"
|
||||
default y
|
||||
depends on BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL
|
||||
depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR # mesa needs big X
|
||||
depends on !BR2_PACKAGE_RPI_USERLAND # x11
|
||||
select BR2_PACKAGE_XLIB_LIBXRENDER
|
||||
select BR2_PACKAGE_XPROTO_GLPROTO
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_X11
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_PLATFORM
|
||||
help
|
||||
OpenGL Extension to the X Window System
|
||||
|
||||
comment "glx not supported with rpi-userland"
|
||||
depends on BR2_PACKAGE_RPI_USERLAND
|
||||
|
||||
comment "glx needs the opengl API and modular X.org"
|
||||
depends on !BR2_PACKAGE_RPI_USERLAND && \
|
||||
(!BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL || \
|
||||
!BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR)
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL
|
||||
bool "egl"
|
||||
default y
|
||||
depends on BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_API
|
||||
depends on BR2_PACKAGE_HAS_LIBEGL
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_PLATFORM
|
||||
|
||||
comment "egl needs an API and an EGL backend"
|
||||
depends on !BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_API || \
|
||||
!BR2_PACKAGE_HAS_LIBEGL
|
||||
|
||||
comment "Window systems"
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_WINDOW
|
||||
bool
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_X11
|
||||
bool "x11"
|
||||
default y
|
||||
depends on BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_PLATFORM
|
||||
depends on !BR2_PACKAGE_RPI_USERLAND
|
||||
depends on BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_XLIB_LIBX11
|
||||
select BR2_PACKAGE_XLIB_LIBXEXT
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_WINDOW
|
||||
|
||||
comment "x11 not supported with rpi-userland"
|
||||
depends on BR2_PACKAGE_RPI_USERLAND
|
||||
|
||||
comment "x11 needs a platform and X.org"
|
||||
depends on !BR2_PACKAGE_RPI_USERLAND && \
|
||||
(!BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_PLATFORM || \
|
||||
!BR2_PACKAGE_XORG7)
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_WAYLAND
|
||||
bool "wayland"
|
||||
default y
|
||||
depends on BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL
|
||||
depends on BR2_PACKAGE_WAYLAND
|
||||
select BR2_PACKAGE_WAYLAND_PROTOCOLS
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_WINDOW
|
||||
|
||||
comment "wayland needs the egl platform and the wayland package"
|
||||
depends on !BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL || \
|
||||
!BR2_PACKAGE_WAYLAND
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_DISPMANX
|
||||
bool "dispmanx"
|
||||
default y
|
||||
depends on BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL
|
||||
depends on BR2_PACKAGE_RPI_USERLAND
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_WINDOW
|
||||
help
|
||||
Raspberry Pi's Dispmanx windowing system
|
||||
|
||||
comment "dispmanx needs the egl platform and rpi-userland"
|
||||
depends on !BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL || \
|
||||
!BR2_PACKAGE_RPI_USERLAND
|
||||
|
||||
endif
|
||||
|
||||
comment "opengl needs an OpenGL or OpenGL ES backend"
|
||||
depends on !BR2_PACKAGE_HAS_LIBGL && !BR2_PACKAGE_HAS_LIBGLES
|
||||
|
||||
comment "dependency-less plugins"
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ACCURIP
|
||||
@@ -174,11 +46,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOFXBAD
|
||||
help
|
||||
Audio filters plugin
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXER
|
||||
bool "audiomixer"
|
||||
help
|
||||
Audio mixer plugin
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXMATRIX
|
||||
bool "audiomixmatrix"
|
||||
help
|
||||
@@ -513,10 +380,10 @@ comment "fdk-aac needs a toolchain w/ C++"
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GL
|
||||
bool "gl"
|
||||
default y
|
||||
depends on BR2_PACKAGE_GST1_PLUGINS_BAD_HAS_LIB_OPENGL
|
||||
depends on BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL
|
||||
|
||||
comment "gl needs the gst1-plugins-bad opengl library"
|
||||
depends on !BR2_PACKAGE_GST1_PLUGINS_BAD_HAS_LIB_OPENGL
|
||||
comment "gl needs the gst1-plugins-base opengl library"
|
||||
depends on !BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS
|
||||
bool "hls"
|
||||
|
||||
@@ -1,2 +1,4 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz.sha256sum
|
||||
sha256 0c7857be16686d5c1ba6e34bd338664d3d4599d32714a8eca5c8a41a101e2d08 gst-plugins-bad-1.12.4.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.4.tar.xz.sha256sum
|
||||
sha256 910b4e0e2e897e8b6d06767af1779d70057c309f67292f485ff988d087aa0de5 gst-plugins-bad-1.14.4.tar.xz
|
||||
sha256 0b12e4d1cd5db5f8a0c04fc98a1d8c3acc533097b6198d6644420da78d460223 COPYING
|
||||
sha256 cf9b86bcf2d298e8cf5b9d8982f9dab296465b002fdfa0347357a0732f961e03 COPYING.LIB
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_PLUGINS_BAD_VERSION = 1.12.4
|
||||
GST1_PLUGINS_BAD_VERSION = 1.14.4
|
||||
GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz
|
||||
GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad
|
||||
GST1_PLUGINS_BAD_INSTALL_STAGING = YES
|
||||
@@ -21,7 +21,8 @@ GST1_PLUGINS_BAD_CONF_OPTS = \
|
||||
--disable-winks \
|
||||
--disable-android_media \
|
||||
--disable-apple_media \
|
||||
--disable-acm
|
||||
--disable-acm \
|
||||
--disable-introspection
|
||||
|
||||
# Options which require currently unpackaged libraries
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += \
|
||||
@@ -58,8 +59,7 @@ GST1_PLUGINS_BAD_CONF_OPTS += \
|
||||
--disable-schro \
|
||||
--disable-zbar \
|
||||
--disable-spandsp \
|
||||
--disable-gtk3 \
|
||||
--disable-qt
|
||||
--disable-gtk3
|
||||
|
||||
GST1_PLUGINS_BAD_DEPENDENCIES = gst1-plugins-base gstreamer1
|
||||
|
||||
@@ -72,58 +72,13 @@ GST1_PLUGINS_BAD_CONF_ENV += \
|
||||
-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux"
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --enable-opengl
|
||||
GST1_PLUGINS_BAD_DEPENDENCIES += libgl libglu
|
||||
else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --disable-opengl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLES2),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --enable-gles2
|
||||
GST1_PLUGINS_BAD_DEPENDENCIES += libgles
|
||||
else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --disable-gles2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLX),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --enable-glx
|
||||
GST1_PLUGINS_BAD_DEPENDENCIES += xproto_glproto xlib_libXrender
|
||||
else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --disable-glx
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --enable-egl
|
||||
GST1_PLUGINS_BAD_DEPENDENCIES += libegl
|
||||
GST1_PLUGINS_BAD_CONF_ENV += \
|
||||
CPPFLAGS="$(TARGET_CPPFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags egl`" \
|
||||
LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs egl`"
|
||||
else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --disable-egl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_X11),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --enable-x11
|
||||
GST1_PLUGINS_BAD_DEPENDENCIES += xlib_libX11 xlib_libXext
|
||||
else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --disable-x11
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_WAYLAND)$(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND),)
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --enable-wayland
|
||||
GST1_PLUGINS_BAD_DEPENDENCIES += wayland wayland-protocols
|
||||
else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --disable-wayland
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_DISPMANX),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --enable-dispmanx
|
||||
GST1_PLUGINS_BAD_DEPENDENCIES += rpi-userland
|
||||
else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --disable-dispmanx
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ORC),y)
|
||||
GST1_PLUGINS_BAD_DEPENDENCIES += orc
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --enable-orc
|
||||
@@ -178,12 +133,6 @@ else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiofxbad
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXER),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiomixer
|
||||
else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiomixer
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXMATRIX),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiomixmatrix
|
||||
else
|
||||
|
||||
@@ -28,6 +28,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT
|
||||
help
|
||||
Convert audio to different formats
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER
|
||||
bool "audiomixer"
|
||||
help
|
||||
Audio mixer plugin
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORATE
|
||||
bool "audiorate"
|
||||
help
|
||||
@@ -111,6 +116,131 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME
|
||||
|
||||
comment "plugins with external dependencies"
|
||||
|
||||
menuconfig BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL
|
||||
bool "opengl"
|
||||
depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES
|
||||
|
||||
if BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL
|
||||
def_bool BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_WINDOW
|
||||
|
||||
comment "The opengl library needs an API, a platform and a window system"
|
||||
depends on !BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL
|
||||
|
||||
comment "APIs"
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API
|
||||
bool
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL
|
||||
bool "opengl"
|
||||
default y
|
||||
depends on BR2_PACKAGE_HAS_LIBGL
|
||||
select BR2_PACKAGE_LIBGLU
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API
|
||||
|
||||
comment "opengl needs an OpenGL backend"
|
||||
depends on !BR2_PACKAGE_HAS_LIBGL
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLES2
|
||||
bool "gles2"
|
||||
default y
|
||||
depends on BR2_PACKAGE_HAS_LIBGLES
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API
|
||||
|
||||
comment "gles2 needs an OpenGL ES backend"
|
||||
depends on !BR2_PACKAGE_HAS_LIBGLES
|
||||
|
||||
comment "Platforms"
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM
|
||||
bool
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLX
|
||||
bool "glx"
|
||||
default y
|
||||
depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL
|
||||
depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR # mesa needs big X
|
||||
depends on !BR2_PACKAGE_RPI_USERLAND # x11
|
||||
select BR2_PACKAGE_XLIB_LIBXRENDER
|
||||
select BR2_PACKAGE_XORGPROTO
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_X11
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM
|
||||
help
|
||||
OpenGL Extension to the X Window System
|
||||
|
||||
comment "glx not supported with rpi-userland"
|
||||
depends on BR2_PACKAGE_RPI_USERLAND
|
||||
|
||||
comment "glx needs the opengl API and modular X.org"
|
||||
depends on !BR2_PACKAGE_RPI_USERLAND && \
|
||||
(!BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL || \
|
||||
!BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR)
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL
|
||||
bool "egl"
|
||||
default y
|
||||
depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API
|
||||
depends on BR2_PACKAGE_HAS_LIBEGL
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM
|
||||
|
||||
comment "egl needs an API and an EGL backend"
|
||||
depends on !BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API || \
|
||||
!BR2_PACKAGE_HAS_LIBEGL
|
||||
|
||||
comment "Window systems"
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_WINDOW
|
||||
bool
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_X11
|
||||
bool "x11"
|
||||
default y
|
||||
depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM
|
||||
depends on !BR2_PACKAGE_RPI_USERLAND
|
||||
depends on BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_XLIB_LIBX11
|
||||
select BR2_PACKAGE_XLIB_LIBXEXT
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_WINDOW
|
||||
|
||||
comment "x11 not supported with rpi-userland"
|
||||
depends on BR2_PACKAGE_RPI_USERLAND
|
||||
|
||||
comment "x11 needs a platform and X.org"
|
||||
depends on !BR2_PACKAGE_RPI_USERLAND && \
|
||||
(!BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM || \
|
||||
!BR2_PACKAGE_XORG7)
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_WAYLAND
|
||||
bool "wayland"
|
||||
default y
|
||||
depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL
|
||||
depends on BR2_PACKAGE_WAYLAND
|
||||
select BR2_PACKAGE_WAYLAND_PROTOCOLS
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_WINDOW
|
||||
|
||||
comment "wayland needs the egl platform and the wayland package"
|
||||
depends on !BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL || \
|
||||
!BR2_PACKAGE_WAYLAND
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_DISPMANX
|
||||
bool "dispmanx"
|
||||
default y
|
||||
depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL
|
||||
depends on BR2_PACKAGE_RPI_USERLAND
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_WINDOW
|
||||
help
|
||||
Raspberry Pi's Dispmanx windowing system
|
||||
|
||||
comment "dispmanx needs the egl platform and rpi-userland"
|
||||
depends on !BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL || \
|
||||
!BR2_PACKAGE_RPI_USERLAND
|
||||
endif
|
||||
|
||||
comment "opengl needs an OpenGL or OpenGL ES backend"
|
||||
depends on !BR2_PACKAGE_HAS_LIBGL && !BR2_PACKAGE_HAS_LIBGLES
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA
|
||||
bool "alsa (mandatory for audio playback)"
|
||||
select BR2_PACKAGE_ALSA_LIB
|
||||
|
||||
@@ -1,2 +1,4 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.12.4.tar.xz.sha256sum
|
||||
sha256 4c306b03df0212f1b8903784e29bb3493319ba19ebebf13b0c56a17870292282 gst-plugins-base-1.12.4.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.4.tar.xz.sha256sum
|
||||
sha256 ca6139490e48863e7706d870ff4e8ac9f417b56f3b9e4b3ce490c13b09a77461 gst-plugins-base-1.14.4.tar.xz
|
||||
sha256 78fb5977f177ab71cba77a4a127d29b93cb1ca5c25962204b31f183a20cf5c7a COPYING
|
||||
sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_PLUGINS_BASE_VERSION = 1.12.4
|
||||
GST1_PLUGINS_BASE_VERSION = 1.14.4
|
||||
GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz
|
||||
GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base
|
||||
GST1_PLUGINS_BASE_INSTALL_STAGING = YES
|
||||
@@ -14,7 +14,8 @@ GST1_PLUGINS_BASE_LICENSE = LGPL-2.0+, LGPL-2.1+
|
||||
# gio_unix_2_0 is only used for tests
|
||||
GST1_PLUGINS_BASE_CONF_OPTS = \
|
||||
--disable-examples \
|
||||
--disable-valgrind
|
||||
--disable-valgrind \
|
||||
--disable-introspection
|
||||
|
||||
# Options which require currently unpackaged libraries
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += \
|
||||
@@ -24,13 +25,64 @@ GST1_PLUGINS_BASE_CONF_OPTS += \
|
||||
|
||||
GST1_PLUGINS_BASE_DEPENDENCIES = gstreamer1
|
||||
|
||||
# These plugins are liste in the order from ./configure --help
|
||||
|
||||
# These plugins are listed in the order from ./configure --help
|
||||
ifeq ($(BR2_PACKAGE_ORC),y)
|
||||
GST1_PLUGINS_BASE_DEPENDENCIES += orc
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += --enable-orc
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL),y)
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += --enable-opengl
|
||||
GST1_PLUGINS_BASE_DEPENDENCIES += libgl libglu
|
||||
else
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += --disable-opengl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLES2),y)
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += --enable-gles2
|
||||
GST1_PLUGINS_BASE_DEPENDENCIES += libgles
|
||||
else
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += --disable-gles2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLX),y)
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += --enable-glx
|
||||
GST1_PLUGINS_BASE_DEPENDENCIES += xorgproto xlib_libXrender
|
||||
else
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += --disable-glx
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL),y)
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += --enable-egl
|
||||
GST1_PLUGINS_BASE_DEPENDENCIES += libegl
|
||||
GST1_PLUGINS_BASE_CONF_ENV += \
|
||||
CPPFLAGS="$(TARGET_CPPFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags egl`" \
|
||||
LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs egl`"
|
||||
else
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += --disable-egl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_X11),y)
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += --enable-x11
|
||||
GST1_PLUGINS_BASE_DEPENDENCIES += xlib_libX11 xlib_libXext
|
||||
else
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += --disable-x11
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_WAYLAND),y)
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += --enable-wayland
|
||||
GST1_PLUGINS_BASE_DEPENDENCIES += wayland wayland-protocols
|
||||
else
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += --disable-wayland
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_DISPMANX),y)
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += --enable-dispmanx
|
||||
GST1_PLUGINS_BASE_DEPENDENCIES += rpi-userland
|
||||
else
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += --disable-dispmanx
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ADDER),y)
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += --enable-adder
|
||||
else
|
||||
@@ -49,6 +101,12 @@ else
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += --disable-audioconvert
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER),y)
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += --enable-audiomixer
|
||||
else
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += --disable-audiomixer
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORATE),y)
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += --enable-audiorate
|
||||
else
|
||||
|
||||
@@ -261,6 +261,18 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M
|
||||
|
||||
comment "plugins with external dependencies"
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAME
|
||||
bool "lame (*.mp3 audio encoder)"
|
||||
select BR2_PACKAGE_LAME
|
||||
help
|
||||
Encode MP3s with LAME
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MPG123
|
||||
bool "mpg123 (*.mp3 audio)"
|
||||
select BR2_PACKAGE_MPG123
|
||||
help
|
||||
mp3 decoding based on the mpg123 library
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS
|
||||
bool "ossaudio (OSS audio)"
|
||||
help
|
||||
@@ -321,13 +333,16 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
|
||||
depends on BR2_USE_MMU # pulseaudio
|
||||
depends on !BR2_STATIC_LIBS # pulseaudio
|
||||
depends on BR2_USE_WCHAR # pulseaudio
|
||||
depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC # pulseaudio
|
||||
select BR2_PACKAGE_PULSEAUDIO
|
||||
help
|
||||
PulseAudio plugin library
|
||||
|
||||
comment "pulseaudio support needs a toolchain w/ threads, dynamic library"
|
||||
comment "pulseaudio support needs a toolchain w/ threads, wchar, dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || !BR2_USE_WCHAR
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC
|
||||
bool "souphttpsrc (http client)"
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz.sha256sum
|
||||
sha256 649f49bec60892d47ee6731b92266974c723554da1c6649f21296097715eb957 gst-plugins-good-1.12.4.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.4.tar.xz.sha256sum
|
||||
sha256 5f8b553260cb0aac56890053d8511db1528d53cae10f0287cfce2cb2acc70979 gst-plugins-good-1.14.4.tar.xz
|
||||
sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_PLUGINS_GOOD_VERSION = 1.12.4
|
||||
GST1_PLUGINS_GOOD_VERSION = 1.14.4
|
||||
GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz
|
||||
GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good
|
||||
GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING
|
||||
@@ -20,17 +20,24 @@ GST1_PLUGINS_GOOD_CONF_OPTS = \
|
||||
--disable-osx_video \
|
||||
--disable-aalib \
|
||||
--disable-aalibtest \
|
||||
--disable-libcaca
|
||||
--disable-libcaca \
|
||||
--disable-qt
|
||||
|
||||
# Options which require currently unpackaged libraries
|
||||
GST1_PLUGINS_GOOD_CONF_OPTS += \
|
||||
--disable-jack \
|
||||
--disable-libdv \
|
||||
--disable-dv1394 \
|
||||
--disable-shout2
|
||||
|
||||
GST1_PLUGINS_GOOD_DEPENDENCIES = gstreamer1 gst1-plugins-base
|
||||
|
||||
ifeq ($(BR2_PACKAGE_JACK2),y)
|
||||
GST1_PLUGINS_GOOD_CONF_OPTS += --enable-jack
|
||||
GST1_PLUGINS_GOOD_DEPENDENCIES += jack2
|
||||
else
|
||||
GST1_PLUGINS_GOOD_CONF_OPTS += --disable-jack
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBV4L),y)
|
||||
GST1_PLUGINS_GOOD_CONF_OPTS += --with-libv4l2
|
||||
GST1_PLUGINS_GOOD_DEPENDENCIES += libv4l
|
||||
@@ -175,6 +182,20 @@ else
|
||||
GST1_PLUGINS_GOOD_CONF_OPTS += --disable-isomp4
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAME),y)
|
||||
GST1_PLUGINS_GOOD_CONF_OPTS += --enable-lame
|
||||
GST1_PLUGINS_GOOD_DEPENDENCIES += lame
|
||||
else
|
||||
GST1_PLUGINS_GOOD_CONF_OPTS += --disable-lame
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MPG123),y)
|
||||
GST1_PLUGINS_GOOD_CONF_OPTS += --enable-mpg123
|
||||
GST1_PLUGINS_GOOD_DEPENDENCIES += mpg123
|
||||
else
|
||||
GST1_PLUGINS_GOOD_CONF_OPTS += --disable-mpg123
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAW),y)
|
||||
GST1_PLUGINS_GOOD_CONF_OPTS += --enable-law
|
||||
else
|
||||
|
||||
@@ -1,106 +0,0 @@
|
||||
From ffa7ce1e19ec3930de667f213dcaedb7eb10508e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
|
||||
Date: Wed, 28 Feb 2018 10:07:13 +0000
|
||||
Subject: [PATCH] x264enc: fix build with newer x264 with support for multiple
|
||||
bit depths
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
libx264 used to be built for one specific bit depth, and if we
|
||||
wanted to support multiple bit depths we would have to dynamically
|
||||
load the right .so from different paths. That has changed now, and
|
||||
libx264 can include support for multiple depths in the same lib,
|
||||
so we don't need to do the dlopen() dance any more. We'll keep
|
||||
the vtable stuff around until we can drop support for older x264.
|
||||
|
||||
gstx264enc.c:2927:36: error: ‘x264_bit_depth’ undeclared
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=792111
|
||||
|
||||
Upstream: https://cgit.freedesktop.org/gstreamer/gst-plugins-ugly/patch/ext/x264?id=83c38dc44622611c1f67dd26e4cb383c5aef90f6
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
ext/x264/gstx264enc.c | 35 ++++++++++++++++++++++++++++++++++-
|
||||
1 file changed, 34 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c
|
||||
index 4287cf9..d1e4f2b 100644
|
||||
--- a/ext/x264/gstx264enc.c
|
||||
+++ b/ext/x264/gstx264enc.c
|
||||
@@ -117,7 +117,9 @@ struct _GstX264EncVTable
|
||||
{
|
||||
GModule *module;
|
||||
|
||||
+#if X264_BUILD < 153
|
||||
const int *x264_bit_depth;
|
||||
+#endif
|
||||
const int *x264_chroma_format;
|
||||
void (*x264_encoder_close) (x264_t *);
|
||||
int (*x264_encoder_delayed_frames) (x264_t *);
|
||||
@@ -170,8 +172,9 @@ load_x264 (const gchar * filename)
|
||||
"' from '%s'. Incompatible version?", filename);
|
||||
goto error;
|
||||
}
|
||||
-
|
||||
+#if X264_BUILD < 153
|
||||
LOAD_SYMBOL (x264_bit_depth);
|
||||
+#endif
|
||||
LOAD_SYMBOL (x264_chroma_format);
|
||||
LOAD_SYMBOL (x264_encoder_close);
|
||||
LOAD_SYMBOL (x264_encoder_delayed_frames);
|
||||
@@ -288,6 +291,7 @@ gst_x264_enc_add_x264_chroma_format (GstStructure * s,
|
||||
return ret;
|
||||
}
|
||||
|
||||
+#if X264_BUILD < 153
|
||||
static gboolean
|
||||
load_x264_libraries (void)
|
||||
{
|
||||
@@ -326,6 +330,33 @@ load_x264_libraries (void)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
+#else /* X264_BUILD >= 153 */
|
||||
+
|
||||
+static gboolean
|
||||
+load_x264_libraries (void)
|
||||
+{
|
||||
+#if X264_BIT_DEPTH == 0 /* all */
|
||||
+ vtable_8bit = &default_vtable;
|
||||
+ vtable_10bit = &default_vtable;
|
||||
+#elif X264_BIT_DEPTH == 8
|
||||
+ vtable_8bit = &default_vtable;
|
||||
+#elif X264_BIT_DEPTH == 10
|
||||
+ vtable_10bit = &default_vtable;
|
||||
+#else
|
||||
+#error "unexpected X264_BIT_DEPTH value"
|
||||
+#endif
|
||||
+
|
||||
+#ifdef HAVE_X264_ADDITIONAL_LIBRARIES
|
||||
+ GST_WARNING ("Ignoring configured additional libraries %s, using libx264 "
|
||||
+ "version enabled for multiple bit depths",
|
||||
+ HAVE_X264_ADDITIONAL_LIBRARIES);
|
||||
+#endif
|
||||
+
|
||||
+ return TRUE;
|
||||
+}
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
enum
|
||||
{
|
||||
ARG_0,
|
||||
@@ -2897,7 +2928,9 @@ plugin_init (GstPlugin * plugin)
|
||||
* if needed. We can't initialize statically because these values are not
|
||||
* constant on Windows. */
|
||||
default_vtable.module = NULL;
|
||||
+#if X264_BUILD < 153
|
||||
default_vtable.x264_bit_depth = &x264_bit_depth;
|
||||
+#endif
|
||||
default_vtable.x264_chroma_format = &x264_chroma_format;
|
||||
default_vtable.x264_encoder_close = x264_encoder_close;
|
||||
default_vtable.x264_encoder_delayed_frames = x264_encoder_delayed_frames;
|
||||
--
|
||||
2.16.3
|
||||
|
||||
@@ -44,18 +44,6 @@ config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD
|
||||
help
|
||||
Access a DVD with dvdread
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_LAME
|
||||
bool "lame (*.mp3 audio encoder)"
|
||||
select BR2_PACKAGE_LAME
|
||||
help
|
||||
Encode MP3s with LAME
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPG123
|
||||
bool "mpg123 (*.mp3 audio)"
|
||||
select BR2_PACKAGE_MPG123
|
||||
help
|
||||
mp3 decoding based on the mpg123 library
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC
|
||||
bool "mpeg2dec"
|
||||
select BR2_PACKAGE_LIBMPEG2
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.12.4.tar.xz.sha256sum
|
||||
sha256 1c165b8d888ed350acd8e6ac9f6fe06508e6fcc0a3afc6ccc9fbeb30df9be522 gst-plugins-ugly-1.12.4.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.14.4.tar.xz.sha256sum
|
||||
sha256 ac02d837f166c35ff6ce0738e281680d0b90052cfb1f0255dcf6aaca5f0f6d23 gst-plugins-ugly-1.14.4.tar.xz
|
||||
sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_PLUGINS_UGLY_VERSION = 1.12.4
|
||||
GST1_PLUGINS_UGLY_VERSION = 1.14.4
|
||||
GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz
|
||||
GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly
|
||||
GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING
|
||||
@@ -70,20 +70,6 @@ else
|
||||
GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdread
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_LAME),y)
|
||||
GST1_PLUGINS_UGLY_CONF_OPTS += --enable-lame
|
||||
GST1_PLUGINS_UGLY_DEPENDENCIES += lame
|
||||
else
|
||||
GST1_PLUGINS_UGLY_CONF_OPTS += --disable-lame
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPG123),y)
|
||||
GST1_PLUGINS_UGLY_CONF_OPTS += --enable-mpg123
|
||||
GST1_PLUGINS_UGLY_DEPENDENCIES += mpg123
|
||||
else
|
||||
GST1_PLUGINS_UGLY_CONF_OPTS += --disable-mpg123
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC),y)
|
||||
GST1_PLUGINS_UGLY_CONF_OPTS += --enable-mpeg2dec
|
||||
GST1_PLUGINS_UGLY_DEPENDENCIES += libmpeg2
|
||||
|
||||
@@ -1,2 +1,4 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.12.4.tar.xz.sha256sum
|
||||
sha256 7660112ebd59838f1054796b38109dcbe32f0a040e3a252a68a81055aeaa56a9 gst-rtsp-server-1.12.4.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.14.4.tar.xz.sha256sum
|
||||
sha256 3d0ece2afdcd601c175ece24e32a30bc19247b454f4eafd3deeec2533c6884f1 gst-rtsp-server-1.14.4.tar.xz
|
||||
sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING
|
||||
sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_RTSP_SERVER_VERSION = 1.12.4
|
||||
GST1_RTSP_SERVER_VERSION = 1.14.4
|
||||
GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz
|
||||
GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server
|
||||
GST1_RTSP_SERVER_LICENSE = LGPL-2.0+
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.12.4.tar.xz.sha256sum
|
||||
sha256 1c2d77242e1f30c4d1394636cae9f6877228a017960fca96881e0080d8b6e9c9 gstreamer-vaapi-1.12.4.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.14.4.tar.xz.sha256sum
|
||||
sha256 ce18dbfe961c6a8d31270231686075586bf7a7df62b778c8e7f5ec148251d0a3 gstreamer-vaapi-1.14.4.tar.xz
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_VAAPI_VERSION = 1.12.4
|
||||
GST1_VAAPI_VERSION = 1.14.4
|
||||
GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi
|
||||
GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz
|
||||
GST1_VAAPI_LICENSE = LGPL-2.1+
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.12.4.tar.xz.sha256sum
|
||||
sha256 f9da9dfe6e5d6f5ba3b38c5752b42d3f927715904942b405c2924d3cb77afba1 gst-validate-1.12.4.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.14.4.tar.xz.sha256sum
|
||||
sha256 18dccca94bdc0bab3cddb07817bd280df7ab4abbec9a83b92620367a22d955c7 gst-validate-1.14.4.tar.xz
|
||||
sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_VALIDATE_VERSION = 1.12.4
|
||||
GST1_VALIDATE_VERSION = 1.14.4
|
||||
GST1_VALIDATE_SOURCE = gst-validate-$(GST1_VALIDATE_VERSION).tar.xz
|
||||
GST1_VALIDATE_SITE = https://gstreamer.freedesktop.org/src/gst-validate
|
||||
GST1_VALIDATE_LICENSE = LGPL-2.1+
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
From 76f3dcb8f11a240fc7147ab556c57f10abc9e957 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
|
||||
Date: Sun, 20 May 2018 23:46:42 +0100
|
||||
Subject: [PATCH] examples: ges-ui: fix some gtk2-ism
|
||||
|
||||
Still lots of deprecated API to update.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=796243
|
||||
|
||||
Upstream: https://cgit.freedesktop.org/gstreamer/gst-editing-services/commit/?id=76f3dcb8f11a240fc7147ab556c57f10abc9e957
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
examples/c/ges-ui.c | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/examples/c/ges-ui.c b/examples/c/ges-ui.c
|
||||
index 4acd1ee9..45694a6b 100644
|
||||
--- a/examples/c/ges-ui.c
|
||||
+++ b/examples/c/ges-ui.c
|
||||
@@ -106,7 +106,7 @@ static int n_instances = 0;
|
||||
* These are declared non-static for signal auto-connection
|
||||
*/
|
||||
|
||||
-gboolean window_delete_event_cb (GtkObject * window, GdkEvent * event,
|
||||
+gboolean window_delete_event_cb (GtkWidget * window, GdkEvent * event,
|
||||
App * app);
|
||||
void new_activate_cb (GtkMenuItem * item, App * app);
|
||||
void open_activate_cb (GtkMenuItem * item, App * app);
|
||||
@@ -1076,14 +1076,14 @@ gboolean
|
||||
add_effect_dlg_delete_event_cb (GtkWidget * widget, GdkEvent * event,
|
||||
gpointer * app)
|
||||
{
|
||||
- gtk_widget_hide_all (((App *) app)->add_effect_dlg);
|
||||
+ gtk_widget_hide (((App *) app)->add_effect_dlg);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void
|
||||
on_cancel_add_effect_cb (GtkButton * button, App * app)
|
||||
{
|
||||
- gtk_widget_hide_all (app->add_effect_dlg);
|
||||
+ gtk_widget_hide (app->add_effect_dlg);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -1103,7 +1103,7 @@ on_apply_effect_cb (GtkButton * button, App * app)
|
||||
|
||||
gtk_entry_set_text (GTK_ENTRY (app->audio_effect_entry), "");
|
||||
|
||||
- gtk_widget_hide_all (app->add_effect_dlg);
|
||||
+ gtk_widget_hide (app->add_effect_dlg);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -1347,7 +1347,7 @@ app_new_from_uri (gchar * uri)
|
||||
/* UI callbacks ************************************************************/
|
||||
|
||||
gboolean
|
||||
-window_delete_event_cb (GtkObject * window, GdkEvent * event, App * app)
|
||||
+window_delete_event_cb (GtkWidget * window, GdkEvent * event, App * app)
|
||||
{
|
||||
app_dispose (app);
|
||||
return FALSE;
|
||||
--
|
||||
2.19.0
|
||||
|
||||
@@ -3,15 +3,14 @@ config BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES
|
||||
select BR2_PACKAGE_LIBXML2
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE
|
||||
select BR2_PACKAGE_GST1_PLUGINS_GOOD
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BAD
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT # runtime
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER # runtime
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE # runtime
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT # runtime
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC # runtime
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE # runtime
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME # runtime
|
||||
select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE # runtime
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXER # runtime
|
||||
help
|
||||
GStreamer Editing Services is a high-level library for
|
||||
facilitating the creation of audio/video non-linear editors.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.12.4.tar.xz.sha256sum
|
||||
sha256 bd7eaa2c9572db9e7e535064024b6f69250de864fe8a5d5be86fa8c7edacca0c gstreamer-editing-services-1.12.4.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.14.4.tar.xz.sha256sum
|
||||
sha256 53d1d25b356009505ae0d22c218d6c6b1215399d9f6e3fe5d7b88e156531b35f gstreamer-editing-services-1.14.4.tar.xz
|
||||
|
||||
# Hashes for license files:
|
||||
sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GSTREAMER1_EDITING_SERVICES_VERSION = 1.12.4
|
||||
GSTREAMER1_EDITING_SERVICES_VERSION = 1.14.4
|
||||
GSTREAMER1_EDITING_SERVICES_SOURCE = gstreamer-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz
|
||||
GSTREAMER1_EDITING_SERVICES_SITE = http://gstreamer.freedesktop.org/src/gstreamer-editing-services
|
||||
GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+
|
||||
@@ -15,7 +15,6 @@ GSTREAMER1_EDITING_SERVICES_DEPENDENCIES = \
|
||||
gstreamer1 \
|
||||
gst1-plugins-base \
|
||||
gst1-plugins-good \
|
||||
gst1-plugins-bad \
|
||||
$(if $(BR2_PACKAGE_GST1_VALIDATE),gst1-validate) \
|
||||
libxml2
|
||||
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
From 58982c0d28f1eb385319307ee47bd6522c812f22 Mon Sep 17 00:00:00 2001
|
||||
From: Aurelien Jarno <aurelien@aurel32.net>
|
||||
Date: Sun, 15 Apr 2018 00:49:55 +0200
|
||||
Subject: [PATCH] gstconfig.h.in: initial RISC-V support
|
||||
|
||||
RISC-V supports unaligned accesses, but these might run extremely slowly
|
||||
depending on the implementation. Therefore set GST_HAVE_UNALIGNED_ACCESS
|
||||
to 0 on this architecture.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=795271
|
||||
|
||||
Upstream: https://gitlab.freedesktop.org/gstreamer/gstreamer/commit/8a156d1725ecd03f2e8cdc8874e081dda2d3b43d
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
gst/gstconfig.h.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gst/gstconfig.h.in b/gst/gstconfig.h.in
|
||||
index 6351c04da..33dfed1f6 100644
|
||||
--- a/gst/gstconfig.h.in
|
||||
+++ b/gst/gstconfig.h.in
|
||||
@@ -104,7 +104,7 @@
|
||||
* http://docs.oracle.com/cd/E19205-01/820-4155/c++_faq.html#Vers6
|
||||
* https://software.intel.com/en-us/node/583402
|
||||
*/
|
||||
-#if defined(__alpha__) || defined(__arc__) || defined(__arm__) || defined(__aarch64__) || defined(__bfin) || defined(__hppa__) || defined(__nios2__) || defined(__MICROBLAZE__) || defined(__mips__) || defined(__or1k__) || defined(__sh__) || defined(__SH4__) || defined(__sparc__) || defined(__sparc) || defined(__ia64__) || defined(_M_ALPHA) || defined(_M_ARM) || defined(_M_IA64) || defined(__xtensa__) || defined(__e2k__)
|
||||
+#if defined(__alpha__) || defined(__arc__) || defined(__arm__) || defined(__aarch64__) || defined(__bfin) || defined(__hppa__) || defined(__nios2__) || defined(__MICROBLAZE__) || defined(__mips__) || defined(__or1k__) || defined(__sh__) || defined(__SH4__) || defined(__sparc__) || defined(__sparc) || defined(__ia64__) || defined(_M_ALPHA) || defined(_M_ARM) || defined(_M_IA64) || defined(__xtensa__) || defined(__e2k__) || defined(__riscv)
|
||||
# define GST_HAVE_UNALIGNED_ACCESS 0
|
||||
#elif defined(__i386__) || defined(__i386) || defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__ppc__) || defined(__ppc64__) || defined(__powerpc__) || defined(__powerpc64__) || defined(__m68k__) || defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || defined(__s390__) || defined(__s390x__) || defined(__zarch__)
|
||||
# define GST_HAVE_UNALIGNED_ACCESS 1
|
||||
--
|
||||
2.19.1
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.12.4.tar.xz.sha256sum
|
||||
sha256 5a8704aa4c2eeb04da192c4a9942f94f860ac1a585de90d9f914bac26a970674 gstreamer-1.12.4.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.14.4.tar.xz.sha256sum
|
||||
sha256 f94f6696c5f05a3b3a9183e39c5f5c0b779f75a04c0efa497e7920afa985ffc7 gstreamer-1.14.4.tar.xz
|
||||
sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GSTREAMER1_VERSION = 1.12.4
|
||||
GSTREAMER1_VERSION = 1.14.4
|
||||
GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz
|
||||
GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer
|
||||
GSTREAMER1_INSTALL_STAGING = YES
|
||||
@@ -17,6 +17,7 @@ GSTREAMER1_CONF_OPTS = \
|
||||
--disable-failing-tests \
|
||||
--disable-valgrind \
|
||||
--disable-benchmarks \
|
||||
--disable-introspection \
|
||||
$(if $(BR2_PACKAGE_GSTREAMER1_CHECK),,--disable-check) \
|
||||
$(if $(BR2_PACKAGE_GSTREAMER1_TRACE),,--disable-trace) \
|
||||
$(if $(BR2_PACKAGE_GSTREAMER1_PARSE),,--disable-parse) \
|
||||
|
||||
Reference in New Issue
Block a user