vice: add xpet, properly fix makefile

CHANGELOG.md

@@ -7,6 +7,7 @@
 * Add new libretro core: `jaxe`
 * Add new libretro core: `numero`
 * Add new libretro core: `thepowdertoy`
+* Add new libretro core: `vice_xpet`
 * Add new libretro core: `vircon32`
 * Add new libretro core: `vitaquake2`
 * Update Mesa to [24.0.4](https://docs.mesa3d.org/relnotes/24.0.4.html)

packages/lakka/libretro_cores/vice/package.mk

@@ -6,10 +6,9 @@ PKG_URL="${PKG_SITE}.git"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Versatile Commodore 8-bit Emulator version"
 PKG_TOOLCHAIN="make"
-PKG_BUILD_FLAGS="+pic -gold"
 
 make_target() {
-  for LRCORE in x64 x128 xplus4 xvic ; do
+  for LRCORE in x64 x128 xpet xplus4 xvic ; do
     make EMUTYPE=${LRCORE}
     make objectclean
   done

packages/lakka/libretro_cores/vice/patches/Avoid-multiple-LDFLAGS.patch

@@ -1,18 +0,0 @@
-diff --git a/Makefile b/Makefile
-index fc2830ef4..95af92680 100644
---- a/Makefile
-+++ b/Makefile
-@@ -46,8 +46,11 @@ endif
- # Unix
- ifeq ($(platform), unix)
-    TARGET := $(TARGET_NAME)_libretro.so
--   LDFLAGS += -shared -Wl,--version-script=$(CORE_DIR)/libretro/link.T -Wl,--gc-sections
--   fpic = -fPIC
-+   ifneq ($(findstring --version-script=,$(LDFLAGS)),--version-script=)
-+      LDFLAGS += -shared -Wl,--version-script=$(CORE_DIR)/libretro/link.T -Wl,--gc-sections
-+      fpic = -fPIC
-+   endif
-+
- 
- # Raspberry Pi 4
- else ifneq (,$(findstring rpi4,$(platform)))

packages/lakka/libretro_cores/vice/patches/vice-01-fix_makefile.patch

@@ -0,0 +1,43 @@
+diff --git a/Makefile b/Makefile
+index fc2830e..c29d524 100644
+--- a/Makefile
++++ b/Makefile
+@@ -438,10 +438,11 @@ ifeq ($(platform), theos_ios)
+ 	include $(THEOS_MAKE_PATH)/library.mk
+ else
+ 
+-default:
++default: info all
++
++info:
+ 	$(info CFLAGS: $(PLATFLAGS) $(COMMONFLAGS))
+ 	$(info -------)
+-	$(MAKE) $(TARGET)
+ 
+ all: $(TARGET)
+ 
+@@ -461,21 +462,21 @@ endif
+ 
+ $(OBJDIR)/%.o: %.c
+ 	@mkdir -p $(dir $@)
+-	@if [[ $(SILENT) -ne 1 ]]; then\
++	@if [ $(SILENT) -ne 1 ]; then\
+ 		$(if $@, $(shell echo echo CC $<),);\
+ 	fi
+ 	$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ $(OBJDIR)/%.o: %.cpp
+ 	@mkdir -p $(dir $@)
+-	@if [[ $(SILENT) -ne 1 ]]; then\
++	@if [ $(SILENT) -ne 1 ]; then\
+ 		$(if $@, $(shell echo echo CXX $<),);\
+ 	fi
+ 	$(CXX) $(CXXFLAGS) -c -o $@ $<
+ 
+ $(OBJDIR)/%.o: %.cc
+ 	@mkdir -p $(dir $@)
+-	@if [[ $(SILENT) -ne 1 ]]; then\
++	@if [ $(SILENT) -ne 1 ]; then\
+ 		$(if $@, $(shell echo echo CXX $<),);\
+ 	fi
+ 	$(CXX) $(CXXFLAGS) -c -o $@ $<