jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-01 23:47:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/gstreamer1/gst1-libav: bump to version 1.16.0

Browse Source 
In addition:
  - Allow gst1-libav to use the system ffmpeg, as 1.16.0 is compatible with
    ffmpeg 4.x.

Signed-off-by: Adam Duskett <Aduskett@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Adam Duskett 2019-05-02 11:16:20 -04:00 committed by Peter Korsgaard
parent 4c2825d4c1
commit 463851f067
3 changed files with 13 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/gstreamer1/gst1-libav/Config.in
View File

@ -1,6 +1,8 @@
config BR2_PACKAGE_GST1_LIBAV config BR2_PACKAGE_GST1_LIBAV
bool "gst1-libav" bool "gst1-libav"
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
select BR2_PACKAGE_FFMPEG
select BR2_PACKAGE_FFMPEG_SWSCALE
select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BASE
help help
GStreamer plugin (formerly gst-ffmpeg). GStreamer plugin (formerly gst-ffmpeg).
@ -8,4 +10,7 @@ config BR2_PACKAGE_GST1_LIBAV
This package contains GStreamer plugins based on This package contains GStreamer plugins based on
the libav project. the libav project.
The codecs, muxers, bitstreams and filters to build can be
selected in the ffmpeg package.
http://gstreamer.freedesktop.org/ http://gstreamer.freedesktop.org/

4
package/gstreamer1/gst1-libav/gst1-libav.hash
View File

@ -1,3 +1,3 @@
# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.14.4.tar.xz.sha256sum # From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.16.0.tar.xz.sha256sum
sha256 dfd78591901df7853eab7e56a86c34a1b03635da0d3d56b89aa577f1897865da gst-libav-1.14.4.tar.xz sha256 dfac119043a9cfdcacd7acde77f674ab172cf2537b5812be52f49e9cddc53d9a gst-libav-1.16.0.tar.xz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING

69
package/gstreamer1/gst1-libav/gst1-libav.mk
View File

@ -4,19 +4,20 @@
# #
################################################################################ ################################################################################
GST1_LIBAV_VERSION = 1.14.4 GST1_LIBAV_VERSION = 1.16.0
GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz
GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav
GST1_LIBAV_DEPENDENCIES = \ GST1_LIBAV_DEPENDENCIES = \
host-pkgconf gstreamer1 gst1-plugins-base \ host-pkgconf ffmpeg gstreamer1 gst1-plugins-base \
$(if $(BR2_PACKAGE_BZIP2),bzip2) \ $(if $(BR2_PACKAGE_BZIP2),bzip2) \
$(if $(BR2_PACKAGE_XZ),xz) $(if $(BR2_PACKAGE_XZ),xz)
GST1_LIBAV_LICENSE = GPL-2.0+ GST1_LIBAV_LICENSE = GPL-2.0+
GST1_LIBAV_LICENSE_FILES = COPYING GST1_LIBAV_LICENSE_FILES = COPYING
GST1_LIBAV_CONF_EXTRA_OPTS = --cross-prefix=$(TARGET_CROSS) --target-os=linux GST1_LIBAV_CONF_EXTRA_OPTS = --cross-prefix=$(TARGET_CROSS) --target-os=linux
# fixes arm/powerpc build: https://bugzilla.gnome.org/show_bug.cgi?id=694416 # fixes arm build: https://bugzilla.gnome.org/show_bug.cgi?id=694416
ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be)$(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y) ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be),y)
GST1_LIBAV_CONF_ENV = AS="$(TARGET_CROSS)gcc" GST1_LIBAV_CONF_ENV = AS="$(TARGET_CROSS)gcc"
endif endif
@ -34,66 +35,8 @@ else
GST1_LIBAV_CONF_EXTRA_OPTS += --disable-bzlib GST1_LIBAV_CONF_EXTRA_OPTS += --disable-bzlib
endif endif
# Generic CPU setup for bundled ffmpeg
# Default to --cpu=generic for MIPS architecture, in order to avoid a
# build failure on mips64r6.
ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y)
GST1_LIBAV_CONF_EXTRA_OPTS += --cpu=generic
else ifneq ($(GCC_TARGET_CPU),)
GST1_LIBAV_CONF_EXTRA_OPTS += --cpu=$(GCC_TARGET_CPU)
else ifneq ($(GCC_TARGET_ARCH),)
GST1_LIBAV_CONF_EXTRA_OPTS += --cpu=$(GCC_TARGET_ARCH)
endif
ifeq ($(BR2_X86_CPU_HAS_MMX),y)
GST1_LIBAV_CONF_EXTRA_OPTS += --enable-yasm
GST1_LIBAV_DEPENDENCIES += host-yasm
else
GST1_LIBAV_CONF_EXTRA_OPTS += --disable-yasm
GST1_LIBAV_CONF_EXTRA_OPTS += --disable-mmx
endif
ifeq ($(BR2_X86_CPU_HAS_SSE),y)
GST1_LIBAV_CONF_EXTRA_OPTS += --enable-sse
else
GST1_LIBAV_CONF_EXTRA_OPTS += --disable-sse
endif
ifeq ($(BR2_X86_CPU_HAS_SSSE3),y)
GST1_LIBAV_CONF_EXTRA_OPTS += --enable-ssse3
else
GST1_LIBAV_CONF_EXTRA_OPTS += --disable-ssse3
endif
# Explicitly disable everything that doesn't match for ARM
# FFMPEG "autodetects" by compiling an extended instruction via AS
# This works on compilers that aren't built for generic by default
ifeq ($(BR2_ARM_CPU_ARMV4),y)
GST1_LIBAV_CONF_EXTRA_OPTS += --disable-armv5te
endif
ifeq ($(BR2_ARM_CPU_ARMV6)$(BR2_ARM_CPU_ARMV7A),y)
GST1_LIBAV_CONF_EXTRA_OPTS += --enable-armv6
else
GST1_LIBAV_CONF_EXTRA_OPTS += --disable-armv6 --disable-armv6t2
endif
ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
GST1_LIBAV_CONF_EXTRA_OPTS += --enable-neon
else
GST1_LIBAV_CONF_EXTRA_OPTS += --disable-neon
endif
ifeq ($(BR2_ARM_CPU_HAS_VFPV2),y)
GST1_LIBAV_CONF_EXTRA_OPTS += --enable-vfp
else
GST1_LIBAV_CONF_EXTRA_OPTS += --disable-vfp
endif
ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
GST1_LIBAV_CONF_EXTRA_OPTS += --enable-altivec
else
GST1_LIBAV_CONF_EXTRA_OPTS += --disable-altivec
endif
GST1_LIBAV_CONF_OPTS = \ GST1_LIBAV_CONF_OPTS = \
--with-system-libav \
--with-libav-extra-configure="$(GST1_LIBAV_CONF_EXTRA_OPTS)" --with-libav-extra-configure="$(GST1_LIBAV_CONF_EXTRA_OPTS)"
$(eval $(autotools-package)) $(eval $(autotools-package))