package/libm2d: reintroduce libm2d

libm2d has been reworked and provides an API for 2D acceleration that is
used by EGT. It supports the GFX2D accelerator found on SAM9X60 and
SAM9X75.

Remove the vestige of the dependency of cairo on libm2d. It is no longer
true with this new version.

Signed-off-by: Ludovic Desroches <[email protected]>
Reviewed-by: Nayab Sayed <[email protected]>
Signed-off-by: Conor Dooley <[email protected]>

Author: ldesroches

Config.in

@@ -9,6 +9,7 @@ source "$BR2_EXTERNAL_MCHP_PATH/package/dt-overlay-mchp/Config.in"
 
 source "$BR2_EXTERNAL_MCHP_PATH/package/g1-decoder/Config.in"
 source "$BR2_EXTERNAL_MCHP_PATH/package/gst1-at91/Config.in"
+source "$BR2_EXTERNAL_MCHP_PATH/package/libm2d/Config.in"
 source "$BR2_EXTERNAL_MCHP_PATH/package/libplanes/Config.in"
 source "$BR2_EXTERNAL_MCHP_PATH/package/ptc_examples/Config.in"
 source "$BR2_EXTERNAL_MCHP_PATH/package/python-mpio/Config.in"

external.mk

@@ -1,8 +1,2 @@
 include $(sort $(wildcard $(BR2_EXTERNAL_MCHP_PATH)/package/*/*.mk))
 
-# add libm2d as a dependency of cairo when it is enabled
-ifeq ($(BR2_PACKAGE_LIBM2D),y)
-CAIRO_DEPENDENCIES += libm2d
-$(CAIRO_TARGET_CONFIGURE): | libm2d
-CAIRO_CONF_OPTS += --enable-gfx2d
-endif

package/egt/egt.mk

@@ -148,6 +148,10 @@ else
 EGT_CONF_OPTS += --without-libmagic
 endif
 
+ifeq ($(BR2_PACKAGE_LIBM2D),y)
+EGT_DEPENDENCIES += libm2d
+endif
+
 define EGT_RUN_AUTOGEN
         cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
 endef

package/libm2d/Config.in

@@ -0,0 +1,13 @@
+comment "libm2d requires a GPU strategy"
+	depends on BR2_MCHP_SAM_NO_GPU
+
+comment "libm2d depends on libdrm"
+	depends on !BR2_PACKAGE_LIBDRM
+
+config BR2_PACKAGE_LIBM2D
+	bool "libm2d"
+	depends on BR2_MCHP_SAM_HAS_GPU2D
+	depends on BR2_PACKAGE_LIBDRM
+	depends on !BR2_MCHP_SAM_NO_GPU
+	help
+	  libm2d is a library that provides the Microchip 2D Graphics API.

package/libm2d/libm2d.mk

@@ -0,0 +1,14 @@
+################################################################################
+#
+# libm2d
+#
+################################################################################
+
+LIBM2D_VERSION = v2.0.0-rc1
+LIBM2D_SITE = $(call github,linux4sam,libm2d,$(LIBM2D_VERSION))
+LIBM2D_LICENSE = MIT
+LIBM2D_LICENSE_FILES = COPYING
+LIBM2D_DEPENDENCIES = libdrm host-pkgconf
+LIBM2D_INSTALL_STAGING = YES
+
+$(eval $(cmake-package))