diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index dcee18b8df..97170098be 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,6 +1,5 @@ # Locally calculated -sha256 733984395e0dbbe5c046abda2dc49a5544e7e0e1e2366bba849222ae9e3a03b1 ffmpeg-7.1.1.tar.xz -sha256 8646515b638a3ad303e23af6a3587734447cb8fc0a0c064ecdb8e95c4fd8b389 ffmpeg-7.0.2.tar.xz +sha256 464beb5e7bf0c311e68b45ae2f04e9cc2af88851abb4082231742a74d97b524c ffmpeg-8.1.2.tar.xz sha256 66aead94c3884c9bc1ff2866f44d87f2f61d106bf203e1c723f83170b7e84297 ffmpeg-6dbf87aefd7f491210abe1e043a1c228fa1439a0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1 diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 71d3bba9ae..568c284d4b 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -3,14 +3,12 @@ # ffmpeg # ################################################################################ -# batocera - upgrade to v7.1 (removed patches) so most packages use this version -# use a specialist repo for the RPi 4/5 & -# buildroot 4.4.x moved to a batocera package -ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_BCM2712)$(BR2_PACKAGE_BATOCERA_TARGET_BCM2711),y) - FFMPEG_VERSION = 6dbf87aefd7f491210abe1e043a1c228fa1439a0 +# batocera - uses jc-kynesim's optimized branch for Amlogic +ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_AMLOGIC_ANY),y) + FFMPEG_VERSION = 3a4c4864e5790539ef00eeef8a229dbf19dc62e0 FFMPEG_SITE = $(call github,jc-kynesim,rpi-ffmpeg,$(FFMPEG_VERSION)) else - FFMPEG_VERSION = 7.1.1 + FFMPEG_VERSION = 8.1.2 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = https://ffmpeg.org/releases endif @@ -119,9 +117,10 @@ endif ifeq ($(BR2_PACKAGE_LIBV4L),y) FFMPEG_DEPENDENCIES += libv4l FFMPEG_CONF_OPTS += --enable-libv4l2 -# batocera - rk3568 patches include --enable-v4l2-request support -ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_RK3568),y) -FFMPEG_CONF_OPTS += --enable-v4l2-request +# batocera - patches include --enable-v4l2-request support +ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_RK3568)$(BR2_PACKAGE_BATOCERA_TARGET_RK3576)$(BR2_PACKAGE_BATOCERA_TARGET_RK3588_MAINLINE),y) +FFMPEG_CONF_OPTS += --enable-v4l2-request --enable-libudev +FFMPEG_DEPENDENCIES += udev endif else FFMPEG_CONF_OPTS += --disable-libv4l2 @@ -330,6 +329,7 @@ FFMPEG_CONF_OPTS += --enable-v4l2-request FFMPEG_CONF_OPTS += --enable-libudev FFMPEG_CONF_OPTS += --enable-epoxy FFMPEG_CONF_OPTS += --enable-sand +FFMPEG_DEPENDENCIES += udev endif # To avoid a circular dependency only use opencv if opencv itself does