mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 06:06:32 +00:00
ffmpeg: upgrade (again) to 3.4.4
This commit is contained in:
parent
3d29923f1a
commit
15e0f2bbd2
34
package/ffmpeg/0001-ffmpeg-pthreads.patch
Normal file
34
package/ffmpeg/0001-ffmpeg-pthreads.patch
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
From patchwork Wed Oct 25 13:32:36 2017
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
Subject: [FFmpeg-devel] configure: v4l2_m2m depends on pthreads
|
||||||
|
From: Mark Thompson <sw@jkqxz.net>
|
||||||
|
X-Patchwork-Id: 5688
|
||||||
|
Message-Id: <27e5b360-1210-d550-c8de-a761f8e9f326@jkqxz.net>
|
||||||
|
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
|
||||||
|
Date: Wed, 25 Oct 2017 14:32:36 +0100
|
||||||
|
|
||||||
|
Fixes build with --disable-pthreads.
|
||||||
|
|
||||||
|
Downloaded from upstream patchworks:
|
||||||
|
https://patchwork.ffmpeg.org/patch/5688/
|
||||||
|
|
||||||
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||||
|
---
|
||||||
|
configure | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/configure b/configure
|
||||||
|
index c86e578..76523c8 100755
|
||||||
|
--- a/configure
|
||||||
|
+++ b/configure
|
||||||
|
@@ -2780,7 +2780,7 @@ omx_rpi_select="omx"
|
||||||
|
qsvdec_select="qsv"
|
||||||
|
qsvenc_select="qsv"
|
||||||
|
vaapi_encode_deps="vaapi"
|
||||||
|
-v4l2_m2m_deps_any="linux_videodev2_h"
|
||||||
|
+v4l2_m2m_deps="linux_videodev2_h pthreads"
|
||||||
|
|
||||||
|
hwupload_cuda_filter_deps="cuda"
|
||||||
|
scale_npp_filter_deps="cuda libnpp"
|
@ -1,5 +1,5 @@
|
|||||||
# Locally calculated
|
# Locally calculated
|
||||||
sha256 ae34f14fffa65a1a59b256737ca9af7bf4e296b7c4320d42512350126ce06c84 ffmpeg-3.3.9.tar.xz
|
sha256 386f7601e865df6bddde05bb6927119b5a853f0b92e2e9834f59c125a17d3fc6 ffmpeg-3.4.4.tar.xz
|
||||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2
|
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2
|
||||||
sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1
|
sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1
|
||||||
sha256 73d99bc83313fff665b426d6672b4e0479102bc402fe22314ac9ce94a38aa5ff LICENSE.md
|
sha256 73d99bc83313fff665b426d6672b4e0479102bc402fe22314ac9ce94a38aa5ff LICENSE.md
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
FFMPEG_VERSION = 3.3.9
|
FFMPEG_VERSION = 3.4.4
|
||||||
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
|
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
|
||||||
FFMPEG_SITE = http://ffmpeg.org/releases
|
FFMPEG_SITE = http://ffmpeg.org/releases
|
||||||
FFMPEG_INSTALL_STAGING = YES
|
FFMPEG_INSTALL_STAGING = YES
|
||||||
@ -49,18 +49,14 @@ FFMPEG_CONF_OPTS = \
|
|||||||
--disable-frei0r \
|
--disable-frei0r \
|
||||||
--disable-libopencore-amrnb \
|
--disable-libopencore-amrnb \
|
||||||
--disable-libopencore-amrwb \
|
--disable-libopencore-amrwb \
|
||||||
--disable-libcdio \
|
|
||||||
--disable-libdc1394 \
|
--disable-libdc1394 \
|
||||||
--disable-libgsm \
|
--disable-libgsm \
|
||||||
--disable-libilbc \
|
--disable-libilbc \
|
||||||
--disable-libnut \
|
|
||||||
--disable-libopenjpeg \
|
|
||||||
--disable-libschroedinger \
|
|
||||||
--disable-libvo-amrwbenc \
|
--disable-libvo-amrwbenc \
|
||||||
--disable-symver \
|
--disable-symver \
|
||||||
--disable-doc
|
--disable-doc
|
||||||
|
|
||||||
FFMPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf
|
FFMPEG_DEPENDENCIES += host-pkgconf
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
|
ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
|
||||||
FFMPEG_CONF_OPTS += --enable-gpl
|
FFMPEG_CONF_OPTS += --enable-gpl
|
||||||
@ -161,7 +157,10 @@ endif
|
|||||||
ifeq ($(BR2_PACKAGE_FFMPEG_INDEVS),y)
|
ifeq ($(BR2_PACKAGE_FFMPEG_INDEVS),y)
|
||||||
FFMPEG_CONF_OPTS += --enable-indevs
|
FFMPEG_CONF_OPTS += --enable-indevs
|
||||||
ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
|
ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
|
||||||
|
FFMPEG_CONF_OPTS += --enable-alsa
|
||||||
FFMPEG_DEPENDENCIES += alsa-lib
|
FFMPEG_DEPENDENCIES += alsa-lib
|
||||||
|
else
|
||||||
|
FFMPEG_CONF_OPTS += --disable-alsa
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
FFMPEG_CONF_OPTS += --disable-indevs
|
FFMPEG_CONF_OPTS += --disable-indevs
|
||||||
@ -203,18 +202,25 @@ else
|
|||||||
FFMPEG_CONF_OPTS += --disable-libfdk-aac
|
FFMPEG_CONF_OPTS += --disable-libfdk-aac
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(BR2_PACKAGE_FFMPEG_GPL)$(BR2_PACKAGE_LIBCDIO_PARANOIA),yy)
|
||||||
|
FFMPEG_CONF_OPTS += --enable-libcdio
|
||||||
|
FFMPEG_DEPENDENCIES += libcdio-paranoia
|
||||||
|
else
|
||||||
|
FFMPEG_CONF_OPTS += --disable-libcdio
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_GNUTLS),y)
|
ifeq ($(BR2_PACKAGE_GNUTLS),y)
|
||||||
FFMPEG_CONF_OPTS += --enable-gnutls --disable-openssl
|
FFMPEG_CONF_OPTS += --enable-gnutls --disable-openssl
|
||||||
FFMPEG_DEPENDENCIES += gnutls
|
FFMPEG_DEPENDENCIES += gnutls
|
||||||
else
|
else
|
||||||
FFMPEG_CONF_OPTS += --disable-gnutls
|
FFMPEG_CONF_OPTS += --disable-gnutls
|
||||||
ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
|
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||||
# openssl isn't license compatible with GPL
|
# openssl isn't license compatible with GPL
|
||||||
ifeq ($(BR2_PACKAGE_FFMPEG_GPL)x$(BR2_PACKAGE_FFMPEG_NONFREE),yx)
|
ifeq ($(BR2_PACKAGE_FFMPEG_GPL)x$(BR2_PACKAGE_FFMPEG_NONFREE),yx)
|
||||||
FFMPEG_CONF_OPTS += --disable-openssl
|
FFMPEG_CONF_OPTS += --disable-openssl
|
||||||
else
|
else
|
||||||
FFMPEG_CONF_OPTS += --enable-openssl
|
FFMPEG_CONF_OPTS += --enable-openssl
|
||||||
FFMPEG_DEPENDENCIES += libopenssl
|
FFMPEG_DEPENDENCIES += openssl
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
FFMPEG_CONF_OPTS += --disable-openssl
|
FFMPEG_CONF_OPTS += --disable-openssl
|
||||||
@ -225,6 +231,13 @@ ifeq ($(BR2_PACKAGE_FFMPEG_GPL)$(BR2_PACKAGE_LIBEBUR128),yy)
|
|||||||
FFMPEG_DEPENDENCIES += libebur128
|
FFMPEG_DEPENDENCIES += libebur128
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(BR2_PACKAGE_LIBDRM),y)
|
||||||
|
FFMPEG_CONF_OPTS += --enable-libdrm
|
||||||
|
FFMPEG_DEPENDENCIES += libdrm
|
||||||
|
else
|
||||||
|
FFMPEG_CONF_OPTS += --disable-libdrm
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_LIBOPENH264),y)
|
ifeq ($(BR2_PACKAGE_LIBOPENH264),y)
|
||||||
FFMPEG_CONF_OPTS += --enable-libopenh264
|
FFMPEG_CONF_OPTS += --enable-libopenh264
|
||||||
FFMPEG_DEPENDENCIES += libopenh264
|
FFMPEG_DEPENDENCIES += libopenh264
|
||||||
@ -254,10 +267,10 @@ else
|
|||||||
FFMPEG_CONF_OPTS += --disable-vdpau
|
FFMPEG_CONF_OPTS += --disable-vdpau
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_RPI_FIRMWARE)$(BR2_PACKAGE_RPI_USERLAND),yy)
|
ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
|
||||||
FFMPEG_CONF_OPTS += --enable-mmal --enable-omx --enable-omx-rpi \
|
FFMPEG_CONF_OPTS += --enable-mmal --enable-omx --enable-omx-rpi \
|
||||||
--extra-cflags=-I$(STAGING_DIR)/usr/include/IL
|
--extra-cflags=-I$(STAGING_DIR)/usr/include/IL
|
||||||
FFMPEG_DEPENDENCIES += rpi-firmware rpi-userland
|
FFMPEG_DEPENDENCIES += rpi-userland
|
||||||
else
|
else
|
||||||
FFMPEG_CONF_OPTS += --disable-mmal --disable-omx --disable-omx-rpi
|
FFMPEG_CONF_OPTS += --disable-mmal --disable-omx --disable-omx-rpi
|
||||||
endif
|
endif
|
||||||
@ -344,6 +357,13 @@ else
|
|||||||
FFMPEG_CONF_OPTS += --disable-libwavpack
|
FFMPEG_CONF_OPTS += --disable-libwavpack
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(BR2_PACKAGE_LIBICONV),y)
|
||||||
|
FFMPEG_CONF_OPTS += --enable-iconv
|
||||||
|
FFMPEG_DEPENDENCIES += libiconv
|
||||||
|
else
|
||||||
|
FFMPEG_CONF_OPTS += --disable-iconv
|
||||||
|
endif
|
||||||
|
|
||||||
# ffmpeg freetype support require fenv.h which is only
|
# ffmpeg freetype support require fenv.h which is only
|
||||||
# available/working on glibc.
|
# available/working on glibc.
|
||||||
# The microblaze variant doesn't provide the needed exceptions
|
# The microblaze variant doesn't provide the needed exceptions
|
||||||
@ -361,6 +381,13 @@ else
|
|||||||
FFMPEG_CONF_OPTS += --disable-fontconfig
|
FFMPEG_CONF_OPTS += --disable-fontconfig
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(BR2_PACKAGE_OPENJPEG),y)
|
||||||
|
FFMPEG_CONF_OPTS += --enable-libopenjpeg
|
||||||
|
FFMPEG_DEPENDENCIES += openjpeg
|
||||||
|
else
|
||||||
|
FFMPEG_CONF_OPTS += --disable-libopenjpeg
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_X264)$(BR2_PACKAGE_FFMPEG_GPL),yy)
|
ifeq ($(BR2_PACKAGE_X264)$(BR2_PACKAGE_FFMPEG_GPL),yy)
|
||||||
FFMPEG_CONF_OPTS += --enable-libx264
|
FFMPEG_CONF_OPTS += --enable-libx264
|
||||||
FFMPEG_DEPENDENCIES += x264
|
FFMPEG_DEPENDENCIES += x264
|
||||||
@ -376,10 +403,10 @@ FFMPEG_CONF_OPTS += --disable-libx265
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(BR2_X86_CPU_HAS_MMX),y)
|
ifeq ($(BR2_X86_CPU_HAS_MMX),y)
|
||||||
FFMPEG_CONF_OPTS += --enable-yasm
|
FFMPEG_CONF_OPTS += --enable-x86asm
|
||||||
FFMPEG_DEPENDENCIES += host-yasm
|
FFMPEG_DEPENDENCIES += host-nasm
|
||||||
else
|
else
|
||||||
FFMPEG_CONF_OPTS += --disable-yasm
|
FFMPEG_CONF_OPTS += --disable-x86asm
|
||||||
FFMPEG_CONF_OPTS += --disable-mmx
|
FFMPEG_CONF_OPTS += --disable-mmx
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user