[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-306-gb2882469b
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-306-gb2882469b
|
From: Sébastien S. <ss...@us...> - 2022-01-12 13:28:57
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via b2882469b5f1614f2d05e407c295a1567651084c (commit)
via 0df0e4b8858286f50005d7aff54fb934597fd77b (commit)
from 146369119af2a0cd9c1ee7b92d9d10da38e0d999 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b2882469b5f1614f2d05e407c295a1567651084c
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Jan 12 14:26:12 2022 +0100
[BUILDROOT] opos8mm: patches and update config to have gst VPU plugins
* New packages
* Use Buildroot toolchain
commit 0df0e4b8858286f50005d7aff54fb934597fd77b
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Jan 12 11:59:36 2022 +0100
[BUILDROOT] Bump BR to 2021.02.8
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
buildroot/configs/opos8mm-legacy-5.10_defconfig | 13 +-
...-package-stress-ng-bump-to-version-0.13.1.patch | 25 ++-
...package-stress-ng-bump-to-version-0.13.05.patch | 39 +---
.../410-package-pcre-bump-to-version-8.45.patch | 29 ++-
.../412-package-libimxdmabuffer-new-package.patch | 171 +++++++++++++++++
.../2021.02/412-package-pcre-fix-broken-URL.patch | 30 ---
.../413-package-libimxvpuapi2-new-package.patch | 139 ++++++++++++++
...-package-gstreamer1-gst1-imx2-new-package.patch | 208 +++++++++++++++++++++
patches/buildroot/2021.02/cleanup_buildroot.sh | 11 +-
10 files changed, 574 insertions(+), 93 deletions(-)
create mode 100644 patches/buildroot/2021.02/412-package-libimxdmabuffer-new-package.patch
delete mode 100644 patches/buildroot/2021.02/412-package-pcre-fix-broken-URL.patch
create mode 100644 patches/buildroot/2021.02/413-package-libimxvpuapi2-new-package.patch
create mode 100644 patches/buildroot/2021.02/414-package-gstreamer1-gst1-imx2-new-package.patch
diff --git a/Makefile b/Makefile
index 53d8ff56c..93619dd95 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2021.02
-BUILDROOT_MINOR_VERSION ?= 7
+BUILDROOT_MINOR_VERSION ?= 8
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
diff --git a/buildroot/configs/opos8mm-legacy-5.10_defconfig b/buildroot/configs/opos8mm-legacy-5.10_defconfig
index 61c41323a..fb2b3850a 100644
--- a/buildroot/configs/opos8mm-legacy-5.10_defconfig
+++ b/buildroot/configs/opos8mm-legacy-5.10_defconfig
@@ -3,8 +3,8 @@ BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_TOOLCHAIN_EXTERNAL=y
-BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY=y
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_TARGET_GENERIC_HOSTNAME="opos8mm"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
@@ -62,8 +62,13 @@ BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
BR2_PACKAGE_GST1_PLUGINS_BAD=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BAYER=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS=y
BR2_PACKAGE_GST1_PLUGINS_UGLY=y
+BR2_PACKAGE_GST1_IMX2=y
+BR2_PACKAGE_GST1_IMX2_G2D=y
+BR2_PACKAGE_GST1_IMX2_VPU=y
BR2_PACKAGE_GST1_LIBAV=y
BR2_PACKAGE_GST1_RTSP_SERVER=y
BR2_PACKAGE_YAVTA=y
@@ -100,6 +105,7 @@ BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_HWDATA_IAB_OUI_TXT=y
BR2_PACKAGE_HWDATA_PNP_IDS=y
BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_LIBIMXDMABUFFER=y
BR2_PACKAGE_SPI_TOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
@@ -110,6 +116,9 @@ BR2_PACKAGE_LIBGPIOD_TOOLS=y
BR2_PACKAGE_LIBV4L=y
BR2_PACKAGE_LIBV4L_UTILS=y
BR2_PACKAGE_TSLIB=y
+BR2_PACKAGE_LIBIMXVPUAPI2=y
+BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM=y
+BR2_PACKAGE_LIBTIRPC=y
BR2_PACKAGE_BLUEZ_TOOLS=y
BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_OBEX=y
diff --git a/patches/buildroot/2021.02/408-package-stress-ng-bump-to-version-0.13.1.patch b/patches/buildroot/2021.02/408-package-stress-ng-bump-to-version-0.13.1.patch
index e3886b348..521914af3 100644
--- a/patches/buildroot/2021.02/408-package-stress-ng-bump-to-version-0.13.1.patch
+++ b/patches/buildroot/2021.02/408-package-stress-ng-bump-to-version-0.13.1.patch
@@ -27,28 +27,25 @@ Signed-off-by: Sébastien Szymanski <seb...@ar...>
package/stress-ng/stress-ng.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/package/stress-ng/stress-ng.hash b/package/stress-ng/stress-ng.hash
-index 41e2801915..f3eb76fa82 100644
---- a/package/stress-ng/stress-ng.hash
-+++ b/package/stress-ng/stress-ng.hash
+Index: buildroot/package/stress-ng/stress-ng.hash
+===================================================================
+--- buildroot.orig/package/stress-ng/stress-ng.hash
++++ buildroot/package/stress-ng/stress-ng.hash
@@ -1,3 +1,3 @@
# Locally calculated
--sha256 f847be115f60d3ad7d37c806fd1bfb1412aa3c631fca581d6dc233322f50d6a5 stress-ng-0.12.02.tar.xz
+-sha256 0b4557a511be985dfacccc23f1782620b217b1172cdc276a8eee82872b8258c5 stress-ng-0.12.02.tar.gz
+sha256 f37f739e4d15343360a47980b67dc8b2a6bf3d4d3ef727d55e2dd99a0b64f9ea stress-ng-0.13.01.tar.xz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
-diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk
-index 53d7b7e5b7..e0b385e756 100644
---- a/package/stress-ng/stress-ng.mk
-+++ b/package/stress-ng/stress-ng.mk
+Index: buildroot/package/stress-ng/stress-ng.mk
+===================================================================
+--- buildroot.orig/package/stress-ng/stress-ng.mk
++++ buildroot/package/stress-ng/stress-ng.mk
@@ -4,7 +4,7 @@
#
################################################################################
-STRESS_NG_VERSION = 0.12.02
+STRESS_NG_VERSION = 0.13.01
- STRESS_NG_SOURCE = stress-ng-$(STRESS_NG_VERSION).tar.xz
- STRESS_NG_SITE = https://kernel.ubuntu.com/~cking/tarballs/stress-ng
+ STRESS_NG_SITE = $(call github,ColinIanKing,stress-ng,V$(STRESS_NG_VERSION))
STRESS_NG_LICENSE = GPL-2.0+
---
-2.32.0
-
+ STRESS_NG_LICENSE_FILES = COPYING
diff --git a/patches/buildroot/2021.02/409-package-stress-ng-bump-to-version-0.13.05.patch b/patches/buildroot/2021.02/409-package-stress-ng-bump-to-version-0.13.05.patch
index 7d2ca8766..7ea42e487 100644
--- a/patches/buildroot/2021.02/409-package-stress-ng-bump-to-version-0.13.05.patch
+++ b/patches/buildroot/2021.02/409-package-stress-ng-bump-to-version-0.13.05.patch
@@ -21,44 +21,25 @@ Signed-off-by: Sébastien Szymanski <seb...@ar...>
package/stress-ng/stress-ng.mk | 5 ++---
3 files changed, 4 insertions(+), 5 deletions(-)
-diff --git a/package/stress-ng/Config.in b/package/stress-ng/Config.in
-index 64b473b75c..839cbb1cc0 100644
---- a/package/stress-ng/Config.in
-+++ b/package/stress-ng/Config.in
-@@ -12,7 +12,7 @@ config BR2_PACKAGE_STRESS_NG
- subsystems of a computer as well as the various operating
- system kernel interfaces.
-
-- http://kernel.ubuntu.com/~cking/stress-ng/
-+ https://github.com/ColinIanKing/stress-ng
-
- comment "stress-ng needs a toolchain w/ headers >= 3.3"
- depends on !BR2_nios2 && !BR2_arc
-diff --git a/package/stress-ng/stress-ng.hash b/package/stress-ng/stress-ng.hash
-index f3eb76fa82..2e3f998769 100644
---- a/package/stress-ng/stress-ng.hash
-+++ b/package/stress-ng/stress-ng.hash
+Index: buildroot/package/stress-ng/stress-ng.hash
+===================================================================
+--- buildroot.orig/package/stress-ng/stress-ng.hash
++++ buildroot/package/stress-ng/stress-ng.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 f37f739e4d15343360a47980b67dc8b2a6bf3d4d3ef727d55e2dd99a0b64f9ea stress-ng-0.13.01.tar.xz
+sha256 3de49e1100866634f549e99c1644283d0cde817b844a69dcf7f80afa2227d350 stress-ng-0.13.05.tar.gz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
-diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk
-index e0b385e756..0b2287c7fb 100644
---- a/package/stress-ng/stress-ng.mk
-+++ b/package/stress-ng/stress-ng.mk
-@@ -4,9 +4,8 @@
+Index: buildroot/package/stress-ng/stress-ng.mk
+===================================================================
+--- buildroot.orig/package/stress-ng/stress-ng.mk
++++ buildroot/package/stress-ng/stress-ng.mk
+@@ -4,7 +4,7 @@
#
################################################################################
-STRESS_NG_VERSION = 0.13.01
--STRESS_NG_SOURCE = stress-ng-$(STRESS_NG_VERSION).tar.xz
--STRESS_NG_SITE = https://kernel.ubuntu.com/~cking/tarballs/stress-ng
+STRESS_NG_VERSION = 0.13.05
-+STRESS_NG_SITE = $(call github,ColinIanKing,stress-ng,V$(STRESS_NG_VERSION))
+ STRESS_NG_SITE = $(call github,ColinIanKing,stress-ng,V$(STRESS_NG_VERSION))
STRESS_NG_LICENSE = GPL-2.0+
STRESS_NG_LICENSE_FILES = COPYING
-
---
-2.32.0
-
diff --git a/patches/buildroot/2021.02/410-package-pcre-bump-to-version-8.45.patch b/patches/buildroot/2021.02/410-package-pcre-bump-to-version-8.45.patch
index 931447b73..f4f7c39c2 100644
--- a/patches/buildroot/2021.02/410-package-pcre-bump-to-version-8.45.patch
+++ b/patches/buildroot/2021.02/410-package-pcre-bump-to-version-8.45.patch
@@ -11,10 +11,10 @@ Signed-off-by: Peter Korsgaard <pe...@ko...>
package/pcre/pcre.mk | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
-diff --git a/package/pcre/0002-Disable-C-unit-tests.patch b/package/pcre/0002-Disable-C-unit-tests.patch
-index c5c1a49f23..1c9f26eb2e 100644
---- a/package/pcre/0002-Disable-C-unit-tests.patch
-+++ b/package/pcre/0002-Disable-C-unit-tests.patch
+Index: buildroot/package/pcre/0002-Disable-C-unit-tests.patch
+===================================================================
+--- buildroot.orig/package/pcre/0002-Disable-C-unit-tests.patch
++++ buildroot/package/pcre/0002-Disable-C-unit-tests.patch
@@ -27,16 +27,16 @@ index 6d03912..2c42b3e 100644
@WITH_GCOV_TRUE@@WITH_PCRE_CPP_TRUE@am__append_25 = $(GCOV_CXXFLAGS)
@WITH_GCOV_TRUE@@WITH_PCRE_CPP_TRUE@am__append_26 = $(GCOV_LIBS)
@@ -36,29 +36,26 @@ index c5c1a49f23..1c9f26eb2e 100644
--
2.7.3
-diff --git a/package/pcre/pcre.hash b/package/pcre/pcre.hash
-index 628d617353..a84d63e1bc 100644
---- a/package/pcre/pcre.hash
-+++ b/package/pcre/pcre.hash
+Index: buildroot/package/pcre/pcre.hash
+===================================================================
+--- buildroot.orig/package/pcre/pcre.hash
++++ buildroot/package/pcre/pcre.hash
@@ -1,4 +1,4 @@
# Locally calculated after checking pgp signature
-sha256 19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d pcre-8.44.tar.bz2
+sha256 4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8 pcre-8.45.tar.bz2
# License files, locally calculated
sha256 0dd9c13864dbb9ee4d77a1557e96be29b2d719fb6584192ee36611aae264c4a3 LICENCE
-diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
-index c8498b7acf..264eaa10c7 100644
---- a/package/pcre/pcre.mk
-+++ b/package/pcre/pcre.mk
+Index: buildroot/package/pcre/pcre.mk
+===================================================================
+--- buildroot.orig/package/pcre/pcre.mk
++++ buildroot/package/pcre/pcre.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PCRE_VERSION = 8.44
+PCRE_VERSION = 8.45
- PCRE_SITE = https://ftp.pcre.org/pub/pcre
+ PCRE_SITE = http://downloads.sourceforge.net/project/pcre/pcre/$(PCRE_VERSION)
PCRE_SOURCE = pcre-$(PCRE_VERSION).tar.bz2
PCRE_LICENSE = BSD-3-Clause
---
-2.32.0
-
diff --git a/patches/buildroot/2021.02/412-package-libimxdmabuffer-new-package.patch b/patches/buildroot/2021.02/412-package-libimxdmabuffer-new-package.patch
new file mode 100644
index 000000000..7c3673277
--- /dev/null
+++ b/patches/buildroot/2021.02/412-package-libimxdmabuffer-new-package.patch
@@ -0,0 +1,171 @@
+From 255b54dc43140393bda5fb7dd688719f1c3378b7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Tue, 4 Jan 2022 16:58:30 +0100
+Subject: [PATCH 1/3] package/libimxdmabuffer: new package
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Library for allocating and managing physically contiguous memory ("DMA
+memory" or "DMA buffers") on i.MX devices.
+Needed for libimxvpuapi2 and gst1-imx2.
+The user has to choose an allocator depending on the i.MX device.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ package/Config.in | 1 +
+ package/libimxdmabuffer/Config.in | 59 ++++++++++++++++++++
+ package/libimxdmabuffer/libimxdmabuffer.hash | 3 +
+ package/libimxdmabuffer/libimxdmabuffer.mk | 51 +++++++++++++++++
+ 4 files changed, 114 insertions(+)
+ create mode 100644 package/libimxdmabuffer/Config.in
+ create mode 100644 package/libimxdmabuffer/libimxdmabuffer.hash
+ create mode 100644 package/libimxdmabuffer/libimxdmabuffer.mk
+
+diff --git a/package/Config.in b/package/Config.in
+index 59297c3f3d..8d844aa11e 100644
+--- a/package/Config.in
++++ b/package/Config.in
+@@ -505,6 +505,7 @@ endmenu
+ source "package/kbd/Config.in"
+ source "package/lcdproc/Config.in"
+ source "package/libiec61850/Config.in"
++ source "package/libimxdmabuffer/Config.in"
+ source "package/libubootenv/Config.in"
+ source "package/libuio/Config.in"
+ source "package/linux-backports/Config.in"
+diff --git a/package/libimxdmabuffer/Config.in b/package/libimxdmabuffer/Config.in
+new file mode 100644
+index 0000000000..9e81a69123
+--- /dev/null
++++ b/package/libimxdmabuffer/Config.in
+@@ -0,0 +1,59 @@
++comment "libimxdmabuffer needs an imx-specific Linux kernel to be built"
++ depends on (BR2_arm || BR2_aarch64) && !BR2_LINUX_KERNEL
++
++config BR2_PACKAGE_LIBIMXDMABUFFER
++ bool "libimxdmabuffer"
++ depends on BR2_arm || BR2_aarch64 # Only relevant for i.MX
++ depends on BR2_LINUX_KERNEL
++ help
++ Library for allocating and managing physically contiguous
++ memory ("DMA memory" or "DMA buffers") on i.MX devices.
++
++ It requires a kernel that includes the i.MX specific headers
++ to be built.
++
++ https://github.com/Freescale/libimxdmabuffer
++
++if BR2_PACKAGE_LIBIMXDMABUFFER
++choice
++ prompt "Allocator"
++
++config BR2_PACKAGE_LIBIMXDMABUFFER_DWL
++ bool "dwl"
++ depends on BR2_PACKAGE_IMX_VPU_HANTRO
++
++comment "dwl allocator needs imx-vpu-hantro"
++ depends on !BR2_PACKAGE_IMX_VPU_HANTRO
++
++config BR2_PACKAGE_LIBIMXDMABUFFER_IPU
++ bool "ipu"
++
++config BR2_PACKAGE_LIBIMXDMABUFFER_G2D
++ bool "g2d"
++ depends on BR2_PACKAGE_IMX_GPU_G2D
++
++comment "g2d allocator needs imx-gpu-g2d"
++ depends on !BR2_PACKAGE_IMX_GPU_G2D
++
++config BR2_PACKAGE_LIBIMXDMABUFFER_PXP
++ bool "pxp"
++endchoice
++
++if BR2_PACKAGE_LIBIMXDMABUFFER_DWL
++choice
++ prompt "Hantro decoder version"
++
++config BR2_PACKAGE_LIBIMXDMABUFFER_DWL_G1
++ bool "G1"
++
++config BR2_PACKAGE_LIBIMXDMABUFFER_DWL_G2
++ bool "G2"
++endchoice
++
++config BR2_PACKAGE_LIBIMXDMABUFFER_DWL_HANTRO_DEC_VERSION
++ string
++ default "G1" if BR2_PACKAGE_LIBIMXDMABUFFER_DWL_G1
++ default "G2" if BR2_PACKAGE_LIBIMXDMABUFFER_DWL_G2
++endif
++
++endif
+diff --git a/package/libimxdmabuffer/libimxdmabuffer.hash b/package/libimxdmabuffer/libimxdmabuffer.hash
+new file mode 100644
+index 0000000000..7d317005df
+--- /dev/null
++++ b/package/libimxdmabuffer/libimxdmabuffer.hash
+@@ -0,0 +1,3 @@
++# locally computed hash
++sha256 cea163d213206f5451eb75a4501b52d861ed00bfd14cd3e4e8734c6181edb6cc libimxdmabuffer-1.0.1.tar.gz
++sha256 4bb33cc4cd956b56b779b501f18cae46a9e26f8c8500cca86ed758b8bc5e1788 LICENSE
+diff --git a/package/libimxdmabuffer/libimxdmabuffer.mk b/package/libimxdmabuffer/libimxdmabuffer.mk
+new file mode 100644
+index 0000000000..c8adf03365
+--- /dev/null
++++ b/package/libimxdmabuffer/libimxdmabuffer.mk
+@@ -0,0 +1,51 @@
++################################################################################
++#
++# libimxdmabuffer
++#
++################################################################################
++
++LIBIMXDMABUFFER_VERSION = 1.0.1
++LIBIMXDMABUFFER_SITE = $(call github,Freescale,libimxdmabuffer,$(LIBIMXDMABUFFER_VERSION))
++LIBIMXDMABUFFER_LICENSE = LGPL-2.1+
++LIBIMXDMABUFFER_LICENSE_FILES = LICENSE
++LIBIMXDMABUFFER_DEPENDENCIES = host-pkgconf host-python3
++LIBIMXDMABUFFER_INSTALL_STAGING = YES
++LIBIMXDMABUFFER_NEEDS_EXTERNAL_WAF = NO
++
++# libimxdmabuffer needs access to imx-specific kernel headers
++LIBIMXDMABUFFER_DEPENDENCIES += linux
++
++LIBIMXDMABUFFER_CONF_OPTS += \
++ --imx-linux-headers-path=$(STAGING_DIR)/usr/include/ \
++ --with-ion-allocator=no
++
++ifeq ($(BR2_PACKAGE_LIBIMXDMABUFFER_DWL),y)
++LIBIMXDMABUFFER_CONF_OPTS += \
++ --with-dwl-allocator=yes \
++ --hantro-headers-path=$(STAGING_DIR)/usr/include/hantro_dec \
++ --hantro-decoder-version=$(BR2_PACKAGE_LIBIMXDMABUFFER_DWL_HANTRO_DEC_VERSION)
++LIBIMXDMABUFFER_DEPENDENCIES += imx-vpu-hantro
++else
++LIBIMXDMABUFFER_CONF_OPTS += --with-dwl-allocator=no
++endif
++
++ifeq ($(BR2_PACKAGE_LIBIMXDMABUFFER_IPU),y)
++LIBIMXDMABUFFER_CONF_OPTS += --with-ipu-allocator=yes
++else
++LIBIMXDMABUFFER_CONF_OPTS += --with-ipu-allocator=no
++endif
++
++ifeq ($(BR2_PACKAGE_LIBIMXDMABUFFER_G2D),y)
++LIBIMXDMABUFFER_CONF_OPTS += --with-g2d-allocator=yes
++LIBIMXDMABUFFER_DEPENDENCIES += imx-gpu-g2d
++else
++LIBIMXDMABUFFER_CONF_OPTS += --with-g2d-allocator=no
++endif
++
++ifeq ($(BR2_PACKAGE_LIBIMXDMABUFFER_PXP),y)
++LIBIMXDMABUFFER_CONF_OPTS += --with-pxp-allocator=yes
++else
++LIBIMXDMABUFFER_CONF_OPTS += --with-pxp-allocator=no
++endif
++
++$(eval $(waf-package))
+--
+2.34.1
+
diff --git a/patches/buildroot/2021.02/412-package-pcre-fix-broken-URL.patch b/patches/buildroot/2021.02/412-package-pcre-fix-broken-URL.patch
deleted file mode 100644
index bcfc45493..000000000
--- a/patches/buildroot/2021.02/412-package-pcre-fix-broken-URL.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ede473267ac3d00684a23a5280c74423e01977bf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
- <seb...@ar...>
-Date: Fri, 19 Nov 2021 09:53:34 +0100
-Subject: [PATCH 412/412] package/pcre: fix broken URL
-
-As stated on www.pcre.org:
-"Note that the former ftp.pcre.org FTP site is no longer available."
-
-Update _SITE URL to Sourceforge.
----
- package/pcre/pcre.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
-index 264eaa10c7..c85f6717db 100644
---- a/package/pcre/pcre.mk
-+++ b/package/pcre/pcre.mk
-@@ -5,7 +5,7 @@
- ################################################################################
-
- PCRE_VERSION = 8.45
--PCRE_SITE = https://ftp.pcre.org/pub/pcre
-+PCRE_SITE = http://downloads.sourceforge.net/project/pcre/pcre/$(PCRE_VERSION)
- PCRE_SOURCE = pcre-$(PCRE_VERSION).tar.bz2
- PCRE_LICENSE = BSD-3-Clause
- PCRE_LICENSE_FILES = LICENCE
---
-2.32.0
-
diff --git a/patches/buildroot/2021.02/413-package-libimxvpuapi2-new-package.patch b/patches/buildroot/2021.02/413-package-libimxvpuapi2-new-package.patch
new file mode 100644
index 000000000..4ad8f34ce
--- /dev/null
+++ b/patches/buildroot/2021.02/413-package-libimxvpuapi2-new-package.patch
@@ -0,0 +1,139 @@
+From 24f21743bfb78eb9ad30a9e55529e7ba3562dbaa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Wed, 5 Jan 2022 16:37:17 +0100
+Subject: [PATCH 2/3] package/libimxvpuapi2: new package
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is version 2 of libimxvpuapi.
+The API has been rewritten, and is incompatible with the older one.
+Currently, the following platforms are supported (listed with their VPUs):
+* i.MX6 (Chips&Media CODA960 codec)
+* i.MX8m (Hantro G1/G2 decoder, no encoder)
+* i.MX8mm (Hantro G1/G2 decoder, Hantro H1 encoder)
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ package/Config.in | 1 +
+ package/libimxvpuapi2/Config.in | 48 ++++++++++++++++++++++++
+ package/libimxvpuapi2/libimxvpuapi2.hash | 3 ++
+ package/libimxvpuapi2/libimxvpuapi2.mk | 28 ++++++++++++++
+ 4 files changed, 80 insertions(+)
+ create mode 100644 package/libimxvpuapi2/Config.in
+ create mode 100644 package/libimxvpuapi2/libimxvpuapi2.hash
+ create mode 100644 package/libimxvpuapi2/libimxvpuapi2.mk
+
+diff --git a/package/Config.in b/package/Config.in
+index 8d844aa11e..009d2006f0 100644
+--- a/package/Config.in
++++ b/package/Config.in
+@@ -1763,6 +1763,7 @@ menu "Multimedia"
+ source "package/libebml/Config.in"
+ source "package/libhdhomerun/Config.in"
+ source "package/libimxvpuapi/Config.in"
++ source "package/libimxvpuapi2/Config.in"
+ source "package/libmatroska/Config.in"
+ source "package/libmms/Config.in"
+ source "package/libmpeg2/Config.in"
+diff --git a/package/libimxvpuapi2/Config.in b/package/libimxvpuapi2/Config.in
+new file mode 100644
+index 0000000000..0954718cc0
+--- /dev/null
++++ b/package/libimxvpuapi2/Config.in
+@@ -0,0 +1,48 @@
++comment "libimxvpuapi2 needs an i.MX platform with VPU support and libimxdmabuffer"
++ depends on BR2_arm || BR2_aarch64
++ depends on (!BR2_PACKAGE_FREESCALE_IMX_HAS_VPU \
++ && !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO) \
++ || !BR2_PACKAGE_LIBIMXDMABUFFER
++
++config BR2_PACKAGE_LIBIMXVPUAPI2
++ bool "libimxvpuapi2"
++ depends on BR2_arm || BR2_aarch64 # Only relevant for i.MX
++ depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU || BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO
++ depends on BR2_PACKAGE_LIBIMXDMABUFFER
++ select BR2_PACKAGE_IMX_VPU if BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
++ select BR2_PACKAGE_IMX_VPU_HANTRO if BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO
++ help
++ This library provides an API for using hardware video codecs
++ on i.MX platforms. The API abstracts away platform specific
++ details and allows for using the same code with different
++ hardware video codecs on different i.MX platforms.
++
++ This is version 2 of libimxvpuapi. The API has been rewritten,
++ and is incompatible with the older one.
++
++ https://github.com/Freescale/libimxvpuapi
++
++if BR2_PACKAGE_LIBIMXVPUAPI2
++choice
++ prompt "Platform"
++
++config BR2_PACKAGE_LIBIMXVPUAPI2_IMX6
++ bool "i.MX6 (Coda)"
++ depends on BR2_PACKAGE_IMX_VPU
++
++config BR2_PACKAGE_LIBIMXVPUAPI2_IMX8M
++ bool "i.MX8M (Hantro)"
++ depends on BR2_PACKAGE_IMX_VPU_HANTRO
++
++config BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM
++ bool "i.MX8MM (Hantro)"
++ depends on BR2_PACKAGE_IMX_VPU_HANTRO
++endchoice
++
++config BR2_PACKAGE_LIBIMXVPUAPI2_PLATFORM
++ string
++ default "imx6" if BR2_PACKAGE_LIBIMXVPUAPI2_IMX6
++ default "imx8m" if BR2_PACKAGE_LIBIMXVPUAPI2_IMX8M
++ default "imx8mm" if BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM
++
++endif
+diff --git a/package/libimxvpuapi2/libimxvpuapi2.hash b/package/libimxvpuapi2/libimxvpuapi2.hash
+new file mode 100644
+index 0000000000..d26cf8767b
+--- /dev/null
++++ b/package/libimxvpuapi2/libimxvpuapi2.hash
+@@ -0,0 +1,3 @@
++# locally computed hash
++sha256 611a5176e37e5132d97817e6d6048acf229f67efd2201e3f4aab6f720e7b67d1 libimxvpuapi2-2.2.0.tar.gz
++sha256 4bb33cc4cd956b56b779b501f18cae46a9e26f8c8500cca86ed758b8bc5e1788 LICENSE
+diff --git a/package/libimxvpuapi2/libimxvpuapi2.mk b/package/libimxvpuapi2/libimxvpuapi2.mk
+new file mode 100644
+index 0000000000..6957171ad3
+--- /dev/null
++++ b/package/libimxvpuapi2/libimxvpuapi2.mk
+@@ -0,0 +1,28 @@
++################################################################################
++#
++# libimxvpuapi2
++#
++################################################################################
++
++LIBIMXVPUAPI2_VERSION = 2.2.0
++LIBIMXVPUAPI2_SITE = $(call github,Freescale,libimxvpuapi,$(LIBIMXVPUAPI2_VERSION))
++LIBIMXVPUAPI2_LICENSE = LGPL-2.1+
++LIBIMXVPUAPI2_LICENSE_FILES = LICENSE
++LIBIMXVPUAPI2_DEPENDENCIES = host-pkgconf host-python3 libimxdmabuffer
++LIBIMXVPUAPI2_INSTALL_STAGING = YES
++LIBIMXVPUAPI2_NEEDS_EXTERNAL_WAF = NO
++
++ifeq ($(BR2_PACKAGE_LIBIMXVPUAPI2_IMX6),y)
++LIBIMXVPUAPI2_DEPENDENCIES += imx-vpu
++endif
++
++ifeq ($(BR2_PACKAGE_LIBIMXVPUAPI2_IMX8M)$(BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM),y)
++LIBIMXVPUAPI2_DEPENDENCIES += imx-vpu-hantro
++endif
++
++LIBIMXVPUAPI2_CONF_OPTS += \
++ --imx-headers=$(STAGING_DIR)/usr/include/ \
++ --sysroot-path=$(STAGING_DIR) \
++ --imx-platform=$(BR2_PACKAGE_LIBIMXVPUAPI2_PLATFORM)
++
++$(eval $(waf-package))
+--
+2.34.1
+
diff --git a/patches/buildroot/2021.02/414-package-gstreamer1-gst1-imx2-new-package.patch b/patches/buildroot/2021.02/414-package-gstreamer1-gst1-imx2-new-package.patch
new file mode 100644
index 000000000..198a7944c
--- /dev/null
+++ b/patches/buildroot/2021.02/414-package-gstreamer1-gst1-imx2-new-package.patch
@@ -0,0 +1,208 @@
+From fd5108427f5adf250ad8afb4cbb7a9fd085cb12e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Fri, 7 Jan 2022 14:31:09 +0100
+Subject: [PATCH 3/3] package/gstreamer1/gst1-imx2: new package
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is version 2 of gst1-imx.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ package/gstreamer1/Config.in | 1 +
+ package/gstreamer1/gst1-imx2/Config.in | 75 +++++++++++++++++++++
+ package/gstreamer1/gst1-imx2/gst1-imx2.hash | 3 +
+ package/gstreamer1/gst1-imx2/gst1-imx2.mk | 75 +++++++++++++++++++++
+ 4 files changed, 154 insertions(+)
+ create mode 100644 package/gstreamer1/gst1-imx2/Config.in
+ create mode 100644 package/gstreamer1/gst1-imx2/gst1-imx2.hash
+ create mode 100644 package/gstreamer1/gst1-imx2/gst1-imx2.mk
+
+diff --git a/package/gstreamer1/Config.in b/package/gstreamer1/Config.in
+index 8fe8a34395..436c76379d 100644
+--- a/package/gstreamer1/Config.in
++++ b/package/gstreamer1/Config.in
+@@ -9,6 +9,7 @@ source "package/gstreamer1/gst1-plugins-bad/Config.in"
+ source "package/gstreamer1/gst1-plugins-ugly/Config.in"
+ source "package/gstreamer1/gst1-devtools/Config.in"
+ source "package/gstreamer1/gst1-imx/Config.in"
++source "package/gstreamer1/gst1-imx2/Config.in"
+ source "package/gstreamer1/gst1-interpipe/Config.in"
+ source "package/gstreamer1/gst1-libav/Config.in"
+ source "package/gstreamer1/gst1-python/Config.in"
+diff --git a/package/gstreamer1/gst1-imx2/Config.in b/package/gstreamer1/gst1-imx2/Config.in
+new file mode 100644
+index 0000000000..b95e6bdb21
+--- /dev/null
++++ b/package/gstreamer1/gst1-imx2/Config.in
+@@ -0,0 +1,75 @@
++menuconfig BR2_PACKAGE_GST1_IMX2
++ bool "gst1-imx2"
++ depends on BR2_arm || BR2_aarch64 # Only relevant for i.MX
++ depends on BR2_PACKAGE_LIBIMXDMABUFFER
++ select BR2_PACKAGE_GST1_PLUGINS_BASE
++ help
++ This is a set of GStreamer 1.0 plugins for plugins for
++ Freescale's i.MX platforms, which make use of the i.MX
++ multimedia capabilities.
++
++ https://github.com/Freescale/gstreamer-imx
++
++if BR2_PACKAGE_GST1_IMX2
++
++config BR2_PACKAGE_GST1_IMX2_G2D
++ bool "imxg2d"
++ depends on BR2_PACKAGE_IMX_GPU_G2D
++ help
++ Elements leveraging the 2D GPU
++
++comment "imxg2d needs the G2D libraries"
++ depends on !BR2_PACKAGE_IMX_GPU_G2D
++
++config BR2_PACKAGE_GST1_IMX2_IPU
++ bool "imxipu"
++ depends on BR2_LINUX_KERNEL
++ help
++ Elements leveraging the IPU
++
++comment "imxipu needs an imx-specific Linux kernel to be built"
++ depends on !BR2_LINUX_KERNEL
++
++config BR2_PACKAGE_GST1_IMX2_MP3ENCODER
++ bool "mp3encoder"
++ depends on BR2_PACKAGE_IMX_CODEC
++ help
++ Elements for MP3 encoding
++
++comment "mp3encoder needs the i.MX codec binaries"
++ depends on !BR2_PACKAGE_IMX_CODEC
++
++config BR2_PACKAGE_GST1_IMX2_PXP
++ bool "imxpxp"
++ depends on BR2_LINUX_KERNEL
++ help
++ Elements leveraging the PXP
++
++comment "imxpxp needs an imx-specific Linux kernel to be built"
++ depends on !BR2_LINUX_KERNEL
++
++config BR2_PACKAGE_GST1_IMX2_UNIAUDIODEC
++ bool "uniaudiodec"
++ depends on BR2_PACKAGE_IMX_CODEC
++ help
++ Elements for audio decoding
++
++comment "uniaudiodec needs the i.MX codec binaries"
++ depends on !BR2_PACKAGE_IMX_CODEC
++
++config BR2_PACKAGE_GST1_IMX2_VPU
++ bool "imxvpu"
++ depends on BR2_PACKAGE_LIBIMXVPUAPI2
++ help
++ Elements leveraging the VPU
++
++comment "imxvpu needs the VPU imxvpuapi2 library"
++ depends on !BR2_PACKAGE_LIBIMXVPUAPI2
++
++config BR2_PACKAGE_GST1_IMX2_V4L2
++ bool "imxv4l2"
++ select BR2_PACKAGE_GST1_PLUGINS_BAD
++ help
++ Elements for V4L2 capture and output
++
++endif
+diff --git a/package/gstreamer1/gst1-imx2/gst1-imx2.hash b/package/gstreamer1/gst1-imx2/gst1-imx2.hash
+new file mode 100644
+index 0000000000..cc0734fd52
+--- /dev/null
++++ b/package/gstreamer1/gst1-imx2/gst1-imx2.hash
+@@ -0,0 +1,3 @@
++# locally computed hash
++sha256 57c0e05b3d57f90df8a16760f4373e04ed60c3a7fab7844c00392f67f889d196 gst1-imx2-9a200b1551c4531234f9b6437eac2c42a07334b0.tar.gz
++sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 LICENSE
+diff --git a/package/gstreamer1/gst1-imx2/gst1-imx2.mk b/package/gstreamer1/gst1-imx2/gst1-imx2.mk
+new file mode 100644
+index 0000000000..f71aeae4f6
+--- /dev/null
++++ b/package/gstreamer1/gst1-imx2/gst1-imx2.mk
+@@ -0,0 +1,75 @@
++################################################################################
++#
++# gst1-imx2
++#
++################################################################################
++
++GST1_IMX2_VERSION = 9a200b1551c4531234f9b6437eac2c42a07334b0
++GST1_IMX2_SITE = $(call github,Freescale,gstreamer-imx,$(GST1_IMX2_VERSION))
++GST1_IMX2_LICENSE = LGPL-2.0+
++GST1_IMX2_LICENSE_FILES = LICENSE
++GST1_IMX2_INSTALL_STAGING = YES
++
++GST1_IMX2_DEPENDENCIES = \
++ host-pkgconf \
++ gstreamer1 \
++ gst1-plugins-base \
++ libimxdmabuffer
++
++GST1_IMX2_CONF_OPTS = -Dsysroot=$(STAGING_DIR)
++
++ifeq ($(BR2_LINUX_KERNEL),y)
++# IPU and PXP need access to imx-specific kernel headers
++GST1_IMX2_DEPENDENCIES += linux
++endif
++
++ifeq ($(BR2_PACKAGE_IMX_CODEC),y)
++GST1_IMX2_DEPENDENCIES += imx-codec
++endif
++
++ifeq ($(BR2_PACKAGE_GST1_IMX2_G2D),y)
++GST1_IMX2_CONF_OPTS += -Dg2d=enabled
++GST1_IMX2_DEPENDENCIES += imx-gpu-g2d
++else
++GST1_IMX2_CONF_OPTS += -Dg2d=disabled
++endif
++
++ifeq ($(BR2_PACKAGE_GST1_IMX2_IPU),y)
++GST1_IMX2_CONF_OPTS += -Dipu=enabled
++else
++GST1_IMX2_CONF_OPTS += -Dipu=disabled
++endif
++
++ifeq ($(BR2_PACKAGE_GST1_IMX2_MP3ENCODER),y)
++GST1_IMX2_CONF_OPTS += -Dmp3encoder=enabled
++else
++GST1_IMX2_CONF_OPTS += -Dmp3encoder=disabled
++endif
++
++ifeq ($(BR2_PACKAGE_GST1_IMX2_PXP),y)
++GST1_IMX2_CONF_OPTS += -Dpxp=enabled
++else
++GST1_IMX2_CONF_OPTS += -Dpxp=disabled
++endif
++
++ifeq ($(BR2_PACKAGE_GST1_IMX2_UNIAUDIODEC),y)
++GST1_IMX2_CONF_OPTS += -Duniaudiodec=enabled
++else
++GST1_IMX2_CONF_OPTS += -Duniaudiodec=disabled
++endif
++
++ifeq ($(BR2_PACKAGE_GST1_IMX2_VPU),y)
++GST1_IMX2_DEPENDENCIES += libimxvpuapi2
++GST1_IMX2_CONF_OPTS += -Dvpu=enabled
++else
++GST1_IMX2_CONF_OPTS += -Dvpu=disabled
++endif
++
++ifeq ($(BR2_PACKAGE_GST1_IMX2_V4L2),y)
++GST1_IMX2_DEPENDENCIES += gst1-plugins-bad
++GST1_IMX2_CONF_OPTS += -Dv4l2=true
++else
++GST1_IMX2_CONF_OPTS += -Dv4l2=false
++endif
++
++$(eval $(meson-package))
+--
+2.34.1
+
diff --git a/patches/buildroot/2021.02/cleanup_buildroot.sh b/patches/buildroot/2021.02/cleanup_buildroot.sh
index 7e8220942..fc843260c 100755
--- a/patches/buildroot/2021.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2021.02/cleanup_buildroot.sh
@@ -60,6 +60,10 @@ rm -rf buildroot/package/gpsd/S50gpsd
rm -rf buildroot/package/gpsd/gpsd.mk
rm -rf buildroot/package/gsmmux/Config.in
rm -rf buildroot/package/gsmmux/gsmmux.mk
+rm -rf buildroot/package/gstreamer1/Config.in
+rm -rf buildroot/package/gstreamer1/gst1-imx2/Config.in
+rm -rf buildroot/package/gstreamer1/gst1-imx2/gst1-imx2.hash
+rm -rf buildroot/package/gstreamer1/gst1-imx2/gst1-imx2.mk
rm -rf buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in
rm -rf buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash
rm -rf buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk
@@ -71,6 +75,12 @@ rm -rf buildroot/package/imx-test/imx-test.mk
rm -rf buildroot/package/leptonmodule/0001-flirpi-add-missing-dependency-to-leptcam-target.patch
rm -rf buildroot/package/leptonmodule/Config.in
rm -rf buildroot/package/leptonmodule/leptonmodule.mk
+rm -rf buildroot/package/libimxdmabuffer/Config.in
+rm -rf buildroot/package/libimxdmabuffer/libimxdmabuffer.hash
+rm -rf buildroot/package/libimxdmabuffer/libimxdmabuffer.mk
+rm -rf buildroot/package/libimxvpuapi2/Config.in
+rm -rf buildroot/package/libimxvpuapi2/libimxvpuapi2.hash
+rm -rf buildroot/package/libimxvpuapi2/libimxvpuapi2.mk
rm -rf buildroot/package/libopenssl/libopenssl.mk
rm -rf buildroot/package/lmic-pi/Config.in
rm -rf buildroot/package/lmic-pi/lmic-pi.mk
@@ -124,7 +134,6 @@ rm -rf buildroot/package/slideshow/slideshow.mk
rm -rf buildroot/package/snes9x/Config.in
rm -rf buildroot/package/snes9x/snes9x-1.39-compile.patch
rm -rf buildroot/package/snes9x/snes9x.mk
-rm -rf buildroot/package/stress-ng/Config.in
rm -rf buildroot/package/stress-ng/stress-ng.hash
rm -rf buildroot/package/stress-ng/stress-ng.mk
rm -rf buildroot/package/thingerio/Config.in
hooks/post-receive
--
armadeus
|