Skip to content

Commit 060b08f

Browse files
9ary9ary
committed
Update libogc2
1 parent 783b1f7 commit 060b08f

File tree

2 files changed

+55
-65
lines changed

2 files changed

+55
-65
lines changed

‎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 = 45717c8317772f067b875d04d5a18a981dfe51fd
3+
revision = b204695faf6a7df4cb816bfde1148c57d2ec3f36
44
#depth = 1
55
diff_files = libogc2.patch

‎subprojects/packagefiles/libogc2.patch‎

Lines changed: 54 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 4a63efe11b620e170f572c0e760bbbc59fd786ae Mon Sep 17 00:00:00 2001
1+
From f376e1b0ad3bf5c41669fcbf41450216540e7bc3 Mon Sep 17 00:00:00 2001
22
From: novenary <[email protected]>
33
Date: Wed, 29 Nov 2023 18:46:32 +0200
44
Subject: [PATCH 1/7] Fix out-of-tree builds
@@ -11,10 +11,10 @@ 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 8f8e9b0..1651810 100644
14+
index df3c97d..ad07c48 100644
1515
--- a/.github/workflows/continuous-integration-workflow.yml
1616
+++ b/.github/workflows/continuous-integration-workflow.yml
17-
@@ -27,7 +27,9 @@ jobs:
17+
@@ -39,7 +39,9 @@ jobs:
1818
path: libntfs
1919

2020
- name: Build libogc2
@@ -24,7 +24,7 @@ index 8f8e9b0..1651810 100644
2424
+ make -C build -f ../Makefile install
2525
working-directory: libogc2
2626

27-
- name: Build libfat
27+
- name: Build libdvm
2828
diff --git a/.gitignore b/.gitignore
2929
index d1a46b2..19afba3 100644
3030
--- a/.gitignore
@@ -35,29 +35,29 @@ index d1a46b2..19afba3 100644
3535
deps
3636
include
3737
diff --git a/Doxyfile b/Doxyfile
38-
index 92e028c..aa53840 100644
38+
index 5e987e7..82e55e2 100644
3939
--- a/Doxyfile
4040
+++ b/Doxyfile
41-
@@ -38,7 +38,7 @@ PROJECT_NUMBER = 1.0
42-
# If a relative path is entered, it will be relative to the location
43-
# where doxygen was started. If left blank the current directory will be used.
41+
@@ -74,7 +74,7 @@ PROJECT_ICON =
42+
# entered, it will be relative to the location where Doxygen was started. If
43+
# left blank the current directory will be used.
4444

4545
-OUTPUT_DIRECTORY = docs
4646
+OUTPUT_DIRECTORY = $(BUILDDIR)/docs
4747

48-
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
49-
# 4096 sub-directories (in 2 levels) under the output directory of each output
50-
@@ -579,7 +579,7 @@ WARN_FORMAT = "$file:$line: $text"
51-
# and error messages should be written. If left blank the output is written
52-
# to stderr.
48+
# If the CREATE_SUBDIRS tag is set to YES then Doxygen will create up to 4096
49+
# sub-directories (in 2 levels) under the output directory of each output format
50+
@@ -953,7 +953,7 @@ WARN_LINE_FORMAT = "at line $line of file $file"
51+
# specified the warning and error messages are written to standard output
52+
# (stdout).
5353

5454
-WARN_LOGFILE = warn.log
5555
+WARN_LOGFILE = $(BUILDDIR)/warn.log
5656

5757
#---------------------------------------------------------------------------
58-
# configuration options related to the input files
58+
# Configuration options related to the input files
5959
diff --git a/Makefile b/Makefile
60-
index 56ade00..f40a1e1 100644
60+
index c741a8a..702e3fb 100644
6161
--- a/Makefile
6262
+++ b/Makefile
6363
@@ -10,6 +10,8 @@ ifeq ($(strip $(DEVKITPPC)),)
@@ -69,7 +69,7 @@ index 56ade00..f40a1e1 100644
6969
export PATH := $(DEVKITPPC)/bin:$(PATH)
7070

7171
export LIBOGC_MAJOR := 2
72-
@@ -26,7 +28,8 @@ VERSTRING := $(LIBOGC_MAJOR).$(LIBOGC_MINOR).$(LIBOGC_PATCH)
72+
@@ -26,7 +28,8 @@ VERSTRING := $(shell printf "r%s.%s" "$$(git rev-list --count HEAD)" "$$(git rev
7373
#---------------------------------------------------------------------------------
7474
ifeq ($(strip $(PLATFORM)),)
7575
#---------------------------------------------------------------------------------
@@ -125,14 +125,14 @@ index 56ade00..f40a1e1 100644
125125

126126

127127
#---------------------------------------------------------------------------------
128-
-gc/ogc/libversion.h : Makefile
128+
-gc/ogc/libversion.h: .git/HEAD .git/index Makefile
129129
+gc/ogc/libversion.h : $(CURFILE)
130130
#---------------------------------------------------------------------------------
131131
+ @[ -d gc/ogc ] || mkdir -p gc/ogc
132132
@echo "#ifndef __OGC_LIBVERSION_H__" > $@
133133
@echo "#define __OGC_LIBVERSION_H__" >> $@
134134
@echo >> $@
135-
@@ -265,7 +271,7 @@ $(WIIUSELIB).a: $(WIIUSEOBJ)
135+
@@ -267,7 +273,7 @@ $(WIIUSELIB).a: $(WIIUSEOBJ)
136136
.PHONY: libs wii cube install-headers install uninstall dist docs
137137

138138
#---------------------------------------------------------------------------------
@@ -141,7 +141,7 @@ index 56ade00..f40a1e1 100644
141141
#---------------------------------------------------------------------------------
142142
@mkdir -p $(INCDIR)
143143
@mkdir -p $(INCDIR)/ogc/machine
144-
@@ -276,16 +282,17 @@ install-headers:
144+
@@ -278,16 +284,17 @@ install-headers:
145145
@mkdir -p $(INCDIR)/sdcard
146146
@mkdir -p $(INCDIR)/di
147147
@mkdir -p $(INCDIR)/wiikeyboard
@@ -169,7 +169,7 @@ index 56ade00..f40a1e1 100644
169169

170170
#---------------------------------------------------------------------------------
171171
install: wii cube install-headers
172-
@@ -293,8 +300,8 @@ install: wii cube install-headers
172+
@@ -295,8 +302,8 @@ install: wii cube install-headers
173173
@mkdir -p $(DESTDIR)$(DEVKITPRO)/libogc2
174174
@cp -frv include $(DESTDIR)$(DEVKITPRO)/libogc2
175175
@cp -frv lib $(DESTDIR)$(DEVKITPRO)/libogc2
@@ -180,7 +180,7 @@ index 56ade00..f40a1e1 100644
180180

181181
#---------------------------------------------------------------------------------
182182
uninstall:
183-
@@ -304,9 +311,10 @@ uninstall:
183+
@@ -306,9 +313,10 @@ uninstall:
184184
#---------------------------------------------------------------------------------
185185
dist: wii cube install-headers
186186
#---------------------------------------------------------------------------------
@@ -194,27 +194,27 @@ index 56ade00..f40a1e1 100644
194194
@tar -cvjf libogc2-$(VERSTRING).tar.bz2 include lib libogc_license.txt gamecube_rules wii_rules
195195

196196

197-
@@ -327,6 +335,7 @@ libs: $(LIBRARIES)
197+
@@ -329,6 +337,7 @@ libs: $(LIBRARIES)
198198
clean:
199199
#---------------------------------------------------------------------------------
200200
rm -fr wii cube
201201
+ rm -fr gc/ogc/libversion.h
202202
rm -fr $(DEPS)
203203
rm -fr $(LIBS)
204204
rm -fr $(INCDIR)
205-
@@ -335,6 +344,6 @@ clean:
205+
@@ -337,6 +346,6 @@ clean:
206206
#---------------------------------------------------------------------------------
207207
docs: install-headers
208208
#---------------------------------------------------------------------------------
209-
- doxygen Doxyfile
210-
+ @cd $(BASEDIR); doxygen Doxyfile
209+
- VERSTRING="$(VERSTRING)" doxygen Doxyfile
210+
+ @cd $(BASEDIR); VERSTRING="$(VERSTRING)" doxygen Doxyfile
211211

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

216216

217-
From 649ca8b8f472c7baf089ce3c8eabe9f1a540ebc8 Mon Sep 17 00:00:00 2001
217+
From f7af2086b8649846609baa5651c4fd20ca2b93ff Mon Sep 17 00:00:00 2001
218218
From: novenary <[email protected]>
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 f40a1e1..c875d4f 100644
227+
index 702e3fb..15858d5 100644
228228
--- a/Makefile
229229
+++ b/Makefile
230230
@@ -102,7 +102,8 @@ endif
@@ -238,10 +238,10 @@ index f40a1e1..c875d4f 100644
238238

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

243243

244-
From 7e57e51c0b7709213aa8172e3dc090f1fa815b90 Mon Sep 17 00:00:00 2001
244+
From bb86319812581dbae4b319b205e0a7a470e92a68 Mon Sep 17 00:00:00 2001
245245
From: novenary <[email protected]>
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 c875d4f..99c436c 100644
256+
index 15858d5..fc92c0d 100644
257257
--- a/Makefile
258258
+++ b/Makefile
259259
@@ -186,7 +186,8 @@ WIIKEYBLIBOBJ := usbkeyboard.o keyboard.o ukbdmap.o wskbdutil.o
@@ -266,7 +266,7 @@ index c875d4f..99c436c 100644
266266

267267
#---------------------------------------------------------------------------------
268268
wii: gc/ogc/libversion.h
269-
@@ -296,7 +297,7 @@ install-headers: gc/ogc/libversion.h
269+
@@ -298,7 +299,7 @@ install-headers: gc/ogc/libversion.h
270270
@cp $(BASEDIR)/gc/wiikeyboard/*.h $(INCDIR)/wiikeyboard
271271

272272
#---------------------------------------------------------------------------------
@@ -275,7 +275,7 @@ index c875d4f..99c436c 100644
275275
#---------------------------------------------------------------------------------
276276
@mkdir -p $(DESTDIR)$(DEVKITPRO)/libogc2
277277
@cp -frv include $(DESTDIR)$(DEVKITPRO)/libogc2
278-
@@ -310,7 +311,7 @@ uninstall:
278+
@@ -312,7 +313,7 @@ uninstall:
279279
@rm -frv $(DESTDIR)$(DEVKITPRO)/libogc2
280280

281281
#---------------------------------------------------------------------------------
@@ -284,7 +284,7 @@ index c875d4f..99c436c 100644
284284
#---------------------------------------------------------------------------------
285285
@tar -C $(BASEDIR) --exclude-vcs --exclude-vcs-ignores --exclude .github \
286286
-cvjf $(BUILDDIR)/libogc2-src-$(VERSTRING).tar.bz2 .
287-
@@ -319,17 +320,19 @@ dist: wii cube install-headers
287+
@@ -321,17 +322,19 @@ dist: wii cube install-headers
288288
@tar -cvjf libogc2-$(VERSTRING).tar.bz2 include lib libogc_license.txt gamecube_rules wii_rules
289289

290290

@@ -309,10 +309,10 @@ index c875d4f..99c436c 100644
309309

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

314314

315-
From dc27c7f958c5753b6e80dc188fa59d4b308d1a4d Mon Sep 17 00:00:00 2001
315+
From 82362bc11f3069bc25602c29bac0129266ef7beb Mon Sep 17 00:00:00 2001
316316
From: novenary <[email protected]>
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 99c436c..ee01ef3 100644
342+
index fc92c0d..ccdb5d8 100644
343343
--- a/Makefile
344344
+++ b/Makefile
345345
@@ -2,9 +2,16 @@
@@ -359,7 +359,7 @@ index 99c436c..ee01ef3 100644
359359

360360
ifeq ($(strip $(DEVKITPPC)),)
361361
$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
362-
@@ -226,6 +233,16 @@ gc/ogc/libversion.h : $(CURFILE)
362+
@@ -228,6 +235,16 @@ gc/ogc/libversion.h : $(CURFILE)
363363
@echo >> $@
364364
@echo "#endif // __OGC_LIBVERSION_H__" >> $@
365365

@@ -376,7 +376,7 @@ index 99c436c..ee01ef3 100644
376376
#---------------------------------------------------------------------------------
377377
asndlib.o: asnd_dsp_mixer.h
378378
#---------------------------------------------------------------------------------
379-
@@ -297,27 +314,31 @@ install-headers: gc/ogc/libversion.h
379+
@@ -299,27 +316,31 @@ install-headers: gc/ogc/libversion.h
380380
@cp $(BASEDIR)/gc/wiikeyboard/*.h $(INCDIR)/wiikeyboard
381381

382382
#---------------------------------------------------------------------------------
@@ -418,7 +418,7 @@ index 99c436c..ee01ef3 100644
418418

419419

420420
ifeq ($(strip $(LIBRARIES)),)
421-
@@ -340,6 +361,7 @@ clean:
421+
@@ -342,6 +363,7 @@ clean:
422422
#---------------------------------------------------------------------------------
423423
rm -fr wii cube
424424
rm -fr gc/ogc/libversion.h
@@ -463,10 +463,10 @@ index 4c979ed..8a8b3f5 100644
463463
MACHDEP = -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float
464464

465465
--
466-
2.44.1
466+
2.47.2
467467

468468

469-
From f7288ac82a71cc8672daae9037b851e0b8f2e97c Mon Sep 17 00:00:00 2001
469+
From 2714f6dc6718f95958013e97684f30139b347af4 Mon Sep 17 00:00:00 2001
470470
From: novenary <[email protected]>
471471
Date: Thu, 30 Nov 2023 21:06:45 +0200
472472
Subject: [PATCH 5/7] Add meson wrapper
@@ -607,10 +607,10 @@ index 0000000..dd5db87
607607
+option('platform', type: 'combo', choices: ['cube', 'wii'])
608608
+option('libraries', type: 'array')
609609
--
610-
2.44.1
610+
2.47.2
611611

612612

613-
From 1caaceb71c2bfbc17750be150a02209ff245a07f Mon Sep 17 00:00:00 2001
613+
From c5207e3d3e35881bfc7c82f2ccdbf96c23604ef8 Mon Sep 17 00:00:00 2001
614614
From: novenary <[email protected]>
615615
Date: Tue, 5 Dec 2023 20:33:04 +0200
616616
Subject: [PATCH 6/7] Make console_font_8x16 weak
@@ -630,10 +630,10 @@ index 21ef8da..40c4740 100644
630630
/* 0 0x00 '^@' */
631631
0x00, /* 00000000 */
632632
--
633-
2.44.1
633+
2.47.2
634634

635635

636-
From ccee14a8d4308d890a10b34ea65d2fd637d6189d Mon Sep 17 00:00:00 2001
636+
From f244e6d30bd19a152911ddb7f42d54608c2ef50c Mon Sep 17 00:00:00 2001
637637
From: novenary <[email protected]>
638638
Date: Tue, 5 Dec 2023 22:07:32 +0200
639639
Subject: [PATCH 7/7] Make builds deterministic
@@ -643,12 +643,12 @@ Subject: [PATCH 7/7] Make builds deterministic
643643

644644
This allows consecutive rebuilds to produce identical binaries.
645645
---
646-
Makefile | 5 +----
646+
Makefile | 2 +-
647647
libogc/system.c | 3 +--
648-
2 files changed, 2 insertions(+), 6 deletions(-)
648+
2 files changed, 2 insertions(+), 3 deletions(-)
649649

650650
diff --git a/Makefile b/Makefile
651-
index ee01ef3..38959ac 100644
651+
index ccdb5d8..3f2c448 100644
652652
--- a/Makefile
653653
+++ b/Makefile
654654
@@ -26,10 +26,10 @@ export LIBOGC_MINOR := 1
@@ -660,32 +660,22 @@ index ee01ef3..38959ac 100644
660660
BUILD := build
661661

662662
-DATESTRING := $(shell date +%Y%m%d)
663-
VERSTRING := $(LIBOGC_MAJOR).$(LIBOGC_MINOR).$(LIBOGC_PATCH)
663+
VERSTRING := $(shell printf "r%s.%s" "$$(git rev-list --count HEAD)" "$$(git rev-parse --short=7 HEAD)")
664664

665665
#---------------------------------------------------------------------------------
666-
@@ -226,9 +226,6 @@ gc/ogc/libversion.h : $(CURFILE)
667-
@echo "#define _V_MINOR_ $(LIBOGC_MINOR)" >> $@
668-
@echo "#define _V_PATCH_ $(LIBOGC_PATCH)" >> $@
669-
@echo >> $@
670-
- @echo "#define _V_DATE_ __DATE__" >> $@
671-
- @echo "#define _V_TIME_ __TIME__" >> $@
672-
- @echo >> $@
673-
@echo '#define _V_STRING "libOGC Release '$(LIBOGC_MAJOR).$(LIBOGC_MINOR).$(LIBOGC_PATCH)'"' >> $@
674-
@echo >> $@
675-
@echo "#endif // __OGC_LIBVERSION_H__" >> $@
676666
diff --git a/libogc/system.c b/libogc/system.c
677-
index bf07905..b4da7f9 100644
667+
index 69e7016..d8b97db 100644
678668
--- a/libogc/system.c
679669
+++ b/libogc/system.c
680-
@@ -237,7 +237,6 @@ static sys_resetinfo mem_resetinfo = {
670+
@@ -246,7 +246,6 @@ static sys_resetinfo mem_resetinfo = {
681671
127
682672
};
683673

684674
-static const char *__sys_versiondate;
685675
static const char *__sys_versionbuild;
686676

687677
static __inline__ alarm_st* __lwp_syswd_open(syswd_t wd)
688-
@@ -1034,7 +1033,7 @@ void* __SYS_GetIPCBufferHi(void)
678+
@@ -1036,7 +1035,7 @@ void* __SYS_GetIPCBufferHi(void)
689679
#endif
690680

691681
void _V_EXPORTNAME(void)
@@ -695,5 +685,5 @@ index bf07905..b4da7f9 100644
695685
#if defined(HW_RVL)
696686
void __SYS_DoPowerCB(void)
697687
--
698-
2.44.1
688+
2.47.2
699689

0 commit comments

Comments
 (0)