diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 0001-Fix-compilation-on-GCC-10.patch | 95 | ||||
| -rw-r--r-- | PKGBUILD | 14 |
3 files changed, 108 insertions, 5 deletions
@@ -1,7 +1,7 @@ pkgbase = doomretro pkgdesc = The classic, refined DOOM source port pkgver = 3.5.8 - pkgrel = 1 + pkgrel = 2 url = http://doomretro.com arch = x86_64 license = GPL3 @@ -10,7 +10,9 @@ pkgbase = doomretro depends = sdl2_mixer optdepends = timidity++: for music playback source = doomretro-3.5.8.tar.gz::https://github.com/bradharding/doomretro/archive/v3.5.8.tar.gz + source = 0001-Fix-compilation-on-GCC-10.patch sha512sums = 76127772972f6165fd44e53eb9fd38c14afd3a92d474caa9f941e7f159a26cfb3a19e72b837cbae5767dcb4617e89729558c6e5d65f74970b1fd059123ad4eb7 + sha512sums = c2413ad416b1122771566df8c36ce05093ba81756c65a724bab29ec4f8092a6c9b3373034ffdec49cddbee3456dcd2f4405631e5d8b411deb0dd0ab3672a4d48 pkgname = doomretro diff --git a/0001-Fix-compilation-on-GCC-10.patch b/0001-Fix-compilation-on-GCC-10.patch new file mode 100644 index 000000000000..0d47ac745199 --- /dev/null +++ b/0001-Fix-compilation-on-GCC-10.patch @@ -0,0 +1,95 @@ +--- a/src/hu_lib.h ++++ b/src/hu_lib.h +@@ -118,7 +118,7 @@ void HUlib_DrawSText(hu_stext_t *s, dboolean external); + // erases all stext lines + void HUlib_EraseSText(hu_stext_t *s); + +-void (*althudtextfunc)(int, int, byte *, patch_t *, int); ++extern void (*althudtextfunc)(int, int, byte *, patch_t *, int); + + extern dboolean STCFN034; + extern dboolean idbehold; + +--- a/src/i_video.h ++++ b/src/i_video.h +@@ -86,8 +86,8 @@ void I_SetGamma(float value); + void I_WindowResizeBlit(void); + #endif + +-void (*blitfunc)(void); +-void (*mapblitfunc)(void); ++extern void (*blitfunc)(void); ++extern void (*mapblitfunc)(void); + + extern dboolean sendpause; + extern dboolean quitting; + +--- a/src/r_main.h ++++ b/src/r_main.h +@@ -101,36 +101,36 @@ extern fixed_t fractionaltic; + // Function pointers to switch refresh/drawing functions. + // Used to select shadow mode etc. + // +-void (*colfunc)(void); +-void (*wallcolfunc)(void); +-void (*bmapwallcolfunc)(void); +-void (*segcolfunc)(void); +-void (*transcolfunc)(void); +-void (*basecolfunc)(void); +-void (*fuzzcolfunc)(void); +-void (*tlcolfunc)(void); +-void (*tl50colfunc)(void); +-void (*tl50segcolfunc)(void); +-void (*tl33colfunc)(void); +-void (*tlgreencolfunc)(void); +-void (*tlredcolfunc)(void); +-void (*tlredwhitecolfunc1)(void); +-void (*tlredwhitecolfunc2)(void); +-void (*tlredwhite50colfunc)(void); +-void (*tlbluecolfunc)(void); +-void (*tlgreen33colfunc)(void); +-void (*tlred33colfunc)(void); +-void (*tlblue25colfunc)(void); +-void (*redtobluecolfunc)(void); +-void (*tlredtoblue33colfunc)(void); +-void (*skycolfunc)(void); +-void (*redtogreencolfunc)(void); +-void (*tlredtogreen33colfunc)(void); +-void (*psprcolfunc)(void); +-void (*spanfunc)(void); +-void (*bloodsplatcolfunc)(void); +-void (*megaspherecolfunc)(void); +-void (*supershotguncolfunc)(void); ++extern void (*colfunc)(void); ++extern void (*wallcolfunc)(void); ++extern void (*bmapwallcolfunc)(void); ++extern void (*segcolfunc)(void); ++extern void (*transcolfunc)(void); ++extern void (*basecolfunc)(void); ++extern void (*fuzzcolfunc)(void); ++extern void (*tlcolfunc)(void); ++extern void (*tl50colfunc)(void); ++extern void (*tl50segcolfunc)(void); ++extern void (*tl33colfunc)(void); ++extern void (*tlgreencolfunc)(void); ++extern void (*tlredcolfunc)(void); ++extern void (*tlredwhitecolfunc1)(void); ++extern void (*tlredwhitecolfunc2)(void); ++extern void (*tlredwhite50colfunc)(void); ++extern void (*tlbluecolfunc)(void); ++extern void (*tlgreen33colfunc)(void); ++extern void (*tlred33colfunc)(void); ++extern void (*tlblue25colfunc)(void); ++extern void (*redtobluecolfunc)(void); ++extern void (*tlredtoblue33colfunc)(void); ++extern void (*skycolfunc)(void); ++extern void (*redtogreencolfunc)(void); ++extern void (*tlredtogreen33colfunc)(void); ++extern void (*psprcolfunc)(void); ++extern void (*spanfunc)(void); ++extern void (*bloodsplatcolfunc)(void); ++extern void (*megaspherecolfunc)(void); ++extern void (*supershotguncolfunc)(void); + + // + // Utility functions. @@ -3,7 +3,7 @@ pkgname=doomretro pkgver=3.5.8 -pkgrel=1 +pkgrel=2 pkgdesc='The classic, refined DOOM source port' arch=('x86_64') url='http://doomretro.com' @@ -11,16 +11,22 @@ license=('GPL3') depends=('sdl2_image' 'sdl2_mixer') makedepends=('cmake') optdepends=('timidity++: for music playback') -source=("$pkgname-$pkgver.tar.gz::https://github.com/bradharding/doomretro/archive/v$pkgver.tar.gz") -sha512sums=('76127772972f6165fd44e53eb9fd38c14afd3a92d474caa9f941e7f159a26cfb3a19e72b837cbae5767dcb4617e89729558c6e5d65f74970b1fd059123ad4eb7') +source=("$pkgname-$pkgver.tar.gz::https://github.com/bradharding/doomretro/archive/v$pkgver.tar.gz" + "0001-Fix-compilation-on-GCC-10.patch") +sha512sums=('76127772972f6165fd44e53eb9fd38c14afd3a92d474caa9f941e7f159a26cfb3a19e72b837cbae5767dcb4617e89729558c6e5d65f74970b1fd059123ad4eb7' + 'c2413ad416b1122771566df8c36ce05093ba81756c65a724bab29ec4f8092a6c9b3373034ffdec49cddbee3456dcd2f4405631e5d8b411deb0dd0ab3672a4d48') prepare() { mkdir -p build + + # remove in the next version, this patch is backported from upstream + cd "$pkgname-$pkgver" + patch -sp1 < "$srcdir/0001-Fix-compilation-on-GCC-10.patch" } build() { cd build - cmake ../$pkgname-$pkgver \ + cmake ../"$pkgname-$pkgver" \ -DCMAKE_INSTALL_PREFIX=/usr make } |