From e50c5649663f628f5d7033c52ce9dccef7424157 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Mon, 16 Nov 2020 13:58:36 +0100 Subject: [PATCH] use public repositories for packages Signed-off-by: Michel-FK --- .../patches/gnuboy/0001-cross-compile.patch | 76 ------------------- FunKey/board/funkey/rootfs-overlay/etc/issue | 2 +- .../funkey/rootfs-overlay/etc/os-release | 6 +- .../funkey/rootfs-overlay/etc/sw-versions | 2 +- FunKey/package/FCEUX/FCEUX.mk | 4 +- .../FunKey-GPIO-Mapping.mk | 3 +- FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk | 6 +- FunKey/package/PocketSNES/PocketSNES.mk | 4 +- FunKey/package/ProdScreens/ProdScreens.mk | 4 +- FunKey/package/gnuboy/gnuboy.mk | 4 +- FunKey/package/gpsp/gpsp.mk | 4 +- FunKey/package/mednafen/mednafen.mk | 12 +-- FunKey/package/picodrive/picodrive.mk | 6 +- FunKey/package/retrofe/retrofe.mk | 5 +- 14 files changed, 32 insertions(+), 106 deletions(-) delete mode 100644 FunKey/board/funkey/patches/gnuboy/0001-cross-compile.patch diff --git a/FunKey/board/funkey/patches/gnuboy/0001-cross-compile.patch b/FunKey/board/funkey/patches/gnuboy/0001-cross-compile.patch deleted file mode 100644 index 75a92ba..0000000 --- a/FunKey/board/funkey/patches/gnuboy/0001-cross-compile.patch +++ /dev/null @@ -1,76 +0,0 @@ - Makefile | 2 +- - Makefile.in | 2 +- - configure | 6 +++--- - configure.in | 6 +++--- - 4 files changed, 8 insertions(+), 8 deletions(-) - -diff -Naur a/configure b/configure ---- a/configure -+++ b/configure -@@ -2219,7 +2219,7 @@ - fi - done - --LIBS="$LIBS -L/usr/local/lib -L/usr/X11R6/lib" -+#LIBS="$LIBS -L/usr/local/lib -L/usr/X11R6/lib" - - # Check whether --with-fb or --without-fb was given. - if test "${with_fb+set}" = set; then -@@ -2658,8 +2658,8 @@ - fi - - if test "$SDL_CONFIG" ; then --SDL_LIBS="`sdl-config --libs` -lSDL_image -lSDL_ttf" --SDL_CFLAGS="`sdl-config --cflags` -lSDL -lSDL_image -lSDL_ttf" -+SDL_LIBS="`$SDL_CONFIG --libs` -lSDL_image -lSDL_ttf" -+SDL_CFLAGS="`$SDL_CONFIG --cflags` -lSDL -lSDL_image -lSDL_ttf" - old_incs="$INCS" - INCS="$INCS $SDL_CFLAGS" - echo "$as_me:2662: checking for SDL_Init in -lSDL" >&5 -diff -Naur a/configure.in b/configure.in ---- a/configure.in -+++ b/configure.in -@@ -21,7 +21,7 @@ - - - --LIBS="$LIBS -L/usr/local/lib -L/usr/X11R6/lib" -+#LIBS="$LIBS -L/usr/local/lib -L/usr/X11R6/lib" - - - -@@ -79,8 +79,8 @@ - if test "$with_sdl" != "no" ; then - AC_CHECK_PROG(SDL_CONFIG, sdl-config, yes) - if test "$SDL_CONFIG" ; then --SDL_LIBS="`sdl-config --libs`" --SDL_CFLAGS="`sdl-config --cflags`" -+SDL_LIBS="`$SDL_CONFIG --libs`" -+SDL_CFLAGS="`$SDL_CONFIG --cflags`" - old_incs="$INCS" - INCS="$INCS $SDL_CFLAGS" - AC_CHECK_LIB(SDL, SDL_Init, [ -diff -Naur a/Makefile b/Makefile ---- a/Makefile -+++ b/Makefile -@@ -18,7 +18,7 @@ - - SYS_DEFS = -DHAVE_CONFIG_H -DIS_LITTLE_ENDIAN -DIS_LINUX - SYS_OBJS = sys/nix/nix.o $(ASM_OBJS) --SYS_INCS = -I/usr/local/include -I./sys/nix -+SYS_INCS = -I./sys/nix - - FB_OBJS = sys/linux/joy.o sys/oss/oss.o - FB_LIBS = -diff -Naur a/Makefile.in b/Makefile.in ---- a/Makefile.in -+++ b/Makefile.in -@@ -18,7 +18,7 @@ - - SYS_DEFS = @DEFS@ @ENDIAN@ @ASM@ @SYS_DEFS@ - SYS_OBJS = sys/nix/nix.o $(ASM_OBJS) --SYS_INCS = -I/usr/local/include @XINCS@ -I./sys/nix -+SYS_INCS = @XINCS@ -I./sys/nix - - FB_OBJS = @FB_OBJS@ @JOY@ @SOUND@ - FB_LIBS = diff --git a/FunKey/board/funkey/rootfs-overlay/etc/issue b/FunKey/board/funkey/rootfs-overlay/etc/issue index cce35b7..c4099eb 100644 --- a/FunKey/board/funkey/rootfs-overlay/etc/issue +++ b/FunKey/board/funkey/rootfs-overlay/etc/issue @@ -5,6 +5,6 @@ |___| |_____|__|__||__|\__||_____|___ | FUN ON A KEYCHAIN |_____| ----------------------------------------------------- - Version 0.971 + Version 0.98 ----------------------------------------------------- diff --git a/FunKey/board/funkey/rootfs-overlay/etc/os-release b/FunKey/board/funkey/rootfs-overlay/etc/os-release index 16d1fb8..2595272 100644 --- a/FunKey/board/funkey/rootfs-overlay/etc/os-release +++ b/FunKey/board/funkey/rootfs-overlay/etc/os-release @@ -1,9 +1,9 @@ NAME="FunKey-OS" -VERSION="0.971 (Khaki Kitten)" +VERSION="0.98 (Khaki Kitten)" ID=funkey ID_LIKE=buildroot -PRETTY_NAME="FunKey-OS 0.971" -VERSION_ID="0.971" +PRETTY_NAME="FunKey-OS 0.98" +VERSION_ID="0.98" HOME_URL="https://www.funkey-project.com/" SUPPORT_URL="https://www.funkey-project.com/" BUG_REPORT_URL="https://www.funkey-project.com/" diff --git a/FunKey/board/funkey/rootfs-overlay/etc/sw-versions b/FunKey/board/funkey/rootfs-overlay/etc/sw-versions index 2d8cb4c..7b8c28b 100644 --- a/FunKey/board/funkey/rootfs-overlay/etc/sw-versions +++ b/FunKey/board/funkey/rootfs-overlay/etc/sw-versions @@ -1 +1 @@ -rootfs 0.971 +rootfs 0.98 diff --git a/FunKey/package/FCEUX/FCEUX.mk b/FunKey/package/FCEUX/FCEUX.mk index cb58d6d..414fa1b 100644 --- a/FunKey/package/FCEUX/FCEUX.mk +++ b/FunKey/package/FCEUX/FCEUX.mk @@ -4,9 +4,9 @@ # ################################################################################ -FCEUX_VERSION = 47928bf2fd24902826e8b8ff57b9a9ec5cf886a1 +FCEUX_VERSION = 23fe9d5d47bd4fc9c9638030cd713942dca22d2d FCEUX_SITE_METHOD = git -FCEUX_SITE = ssh://git@fk/FunKey-Project/FunKey-Emulator-FCEUX +FCEUX_SITE = https://github.com/FunKey-Project/fceux.git FCEUX_LICENSE = GPL-2.0 FCEUX_LICENSE_FILES = COPYING diff --git a/FunKey/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk b/FunKey/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk index 9d62057..f2ccd07 100644 --- a/FunKey/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk +++ b/FunKey/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk @@ -6,8 +6,7 @@ FUNKEY_GPIO_MAPPING_VERSION = cd412528079a59eab66e7d426e28d9966c2d731c FUNKEY_GPIO_MAPPING_SITE_METHOD = git -#FUNKEY_GPIO_MAPPING_SITE = ssh://git@github.com/FunKey-Project/FunKey-GPIO-Mapping.git -FUNKEY_GPIO_MAPPING_SITE = ssh://git@fk/FunKey-Project/FunKey-GPIO-Mapping.git +FUNKEY_GPIO_MAPPING_SITE = ssh://git@github.com/FunKey-Project/FunKey-GPIO-Mapping.git FUNKEY_GPIO_MAPPING_SITE_LICENSE = GPL-2.1+ FUNKEY_GPIO_MAPPING_SITE_LICENSE_FILES = COPYING diff --git a/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk b/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk index 227df20..c2a453f 100644 --- a/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk +++ b/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk @@ -4,9 +4,9 @@ # ################################################################################ -PCSX_REARMED_VERSION = abb2b261f1dbe6a54d94cf42c089bd9f6ecdc6b6 +PCSX_REARMED_VERSION = bbaf67447bbcc8b169a0f092492f97c27923c3b7 PCSX_REARMED_SITE_METHOD = git -PCSX_REARMED_SITE = ssh://git@fk/FunKey-Project/FunKey-Emulator-PCSX-ReARMed +PCSX_REARMED_SITE = https://github.com/FunKey-Project/pcsx_rearmed.git PCSX_REARMED_LICENSE = GPL-2.0 PCSX_REARMED_LICENSE_FILES = COPYING @@ -55,6 +55,8 @@ define PCSX_REARMED_BUILD_CMDS ) endef +PCSX_REARMED_GIT_SUBMODULES = YES + define PCSX_REARMED_INSTALL_TARGET_CMDS $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games $(INSTALL) -m 0755 $(@D)/pcsx $(TARGET_DIR)/usr/games/pcsx diff --git a/FunKey/package/PocketSNES/PocketSNES.mk b/FunKey/package/PocketSNES/PocketSNES.mk index 22e3bbc..2c91278 100644 --- a/FunKey/package/PocketSNES/PocketSNES.mk +++ b/FunKey/package/PocketSNES/PocketSNES.mk @@ -4,9 +4,9 @@ # ################################################################################ -POCKETSNES_VERSION = 34586622b124fa9d9231a5a0a3bc11b2375e4094 +POCKETSNES_VERSION = 4c48411d3b71976a46696441c43ae86028962d58 POCKETSNES_SITE_METHOD = git -POCKETSNES_SITE = ssh://git@fk/FunKey-Project/FunKey-Emulator-PocketSNES +POCKETSNES_SITE = https://github.com/FunKey-Project/PocketSNES.git POCKETSNES_LICENSE = GPL-2.0 POCKETSNES_LICENSE_FILES = COPYING diff --git a/FunKey/package/ProdScreens/ProdScreens.mk b/FunKey/package/ProdScreens/ProdScreens.mk index 404652b..8d9148e 100644 --- a/FunKey/package/ProdScreens/ProdScreens.mk +++ b/FunKey/package/ProdScreens/ProdScreens.mk @@ -6,9 +6,7 @@ PRODSCREENS_VERSION = 6040b6aee8b5e277ca5ac37c7693376296710bbc PRODSCREENS_SITE_METHOD = git -#PRODSCREENS_SITE = ssh://git@github.com/FunKey-Project/FunKey-ProdScreens.git -PRODSCREENS_SITE = ssh://git@fk/FunKey-Project/FunKey-ProdScreens.git -#PRODSCREENS_SITE = https://github.com/FunKey-Project/FunKey-ProdScreens.git +PRODSCREENS_SITE = https://github.com/FunKey-Project/FunKey-ProdScreens.git PRODSCREENS_SITE_LICENSE = GPL-2.1+ PRODSCREENS_SITE_LICENSE_FILES = COPYING diff --git a/FunKey/package/gnuboy/gnuboy.mk b/FunKey/package/gnuboy/gnuboy.mk index 5deab41..c8feba8 100644 --- a/FunKey/package/gnuboy/gnuboy.mk +++ b/FunKey/package/gnuboy/gnuboy.mk @@ -4,9 +4,9 @@ # ################################################################################ -GNUBOY_VERSION = e01db4f319c7e58f5b07757a91cc5ca1ba12ba79 +GNUBOY_VERSION = 3edf32baa09882c4aa52f3e052e3d071c7044860 GNUBOY_SITE_METHOD = git -GNUBOY_SITE = ssh://git@fk/FunKey-Project/FunKey-Emulator-GNUBoy +GNUBOY_SITE = https://github.com/FunKey-Project/gnuboy.git GNUBOY_LICENSE = GPL-2.0 GNUBOY_LICENSE_FILES = COPYING diff --git a/FunKey/package/gpsp/gpsp.mk b/FunKey/package/gpsp/gpsp.mk index c054fde..5665380 100644 --- a/FunKey/package/gpsp/gpsp.mk +++ b/FunKey/package/gpsp/gpsp.mk @@ -4,9 +4,9 @@ # ################################################################################ -GPSP_VERSION = 51d4b46d74c646ff4c1549973a966b023fbaaebf +GPSP_VERSION = 1cf3af9f2b041b861d4d2a5344ef27897bf60878 GPSP_SITE_METHOD = git -GPSP_SITE = ssh://git@fk/FunKey-Project/FunKey-Emulator-GPSP +GPSP_SITE = https://github.com/FunKey-Project/gpsp.git GPSP_LICENSE = GPL-2.0 GPSP_LICENSE_FILES = COPYING.DOC diff --git a/FunKey/package/mednafen/mednafen.mk b/FunKey/package/mednafen/mednafen.mk index 0ee279a..b1307fb 100644 --- a/FunKey/package/mednafen/mednafen.mk +++ b/FunKey/package/mednafen/mednafen.mk @@ -4,12 +4,9 @@ # ################################################################################ -#MEDNAFEN_VERSION = 0.9.48 -#MEDNAFEN_SOURCE = mednafen-$(MEDNAFEN_VERSION).tar.xz -#MEDNAFEN_SITE = http://downloads.sourceforge.net/sourceforge/mednafen -MEDNAFEN_VERSION = e7ee7d0fb9438c2f3e132583b2d79eb0db7ebb91 +MEDNAFEN_VERSION = d60fb0da3e9fd1afb8ed43c4ef8cae6b3678d1a4 MEDNAFEN_SITE_METHOD = git -MEDNAFEN_SITE = ssh://git@fk/FunKey-Project/FunKey-Emulator-mednafen-0.9.48 +MEDNAFEN_SITE = https://github.com/FunKey-Project/mednafen-git.git MEDNAFEN_LICENSE = GPL-2.0+ MEDNAFEN_LICENSE_FILES = COPYING @@ -35,9 +32,14 @@ ifeq ($(BR2_ARM_CPU_HAS_NEON),y) MEDNAFEN_CFLAGS += -D__ARM_NEON__ -mfpu=neon -mvectorize-with-neon-quad endif +#MEDNAFEN_AUTORECONF = YES + MEDNAFEN_CFLAGS += -ggdb -O3 +#MEDNAFEN_LDFLAGS += -lSDL_ttf -lSDL_image + MEDNAFEN_CONF_OPTS += CFLAGS="$(MEDNAFEN_CFLAGS)" +#MEDNAFEN_CONF_OPTS += LDFLAGS="$(MEDNAFEN_LDFLAGS)" MEDNAFEN_CONF_OPTS += --prefix=/usr/local --bindir=/usr/games --without-libsndfile MEDNAFEN_CONF_ENV += SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" diff --git a/FunKey/package/picodrive/picodrive.mk b/FunKey/package/picodrive/picodrive.mk index 47f689a..610c447 100644 --- a/FunKey/package/picodrive/picodrive.mk +++ b/FunKey/package/picodrive/picodrive.mk @@ -4,9 +4,9 @@ # ################################################################################ -PICODRIVE_VERSION = ed1e17a4c1b2e7e105327ecd4c025126d3b0f980 +PICODRIVE_VERSION = 6bc02d3ba011b718d5dcf6b9215ce2b671ab4f7d PICODRIVE_SITE_METHOD = git -PICODRIVE_SITE = ssh://git@fk/FunKey-Project/FunKey-Emulator-picodrive +PICODRIVE_SITE = https://github.com/FunKey-Project/picodrive.git PICODRIVE_LICENSE = MAME PICODRIVE_LICENSE_FILES = COPYING @@ -55,6 +55,8 @@ define PICODRIVE_BUILD_CMDS ) endef +PICODRIVE_GIT_SUBMODULES = YES + define PICODRIVE_INSTALL_TARGET_CMDS $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games $(INSTALL) -m 0755 $(@D)/PicoDrive $(TARGET_DIR)/usr/games/ diff --git a/FunKey/package/retrofe/retrofe.mk b/FunKey/package/retrofe/retrofe.mk index 410f835..25feb37 100644 --- a/FunKey/package/retrofe/retrofe.mk +++ b/FunKey/package/retrofe/retrofe.mk @@ -4,10 +4,9 @@ # ################################################################################ -RETROFE_VERSION = bc8bdafec007f850135bde9cde1b8d313ee665a4 +RETROFE_VERSION = bda5f1bda8931659fe5f6d0a95b9858312b89da7 RETROFE_SITE_METHOD = git -#RETROFE_SITE = ssh://git@github.com/FunKey-Project/FunKey-Launcher-retrofe.git -RETROFE_SITE = ssh://git@fk/FunKey-Project/FunKey-Launcher-retrofe.git +RETROFE_SITE = https://github.com/FunKey-Project/RetroFE.git RETROFE_DEPENDENCIES = gstreamer1 gst1-plugins-base sdl sdl_image sdl_mixer sdl_sound sdl_ttf libglib2 sqlite zlib RETROFE_LICENSE = GPL-3.0 RETROFE_LICENSE_FILES = LICENSE.txt