From 88985d354f233a2cd08cd374e7abe0b96bc55657 Mon Sep 17 00:00:00 2001 From: "Daniel K. O. (dkosmari)" Date: Mon, 2 Feb 2026 19:17:23 -0300 Subject: [PATCH] Updated patch: - Bug fix: missing break in ANSI escape codes handler. - Added explicit member initializers for devoptab to avoid warnings. - Updated .PHONY targets and fixed somepaths in Makefiles. --- libgxflux/PKGBUILD | 40 +++---- libgxflux/libgxflux-changes.patch | 179 ++++++++++++++++++++++++++++++ libgxflux/libgxflux-destdir.patch | 26 ----- 3 files changed, 200 insertions(+), 45 deletions(-) create mode 100644 libgxflux/libgxflux-changes.patch delete mode 100644 libgxflux/libgxflux-destdir.patch diff --git a/libgxflux/PKGBUILD b/libgxflux/PKGBUILD index f52b64f9..7e834cfe 100644 --- a/libgxflux/PKGBUILD +++ b/libgxflux/PKGBUILD @@ -1,36 +1,38 @@ # Maintainer: TurtleP -pkgname=libgxflux +_libname=libgxflux +pkgname=${_libname} pkgver=20230423 _snapshot=91430ea -pkgrel=3 +pkgrel=4 pkgdesc="libgxflux" arch=("any") url="https://repo.or.cz/libgxflux.git" license=("GPL2") -options=("staticlibs" "!strip") -source=( - "libgxflux-${snapshot}.tar.gx::${url}/snapshot/${_snapshot}.tar.gz" - "libgxflux-destdir.patch" -) - -sha256sums=('07b7453f7c2eb54aa049498245bea2694feb0a7ae6d7eeb94c3e625d927ac885' - '85a819135fd777a00ff7dde8f8370a35f2aaadff8a8afec6791ac9fb19b0e4ce') - - +options=(staticlibs !strip) makedepends=("dkp-toolchain-vars") +depends=("libogc") groups=("wii-dev" "gamecube-dev") +source=("${_libname}-${_snapshot}.tar.gz::${url}/snapshot/${_snapshot}.tar.gz" + "libgxflux-changes.patch") -package() { +prepare() { + cd "${_libname}-${_snapshot}" - source /opt/devkitpro/ppcvars.sh + patch -Np1 -i ${srcdir}/libgxflux-changes.patch +} - cd libgxflux-${_snapshot} +package() { + source "${DEVKITPRO}/ppcvars.sh" - patch -Np1 -i ${srcdir}/libgxflux-destdir.patch + cd "${_libname}-${_snapshot}" - make -C src install DESTDIR=${pkgdir} make -C src clean - make -C src install GAMECUBE=1 DESTDIR=${pkgdir} - + make -C src install DESTDIR="$pkgdir" + make -C src clean + make -C src install GAMECUBE=1 DESTDIR="$pkgdir" + make -C src clean } + +sha256sums=('07b7453f7c2eb54aa049498245bea2694feb0a7ae6d7eeb94c3e625d927ac885' + 'abef4126333bd8a41404ae82286ca51a44ad0c2b3e27a4f573c804314827a85a') diff --git a/libgxflux/libgxflux-changes.patch b/libgxflux/libgxflux-changes.patch new file mode 100644 index 00000000..377ce657 --- /dev/null +++ b/libgxflux/libgxflux-changes.patch @@ -0,0 +1,179 @@ +diff -r 651485e1d462 common.mk +--- a/common.mk Sun Sep 29 18:42:52 2019 +0200 ++++ b/common.mk Mon Feb 02 19:05:34 2026 -0300 +@@ -31,6 +31,8 @@ + + DEPDIR = .deps + ++.PHONY: all ++ + all: $(TARGET) + + ifeq ($(LIBRARY),1) +@@ -60,13 +62,15 @@ + @echo " STRIP $@" + @$(STRIP) $< -o $@ + ++.PHONY: wiiload geckoload upload ++ + wiiload: $(TARGET_STRIPPED) + @echo " WIILOAD $<" +- @$(DEVKITPPC)/bin/wiiload $< ++ @$(DEVKITPRO)/tools/bin/wiiload $< + + geckoload: $(TARGET_STRIPPED) + @echo " WIILOAD $<" +- @WIILOAD=$(USBGECKODEVICE) $(DEVKITPPC)/bin/wiiload $< ++ @WIILOAD=$(USBGECKODEVICE) $(DEVKITPRO)/tools/bin/wiiload $< + + upload: geckoload + endif +@@ -84,10 +88,10 @@ + @echo " ASSEMBLE $@" + @$(CC) $(CFLAGS) $(DEFINES) $(ASFLAGS) -c $< -o $@ + ++.PHONY: clean ++ + clean: + @rm -rf $(DEPDIR) + @rm -f $(TARGET) $(TARGET_STRIPPED) $(TARGET).map $(OBJS) + + -include $(DEPDIR)/* +- +-.PHONY: clean +diff -r 651485e1d462 examples/console/main.c +--- a/examples/console/main.c Sun Sep 29 18:42:52 2019 +0200 ++++ b/examples/console/main.c Mon Feb 02 19:05:34 2026 -0300 +@@ -13,7 +13,13 @@ + + static bool quit = false; + +-void stmcb(void) { ++void on_power(void) { ++ quit = true; ++} ++ ++void on_reset(u32 irq, void* ctx) { ++ (void)irq; ++ (void)ctx; + quit = true; + } + +@@ -25,8 +31,8 @@ + VIDEO_Init(); + PAD_Init(); + +- SYS_SetResetCallback(stmcb); +- SYS_SetPowerCallback(stmcb); ++ SYS_SetResetCallback(on_reset); ++ SYS_SetPowerCallback(on_power); + + gfx_video_init(NULL); + gfx_init(); +diff -r 651485e1d462 src/Makefile +--- a/src/Makefile Sun Sep 29 18:42:52 2019 +0200 ++++ b/src/Makefile Mon Feb 02 19:05:34 2026 -0300 +@@ -7,18 +7,19 @@ + include ../common.mk + + ifeq ($(GAMECUBE),1) +-INSTALLLIB = $(DEVKITPRO)/libogc/lib/cube ++INSTALLLIB = $(DESTDIR)$(DEVKITPRO)/libogc/lib/cube + else +-INSTALLLIB = $(DEVKITPRO)/libogc/lib/wii ++INSTALLLIB = $(DESTDIR)$(DEVKITPRO)/libogc/lib/wii + endif + +-INSTALLINCLUDE = $(DEVKITPRO)/libogc/include/gxflux ++INSTALLINCLUDE = $(DESTDIR)$(DEVKITPRO)/libogc/include/gxflux ++ ++.PHONY: install install-all + + install: all + @echo " INSTALL $(INSTALLLIB)" +- @install -m 644 $(TARGET) $(INSTALLLIB) +- @mkdir -p $(INSTALLINCLUDE) +- @install -m 644 $(HEADERS) $(INSTALLINCLUDE) ++ @install -Dm 644 -t $(INSTALLLIB) $(TARGET) ++ @install -Dm 644 -t $(INSTALLINCLUDE) $(HEADERS) + + install-all: + @$(MAKE) --no-print-directory clean +diff -r 651485e1d462 src/gfx_con.c +--- a/src/gfx_con.c Sun Sep 29 18:42:52 2019 +0200 ++++ b/src/gfx_con.c Mon Feb 02 19:05:34 2026 -0300 +@@ -42,34 +42,38 @@ + static ssize_t _con_read(struct _reent *r, void *fd, char *ptr, size_t len); + + static const devoptab_t _dt_stdio = { +- "stdio", // device name +- 0, // size of file structure +- NULL, // device open +- NULL, // device close +- _con_write, // device write +- _con_read, // device read +- NULL, // device seek +- NULL, // device fstat +- NULL, // device stat +- NULL, // device link +- NULL, // device unlink +- NULL, // device chdir +- NULL, // device rename +- NULL, // device mkdir +- 0, // dirStateSize +- NULL, // device diropen_r +- NULL, // device dirreset_r +- NULL, // device dirnext_r +- NULL, // device dirclose_r +- NULL, // device statvfs_r +- NULL, // device ftrunctate_r +- NULL, // device fsync_r +- NULL, // deviceData; +- NULL, // chmod_r +- NULL, // fchmod_r +- NULL, // rmdir_r +- NULL, // lstat_r +- NULL, // utimes_r ++ .name = "stdio", ++ .structSize = sizeof(devoptab_t), ++ .open_r = NULL, ++ .close_r = NULL, ++ .write_r = _con_write, ++ .read_r = _con_read, ++ .seek_r = NULL, ++ .fstat_r = NULL, ++ .stat_r = NULL, ++ .link_r = NULL, ++ .unlink_r = NULL, ++ .chdir_r = NULL, ++ .rename_r = NULL, ++ .mkdir_r = NULL, ++ .dirStateSize = 0, ++ .diropen_r = NULL, ++ .dirreset_r = NULL, ++ .dirnext_r = NULL, ++ .dirclose_r = NULL, ++ .statvfs_r = NULL, ++ .ftruncate_r = NULL, ++ .fsync_r = NULL, ++ .deviceData = NULL, ++ .chmod_r = NULL, ++ .fchmod_r = NULL, ++ .rmdir_r = NULL, ++ .lstat_r = NULL, ++ .utimes_r = NULL, ++ .fpathconf_r = NULL, ++ .pathconf_r = NULL, ++ .symlink_r = NULL, ++ .readlink_r = NULL, + }; + + static const GXColor _con_colors[] = { +@@ -312,6 +316,7 @@ + default: + break; + } ++ break; + + case 'm': // Set Attribute Mode + if (!count) diff --git a/libgxflux/libgxflux-destdir.patch b/libgxflux/libgxflux-destdir.patch deleted file mode 100644 index 0f7d28e8..00000000 --- a/libgxflux/libgxflux-destdir.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/Makefile b/src/Makefile -index 42bd5c2..f6ae9fb 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -7,16 +7,17 @@ HEADERS = gfx.h gfx_types.h gfx_tex.h gfx_color.h gfx_con.h gfx_con_esc.h - include ../common.mk - - ifeq ($(GAMECUBE),1) --INSTALLLIB = $(DEVKITPRO)/libogc/lib/cube -+INSTALLLIB = ${DESTDIR}$(DEVKITPRO)/libogc/lib/cube/ - else --INSTALLLIB = $(DEVKITPRO)/libogc/lib/wii -+INSTALLLIB = ${DESTDIR}$(DEVKITPRO)/libogc/lib/wii/ - endif - --INSTALLINCLUDE = $(DEVKITPRO)/libogc/include/gxflux -+INSTALLINCLUDE = ${DESTDIR}$(DEVKITPRO)/libogc/include/gxflux/ - - install: all - @echo " INSTALL $(INSTALLLIB)" -- @install -m 644 $(TARGET) $(INSTALLLIB) -+ @mkdir -p $(INSTALLLIB) -+ @install -m 644 $(TARGET) $(INSTALLLIB)/$(TARGET) - @mkdir -p $(INSTALLINCLUDE) - @install -m 644 $(HEADERS) $(INSTALLINCLUDE) -