From dd9fd561e323054cb513465277e85e766f41f9bd Mon Sep 17 00:00:00 2001 From: paradadf Date: Mon, 4 May 2020 16:24:26 +0000 Subject: [PATCH 01/12] chore(dosbox-core): add inital libretro packages --- Config.in | 1 + configs/recalbox-odroidxu4_defconfig | 1 + configs/recalbox-rpi1_defconfig | 1 + configs/recalbox-rpi2_defconfig | 1 + configs/recalbox-rpi3_defconfig | 1 + configs/recalbox-x86_64_defconfig | 1 + configs/recalbox-x86_defconfig | 1 + package/libretro-dosbox-core/Config.in | 12 +++++++++ .../libretro-dosbox-core.mk | 25 +++++++++++++++++++ .../recalbox-romfs-dos/Config.in | 1 + 10 files changed, 45 insertions(+) create mode 100644 package/libretro-dosbox-core/Config.in create mode 100644 package/libretro-dosbox-core/libretro-dosbox-core.mk diff --git a/Config.in b/Config.in index 76b15027c6..20f5d626c1 100644 --- a/Config.in +++ b/Config.in @@ -106,6 +106,7 @@ menu "Libretro Cores" source "$BR2_EXTERNAL_RECALBOX_PATH/package/libretro-crocods/Config.in" source "$BR2_EXTERNAL_RECALBOX_PATH/package/libretro-desmume/Config.in" source "$BR2_EXTERNAL_RECALBOX_PATH/package/libretro-dinothawr/Config.in" + source "$BR2_EXTERNAL_RECALBOX_PATH/package/libretro-dosbox-core/Config.in" source "$BR2_EXTERNAL_RECALBOX_PATH/package/libretro-ecwolf/Config.in" source "$BR2_EXTERNAL_RECALBOX_PATH/package/libretro-fbneo/Config.in" source "$BR2_EXTERNAL_RECALBOX_PATH/package/libretro-fceumm/Config.in" diff --git a/configs/recalbox-odroidxu4_defconfig b/configs/recalbox-odroidxu4_defconfig index 0f00671a95..e3db84d813 100644 --- a/configs/recalbox-odroidxu4_defconfig +++ b/configs/recalbox-odroidxu4_defconfig @@ -239,6 +239,7 @@ BR2_PACKAGE_LIBRETRO_CAP32=y BR2_PACKAGE_LIBRETRO_CRAWL=y BR2_PACKAGE_LIBRETRO_CROCODS=y BR2_PACKAGE_LIBRETRO_DINOTHAWR=y +BR2_PACKAGE_LIBRETRO_DOSBOX_CORE=y BR2_PACKAGE_LIBRETRO_ECWOLF=y BR2_PACKAGE_LIBRETRO_FBNEO=y BR2_PACKAGE_LIBRETRO_FCEUMM=y diff --git a/configs/recalbox-rpi1_defconfig b/configs/recalbox-rpi1_defconfig index e5a5e5d158..5f592829ae 100644 --- a/configs/recalbox-rpi1_defconfig +++ b/configs/recalbox-rpi1_defconfig @@ -231,6 +231,7 @@ BR2_PACKAGE_LIBRETRO_CAP32=y BR2_PACKAGE_LIBRETRO_CRAWL=y BR2_PACKAGE_LIBRETRO_CROCODS=y BR2_PACKAGE_LIBRETRO_DINOTHAWR=y +BR2_PACKAGE_LIBRETRO_DOSBOX_CORE=y BR2_PACKAGE_LIBRETRO_ECWOLF=y BR2_PACKAGE_LIBRETRO_FBNEO=y BR2_PACKAGE_LIBRETRO_FCEUMM=y diff --git a/configs/recalbox-rpi2_defconfig b/configs/recalbox-rpi2_defconfig index de714c7356..a4b6c1c85e 100644 --- a/configs/recalbox-rpi2_defconfig +++ b/configs/recalbox-rpi2_defconfig @@ -244,6 +244,7 @@ BR2_PACKAGE_LIBRETRO_CAP32=y BR2_PACKAGE_LIBRETRO_CRAWL=y BR2_PACKAGE_LIBRETRO_CROCODS=y BR2_PACKAGE_LIBRETRO_DINOTHAWR=y +BR2_PACKAGE_LIBRETRO_DOSBOX_CORE=y BR2_PACKAGE_LIBRETRO_ECWOLF=y BR2_PACKAGE_LIBRETRO_FBNEO=y BR2_PACKAGE_LIBRETRO_FCEUMM=y diff --git a/configs/recalbox-rpi3_defconfig b/configs/recalbox-rpi3_defconfig index 0e9a9cc6fc..4975aca701 100644 --- a/configs/recalbox-rpi3_defconfig +++ b/configs/recalbox-rpi3_defconfig @@ -246,6 +246,7 @@ BR2_PACKAGE_LIBRETRO_CAP32=y BR2_PACKAGE_LIBRETRO_CRAWL=y BR2_PACKAGE_LIBRETRO_CROCODS=y BR2_PACKAGE_LIBRETRO_DINOTHAWR=y +BR2_PACKAGE_LIBRETRO_DOSBOX_CORE=y BR2_PACKAGE_LIBRETRO_ECWOLF=y BR2_PACKAGE_LIBRETRO_FBNEO=y BR2_PACKAGE_LIBRETRO_FCEUMM=y diff --git a/configs/recalbox-x86_64_defconfig b/configs/recalbox-x86_64_defconfig index e31ef89c7b..fe199e8ca6 100644 --- a/configs/recalbox-x86_64_defconfig +++ b/configs/recalbox-x86_64_defconfig @@ -376,6 +376,7 @@ BR2_PACKAGE_LIBRETRO_CRAWL=y BR2_PACKAGE_LIBRETRO_CROCODS=y BR2_PACKAGE_LIBRETRO_DESMUME=y BR2_PACKAGE_LIBRETRO_DINOTHAWR=y +BR2_PACKAGE_LIBRETRO_DOSBOX_CORE=y BR2_PACKAGE_LIBRETRO_ECWOLF=y BR2_PACKAGE_LIBRETRO_FBNEO=y BR2_PACKAGE_LIBRETRO_FCEUMM=y diff --git a/configs/recalbox-x86_defconfig b/configs/recalbox-x86_defconfig index c9d7cd5cd1..1d9870bf4a 100644 --- a/configs/recalbox-x86_defconfig +++ b/configs/recalbox-x86_defconfig @@ -358,6 +358,7 @@ BR2_PACKAGE_LIBRETRO_CRAWL=y BR2_PACKAGE_LIBRETRO_CROCODS=y BR2_PACKAGE_LIBRETRO_DESMUME=y BR2_PACKAGE_LIBRETRO_DINOTHAWR=y +BR2_PACKAGE_LIBRETRO_DOSBOX_CORE=y BR2_PACKAGE_LIBRETRO_ECWOLF=y BR2_PACKAGE_LIBRETRO_FBNEO=y BR2_PACKAGE_LIBRETRO_FCEUMM=y diff --git a/package/libretro-dosbox-core/Config.in b/package/libretro-dosbox-core/Config.in new file mode 100644 index 0000000000..54ec896eab --- /dev/null +++ b/package/libretro-dosbox-core/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_LIBRETRO_DOSBOX_CORE + bool "libretro-dosbox-core" + depends on BR2_PACKAGE_RETROARCH + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_RECALBOX_ROMFS_DOS + help + A libretro dosbox-core emulator. + + http://www.libretro.com + +comment "LIBRETRO_DOSBOX_CORE needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/libretro-dosbox-core/libretro-dosbox-core.mk b/package/libretro-dosbox-core/libretro-dosbox-core.mk new file mode 100644 index 0000000000..84ba0fc641 --- /dev/null +++ b/package/libretro-dosbox-core/libretro-dosbox-core.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# DOSBOX_CORE +# +################################################################################ + +LIBRETRO_DOSBOX_CORE_VERSION = 5521e6f216f1084613f5c15c8b44c06541cc85c2 +LIBRETRO_DOSBOX_CORE_SITE = $(call github,libretro,dosbox-core,$(LIBRETRO_DOSBOX_CORE_VERSION)) +LIBRETRO_DOSBOX_CORE_DEPENDENCIES = sdl sdl_net +LIBRETRO_DOSBOX_CORE_GIT_SUBMODULES = YES + +define LIBRETRO_DOSBOX_CORE_BUILD_CMDS + $(SED) "s|-O2|-O3|g" $(@D)/Makefile.libretro + CFLAGS="$(TARGET_CFLAGS) $(COMPILER_COMMONS_CFLAGS_SO)" \ + CXXFLAGS="$(TARGET_CXXFLAGS) $(COMPILER_COMMONS_CXXFLAGS_SO)" \ + LDFLAGS="$(TARGET_LDFLAGS) $(COMPILER_COMMONS_LDFLAGS_SO)" \ + $(MAKE) CXX="$(TARGET_CXX)" CC="$(TARGET_CC)" -C $(@D)/ -f Makefile platform="$(RETROARCH_LIBRETRO_BOARD)" +endef + +define LIBRETRO_DOSBOX_CORE_INSTALL_TARGET_CMDS + $(INSTALL) -D $(@D)/libretro/dosbox_core_libretro.so \ + $(TARGET_DIR)/usr/bin/dosbox_core_libretro.so +endef + +$(eval $(generic-package)) diff --git a/package/recalbox-romfs/recalbox-romfs-dos/Config.in b/package/recalbox-romfs/recalbox-romfs-dos/Config.in index 384856af17..f17d9b0524 100644 --- a/package/recalbox-romfs/recalbox-romfs-dos/Config.in +++ b/package/recalbox-romfs/recalbox-romfs-dos/Config.in @@ -2,5 +2,6 @@ config BR2_PACKAGE_RECALBOX_ROMFS_DOS bool "recalbox-romfs-dos" select BR2_PACKAGE_RECALBOX_ROMS depends on BR2_PACKAGE_DOSBOX + depends on BR2_PACKAGE_LIBRETRO_DOSBOX_CORE help share_init/roms and xml for dos -- GitLab From 7e844ce6038538aa03ca4922a955dd35d58c42b5 Mon Sep 17 00:00:00 2001 From: paradadf Date: Mon, 4 May 2020 17:01:09 +0000 Subject: [PATCH 02/12] chore(dosbox-core): add romfs --- .../recalbox-romfs-dos/Config.in | 4 +-- .../recalbox-romfs-dos/recalbox-romfs-dos.mk | 26 ++++++++++++++++--- .../recalbox-romfs/recalbox-romfs.mk | 4 +-- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/package/recalbox-romfs/recalbox-romfs-dos/Config.in b/package/recalbox-romfs/recalbox-romfs-dos/Config.in index f17d9b0524..7116424dd9 100644 --- a/package/recalbox-romfs/recalbox-romfs-dos/Config.in +++ b/package/recalbox-romfs/recalbox-romfs-dos/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_RECALBOX_ROMFS_DOS bool "recalbox-romfs-dos" select BR2_PACKAGE_RECALBOX_ROMS - depends on BR2_PACKAGE_DOSBOX - depends on BR2_PACKAGE_LIBRETRO_DOSBOX_CORE + depends on BR2_PACKAGE_DOSBOX \ + || BR2_PACKAGE_LIBRETRO_DOSBOX_CORE help share_init/roms and xml for dos diff --git a/package/recalbox-romfs/recalbox-romfs-dos/recalbox-romfs-dos.mk b/package/recalbox-romfs/recalbox-romfs-dos/recalbox-romfs-dos.mk index cb52e7df1f..05de03fcae 100644 --- a/package/recalbox-romfs/recalbox-romfs-dos/recalbox-romfs-dos.mk +++ b/package/recalbox-romfs/recalbox-romfs-dos/recalbox-romfs-dos.mk @@ -5,7 +5,7 @@ ################################################################################ # Package generated with : -# ./scripts/linux/empack.py --force --system dos --extension '.pc .PC .dos .DOS' --fullname 'Dos (x86)' --platform pc --theme pc 1:dosbox:dosbox:BR2_PACKAGE_DOSBOX +# ./scripts/linux/empack.py --force --system dos --extension '.pc .dos .cue' --fullname 'Dos (x86)' --platform pc --theme pc 1:dosbox:dosbox:BR2_PACKAGE_DOSBOX 2:libretro:dosbox_core:BR2_PACKAGE_LIBRETRO_DOSBOX_CORE # Name the 3 vars as the package requires RECALBOX_ROMFS_DOS_SOURCE = @@ -21,12 +21,27 @@ SOURCE_ROMDIR_DOS = $(RECALBOX_ROMFS_DOS_PKGDIR)/roms # variables are global across buildroot -ifneq ($(BR2_PACKAGE_DOSBOX),) +ifneq ($(BR2_PACKAGE_DOSBOX)$(BR2_PACKAGE_LIBRETRO_DOSBOX_CORE),) define CONFIGURE_MAIN_DOS_START - $(call RECALBOX_ROMFS_CALL_ADD_SYSTEM,$(SYSTEM_XML_DOS),Dos (x86),$(SYSTEM_NAME_DOS),.pc .PC .dos .DOS,pc,pc) + $(call RECALBOX_ROMFS_CALL_ADD_SYSTEM,$(SYSTEM_XML_DOS),Dos (x86),$(SYSTEM_NAME_DOS),.pc .dos .cue,pc,pc) endef -ifneq ($(BR2_PACKAGE_DOSBOX),) +ifneq ($(BR2_PACKAGE_DOSBOX)$(BR2_PACKAGE_LIBRETRO_DOSBOX_CORE),) +define CONFIGURE_DOS_LIBRETRO_START + $(call RECALBOX_ROMFS_CALL_START_EMULATOR,$(SYSTEM_XML_DOS),libretro) +endef +ifeq ($(BR2_PACKAGE_LIBRETRO_DOSBOX_CORE),y) +define CONFIGURE_DOS_LIBRETRO_DOSBOX_CORE_DEF + $(call RECALBOX_ROMFS_CALL_ADD_CORE,$(SYSTEM_XML_DOS),dosbox_core,2) +endef +endif + +define CONFIGURE_DOS_LIBRETRO_END + $(call RECALBOX_ROMFS_CALL_END_EMULATOR,$(SYSTEM_XML_DOS)) +endef +endif + +ifneq ($(BR2_PACKAGE_DOSBOX)$(BR2_PACKAGE_LIBRETRO_DOSBOX_CORE),) define CONFIGURE_DOS_DOSBOX_START $(call RECALBOX_ROMFS_CALL_START_EMULATOR,$(SYSTEM_XML_DOS),dosbox) endef @@ -50,6 +65,9 @@ endif define RECALBOX_ROMFS_DOS_CONFIGURE_CMDS $(CONFIGURE_MAIN_DOS_START) + $(CONFIGURE_DOS_LIBRETRO_START) + $(CONFIGURE_DOS_LIBRETRO_DOSBOX_CORE_DEF) + $(CONFIGURE_DOS_LIBRETRO_END) $(CONFIGURE_DOS_DOSBOX_START) $(CONFIGURE_DOS_DOSBOX_DOSBOX_DEF) $(CONFIGURE_DOS_DOSBOX_END) diff --git a/package/recalbox-romfs/recalbox-romfs/recalbox-romfs.mk b/package/recalbox-romfs/recalbox-romfs/recalbox-romfs.mk index ae589491ac..f1b6f94c36 100644 --- a/package/recalbox-romfs/recalbox-romfs/recalbox-romfs.mk +++ b/package/recalbox-romfs/recalbox-romfs/recalbox-romfs.mk @@ -295,8 +295,8 @@ ifneq ($(BR2_PACKAGE_LIBRETRO_BOOM3),) endif # System: dos -ifeq ($(BR2_PACKAGE_DOSBOX),y) - RECALBOX_ROMFS_DEPENDENCIES += recalbox-romfs-dos +ifneq ($(BR2_PACKAGE_DOSBOX)$(BR2_PACKAGE_LIBRETRO_DOSBOX_CORE),) + RECALBOX_ROMFS_DEPENDENCIES += recalbox-romfs-dos endif # System: dreamcast -- GitLab From fd7ee60e60b0d80a2946c2148a252a32df4e9eac Mon Sep 17 00:00:00 2001 From: paradadf Date: Mon, 4 May 2020 18:16:13 +0000 Subject: [PATCH 03/12] chore(dosbox-core): change git method --- package/libretro-dosbox-core/libretro-dosbox-core.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libretro-dosbox-core/libretro-dosbox-core.mk b/package/libretro-dosbox-core/libretro-dosbox-core.mk index 84ba0fc641..7a430132e3 100644 --- a/package/libretro-dosbox-core/libretro-dosbox-core.mk +++ b/package/libretro-dosbox-core/libretro-dosbox-core.mk @@ -5,7 +5,7 @@ ################################################################################ LIBRETRO_DOSBOX_CORE_VERSION = 5521e6f216f1084613f5c15c8b44c06541cc85c2 -LIBRETRO_DOSBOX_CORE_SITE = $(call github,libretro,dosbox-core,$(LIBRETRO_DOSBOX_CORE_VERSION)) +LIBRETRO_DOSBOX_CORE_SITE = git://github.com/libretro/dosbox-core.git LIBRETRO_DOSBOX_CORE_DEPENDENCIES = sdl sdl_net LIBRETRO_DOSBOX_CORE_GIT_SUBMODULES = YES -- GitLab From 8d57d712f69c408364169829a9315499d37300fd Mon Sep 17 00:00:00 2001 From: paradadf Date: Mon, 4 May 2020 22:25:18 +0000 Subject: [PATCH 04/12] chore(dosbox-core): fix mk --- package/libretro-dosbox-core/libretro-dosbox-core.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libretro-dosbox-core/libretro-dosbox-core.mk b/package/libretro-dosbox-core/libretro-dosbox-core.mk index 7a430132e3..24e0f8907a 100644 --- a/package/libretro-dosbox-core/libretro-dosbox-core.mk +++ b/package/libretro-dosbox-core/libretro-dosbox-core.mk @@ -10,11 +10,11 @@ LIBRETRO_DOSBOX_CORE_DEPENDENCIES = sdl sdl_net LIBRETRO_DOSBOX_CORE_GIT_SUBMODULES = YES define LIBRETRO_DOSBOX_CORE_BUILD_CMDS - $(SED) "s|-O2|-O3|g" $(@D)/Makefile.libretro + $(SED) "s|-O2|-O3|g" $(@D)/libretro/Makefile.libretro CFLAGS="$(TARGET_CFLAGS) $(COMPILER_COMMONS_CFLAGS_SO)" \ CXXFLAGS="$(TARGET_CXXFLAGS) $(COMPILER_COMMONS_CXXFLAGS_SO)" \ LDFLAGS="$(TARGET_LDFLAGS) $(COMPILER_COMMONS_LDFLAGS_SO)" \ - $(MAKE) CXX="$(TARGET_CXX)" CC="$(TARGET_CC)" -C $(@D)/ -f Makefile platform="$(RETROARCH_LIBRETRO_BOARD)" + $(MAKE) CXX="$(TARGET_CXX)" CC="$(TARGET_CC)" -C $(@D)/libretro -f Makefile.libretro platform="$(RETROARCH_LIBRETRO_BOARD)" endef define LIBRETRO_DOSBOX_CORE_INSTALL_TARGET_CMDS -- GitLab From 4ba04efbdd1ed63d327542872875b16450246cfe Mon Sep 17 00:00:00 2001 From: paradadf Date: Wed, 6 May 2020 00:55:50 +0000 Subject: [PATCH 05/12] chore(dosbox-core): add git sit method --- package/libretro-dosbox-core/libretro-dosbox-core.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libretro-dosbox-core/libretro-dosbox-core.mk b/package/libretro-dosbox-core/libretro-dosbox-core.mk index 24e0f8907a..1a312e9cb3 100644 --- a/package/libretro-dosbox-core/libretro-dosbox-core.mk +++ b/package/libretro-dosbox-core/libretro-dosbox-core.mk @@ -7,6 +7,7 @@ LIBRETRO_DOSBOX_CORE_VERSION = 5521e6f216f1084613f5c15c8b44c06541cc85c2 LIBRETRO_DOSBOX_CORE_SITE = git://github.com/libretro/dosbox-core.git LIBRETRO_DOSBOX_CORE_DEPENDENCIES = sdl sdl_net +LIBRETRO_DOSBOX_CORE_SITE_METHOD = git LIBRETRO_DOSBOX_CORE_GIT_SUBMODULES = YES define LIBRETRO_DOSBOX_CORE_BUILD_CMDS -- GitLab From 33082c31935329f5e8df1b885f139af518559728 Mon Sep 17 00:00:00 2001 From: paradadf Date: Thu, 14 May 2020 23:29:56 +0000 Subject: [PATCH 06/12] chore(dosbox-core): add opts and dynarec --- .../libretro-dosbox-core.mk | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/package/libretro-dosbox-core/libretro-dosbox-core.mk b/package/libretro-dosbox-core/libretro-dosbox-core.mk index 1a312e9cb3..99d119aad2 100644 --- a/package/libretro-dosbox-core/libretro-dosbox-core.mk +++ b/package/libretro-dosbox-core/libretro-dosbox-core.mk @@ -4,18 +4,31 @@ # ################################################################################ -LIBRETRO_DOSBOX_CORE_VERSION = 5521e6f216f1084613f5c15c8b44c06541cc85c2 +LIBRETRO_DOSBOX_CORE_VERSION = b36bcdd9e3c97ecc67482054a1be9805df050b3c LIBRETRO_DOSBOX_CORE_SITE = git://github.com/libretro/dosbox-core.git LIBRETRO_DOSBOX_CORE_DEPENDENCIES = sdl sdl_net LIBRETRO_DOSBOX_CORE_SITE_METHOD = git LIBRETRO_DOSBOX_CORE_GIT_SUBMODULES = YES +LIBRETRO_DOSBOX_CORE_OPTIONS += BUNDLED_SDL=1 + +ifeq ($(BR2_arm),y) +LIBRETRO_DOSBOX_CORE_DYNAREC=arm +else +ifeq ($(BR2_i386),y) +LIBRETRO_DOSBOX_CORE_DYNAREC=x86 +else +ifeq ($(BR2_x86_64),y) +LIBRETRO_DOSBOX_CORE_DYNAREC=x86_64 +endif + define LIBRETRO_DOSBOX_CORE_BUILD_CMDS $(SED) "s|-O2|-O3|g" $(@D)/libretro/Makefile.libretro CFLAGS="$(TARGET_CFLAGS) $(COMPILER_COMMONS_CFLAGS_SO)" \ CXXFLAGS="$(TARGET_CXXFLAGS) $(COMPILER_COMMONS_CXXFLAGS_SO)" \ LDFLAGS="$(TARGET_LDFLAGS) $(COMPILER_COMMONS_LDFLAGS_SO)" \ - $(MAKE) CXX="$(TARGET_CXX)" CC="$(TARGET_CC)" -C $(@D)/libretro -f Makefile.libretro platform="$(RETROARCH_LIBRETRO_BOARD)" + $(MAKE) CXX="$(TARGET_CXX)" CC="$(TARGET_CC)" -C $(@D)/libretro -f Makefile.libretro platform="$(RETROARCH_LIBRETRO_BOARD)" $(LIBRETRO_DOSBOX_CORE_OPTIONS) \ + WITH_DYNAREC=$(LIBRETRO_DOSBOX_CORE_DYNAREC) endef define LIBRETRO_DOSBOX_CORE_INSTALL_TARGET_CMDS -- GitLab From c2ee12377db3a5539db587c260ea7a21446aedb6 Mon Sep 17 00:00:00 2001 From: paradadf Date: Fri, 15 May 2020 00:27:10 +0000 Subject: [PATCH 07/12] chore(dosbox-core): fix dynarec --- package/libretro-dosbox-core/libretro-dosbox-core.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/libretro-dosbox-core/libretro-dosbox-core.mk b/package/libretro-dosbox-core/libretro-dosbox-core.mk index 99d119aad2..17cc1e25bb 100644 --- a/package/libretro-dosbox-core/libretro-dosbox-core.mk +++ b/package/libretro-dosbox-core/libretro-dosbox-core.mk @@ -14,10 +14,12 @@ LIBRETRO_DOSBOX_CORE_OPTIONS += BUNDLED_SDL=1 ifeq ($(BR2_arm),y) LIBRETRO_DOSBOX_CORE_DYNAREC=arm -else +endif + ifeq ($(BR2_i386),y) LIBRETRO_DOSBOX_CORE_DYNAREC=x86 -else +endif + ifeq ($(BR2_x86_64),y) LIBRETRO_DOSBOX_CORE_DYNAREC=x86_64 endif -- GitLab From 2213bf920b5a4aa43b8abc11b03010da13871e9e Mon Sep 17 00:00:00 2001 From: paradadf Date: Mon, 18 May 2020 03:41:33 +0000 Subject: [PATCH 08/12] chore(dosbox-core): bump core --- package/libretro-dosbox-core/libretro-dosbox-core.mk | 2 +- .../recalbox-romfs/recalbox-romfs-dos/recalbox-romfs-dos.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libretro-dosbox-core/libretro-dosbox-core.mk b/package/libretro-dosbox-core/libretro-dosbox-core.mk index 17cc1e25bb..5121b77a63 100644 --- a/package/libretro-dosbox-core/libretro-dosbox-core.mk +++ b/package/libretro-dosbox-core/libretro-dosbox-core.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRETRO_DOSBOX_CORE_VERSION = b36bcdd9e3c97ecc67482054a1be9805df050b3c +LIBRETRO_DOSBOX_CORE_VERSION = 7cb3896e0988ce365cc96ffd27f4a15cd98e6a76 LIBRETRO_DOSBOX_CORE_SITE = git://github.com/libretro/dosbox-core.git LIBRETRO_DOSBOX_CORE_DEPENDENCIES = sdl sdl_net LIBRETRO_DOSBOX_CORE_SITE_METHOD = git diff --git a/package/recalbox-romfs/recalbox-romfs-dos/recalbox-romfs-dos.mk b/package/recalbox-romfs/recalbox-romfs-dos/recalbox-romfs-dos.mk index 05de03fcae..7a8444f2d5 100644 --- a/package/recalbox-romfs/recalbox-romfs-dos/recalbox-romfs-dos.mk +++ b/package/recalbox-romfs/recalbox-romfs-dos/recalbox-romfs-dos.mk @@ -5,7 +5,7 @@ ################################################################################ # Package generated with : -# ./scripts/linux/empack.py --force --system dos --extension '.pc .dos .cue' --fullname 'Dos (x86)' --platform pc --theme pc 1:dosbox:dosbox:BR2_PACKAGE_DOSBOX 2:libretro:dosbox_core:BR2_PACKAGE_LIBRETRO_DOSBOX_CORE +# ./scripts/linux/empack.py --force --system dos --extension '.pc .dos .cue .conf' --fullname 'Dos (x86)' --platform pc --theme pc 1:dosbox:dosbox:BR2_PACKAGE_DOSBOX 2:libretro:dosbox_core:BR2_PACKAGE_LIBRETRO_DOSBOX_CORE # Name the 3 vars as the package requires RECALBOX_ROMFS_DOS_SOURCE = @@ -23,7 +23,7 @@ SOURCE_ROMDIR_DOS = $(RECALBOX_ROMFS_DOS_PKGDIR)/roms ifneq ($(BR2_PACKAGE_DOSBOX)$(BR2_PACKAGE_LIBRETRO_DOSBOX_CORE),) define CONFIGURE_MAIN_DOS_START - $(call RECALBOX_ROMFS_CALL_ADD_SYSTEM,$(SYSTEM_XML_DOS),Dos (x86),$(SYSTEM_NAME_DOS),.pc .dos .cue,pc,pc) + $(call RECALBOX_ROMFS_CALL_ADD_SYSTEM,$(SYSTEM_XML_DOS),Dos (x86),$(SYSTEM_NAME_DOS),.pc .dos .cue .conf,pc,pc) endef ifneq ($(BR2_PACKAGE_DOSBOX)$(BR2_PACKAGE_LIBRETRO_DOSBOX_CORE),) -- GitLab From f52e8b85f9468644cea74fee2ee583634cf48eff Mon Sep 17 00:00:00 2001 From: Bkg2k Date: Mon, 18 May 2020 15:21:53 +0200 Subject: [PATCH 09/12] fix: add cmake to dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 35da55e0ba..a395e000e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ apt-get -y install build-essential git libncurses5-dev qt5-default qttools5-dev- mercurial libdbus-glib-1-dev texinfo zip openssh-client libxml2-utils libpng-dev \ software-properties-common wget cpio bc locales rsync imagemagick bison flex bsdmainutils \ nano vim automake autopoint mtools dosfstools subversion openjdk-8-jdk libssl-dev libelf-dev \ -graphviz python-matplotlib python-numpy python-six re2c libc6-dev-i386 libtool && \ +graphviz python-matplotlib python-numpy python-six re2c libc6-dev-i386 libtool cmake && \ rm -rf /var/lib/apt/lists/* # Set the locale needed by toolchain -- GitLab From 38d603130af51a762b05ea96fd0673dee1341c2c Mon Sep 17 00:00:00 2001 From: Bkg2k Date: Mon, 18 May 2020 19:13:47 +0200 Subject: [PATCH 10/12] fix: fix missing meson and pkg-config path --- Dockerfile | 2 +- package/libretro-dosbox-core/libretro-dosbox-core.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a395e000e8..c3e63c0b9e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ apt-get -y install build-essential git libncurses5-dev qt5-default qttools5-dev- mercurial libdbus-glib-1-dev texinfo zip openssh-client libxml2-utils libpng-dev \ software-properties-common wget cpio bc locales rsync imagemagick bison flex bsdmainutils \ nano vim automake autopoint mtools dosfstools subversion openjdk-8-jdk libssl-dev libelf-dev \ -graphviz python-matplotlib python-numpy python-six re2c libc6-dev-i386 libtool cmake && \ +graphviz python-matplotlib python-numpy python-six re2c libc6-dev-i386 libtool cmake meson && \ rm -rf /var/lib/apt/lists/* # Set the locale needed by toolchain diff --git a/package/libretro-dosbox-core/libretro-dosbox-core.mk b/package/libretro-dosbox-core/libretro-dosbox-core.mk index 5121b77a63..16bf25fb75 100644 --- a/package/libretro-dosbox-core/libretro-dosbox-core.mk +++ b/package/libretro-dosbox-core/libretro-dosbox-core.mk @@ -29,6 +29,7 @@ define LIBRETRO_DOSBOX_CORE_BUILD_CMDS CFLAGS="$(TARGET_CFLAGS) $(COMPILER_COMMONS_CFLAGS_SO)" \ CXXFLAGS="$(TARGET_CXXFLAGS) $(COMPILER_COMMONS_CXXFLAGS_SO)" \ LDFLAGS="$(TARGET_LDFLAGS) $(COMPILER_COMMONS_LDFLAGS_SO)" \ + PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig/" \ $(MAKE) CXX="$(TARGET_CXX)" CC="$(TARGET_CC)" -C $(@D)/libretro -f Makefile.libretro platform="$(RETROARCH_LIBRETRO_BOARD)" $(LIBRETRO_DOSBOX_CORE_OPTIONS) \ WITH_DYNAREC=$(LIBRETRO_DOSBOX_CORE_DYNAREC) endef -- GitLab From e4937beefbe88df5964942c788c789fc79cc8624 Mon Sep 17 00:00:00 2001 From: paradadf Date: Sun, 24 May 2020 21:56:37 +0000 Subject: [PATCH 11/12] chore(checkpackages): one line per package --- scripts/linux/checkPackages.sh | 128 ++++++++++++++++++++++++++++++++- 1 file changed, 127 insertions(+), 1 deletion(-) diff --git a/scripts/linux/checkPackages.sh b/scripts/linux/checkPackages.sh index caa66a87c0..f61c16ffb8 100755 --- a/scripts/linux/checkPackages.sh +++ b/scripts/linux/checkPackages.sh @@ -5,7 +5,133 @@ [[ -z $RECALBOX_DIR ]] && RECALBOX_DIR=. # EMULATORS is compared to each package's repo -EMULATORS="advancemame amiberry citra dolphin-emu dosbox gsplus hypseus libretro-81 libretro-2048 libretro-atari800 libretro-beetle-lynx libretro-beetle-ngp libretro-beetle-pce-fast libretro-beetle-pcfx libretro-beetle-psx libretro-beetle-psx-hw libretro-beetle-saturn libretro-beetle-supergrafx libretro-beetle-vb libretro-beetle-wswan libretro-bluemsx libretro-boom3 libretro-cap32 libretro-crawl libretro-cheats libretro-citra libretro-crocods libretro-desmume libretro-dinothawr libretro-ecwolf libretro-fbneo libretro-fceumm libretro-fceunext libretro-flycast libretro-fmsx libretro-freechaf libretro-freeintv libretro-fuse libretro-gambatte libretro-gearsystem libretro-genesisplusgx libretro-gpsp libretro-gw libretro-handy libretro-hatari libretro-imageviewer libretro-kronos libretro-lutro libretro-mame2000 libretro-mame2003 libretro-mame2003-plus libretro-mame2010 libretro-mame2015 libretro-mame2016 libretro-melonds libretro-meteor libretro-mgba libretro-minivmac libretro-mrboom libretro-mu libretro-mupen64plus libretro-mupen64plus-nx libretro-nestopia libretro-np2kai libretro-nxengine libretro-o2em libretro-opera libretro-parallel-n64 libretro-pcsx_rearmed libretro-picodrive libretro-pokemini libretro-prboom libretro-prosystem libretro-px68k libretro-quasi88 libretro-quicknes libretro-race libretro-reminiscence libretro-sameboy libretro-scummvm libretro-snes9x libretro-snes9x2002 libretro-snes9x2005 libretro-snes9x2010 libretro-stella libretro-stella2014 libretro-tgbdual libretro-theodore libretro-tic80 libretro-tyrquake libretro-uae libretro-uzem libretro-vecx libretro-vice libretro-virtualjaguar libretro-vitaquake2 libretro-vitaquake3 libretro-vitavoyager libretro-xmil libretro-xrick libretro-yabasanshiro libretro-yabause linapple-pie moonlight-embedded mupen64plus-audio-sdl mupen64plus-core mupen64plus-gles2n64 mupen64plus-gles2rice mupen64plus-gliden64 mupen64plus-input-sdl mupen64plus-omx mupen64plus-rsphle mupen64plus-uiconsole mupen64plus-video-glide64mk2 mupen64plus-video-rice openbor oricutron pifba ppsspp reicast residualvm retroarch scummvm simcoupe solarus-recalbox vice" +EMULATORS="advancemame +amiberry +citra +dolphin-emu +dosbox +gsplus +hypseus +libretro-81 +libretro-2048 +libretro-atari800 +libretro-beetle-lynx +libretro-beetle-ngp +libretro-beetle-pce-fast +libretro-beetle-pcfx +libretro-beetle-psx +libretro-beetle-psx-hw +libretro-beetle-saturn +libretro-beetle-supergrafx +libretro-beetle-vb +libretro-beetle-wswan +libretro-bluemsx +libretro-boom3 +libretro-cap32 +libretro-cheats +libretro-citra +libretro-crawl +libretro-crocods +libretro-desmume +libretro-dinothawr +libretro-dosbox-core +libretro-ecwolf +libretro-fbneo +libretro-fceumm +libretro-fceunext +libretro-flycast +libretro-fmsx +libretro-freechaf +libretro-freeintv +libretro-fuse +libretro-gambatte +libretro-gearsystem +libretro-genesisplusgx +libretro-gpsp +libretro-gw +libretro-handy +libretro-hatari +libretro-imageviewer +libretro-kronos +libretro-lutro +libretro-mame2000 +libretro-mame2003 +libretro-mame2003-plus +libretro-mame2010 +libretro-mame2015 +libretro-mame2016 +libretro-melonds +libretro-meteor +libretro-mgba +libretro-minivmac +libretro-mrboom +libretro-mu +libretro-mupen64plus +libretro-mupen64plus-nx +libretro-nestopia +libretro-np2kai +libretro-nxengine +libretro-o2em +libretro-opera +libretro-parallel-n64 +libretro-pcsx_rearmed +libretro-picodrive +libretro-pokemini +libretro-prboom +libretro-prosystem +libretro-px68k +libretro-quasi88 +libretro-quicknes +libretro-race +libretro-reminiscence +libretro-sameboy +libretro-scummvm +libretro-snes9x +libretro-snes9x2002 +libretro-snes9x2005 +libretro-snes9x2010 +libretro-stella +libretro-stella2014 +libretro-tgbdual +libretro-theodore +libretro-tic80 +libretro-tyrquake +libretro-uae +libretro-uzem +libretro-vecx +libretro-vice +libretro-virtualjaguar +libretro-vitaquake2 +libretro-vitaquake3 +libretro-vitavoyager +libretro-xmil +libretro-xrick +libretro-yabasanshiro +libretro-yabause +linapple-pie +moonlight-embedded +mupen64plus-audio-sdl +mupen64plus-core +mupen64plus-gles2n64 +mupen64plus-gles2rice +mupen64plus-gliden64 +mupen64plus-input-sdl +mupen64plus-omx +mupen64plus-rsphle +mupen64plus-uiconsole +mupen64plus-video-glide64mk2 +mupen64plus-video-rice +openbor +oricutron +pifba +ppsspp +reicast +residualvm +retroarch +scummvm +simcoupe +solarus-recalbox +vice" # PACKAGES is compared to each package's repo PACKAGES="rpi-firmware rpi-userland odroid-scripts odroid-mali" -- GitLab From 8dff1d687495ae1f5f86c4fafa5cad35d60b8e9a Mon Sep 17 00:00:00 2001 From: paradadf Date: Mon, 25 May 2020 03:54:10 +0000 Subject: [PATCH 12/12] chore(dosbox-core): try without bundled sdl --- package/libretro-dosbox-core/libretro-dosbox-core.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libretro-dosbox-core/libretro-dosbox-core.mk b/package/libretro-dosbox-core/libretro-dosbox-core.mk index 16bf25fb75..9715b0904a 100644 --- a/package/libretro-dosbox-core/libretro-dosbox-core.mk +++ b/package/libretro-dosbox-core/libretro-dosbox-core.mk @@ -4,13 +4,13 @@ # ################################################################################ -LIBRETRO_DOSBOX_CORE_VERSION = 7cb3896e0988ce365cc96ffd27f4a15cd98e6a76 +LIBRETRO_DOSBOX_CORE_VERSION = 1d6c84533d0541d22f5485f4dc45f0ba9b2eed14 LIBRETRO_DOSBOX_CORE_SITE = git://github.com/libretro/dosbox-core.git LIBRETRO_DOSBOX_CORE_DEPENDENCIES = sdl sdl_net LIBRETRO_DOSBOX_CORE_SITE_METHOD = git LIBRETRO_DOSBOX_CORE_GIT_SUBMODULES = YES -LIBRETRO_DOSBOX_CORE_OPTIONS += BUNDLED_SDL=1 +#LIBRETRO_DOSBOX_CORE_OPTIONS += BUNDLED_SDL=1 ifeq ($(BR2_arm),y) LIBRETRO_DOSBOX_CORE_DYNAREC=arm -- GitLab