Skip to contentSkip to conversation

package/kodi: remove AMLogic support

PATCH New Bernd Kuhls 2 participants 5 messages Aug 10, 2019 – Aug 11, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 package/kodi: remove AMLogic support

Kodi 19 will remove specific support for AMLogic:
https://github.com/xbmc/xbmc/pull/16043

Also buildroot dropped support for the odroid2c defconfig:
https://git.buildroot.net/buildroot/commit/?id=b80712a16ae3deb65331a7923aa878e13e2e66b6

---
 Config.in.legacy       |  7 +++++++
 package/kodi/Config.in | 11 -----------
 package/kodi/kodi.mk   | 10 ----------
 3 files changed, 7 insertions(+), 21 deletions(-)
Config.in.legacy +7 -0
index de05b07c97..03d17d1743 100644
@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2019.08"
 
+config BR2_PACKAGE_KODI_PLATFORM_AML
+	bool "Kodi AMLogic support was removed"
+	select BR2_LEGACY
+	help
+	  Support for AMLogic was removed due to the removal of the
+	  odroidc2 defconfig.
+
 config BR2_GCC_VERSION_6_X
 	bool "gcc 6.x support removed"
 	select BR2_LEGACY
package/kodi/Config.in +0 -11
index 279b4ead0d..626038e8c8 100644
@@ -18,13 +18,6 @@ comment "kodi needs python w/ .py modules, a uClibc or glibc toolchain w/ C++, t
 config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS
 	bool
 
-config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_AML
-	bool
-	default y
-	depends on BR2_PACKAGE_LIBAMCODEC
-	depends on BR2_PACKAGE_ODROID_MALI
-	select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS
-
 config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_RBPI
 	bool
 	default y
@@ -202,10 +195,6 @@ choice
 	prompt "platform"
 	default BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL
 
-config BR2_PACKAGE_KODI_PLATFORM_AML
-	bool "AMLogic"
-	depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_AML
-
 config BR2_PACKAGE_KODI_PLATFORM_RBPI
 	bool "Raspberry Pi"
 	depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_RBPI
package/kodi/kodi.mk +0 -10
index 590af15b7c..6e482e615c 100644
@@ -163,16 +163,6 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
 KODI_CXX_FLAGS += -latomic
 endif
 
-ifeq ($(BR2_PACKAGE_KODI_PLATFORM_AML),y)
-KODI_CONF_OPTS += -DENABLE_AML=ON -DENABLE_OPENGLES=ON
-# The following line can be removed when bumping to 18.0-Leia,
-# see upstream PR 13425
-KODI_CXX_FLAGS += -DMESA_EGL_NO_X11_HEADERS
-KODI_DEPENDENCIES += libamcodec odroid-mali
-else
-KODI_CONF_OPTS += -DENABLE_AML=OFF
-endif
-
 ifeq ($(BR2_PACKAGE_KODI_PLATFORM_RBPI),y)
 KODI_CONF_OPTS += -DCORE_SYSTEM_NAME=rbpi -DENABLE_OPENGLES=ON
 KODI_DEPENDENCIES += rpi-userland
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/4 package/odroid-mali: remove package

Package is not needed anymore after support for odroid2c was dropped:
https://git.buildroot.net/buildroot/commit/?id=b80712a16ae3deb65331a7923aa878e13e2e66b6

---
 Config.in.legacy                     |  6 ++++
 DEVELOPERS                           |  1 -
 package/Config.in                    |  1 -
 package/odroid-mali/Config.in        | 34 ------------------
 package/odroid-mali/odroid-mali.hash |  2 --
 package/odroid-mali/odroid-mali.mk   | 52 ----------------------------
 6 files changed, 6 insertions(+), 90 deletions(-)
 delete mode 100644 package/odroid-mali/Config.in
 delete mode 100644 package/odroid-mali/odroid-mali.hash
 delete mode 100644 package/odroid-mali/odroid-mali.mk
Config.in.legacy +6 -0
index 03d17d1743..18782046aa 100644
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2019.08"
 
+config BR2_PACKAGE_ODROID_MALI
+	bool "Support for odroidc2 based systems was removed"
+	select BR2_LEGACY
+	help
+	  Support for odroidc2 based systems was removed.
+
 config BR2_PACKAGE_KODI_PLATFORM_AML
 	bool "Kodi AMLogic support was removed"
 	select BR2_LEGACY
DEVELOPERS +0 -1
index d3ebe049f6..670ac61473 100644
@@ -581,7 +581,6 @@ F:	package/kvm-unit-tests
 
 N:	Dagg Stompler <[email protected]>
 F:	package/libamcodec/
-F:	package/odroid-mali/
 F:	package/odroid-scripts/
 
 N:	Daniel J. Leach <[email protected]>
package/Config.in +0 -1
index 49f4621344..d1368575cd 100644
@@ -487,7 +487,6 @@ endmenu
 	source "package/nvidia-driver/Config.in"
 	source "package/nvidia-tegra23/Config.in"
 	source "package/nvme/Config.in"
-	source "package/odroid-mali/Config.in"
 	source "package/odroid-scripts/Config.in"
 	source "package/ofono/Config.in"
 	source "package/on2-8170-modules/Config.in"
package/odroid-mali/Config.in deleted +0 -34
deleted file mode 100644
index 1c31c2d0e3..0000000000
@@ -1,34 +0,0 @@
-config BR2_PACKAGE_ODROID_MALI
-	bool "odroid-mali"
-	depends on BR2_TOOLCHAIN_USES_GLIBC
-	depends on BR2_aarch64 || BR2_ARM_EABIHF
-	select BR2_PACKAGE_HAS_LIBEGL
-	select BR2_PACKAGE_HAS_LIBGLES
-	select BR2_PACKAGE_ODROID_SCRIPTS # runtime
-	help
-	  Install the ARM Mali drivers for odroidc2 based systems.
-
-	  https://github.com/mdrjr/c2_mali
-
-if BR2_PACKAGE_ODROID_MALI
-
-config BR2_PACKAGE_PROVIDES_LIBEGL
-	default "odroid-mali"
-
-config BR2_PACKAGE_PROVIDES_LIBGLES
-	default "odroid-mali"
-
-endif
-
-config BR2_PACKAGE_ODROID_MALI_X11
-	bool
-	depends on BR2_aarch64 # No 32 bit version available
-	select BR2_PACKAGE_LIBDRM
-	select BR2_PACKAGE_XLIB_LIBX11
-	select BR2_PACKAGE_XLIB_LIBXDAMAGE
-	select BR2_PACKAGE_XLIB_LIBXEXT
-	select BR2_PACKAGE_XLIB_LIBXFIXES
-
-comment "odroid-mali needs a glibc toolchain"
-	depends on BR2_aarch64 || BR2_ARM_EABIHF
-	depends on !BR2_TOOLCHAIN_USES_GLIBC
package/odroid-mali/odroid-mali.hash deleted +0 -2
deleted file mode 100644
index b71ebab139..0000000000
@@ -1,2 +0,0 @@
-# Locally computed hash
-sha256 6c85e96f3372c24c6497f2a1cbea867a8dbf3a7b3edd736802c762176006aec6  odroid-mali-4f8a541693fee5fdcaa162a7fd8922861a4ba0a9.tar.gz
package/odroid-mali/odroid-mali.mk deleted +0 -52

52 lines not on this page · raw message

Signature · 1 line
2.20.1
#2 lore raw

PATCH 3/4 package/odroid-scripts: remove package

In reply to Bernd Kuhls

Package is not needed anymore after support for odroid2c was dropped:
https://git.buildroot.net/buildroot/commit/?id=b80712a16ae3deb65331a7923aa878e13e2e66b6

---
 Config.in.legacy                           |  6 ++++
 DEVELOPERS                                 |  1 -
 package/Config.in                          |  1 -
 package/odroid-scripts/Config.in           |  9 ------
 package/odroid-scripts/S02odroidc2_fb      | 20 ------------
 package/odroid-scripts/odroid-scripts.hash |  2 --
 package/odroid-scripts/odroid-scripts.mk   | 36 ----------------------
 7 files changed, 6 insertions(+), 69 deletions(-)
 delete mode 100644 package/odroid-scripts/Config.in
 delete mode 100644 package/odroid-scripts/S02odroidc2_fb
 delete mode 100644 package/odroid-scripts/odroid-scripts.hash
 delete mode 100644 package/odroid-scripts/odroid-scripts.mk
Config.in.legacy +6 -0
index 18782046aa..34c484e1f6 100644
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2019.08"
 
+config BR2_PACKAGE_ODROID_SCRIPTS
+	bool "Support for odroidc2 based systems was removed"
+	select BR2_LEGACY
+	help
+	  Support for odroidc2 based systems was removed.
+
 config BR2_PACKAGE_ODROID_MALI
 	bool "Support for odroidc2 based systems was removed"
 	select BR2_LEGACY
DEVELOPERS +0 -1
index 670ac61473..ce34bc5aca 100644
@@ -581,7 +581,6 @@ F:	package/kvm-unit-tests
 
 N:	Dagg Stompler <[email protected]>
 F:	package/libamcodec/
-F:	package/odroid-scripts/
 
 N:	Daniel J. Leach <[email protected]>
 F:	package/dacapo/
package/Config.in +0 -1
index d1368575cd..ce735e4b0c 100644
@@ -487,7 +487,6 @@ endmenu
 	source "package/nvidia-driver/Config.in"
 	source "package/nvidia-tegra23/Config.in"
 	source "package/nvme/Config.in"
-	source "package/odroid-scripts/Config.in"
 	source "package/ofono/Config.in"
 	source "package/on2-8170-modules/Config.in"
 	source "package/open2300/Config.in"
package/odroid-scripts/Config.in deleted +0 -9
deleted file mode 100644
index c07c3a4c09..0000000000
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_ODROID_SCRIPTS
-	bool "odroid-scripts"
-	depends on BR2_aarch64 || BR2_arm || BR2_armeb
-	select BR2_PACKAGE_FBSET # runtime
-	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # needed for fbset
-	help
-	  Install the scripts for the odroidc2 based systems.
-
-	  https://github.com/mdrjr/c2_bootini
package/odroid-scripts/S02odroidc2_fb deleted +0 -20
deleted file mode 100644
index 2aae59db98..0000000000
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# Set up frame buffer
-#
-
-case "$1" in
-    start)
-        echo "Setting up display..."
-        /usr/sbin/odroidc2_init_fb.sh
-        ;;
-    stop)
-        ;;
-    restart|reload)
-        ;;
-    *)
-        echo "Usage: $0 {start|stop|restart}"
-        exit 1
-esac
-
-exit $?
package/odroid-scripts/odroid-scripts.hash deleted +0 -2
deleted file mode 100644
index e5a262d209..0000000000
@@ -1,2 +0,0 @@
-#  Locally computed hash
-sha256 9d61472ee6aed2d1a7b5afdcb91b823003c8524a242572f24f89d4e57323daf3  odroid-scripts-cfd289b1d69136b8bfd725d90cd648da4654f2bd.tar.gz
package/odroid-scripts/odroid-scripts.mk deleted +0 -36
deleted file mode 100644
index fc1940dcef..0000000000
@@ -1,36 +0,0 @@
-################################################################################
-#
-# odroid-scripts
-#
-################################################################################
-
-ODROID_SCRIPTS_VERSION = cfd289b1d69136b8bfd725d90cd648da4654f2bd
-ODROID_SCRIPTS_SITE = $(call github,mdrjr,c2_bootini,$(ODROID_SCRIPTS_VERSION))
-ODROID_SCRIPTS_LICENSE = unclear
-
-ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
-define ODROID_SCRIPTS_INSTALL_UDEV_RULES
-	$(INSTALL) -D -m 0644 $(@D)/10-odroid.rules \
-		$(TARGET_DIR)/etc/udev/rules.d/10-odroid.rules
-endef
-endif
-
-define ODROID_SCRIPTS_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/c2_init.sh $(TARGET_DIR)/usr/sbin/odroidc2_init_fb.sh
-	$(ODROID_SCRIPTS_INSTALL_UDEV_RULES)
-endef
-
-define ODROID_SCRIPTS_INSTALL_INIT_SYSTEMD
-	$(INSTALL) -D -m 0644 $(@D)/amlogic.service \
-		$(TARGET_DIR)/usr/lib/systemd/system/odroidc2_fb.service
-	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
-	ln -fs ../../../../usr/lib/systemd/system/odroidc2_fb.service \
-		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/odroidc2_fb.service
-endef
-
-define ODROID_SCRIPTS_INSTALL_INIT_SYSV
-	$(INSTALL) -D -m 0755 package/odroid-scripts/S02odroidc2_fb \
-		$(TARGET_DIR)/etc/init.d/S02odroidc2_fb
-endef
-
-$(eval $(generic-package))
Signature · 1 line
2.20.1
#3 lore raw

PATCH 4/4 package/libamcodec: remove package

In reply to Bernd Kuhls

Package is not needed anymore after support for odroid2c was dropped:
https://git.buildroot.net/buildroot/commit/?id=b80712a16ae3deb65331a7923aa878e13e2e66b6

---
 Config.in.legacy                   |  6 +++++
 DEVELOPERS                         |  3 ---
 package/Config.in                  |  1 -
 package/libamcodec/Config.in       | 14 ------------
 package/libamcodec/libamcodec.hash |  2 --
 package/libamcodec/libamcodec.mk   | 36 ------------------------------
 6 files changed, 6 insertions(+), 56 deletions(-)
 delete mode 100644 package/libamcodec/Config.in
 delete mode 100644 package/libamcodec/libamcodec.hash
 delete mode 100644 package/libamcodec/libamcodec.mk
Config.in.legacy +6 -0
index 34c484e1f6..e315f17866 100644
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2019.08"
 
+config BR2_PACKAGE_LIBAMCODEC
+	bool "Support for odroidc2 based systems was removed"
+	select BR2_LEGACY
+	help
+	  Support for odroidc2 based systems was removed.
+
 config BR2_PACKAGE_ODROID_SCRIPTS
 	bool "Support for odroidc2 based systems was removed"
 	select BR2_LEGACY
DEVELOPERS +0 -3
index ce34bc5aca..d37fe038e7 100644
@@ -579,9 +579,6 @@ N:	Cyril Bur <[email protected]>
 F:	arch/Config.in.powerpc
 F:	package/kvm-unit-tests
 
-N:	Dagg Stompler <[email protected]>
-F:	package/libamcodec/
-
 N:	Daniel J. Leach <[email protected]>
 F:	package/dacapo/
 
package/Config.in +0 -1
index ce735e4b0c..3d9af2d523 100644
@@ -1506,7 +1506,6 @@ menu "Multimedia"
 	source "package/dav1d/Config.in"
 	source "package/kvazaar/Config.in"
 	source "package/libaacs/Config.in"
-	source "package/libamcodec/Config.in"
 	source "package/libass/Config.in"
 	source "package/libbdplus/Config.in"
 	source "package/libbluray/Config.in"
package/libamcodec/Config.in deleted +0 -14
deleted file mode 100644
index 45846e6d29..0000000000
@@ -1,14 +0,0 @@
-comment "libamcodec needs a toolchain w/ threads, dynamic library"
-	depends on BR2_arm || BR2_aarch64
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
-
-config BR2_PACKAGE_LIBAMCODEC
-	bool "libamcodec"
-	depends on BR2_arm || BR2_aarch64
-	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
-	depends on !BR2_STATIC_LIBS # dlfcn.h
-	select BR2_PACKAGE_ALSA_LIB
-	help
-	  Interface library for Amlogic media codecs
-
-	  https://github.com/mdrjr/c2_aml_libs.git
package/libamcodec/libamcodec.hash deleted +0 -2
deleted file mode 100644
index a76d20a953..0000000000
@@ -1,2 +0,0 @@
-# Locally computed hash
-sha256 2c9812154b6dfd6a6c9c43aa334d0d03f299379fdf83c20121ad3f3d3f97c666  libamcodec-296f39bc6fc47ddf5d88b9fd3cfb82a5b39048ca.tar.gz
package/libamcodec/libamcodec.mk deleted +0 -36
deleted file mode 100644
index 3fab228fd4..0000000000
@@ -1,36 +0,0 @@
-################################################################################
-#
-# libamcodec
-#
-################################################################################
-
-LIBAMCODEC_VERSION = 296f39bc6fc47ddf5d88b9fd3cfb82a5b39048ca
-LIBAMCODEC_SITE = $(call github,mdrjr,c2_aml_libs,$(LIBAMCODEC_VERSION))
-LIBAMCODEC_DEPENDENCIES = alsa-lib
-LIBAMCODEC_LICENSE = Unclear
-LIBAMCODEC_INSTALL_STAGING = YES
-
-# This package uses the AML_LIBS_STAGING_DIR variable to construct the
-# header and library paths used when compiling
-define LIBAMCODEC_BUILD_CMDS
-	$(foreach d,amavutils amadec amcodec,\
-		$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-			-C $(@D)/$(d) AML_LIBS_STAGING_DIR=$(STAGING_DIR)
-	)
-endef
-
-define LIBAMCODEC_INSTALL_STAGING_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/amavutils/libamavutils.so $(STAGING_DIR)/usr/lib/libamavutils.so
-	$(INSTALL) -D -m 0555 $(@D)/amadec/libamadec.so $(STAGING_DIR)/usr/lib/libamadec.so
-	$(INSTALL) -D -m 0555 $(@D)/amcodec/libamcodec.so $(STAGING_DIR)/usr/lib/libamcodec.so
-	mkdir -p $(STAGING_DIR)/usr/include/amcodec
-	cp -rf $(@D)/amcodec/include/* $(STAGING_DIR)/usr/include/amcodec
-endef
-
-define LIBAMCODEC_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/amavutils/libamavutils.so $(TARGET_DIR)/usr/lib/libamavutils.so
-	$(INSTALL) -D -m 0555 $(@D)/amadec/libamadec.so $(TARGET_DIR)/usr/lib/libamadec.so
-	$(INSTALL) -D -m 0555 $(@D)/amcodec/libamcodec.so $(TARGET_DIR)/usr/lib/libamcodec.so
-endef
-
-$(eval $(generic-package))
Signature · 1 line
2.20.1
#4 lore raw

PATCH 1/4 package/kodi: remove AMLogic support

In reply to Bernd Kuhls
Quoted 6 lines · On Sat, 10 Aug 2019 12:59:52 +0200 Bernd Kuhls <[email protected]> wrote:

Kodi 19 will remove specific support for AMLogic:
https://github.com/xbmc/xbmc/pull/16043

Also buildroot dropped support for the odroid2c defconfig:
https://git.buildroot.net/buildroot/commit/?id=b80712a16ae3deb65331a7923aa878e13e2e66b6

Quoted 6 lines
---
 Config.in.legacy       |  7 +++++++
 package/kodi/Config.in | 11 -----------
 package/kodi/kodi.mk   | 10 ----------
 3 files changed, 7 insertions(+), 21 deletions(-)

Series applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com