jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 13:46:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg 3.3 will not work with ffmpeg.mk for 3.4

Browse Source
This commit is contained in:
Calin Crisan 2019-01-14 18:31:43 +02:00
parent eab1f3d03f
commit fbcecf46a7
1 changed files with 12 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
package/ffmpeg/ffmpeg.mk
View File

@ -49,14 +49,18 @@ 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 += host-pkgconf FFMPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf
ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y) ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
FFMPEG_CONF_OPTS += --enable-gpl FFMPEG_CONF_OPTS += --enable-gpl
@ -157,10 +161,7 @@ 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
@ -202,25 +203,18 @@ 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_OPENSSL),y) ifeq ($(BR2_PACKAGE_LIBOPENSSL),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 += openssl FFMPEG_DEPENDENCIES += libopenssl
endif endif
else else
FFMPEG_CONF_OPTS += --disable-openssl FFMPEG_CONF_OPTS += --disable-openssl
@ -231,13 +225,6 @@ 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
@ -267,10 +254,10 @@ else
FFMPEG_CONF_OPTS += --disable-vdpau FFMPEG_CONF_OPTS += --disable-vdpau
endif endif
ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) ifeq ($(BR2_PACKAGE_RPI_FIRMWARE)$(BR2_PACKAGE_RPI_USERLAND),yy)
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-userland FFMPEG_DEPENDENCIES += rpi-firmware 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
@ -357,13 +344,6 @@ 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
@ -381,13 +361,6 @@ 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
@ -403,10 +376,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-x86asm FFMPEG_CONF_OPTS += --enable-yasm
FFMPEG_DEPENDENCIES += host-nasm FFMPEG_DEPENDENCIES += host-yasm
else else
FFMPEG_CONF_OPTS += --disable-x86asm FFMPEG_CONF_OPTS += --disable-yasm
FFMPEG_CONF_OPTS += --disable-mmx FFMPEG_CONF_OPTS += --disable-mmx
endif endif