From bbddf7004a15b931d3f69f1ac517e14211b22726 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Sat, 5 Dec 2020 15:33:09 +0100 Subject: [PATCH] use our forked repos for gmenu2x Signed-off-by: Michel-FK --- FunKey/Config.in | 1 + FunKey/configs/funkey_defconfig | 1 + FunKey/package/fonts-droid/fonts-droid.mk | 1 + FunKey/package/gmenu2x/gmenu2x.hash | 1 - FunKey/package/gmenu2x/gmenu2x.mk | 6 ++++- FunKey/package/libini/libini.hash | 1 - FunKey/package/libini/libini.mk | 5 +++- FunKey/package/libopk/libopk.hash | 1 - FunKey/package/libopk/libopk.mk | 5 +++- FunKey/package/libxdgmime/Config.in | 12 +++++++++ FunKey/package/libxdgmime/libxdgmime.mk | 30 +++++++++++++++++++++++ 11 files changed, 58 insertions(+), 6 deletions(-) delete mode 100644 FunKey/package/gmenu2x/gmenu2x.hash delete mode 100644 FunKey/package/libini/libini.hash delete mode 100644 FunKey/package/libopk/libopk.hash create mode 100644 FunKey/package/libxdgmime/Config.in create mode 100644 FunKey/package/libxdgmime/libxdgmime.mk diff --git a/FunKey/Config.in b/FunKey/Config.in index 3bdc226..498d0a6 100644 --- a/FunKey/Config.in +++ b/FunKey/Config.in @@ -12,4 +12,5 @@ source "$BR2_EXTERNAL_FUNKEY_PATH/package/ProdScreens/Config.in" source "$BR2_EXTERNAL_FUNKEY_PATH/package/fonts-droid/Config.in" source "$BR2_EXTERNAL_FUNKEY_PATH/package/libini/Config.in" source "$BR2_EXTERNAL_FUNKEY_PATH/package/libopk/Config.in" +source "$BR2_EXTERNAL_FUNKEY_PATH/package/libxdgmime/Config.in" source "$BR2_EXTERNAL_FUNKEY_PATH/package/gmenu2x/Config.in" diff --git a/FunKey/configs/funkey_defconfig b/FunKey/configs/funkey_defconfig index 46c63c9..16cbbe1 100644 --- a/FunKey/configs/funkey_defconfig +++ b/FunKey/configs/funkey_defconfig @@ -86,4 +86,5 @@ BR2_PACKAGE_HOST_DTC=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_LIBOPK=y +BR2_PACKAGE_LIBXDGMIME=y BR2_PACKAGE_GMENU2X=y diff --git a/FunKey/package/fonts-droid/fonts-droid.mk b/FunKey/package/fonts-droid/fonts-droid.mk index b5a828a..7165edc 100644 --- a/FunKey/package/fonts-droid/fonts-droid.mk +++ b/FunKey/package/fonts-droid/fonts-droid.mk @@ -8,6 +8,7 @@ FONTS_DROID_VERSION = 074990596701553b8b51ff22290453de522f0d15 FONTS_DROID_SITE = https://android.googlesource.com/platform/frameworks/base/+archive/$(FONTS_DROID_VERSION)/data FONTS_DROID_SOURCE = fonts.tar.gz FONTS_DROID_LICENSE = Apache-2.0 + FONTS_DROID_STRIP_COMPONENTS = 0 # We cannot verify the hash because googlesource.com produces an archive diff --git a/FunKey/package/gmenu2x/gmenu2x.hash b/FunKey/package/gmenu2x/gmenu2x.hash deleted file mode 100644 index 9b7d393..0000000 --- a/FunKey/package/gmenu2x/gmenu2x.hash +++ /dev/null @@ -1 +0,0 @@ -sha256 7a24a8d20533038613c3475fc96575f0e3d878207b4e2da0c70068f5a3a179c0 gmenu2x-c6e2883.tar.gz diff --git a/FunKey/package/gmenu2x/gmenu2x.mk b/FunKey/package/gmenu2x/gmenu2x.mk index 42c78b8..178e8cc 100644 --- a/FunKey/package/gmenu2x/gmenu2x.mk +++ b/FunKey/package/gmenu2x/gmenu2x.mk @@ -4,8 +4,12 @@ # ############################################################# GMENU2X_VERSION = c6e2883 -GMENU2X_SITE = $(call github,opendingux,gmenu2x,$(GMENU2X_VERSION)) +GMENU2X_SITE_METHOD = git +GMENU2X_SITE = https://github.com/FunKey-Project/gmenu2x.git +GMENU2X_LICENSE = GPL-2.0 + GMENU2X_DEPENDENCIES = sdl sdl_ttf sdl_gfx dejavu libpng fonts-droid + GMENU2X_CONF_OPTS = -DBIND_CONSOLE=ON ifeq ($(BR2_PACKAGE_GMENU2X_SHOW_CLOCK),y) diff --git a/FunKey/package/libini/libini.hash b/FunKey/package/libini/libini.hash deleted file mode 100644 index b2213d9..0000000 --- a/FunKey/package/libini/libini.hash +++ /dev/null @@ -1 +0,0 @@ -sha256 fbb4fd49d367f4c700e893a5ea82e3c8c0175ee917d456de34593a981d7a68b3 libini-c3413da.tar.gz diff --git a/FunKey/package/libini/libini.mk b/FunKey/package/libini/libini.mk index d8fd6fe..7d50b25 100644 --- a/FunKey/package/libini/libini.mk +++ b/FunKey/package/libini/libini.mk @@ -4,7 +4,10 @@ # ############################################################# LIBINI_VERSION = c3413da -LIBINI_SITE = $(call github,pcercuei,libini,$(LIBINI_VERSION)) +LIBINI_SITE_METHOD = git +LIBINI_SITE = https://github.com/FunKey-Project/libini.git +LIBINI_LICENSE = LGPL-2.1 + LIBINI_INSTALL_STAGING = YES $(eval $(cmake-package)) diff --git a/FunKey/package/libopk/libopk.hash b/FunKey/package/libopk/libopk.hash deleted file mode 100644 index e632a35..0000000 --- a/FunKey/package/libopk/libopk.hash +++ /dev/null @@ -1 +0,0 @@ -sha256 99f5f55038bcda1b66de369897a9612fa52a657d1c573d1932e3eaa3d07ee7b1 libopk-3c918c8.tar.gz diff --git a/FunKey/package/libopk/libopk.mk b/FunKey/package/libopk/libopk.mk index 6bb18ea..8cf840a 100644 --- a/FunKey/package/libopk/libopk.mk +++ b/FunKey/package/libopk/libopk.mk @@ -4,8 +4,11 @@ # ############################################################# LIBOPK_VERSION = 3c918c8 -LIBOPK_SITE = $(call github,pcercuei,libopk,$(LIBOPK_VERSION)) +LIBOPK_SITE_METHOD = git +LIBOPK_SITE = https://github.com/FunKey-Project/libopk.git + LIBOPK_DEPENDENCIES = libini zlib + LIBOPK_INSTALL_STAGING = YES $(eval $(cmake-package)) diff --git a/FunKey/package/libxdgmime/Config.in b/FunKey/package/libxdgmime/Config.in new file mode 100644 index 0000000..f1d4fc0 --- /dev/null +++ b/FunKey/package/libxdgmime/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_LIBXDGMIME + bool "libxdgmime" + depends on BR2_USE_WCHAR # shared-mime-info + select BR2_PACKAGE_SHARED_MIME_INFO + help + Simple library that parses the proposed MIME spec + listed at http://freedesktop.org/. + + https://github.com/pcercuei/libxdgmime + +comment "libxdgmime requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/FunKey/package/libxdgmime/libxdgmime.mk b/FunKey/package/libxdgmime/libxdgmime.mk new file mode 100644 index 0000000..c6e592f --- /dev/null +++ b/FunKey/package/libxdgmime/libxdgmime.mk @@ -0,0 +1,30 @@ +############################################################# +# +# libxdgmime +# +############################################################# +LIBXDGMIME_VERSION = db79e7c +LIBXDGMIME_SITE_METHOD = git +LIBXDGMIME_SITE = https://github.com/FunKey-Project/libxdgmime.git +LIBXDGMIME_DEPENDENCIES = shared-mime-info +LIBXDGMIME_LICENCE = LGPL-2.1+ or AFL-2.1 + +LIBXDGMIME_INSTALL_STAGING = YES + +LIBXDGMIME_MAKE_ENV = CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" \ + CROSS_COMPILE="$(TARGET_CROSS)" PREFIX=/usr \ + PLATFORM="$(BR2_VENDOR)" + +define LIBXDGMIME_BUILD_CMDS + $(LIBXDGMIME_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define LIBXDGMIME_INSTALL_STAGING_CMDS + $(LIBXDGMIME_MAKE_ENV) DESTDIR="$(STAGING_DIR)" $(MAKE) -C $(@D) install +endef + +define LIBXDGMIME_INSTALL_TARGET_CMDS + $(LIBXDGMIME_MAKE_ENV) DESTDIR="$(TARGET_DIR)" $(MAKE) -C $(@D) install-lib +endef + +$(eval $(generic-package))