Index: 4.4.4/Makefile
===================================================================
--- 4.4.4/Makefile (revision 384)
+++ 4.4.4/Makefile (revision 385)
@@ -9,7 +9,12 @@
COMPONENT_TARGETS += $(HARDWARE_NANOPI_NEO)
COMPONENT_TARGETS += $(HARDWARE_ORANGE_PP)
COMPONENT_TARGETS += $(HARDWARE_ORANGE_PL2)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PI5)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PI5B)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PI5P)
+COMPONENT_TARGETS += $(HARDWARE_ROCK_5B)
COMPONENT_TARGETS += $(HARDWARE_WECHIP_TX6)
+COMPONENT_TARGETS += $(HARDWARE_REPKA_PI3)
COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
COMPONENT_TARGETS += $(HARDWARE_POIN2)
COMPONENT_TARGETS += $(HARDWARE_RK3328_CC)
@@ -42,6 +47,7 @@
COMPONENT_TARGETS += $(HARDWARE_TL2SV2)
COMPONENT_TARGETS += $(HARDWARE_TL2WK2_LSB)
COMPONENT_TARGETS += $(HARDWARE_TL2SV2_LSB)
+COMPONENT_TARGETS += $(HARDWARE_VISIONFIVE2)
COMPONENT_TARGETS += $(HARDWARE_SIFIVE_U740)
@@ -48,7 +54,9 @@
NEED_ABS_PATH = true
COMPONENT_IS_3PP = true
+__ENABLE_BAIKAL_M1000_VDEC__ = no
+
include ../../../../build-system/constants.mk
@@ -60,7 +68,7 @@
REQUIRES += X11/libs/libvdpau/1.5
REQUIRES += media/jack2/1.9.21
REQUIRES += libs/gmp/6.2.1
-REQUIRES += net/gnutls/3.7.1
+REQUIRES += net/gnutls/3.8.0
REQUIRES += libs/libtasn1/4.16.0
REQUIRES += media/ladspa/1.17
REQUIRES += media/libass/0.17.0
@@ -101,6 +109,11 @@
REQUIRES += X11/libs/libdrm/2.4.114
REQUIRES += X11/libs/librsvg/2.55.1
REQUIRES += app/bzip2/1.0.8
+ifeq ($(__ENABLE_BAIKAL_M1000_VDEC__),yes)
+ifneq ($(filter $(TOOLCHAIN),$(TOOLCHAIN_M1000_GLIBC)),)
+REQUIRES += hal/drivers/baikal-m1/vdec/6.4-20231227
+endif
+endif
REQUIRES += X11/libs/opengl-collection
@@ -116,6 +129,12 @@
PATCHES = PATCHES
+ifeq ($(__ENABLE_BAIKAL_M1000_VDEC__),yes)
+ifneq ($(filter $(TOOLCHAIN),$(TOOLCHAIN_M1000_GLIBC)),)
+OPT_PATCHES = PATCHES.m1000
+endif
+endif
+
build_dir = $(TARGET_BUILD_DIR)/build
build_target = $(TARGET_BUILD_DIR)/.build_done
install_target = $(TARGET_BUILD_DIR)/.install_done
@@ -182,7 +201,8 @@
ARCH = arm
endif
ifneq ($(filter $(TOOLCHAIN),$(TOOLCHAIN_H5_GLIBC) $(TOOLCHAIN_RK33XX_GLIBC) \
- $(TOOLCHAIN_RK339X_GLIBC) $(TOOLCHAIN_S9XX_GLIBC) \
+ $(TOOLCHAIN_RK339X_GLIBC) $(TOOLCHAIN_RK358X_GLIBC) \
+ $(TOOLCHAIN_S9XX_GLIBC) \
$(TOOLCHAIN_A311X_GLIBC) $(TOOLCHAIN_M1000_GLIBC)),)
ARCH = aarch64
endif
@@ -284,8 +304,8 @@
#
# Component options:
#
-extra_configure_switches += --enable-avresample
+
#
# External library support:
#
@@ -334,8 +354,13 @@
extra_configure_switches += --enable-libxvid
extra_configure_switches += --enable-libzmq
extra_configure_switches += --enable-opengl
+ifeq ($(__ENABLE_BAIKAL_M1000_VDEC__),yes)
+ifneq ($(filter $(TOOLCHAIN),$(TOOLCHAIN_M1000_GLIBC)),)
+extra_configure_switches += --enable-omx
+extra_configure_switches += --enable-omx-img
+endif
+endif
-
CPPFLAGS += -Wno-deprecated-declarations -Wno-unused-but-set-variable
CPPFLAGS += -Wno-unused-result -Wno-strict-overflow -Wno-discarded-qualifiers
CPPFLAGS += -Wno-array-bounds -Wno-unused-function -Wno-undef -Wno-format-truncation
@@ -356,6 +381,11 @@
$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
$(UNPACK_SRC_ARCHIVE)
$(APPLY_PATCHES)
+ifeq ($(__ENABLE_BAIKAL_M1000_VDEC__),yes)
+ifneq ($(filter $(TOOLCHAIN),$(TOOLCHAIN_M1000_GLIBC)),)
+ $(call apply-opt-patches, $(SRC_DIR))
+endif
+endif
@touch $@
$(build_target): $(src_done)
@@ -407,17 +437,17 @@
)
# ======= remove target path from target pkg-config *.pc files =======
@( cd $(FFMPEG_PKG)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
- sed -i "s,$(TARGET_DEST_DIR),,g" libavcodec.pc libavdevice.pc libavfilter.pc \
- libavformat.pc libavresample.pc libavutil.pc \
- libpostproc.pc libswresample.pc libswscale.pc ; \
+ sed -i "s,$(TARGET_DEST_DIR),,g" libavcodec.pc libavdevice.pc libavfilter.pc \
+ libavformat.pc libavutil.pc libpostproc.pc \
+ libswresample.pc libswscale.pc ; \
)
# ======= Install the same to $(TARGET_DEST_DIR) =======
$(call install-into-devenv, $(FFMPEG_PKG))
# ======= tune pkg-config *.pc search path to the target destination for development =======
@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
- sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libavcodec.pc libavdevice.pc libavfilter.pc \
- libavformat.pc libavresample.pc libavutil.pc \
- libpostproc.pc libswresample.pc libswscale.pc ; \
+ sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libavcodec.pc libavdevice.pc libavfilter.pc \
+ libavformat.pc libavutil.pc libpostproc.pc \
+ libswresample.pc libswscale.pc ; \
)
# ======= Strip binaries =======
@( cd $(FFMPEG_PKG) ; \
Index: 4.4.4/PATCHES.m1000
===================================================================
--- 4.4.4/PATCHES.m1000 (nonexistent)
+++ 4.4.4/PATCHES.m1000 (revision 385)
@@ -0,0 +1,2 @@
+
+../../../../sources/packages/m/ffmpeg/patches/ffmpeg-4.4.4-omx-img-decoder.patch -p0
Index: 4.4.4
===================================================================
--- 4.4.4 (revision 384)
+++ 4.4.4 (revision 385)
Property changes on: 4.4.4
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc
Index: 4.4.4-ppc32/Makefile
===================================================================
--- 4.4.4-ppc32/Makefile (revision 384)
+++ 4.4.4-ppc32/Makefile (revision 385)
@@ -22,7 +22,7 @@
REQUIRES += X11/libs/libvdpau/1.5-ppc32
REQUIRES += media/jack2/1.9.21-ppc32
REQUIRES += libs/gmp/6.2.1-ppc32
-REQUIRES += net/gnutls/3.7.1-ppc32
+REQUIRES += net/gnutls/3.8.0-ppc32
REQUIRES += libs/libtasn1/4.16.0-ppc32
REQUIRES += media/ladspa/1.17-ppc32
REQUIRES += media/libass/0.17.0-ppc32
@@ -57,6 +57,7 @@
REQUIRES += libs/libwebp/1.2.2-ppc32
REQUIRES += media/libx264/0.164.20221217-ppc32
REQUIRES += media/x265/3.5-ppc32
+REQUIRES += media/libomxil-bellagio/0.9.3-ppc32
REQUIRES += media/xvidcore/1.3.7-ppc32
REQUIRES += libs/libzmq/4.3.4-ppc32
REQUIRES += X11/X.org/xcb/libxcb/1.15-ppc32
@@ -190,11 +191,13 @@
extra_configure_switches += --enable-version3
extra_configure_switches += --disable-debug
extra_configure_switches += --disable-stripping
+
+
#
# Component options:
#
-extra_configure_switches += --enable-avresample
+
#
# External library support:
#
@@ -242,6 +245,7 @@
extra_configure_switches += --enable-libxvid
extra_configure_switches += --enable-libzmq
extra_configure_switches += --enable-opengl
+extra_configure_switches += --enable-omx
CPPFLAGS += -Wno-deprecated-declarations -Wno-unused-but-set-variable
@@ -278,17 +282,17 @@
@rm -rf $(FFMPEG_32_PKG)/usr/share
# ======= remove target path from target pkg-config *.pc files =======
@( cd $(FFMPEG_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/pkgconfig ; \
- sed -i "s,$(TARGET_DEST_DIR),,g" libavcodec.pc libavdevice.pc libavfilter.pc \
- libavformat.pc libavresample.pc libavutil.pc \
- libpostproc.pc libswresample.pc libswscale.pc ; \
+ sed -i "s,$(TARGET_DEST_DIR),,g" libavcodec.pc libavdevice.pc libavfilter.pc \
+ libavformat.pc libavutil.pc libpostproc.pc \
+ libswresample.pc libswscale.pc ; \
)
# ======= Install the same to $(TARGET_DEST_DIR) =======
$(call install-into-devenv, $(FFMPEG_32_PKG))
# ======= tune pkg-config *.pc search path to the target destination for development =======
@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_PPC32_SUFFIX)/pkgconfig ; \
- sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libavcodec.pc libavdevice.pc libavfilter.pc \
- libavformat.pc libavresample.pc libavutil.pc \
- libpostproc.pc libswresample.pc libswscale.pc ; \
+ sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libavcodec.pc libavdevice.pc libavfilter.pc \
+ libavformat.pc libavutil.pc libpostproc.pc \
+ libswresample.pc libswscale.pc ; \
)
# ======= Strip binaries =======
@( cd $(FFMPEG_32_PKG) ; \
Index: 4.4.4-ppc32
===================================================================
--- 4.4.4-ppc32 (revision 384)
+++ 4.4.4-ppc32 (revision 385)
Property changes on: 4.4.4-ppc32
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc
Index: 4.4.4-x86_32/Makefile
===================================================================
--- 4.4.4-x86_32/Makefile (revision 384)
+++ 4.4.4-x86_32/Makefile (revision 385)
@@ -19,7 +19,7 @@
REQUIRES += X11/libs/libvdpau/1.5-x86_32
REQUIRES += media/jack2/1.9.21-x86_32
REQUIRES += libs/gmp/6.2.1-x86_32
-REQUIRES += net/gnutls/3.7.1-x86_32
+REQUIRES += net/gnutls/3.8.0-x86_32
REQUIRES += libs/libtasn1/4.16.0-x86_32
REQUIRES += media/ladspa/1.17-x86_32
REQUIRES += media/libass/0.17.0-x86_32
@@ -54,6 +54,7 @@
REQUIRES += libs/libwebp/1.2.2-x86_32
REQUIRES += media/libx264/0.164.20221217-x86_32
REQUIRES += media/x265/3.5-x86_32
+REQUIRES += media/libomxil-bellagio/0.9.3-x86_32
REQUIRES += media/xvidcore/1.3.7-x86_32
REQUIRES += libs/libzmq/4.3.4-x86_32
REQUIRES += X11/X.org/xcb/libxcb/1.15-x86_32
@@ -196,11 +197,13 @@
extra_configure_switches += --enable-version3
extra_configure_switches += --disable-debug
extra_configure_switches += --disable-stripping
+
+
#
# Component options:
#
-extra_configure_switches += --enable-avresample
+
#
# External library support:
#
@@ -248,6 +251,7 @@
extra_configure_switches += --enable-libxvid
extra_configure_switches += --enable-libzmq
extra_configure_switches += --enable-opengl
+extra_configure_switches += --enable-omx
CPPFLAGS += -Wno-deprecated-declarations -Wno-unused-but-set-variable
@@ -281,17 +285,17 @@
@rm -rf $(FFMPEG_32_PKG)/usr/share
# ======= remove target path from target pkg-config *.pc files =======
@( cd $(FFMPEG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
- sed -i "s,$(TARGET_DEST_DIR),,g" libavcodec.pc libavdevice.pc libavfilter.pc \
- libavformat.pc libavresample.pc libavutil.pc \
- libpostproc.pc libswresample.pc libswscale.pc ; \
+ sed -i "s,$(TARGET_DEST_DIR),,g" libavcodec.pc libavdevice.pc libavfilter.pc \
+ libavformat.pc libavutil.pc libpostproc.pc \
+ libswresample.pc libswscale.pc ; \
)
# ======= Install the same to $(TARGET_DEST_DIR) =======
$(call install-into-devenv, $(FFMPEG_32_PKG))
# ======= tune pkg-config *.pc search path to the target destination for development =======
@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
- sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libavcodec.pc libavdevice.pc libavfilter.pc \
- libavformat.pc libavresample.pc libavutil.pc \
- libpostproc.pc libswresample.pc libswscale.pc ; \
+ sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libavcodec.pc libavdevice.pc libavfilter.pc \
+ libavformat.pc libavutil.pc libpostproc.pc \
+ libswresample.pc libswscale.pc ; \
)
# ======= Strip binaries =======
@( cd $(FFMPEG_32_PKG) ; \
Index: 4.4.4-x86_32
===================================================================
--- 4.4.4-x86_32 (revision 384)
+++ 4.4.4-x86_32 (revision 385)
Property changes on: 4.4.4-x86_32
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc