Skip to content

Commit 28a1bf2

Browse files
9ary9ary
committed
Update libogc2
1 parent dcb0f82 commit 28a1bf2

3 files changed

Lines changed: 41 additions & 41 deletions

File tree

‎meson.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ qoob_sx_updater_tgt = custom_target(
144144
input: [qoob_sx, qoob_sx_updater],
145145
output: 'qoob_sx_gekkoboot_upgrade.elf',
146146
command: [qoob_injector, '@INPUT@', '@OUTPUT@'],
147-
build_by_default: true,
147+
build_by_default: false, # FIXME doesn't fit... again
148148
install: true,
149149
install_dir: '/',
150150
)

‎subprojects/libogc2.wrap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[wrap-git]
22
url = https://github.com/extremscorner/libogc2.git
3-
revision = b204695faf6a7df4cb816bfde1148c57d2ec3f36
3+
revision = d327914896ae5ad9d139886f8b1b3d97cd1c7823
44
#depth = 1
55
diff_files = libogc2.patch

‎subprojects/packagefiles/libogc2.patch‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From f376e1b0ad3bf5c41669fcbf41450216540e7bc3 Mon Sep 17 00:00:00 2001
1+
From e9c49bd7b36362b9465c760985b50f140bbf5bbc Mon Sep 17 00:00:00 2001
22
From: novenary <novenary@kwak.zip>
33
Date: Wed, 29 Nov 2023 18:46:32 +0200
44
Subject: [PATCH 1/7] Fix out-of-tree builds
@@ -11,7 +11,7 @@ Subject: [PATCH 1/7] Fix out-of-tree builds
1111
4 files changed, 40 insertions(+), 28 deletions(-)
1212

1313
diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
14-
index df3c97d..ad07c48 100644
14+
index 7d80fa3..be31507 100644
1515
--- a/.github/workflows/continuous-integration-workflow.yml
1616
+++ b/.github/workflows/continuous-integration-workflow.yml
1717
@@ -39,7 +39,9 @@ jobs:
@@ -35,7 +35,7 @@ index d1a46b2..19afba3 100644
3535
deps
3636
include
3737
diff --git a/Doxyfile b/Doxyfile
38-
index 5e987e7..82e55e2 100644
38+
index c63a959..900f932 100644
3939
--- a/Doxyfile
4040
+++ b/Doxyfile
4141
@@ -74,7 +74,7 @@ PROJECT_ICON =
@@ -57,7 +57,7 @@ index 5e987e7..82e55e2 100644
5757
#---------------------------------------------------------------------------
5858
# Configuration options related to the input files
5959
diff --git a/Makefile b/Makefile
60-
index c741a8a..702e3fb 100644
60+
index 949a7de..4cb95d4 100644
6161
--- a/Makefile
6262
+++ b/Makefile
6363
@@ -10,6 +10,8 @@ ifeq ($(strip $(DEVKITPPC)),)
@@ -173,10 +173,10 @@ index c741a8a..702e3fb 100644
173173
@mkdir -p $(DESTDIR)$(DEVKITPRO)/libogc2
174174
@cp -frv include $(DESTDIR)$(DEVKITPRO)/libogc2
175175
@cp -frv lib $(DESTDIR)$(DEVKITPRO)/libogc2
176-
- @cp -frv libogc_license.txt $(DESTDIR)$(DEVKITPRO)/libogc2
177-
- @cp -frv gamecube_rules wii_rules $(DESTDIR)$(DEVKITPRO)/libogc2
178-
+ @cp -frv $(BASEDIR)/libogc_license.txt $(DESTDIR)$(DEVKITPRO)/libogc2
179-
+ @cp -frv $(BASEDIR)/gamecube_rules $(BASEDIR)/wii_rules $(DESTDIR)$(DEVKITPRO)/libogc2
176+
- @cp -frv *_license.txt $(DESTDIR)$(DEVKITPRO)/libogc2
177+
- @cp -frv *_rules $(DESTDIR)$(DEVKITPRO)/libogc2
178+
+ @cp -frv $(BASEDIR)/*_license.txt $(DESTDIR)$(DEVKITPRO)/libogc2
179+
+ @cp -frv $(BASEDIR)/*_rules $(DESTDIR)$(DEVKITPRO)/libogc2
180180

181181
#---------------------------------------------------------------------------------
182182
uninstall:
@@ -190,8 +190,8 @@ index c741a8a..702e3fb 100644
190190
+ @tar -C $(BASEDIR) --exclude-vcs --exclude-vcs-ignores --exclude .github \
191191
+ -cvjf $(BUILDDIR)/libogc2-src-$(VERSTRING).tar.bz2 .
192192
+
193-
+ @cp $(BASEDIR)/libogc_license.txt $(BASEDIR)/gamecube_rules $(BASEDIR)/wii_rules .
194-
@tar -cvjf libogc2-$(VERSTRING).tar.bz2 include lib libogc_license.txt gamecube_rules wii_rules
193+
+ @cp $(BASEDIR)/*_license.txt $(BASEDIR)/*_rules .
194+
@tar -cvjf libogc2-$(VERSTRING).tar.bz2 include lib *_license.txt *_rules
195195

196196

197197
@@ -329,6 +337,7 @@ libs: $(LIBRARIES)
@@ -211,10 +211,10 @@ index c741a8a..702e3fb 100644
211211

212212
-include $(DEPSDIR)/*.d
213213
--
214-
2.47.2
214+
2.50.1
215215

216216

217-
From f7af2086b8649846609baa5651c4fd20ca2b93ff Mon Sep 17 00:00:00 2001
217+
From 19d0d7ea5e16c9c6915eefbcc689ada99ed86c2b Mon Sep 17 00:00:00 2001
218218
From: novenary <novenary@kwak.zip>
219219
Date: Wed, 29 Nov 2023 19:08:07 +0200
220220
Subject: [PATCH 2/7] Make optimization level configurable
@@ -224,7 +224,7 @@ Subject: [PATCH 2/7] Make optimization level configurable
224224
1 file changed, 2 insertions(+), 1 deletion(-)
225225

226226
diff --git a/Makefile b/Makefile
227-
index 702e3fb..15858d5 100644
227+
index 4cb95d4..81363bf 100644
228228
--- a/Makefile
229229
+++ b/Makefile
230230
@@ -102,7 +102,8 @@ endif
@@ -238,10 +238,10 @@ index 702e3fb..15858d5 100644
238238

239239
#---------------------------------------------------------------------------------
240240
--
241-
2.47.2
241+
2.50.1
242242

243243

244-
From bb86319812581dbae4b319b205e0a7a470e92a68 Mon Sep 17 00:00:00 2001
244+
From 68d83ed7e7319b05882726de0cd1525b8a8e36fb Mon Sep 17 00:00:00 2001
245245
From: novenary <novenary@kwak.zip>
246246
Date: Wed, 29 Nov 2023 22:24:26 +0200
247247
Subject: [PATCH 3/7] Allow selective building of libraries and platforms
@@ -253,7 +253,7 @@ make -C build -f ../Makefile -j10 PLATFORMS=cube LIBRARIES=ogc 19.28s user 1.93
253253
1 file changed, 10 insertions(+), 7 deletions(-)
254254

255255
diff --git a/Makefile b/Makefile
256-
index 15858d5..fc92c0d 100644
256+
index 81363bf..eb22312 100644
257257
--- a/Makefile
258258
+++ b/Makefile
259259
@@ -186,7 +186,8 @@ WIIKEYBLIBOBJ := usbkeyboard.o keyboard.o ukbdmap.o wskbdutil.o
@@ -285,7 +285,7 @@ index 15858d5..fc92c0d 100644
285285
@tar -C $(BASEDIR) --exclude-vcs --exclude-vcs-ignores --exclude .github \
286286
-cvjf $(BUILDDIR)/libogc2-src-$(VERSTRING).tar.bz2 .
287287
@@ -321,17 +322,19 @@ dist: wii cube install-headers
288-
@tar -cvjf libogc2-$(VERSTRING).tar.bz2 include lib libogc_license.txt gamecube_rules wii_rules
288+
@tar -cvjf libogc2-$(VERSTRING).tar.bz2 include lib *_license.txt *_rules
289289

290290

291291
-LIBRARIES := $(OGCLIB).a $(MODLIB).a $(DBLIB).a $(TINYSMBLIB).a $(ASNDLIB).a $(AESNDLIB).a $(ISOLIB).a
@@ -309,10 +309,10 @@ index 15858d5..fc92c0d 100644
309309

310310
#---------------------------------------------------------------------------------
311311
--
312-
2.47.2
312+
2.50.1
313313

314314

315-
From 82362bc11f3069bc25602c29bac0129266ef7beb Mon Sep 17 00:00:00 2001
315+
From d752f30e3447d8f2c7c54c5557b81e40f51f8006 Mon Sep 17 00:00:00 2001
316316
From: novenary <novenary@kwak.zip>
317317
Date: Thu, 30 Nov 2023 00:13:00 +0200
318318
Subject: [PATCH 4/7] Support custom prefix, incdir and libdir
@@ -339,7 +339,7 @@ index 19afba3..68c7041 100644
339339
docs
340340
warn.log
341341
diff --git a/Makefile b/Makefile
342-
index fc92c0d..ccdb5d8 100644
342+
index eb22312..7ba0efd 100644
343343
--- a/Makefile
344344
+++ b/Makefile
345345
@@ -2,9 +2,16 @@
@@ -386,15 +386,15 @@ index fc92c0d..ccdb5d8 100644
386386
- @mkdir -p $(DESTDIR)$(DEVKITPRO)/libogc2
387387
- @cp -frv include $(DESTDIR)$(DEVKITPRO)/libogc2
388388
- @cp -frv lib $(DESTDIR)$(DEVKITPRO)/libogc2
389-
- @cp -frv $(BASEDIR)/libogc_license.txt $(DESTDIR)$(DEVKITPRO)/libogc2
390-
- @cp -frv $(BASEDIR)/gamecube_rules $(BASEDIR)/wii_rules $(DESTDIR)$(DEVKITPRO)/libogc2
389+
- @cp -frv $(BASEDIR)/*_license.txt $(DESTDIR)$(DEVKITPRO)/libogc2
390+
- @cp -frv $(BASEDIR)/*_rules $(DESTDIR)$(DEVKITPRO)/libogc2
391391
+ @$(eval INSTALL_PREFIX := $(INSTALL_PREFIX)) # Expand
392392
+ @mkdir -p $(DESTDIR)$(INSTALL_PREFIX)
393393
+ @mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/$(INCDEST)
394394
+ @cp -frv include/* -t $(DESTDIR)$(INSTALL_PREFIX)/$(INCDEST)
395395
+ @mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/$(LIBDEST)
396396
+ @cp -frv lib/* -t $(DESTDIR)$(INSTALL_PREFIX)/$(LIBDEST)
397-
+ @cp -frv $(BASEDIR)/libogc_license.txt $(DESTDIR)$(INSTALL_PREFIX)
397+
+ @cp -frv $(BASEDIR)/*_license.txt $(DESTDIR)$(INSTALL_PREFIX)
398398
+ @cp -frv $(RULES) $(DESTDIR)$(INSTALL_PREFIX)
399399

400400
#---------------------------------------------------------------------------------
@@ -411,10 +411,10 @@ index fc92c0d..ccdb5d8 100644
411411
@tar -C $(BASEDIR) --exclude-vcs --exclude-vcs-ignores --exclude .github \
412412
-cvjf $(BUILDDIR)/libogc2-src-$(VERSTRING).tar.bz2 .
413413

414-
- @cp $(BASEDIR)/libogc_license.txt $(BASEDIR)/gamecube_rules $(BASEDIR)/wii_rules .
415-
- @tar -cvjf libogc2-$(VERSTRING).tar.bz2 include lib libogc_license.txt gamecube_rules wii_rules
416-
+ @cp $(BASEDIR)/libogc_license.txt .
417-
+ @tar -cvjf libogc2-$(VERSTRING).tar.bz2 include lib libogc_license.txt $(RULES)
414+
- @cp $(BASEDIR)/*_license.txt $(BASEDIR)/*_rules .
415+
- @tar -cvjf libogc2-$(VERSTRING).tar.bz2 include lib *_license.txt *_rules
416+
+ @cp $(BASEDIR)/*_license.txt .
417+
+ @tar -cvjf libogc2-$(VERSTRING).tar.bz2 include lib *_license.txt $(RULES)
418418

419419

420420
ifeq ($(strip $(LIBRARIES)),)
@@ -463,10 +463,10 @@ index 4c979ed..8a8b3f5 100644
463463
MACHDEP = -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float
464464

465465
--
466-
2.47.2
466+
2.50.1
467467

468468

469-
From f451b7143976e6bec641904b50ac5542391e7ecf Mon Sep 17 00:00:00 2001
469+
From eb4bb478b393c75dd65bfaea854f77dde4389ae4 Mon Sep 17 00:00:00 2001
470470
From: novenary <novenary@kwak.zip>
471471
Date: Thu, 30 Nov 2023 21:06:45 +0200
472472
Subject: [PATCH 5/7] Add meson wrapper
@@ -611,10 +611,10 @@ index 0000000..dd5db87
611611
+option('platform', type: 'combo', choices: ['cube', 'wii'])
612612
+option('libraries', type: 'array')
613613
--
614-
2.47.2
614+
2.50.1
615615

616616

617-
From cc6b8f8fd26f2154d9a034fbc284670ddf6b9b35 Mon Sep 17 00:00:00 2001
617+
From 360c5c72880f6d1eaeb54fbe14c4dda61ccf4f7c Mon Sep 17 00:00:00 2001
618618
From: novenary <novenary@kwak.zip>
619619
Date: Tue, 5 Dec 2023 20:33:04 +0200
620620
Subject: [PATCH 6/7] Make console_font_8x16 weak
@@ -634,10 +634,10 @@ index 21ef8da..40c4740 100644
634634
/* 0 0x00 '^@' */
635635
0x00, /* 00000000 */
636636
--
637-
2.47.2
637+
2.50.1
638638

639639

640-
From e66af5e4c69516c363fa185c4a6367b90e603985 Mon Sep 17 00:00:00 2001
640+
From 9079f26184fa446a574040993d31e753b107bfde Mon Sep 17 00:00:00 2001
641641
From: novenary <novenary@kwak.zip>
642642
Date: Tue, 5 Dec 2023 22:07:32 +0200
643643
Subject: [PATCH 7/7] Make builds deterministic
@@ -652,7 +652,7 @@ This allows consecutive rebuilds to produce identical binaries.
652652
2 files changed, 2 insertions(+), 3 deletions(-)
653653

654654
diff --git a/Makefile b/Makefile
655-
index ccdb5d8..3f2c448 100644
655+
index 7ba0efd..a67c7de 100644
656656
--- a/Makefile
657657
+++ b/Makefile
658658
@@ -26,10 +26,10 @@ export LIBOGC_MINOR := 1
@@ -668,18 +668,18 @@ index ccdb5d8..3f2c448 100644
668668

669669
#---------------------------------------------------------------------------------
670670
diff --git a/libogc/system.c b/libogc/system.c
671-
index 69e7016..d8b97db 100644
671+
index 18b28c0..4b82ce4 100644
672672
--- a/libogc/system.c
673673
+++ b/libogc/system.c
674-
@@ -246,7 +246,6 @@ static sys_resetinfo mem_resetinfo = {
674+
@@ -221,7 +221,6 @@ static sys_resetinfo mem_resetinfo = {
675675
127
676676
};
677677

678678
-static const char *__sys_versiondate;
679679
static const char *__sys_versionbuild;
680680

681-
static __inline__ alarm_st* __lwp_syswd_open(syswd_t wd)
682-
@@ -1036,7 +1035,7 @@ void* __SYS_GetIPCBufferHi(void)
681+
static void (*reload)(void) = (void(*)(void))0x80001800;
682+
@@ -974,7 +973,7 @@ void* __SYS_GetIPCBufferHi(void)
683683
#endif
684684

685685
void _V_EXPORTNAME(void)
@@ -689,5 +689,5 @@ index 69e7016..d8b97db 100644
689689
#if defined(HW_RVL)
690690
void __SYS_DoPowerCB(void)
691691
--
692-
2.47.2
692+
2.50.1
693693

0 commit comments

Comments
 (0)