diff --git a/emulators/sameboy/Makefile b/emulators/sameboy/Makefile index 1077d1ef828..5d0b9801b12 100644 --- a/emulators/sameboy/Makefile +++ b/emulators/sameboy/Makefile @@ -4,8 +4,7 @@ COMMENT-libretro = accurate Nintendo Game Boy core for retroarch PKGNAME-main = sameboy-$V PKGNAME-libretro = libretro-sameboy-$V -V = 0.16.7 -REVISION = 1 +V = 1.0 GH_ACCOUNT = LIJI32 GH_PROJECT = SameBoy @@ -27,6 +26,7 @@ MAINTAINER = Anthony J. Bentley PERMIT_PACKAGE = Yes WANTLIB-main += GL SDL2 c m openal pthread +WANTLIB-main += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 intl WANTLIB-libretro += m # -std=gnu11 @@ -47,7 +47,8 @@ RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+4,-guic MAKE_FLAGS = CC="${CC}" \ - DATA_DIR=${PREFIX}/share/sameboy/ + DATA_DIR=${PREFIX}/share/sameboy/ \ + STRIP=true FAKE_FLAGS = PREFIX="${TRUEPREFIX}" USE_GMAKE = Yes diff --git a/emulators/sameboy/distinfo b/emulators/sameboy/distinfo index cabb1f40b25..fbc8287c944 100644 --- a/emulators/sameboy/distinfo +++ b/emulators/sameboy/distinfo @@ -1,2 +1,2 @@ -SHA256 (SameBoy-0.16.7.tar.gz) = 12UpqeztxdjRGlW2wX4O5KQ0+wA2pRpw/vynW2oVecE= -SIZE (SameBoy-0.16.7.tar.gz) = 5664346 +SHA256 (SameBoy-1.0.tar.gz) = 1wMMXqKoReTmZYJ++N8tQ3nSbTovzMaw/TIbWApjgnQ= +SIZE (SameBoy-1.0.tar.gz) = 7437748 diff --git a/emulators/sameboy/patches/patch-Makefile b/emulators/sameboy/patches/patch-Makefile index 9c28d1c773b..f9ce5149026 100644 --- a/emulators/sameboy/patches/patch-Makefile +++ b/emulators/sameboy/patches/patch-Makefile @@ -1,21 +1,33 @@ Index: Makefile --- Makefile.orig +++ Makefile -@@ -170,7 +170,7 @@ OPEN_DIALOG = OpenDialog/cocoa.m +@@ -185,7 +185,7 @@ OPEN_DIALOG = OpenDialog/cocoa.m endif # These must come before the -Wno- flags -WARNINGS += -Werror -Wall -Wno-unknown-warning -Wno-unknown-warning-option -Wno-missing-braces +WARNINGS += -Wall -Wno-unknown-warning -Wno-unknown-warning-option -Wno-missing-braces - WARNINGS += -Wno-nonnull -Wno-unused-result -Wno-multichar -Wno-int-in-bool-context -Wno-format-truncation + WARNINGS += -Wno-nonnull -Wno-unused-result -Wno-multichar -Wno-int-in-bool-context -Wno-format-truncation -Wno-nullability-completeness # Only add this flag if the compiler supports it -@@ -237,7 +237,7 @@ LDFLAGS += -lxaudio2_9redist - sdl: $(BIN)/SDL/xaudio2_9redist.dll +@@ -285,9 +285,11 @@ else + LDFLAGS += -lc -lm + # libdl is not available as a standalone library in Haiku + ifneq ($(PLATFORM),Haiku) ++ifneq ($(PLATFORM),OpenBSD) + LDFLAGS += -ldl endif - else --LDFLAGS += -lc -lm -ldl -+LDFLAGS += -lc -lm endif ++endif ifeq ($(MAKECMDGOALS),_ios) + OBJ := build/obj-ios +@@ -758,7 +760,7 @@ $(BIN)/BootROMs/%.bin: BootROMs/%.asm $(OBJ)/BootROMs/ + + # Libretro Core (uses its own build system) + libretro: +- CC=$(CC) CFLAGS="$(WARNINGS)" $(MAKE) -C libretro BOOTROMS_DIR=$(abspath $(BOOTROMS_DIR)) BIN=$(abspath $(BIN)) ++ CC=$(CC) CFLAGS="$(WARNINGS) $(CFLAGS)" $(MAKE) -C libretro BOOTROMS_DIR=$(abspath $(BOOTROMS_DIR)) BIN=$(abspath $(BIN)) + + # Install for Linux, and other FreeDesktop platforms. + ifneq ($(FREEDESKTOP),) diff --git a/emulators/sameboy/pkg/PLIST-main b/emulators/sameboy/pkg/PLIST-main index 0b66ca20022..2fdfe6b56a9 100644 --- a/emulators/sameboy/pkg/PLIST-main +++ b/emulators/sameboy/pkg/PLIST-main @@ -1,4 +1,5 @@ @bin bin/sameboy +@bin bin/sameboy-thumbnailer share/applications/sameboy.desktop share/icons/hicolor/128x128/apps/sameboy.png share/icons/hicolor/128x128/mimetypes/x-gameboy-color-rom.png @@ -18,15 +19,23 @@ share/icons/hicolor/512x512/mimetypes/x-gameboy-rom.png share/icons/hicolor/64x64/apps/sameboy.png share/icons/hicolor/64x64/mimetypes/x-gameboy-color-rom.png share/icons/hicolor/64x64/mimetypes/x-gameboy-rom.png -share/mime/packages/sameboy.xml +share/mime/sameboy.xml share/sameboy/ +share/sameboy/BootROMs/ share/sameboy/LICENSE share/sameboy/Palettes/ +share/sameboy/Palettes/Canyon.sbp share/sameboy/Palettes/Desert.sbp share/sameboy/Palettes/Evening.sbp share/sameboy/Palettes/Fog.sbp +share/sameboy/Palettes/Green Slate.sbp +share/sameboy/Palettes/Green Tea.sbp +share/sameboy/Palettes/Lavender.sbp share/sameboy/Palettes/Magic Eggplant.sbp +share/sameboy/Palettes/Mystic Blue.sbp +share/sameboy/Palettes/Pink Pop.sbp share/sameboy/Palettes/Radioactive Pea.sbp +share/sameboy/Palettes/Rose.sbp share/sameboy/Palettes/Seaweed.sbp share/sameboy/Palettes/Twilight.sbp share/sameboy/Shaders/ @@ -55,6 +64,7 @@ share/sameboy/mgb_boot.bin share/sameboy/registers.sym share/sameboy/sgb2_boot.bin share/sameboy/sgb_boot.bin +share/thumbnailers/sameboy.thumbnailer @tag update-desktop-database @tag gtk-update-icon-cache %D/share/icons/hicolor @tag update-mime-database