Attachment 249525 Details for Bug 278001 – emulators/mupen64plus-video-glide64mk2: fix build with clang 18

[patch] emulators/mupen64plus-video-glide64mk2: fix build with clang 18

emulators__mupen64plus-video-glide64mk2-fix-clang18-build-1.diff (text/plain), 1.65 KB, created by Dimitry Andric on 2024-03-27 20:21:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2024-03-27 20:21:11 UTC

Size: 1.65 KB

patch

obsolete

>commit fd727c357ab7c84d4a60bb0a05e0dfc905675120
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   2024-03-27T21:16:09+01:00
>
>    emulators/mupen64plus-video-glide64mk2: fix build with clang 18
>    
>    I am unsure if clang 18 actually has anything to do with it, but
>    whatever the case, emulators/mupen64plus-video-glide64mk2 does not
>    build:
>    
>        CXX _obj/Glide64/rdp.o
>    ../../src/Glide64/rdp.cpp:1863:11: error: use of undeclared identifier 'bswap32'
>     1863 |     *v5 = bswap32(v12);
>          |           ^
>    
>    And a bunch more of these. Fix it by including <sys/endian.h> in the
>    __FreeBSD__ case in src/Glide64/Util.h.
>    
>    PR:             278001
>    MFH:            2024Q1
>
>diff --git a/emulators/mupen64plus-video-glide64mk2/files/patch-src_Glide64_Util.h b/emulators/mupen64plus-video-glide64mk2/files/patch-src_Glide64_Util.h
>index 1b60d58f5f26..30529e17c6f7 100644
>--- a/emulators/mupen64plus-video-glide64mk2/files/patch-src_Glide64_Util.h
>+++ b/emulators/mupen64plus-video-glide64mk2/files/patch-src_Glide64_Util.h
>@@ -1,14 +1,16 @@
> --- src/Glide64/Util.h.orig	2024-01-06 03:12:23 UTC
> +++ src/Glide64/Util.h
>-@@ -94,6 +94,7 @@ float ScaleZ(float z);
>+@@ -94,6 +94,9 @@ float ScaleZ(float z);
>    #include <stdlib.h>
>    #define bswap32(x) _byteswap_ulong(x)
>  #else
>-+#if !defined __FreeBSD__
>++#if defined __FreeBSD__
>++#include <sys/endian.h>
>++#else
>  static inline uint32_t bswap32(uint32_t val)
>  {
>  	return (((val & 0xff000000) >> 24) |
>-@@ -101,6 +102,7 @@ static inline uint32_t bswap32(uint32_t val)
>+@@ -101,6 +104,7 @@ static inline uint32_t bswap32(uint32_t val)
>  		((val & 0x0000ff00) <<  8) |
>  		((val & 0x000000ff) << 24));
>  }

Actions: View | Diff

Attachments on bug 278001: 249525