forked from mxe/mxe
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from s09bQ5/updates
Add CI build job and update packages
- Loading branch information
Showing
25 changed files
with
182 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| name: Build | ||
|
|
||
| on: [push, pull_request] | ||
| jobs: | ||
| build_i686: | ||
| name: Build for 32 bit x86 | ||
| runs-on: ubuntu-22.04 | ||
| steps: | ||
| - name: Install dependencies | ||
| run: | | ||
| sudo apt-get update | ||
| sudo apt-get install autopoint gperf intltool libtool-bin lzip python3-mako | ||
| - name: Checkout Repository | ||
| uses: actions/checkout@v4 | ||
| - name: Extract Source Hashes | ||
| run: | | ||
| fgrep '(PKG)_CHECKSUM' src/*.mk > hashes.txt | ||
| - name: Cache Downloaded Packages | ||
| id: cache-pkg | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: pkg | ||
| key: pkg-${{hashFiles('hashes.txt')}} | ||
| restore-keys: | | ||
| pkg- | ||
| - name: Cache Object Files | ||
| id: cache-ccache | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: .ccache/ccache | ||
| key: ccache-${{github.sha}} | ||
| restore-keys: | | ||
| ccache- | ||
| - name: Build | ||
| run: | | ||
| mkdir /tmp/mxe | ||
| sudo mount --bind . /tmp/mxe | ||
| cd /tmp/mxe | ||
| ./build.sh | ||
| - name: Collect Artifacts | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: usdx-dlls-i686 | ||
| path: DLLs/* | ||
| if-no-files-found: error | ||
| - name: Cleanup Download Cache | ||
| if: ${{ steps.cache-pkg.outputs.cache-hit != 'true' }} | ||
| run: | | ||
| find pkg -type f -not -anewer settings.mk -print0 | xargs -r -0 rm -v | ||
| - name: Cleanup Object File Cache | ||
| if: ${{ steps.cache-ccache.outputs.cache-hit != 'true' }} | ||
| run: | | ||
| find .ccache/ccache -type f -not -anewer settings.mk -not -name ccache.conf -print0 | xargs -r -0 rm |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt | ||
| index aea0b9d..4f338a9 100644 | ||
| --- a/sharedlib/CMakeLists.txt | ||
| +++ b/sharedlib/CMakeLists.txt | ||
| @@ -62,6 +62,7 @@ if(MSVC) | ||
| # The jsimd_*.c file is built using /MT, so this prevents a linker warning. | ||
| set_target_properties(jpeg PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT /NODEFAULTLIB:LIBCMTD") | ||
| elseif(MINGW) | ||
| + set_target_properties(jpeg PROPERTIES LINK_FLAGS "-static-libgcc") | ||
| set_target_properties(jpeg PROPERTIES SUFFIX -${SO_MAJOR_VERSION}.dll) | ||
| endif() | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| From 8814e3b506b333d6fcd15f5baa815029b90611fb Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= <[email protected]> | ||
| Date: Sun, 18 Aug 2024 21:28:59 +0200 | ||
| Subject: [PATCH] Remove webp animation support | ||
|
|
||
| --- | ||
| src/IMG_webp.c | 8 ++++++++ | ||
| 1 file changed, 8 insertions(+) | ||
|
|
||
| diff --git a/src/IMG_webp.c b/src/IMG_webp.c | ||
| index 2bf6443..aa920af 100644 | ||
| --- a/src/IMG_webp.c | ||
| +++ b/src/IMG_webp.c | ||
| @@ -49,10 +49,12 @@ static struct { | ||
| VP8StatusCode (*WebPGetFeaturesInternal) (const uint8_t *data, size_t data_size, WebPBitstreamFeatures* features, int decoder_abi_version); | ||
| uint8_t* (*WebPDecodeRGBInto) (const uint8_t* data, size_t data_size, uint8_t* output_buffer, size_t output_buffer_size, int output_stride); | ||
| uint8_t* (*WebPDecodeRGBAInto) (const uint8_t* data, size_t data_size, uint8_t* output_buffer, size_t output_buffer_size, int output_stride); | ||
| +#if 0 | ||
| WebPDemuxer* (*WebPDemuxInternal)(const WebPData* data, int allow_partial, WebPDemuxState* state, int version); | ||
| int (*WebPDemuxGetFrame)(const WebPDemuxer* dmux, int frame_number, WebPIterator* iter); | ||
| uint32_t (*WebPDemuxGetI)(const WebPDemuxer* dmux, WebPFormatFeature feature); | ||
| void (*WebPDemuxDelete)(WebPDemuxer* dmux); | ||
| +#endif | ||
| } lib; | ||
|
|
||
| #if defined(LOAD_WEBP_DYNAMIC) && defined(LOAD_WEBPDEMUX_DYNAMIC) | ||
| @@ -91,10 +93,12 @@ int IMG_InitWEBP() | ||
| FUNCTION_LOADER_LIBWEBP(WebPGetFeaturesInternal, VP8StatusCode (*) (const uint8_t *data, size_t data_size, WebPBitstreamFeatures* features, int decoder_abi_version)) | ||
| FUNCTION_LOADER_LIBWEBP(WebPDecodeRGBInto, uint8_t * (*) (const uint8_t* data, size_t data_size, uint8_t* output_buffer, size_t output_buffer_size, int output_stride)) | ||
| FUNCTION_LOADER_LIBWEBP(WebPDecodeRGBAInto, uint8_t * (*) (const uint8_t* data, size_t data_size, uint8_t* output_buffer, size_t output_buffer_size, int output_stride)) | ||
| +#if 0 | ||
| FUNCTION_LOADER_LIBWEBPDEMUX(WebPDemuxInternal, WebPDemuxer* (*)(const WebPData*, int, WebPDemuxState*, int)) | ||
| FUNCTION_LOADER_LIBWEBPDEMUX(WebPDemuxGetFrame, int (*)(const WebPDemuxer* dmux, int frame_number, WebPIterator* iter)) | ||
| FUNCTION_LOADER_LIBWEBPDEMUX(WebPDemuxGetI, uint32_t (*)(const WebPDemuxer* dmux, WebPFormatFeature feature)); | ||
| FUNCTION_LOADER_LIBWEBPDEMUX(WebPDemuxDelete, void (*)(WebPDemuxer* dmux)) | ||
| +#endif | ||
| } | ||
| ++lib.loaded; | ||
|
|
||
| @@ -257,6 +261,7 @@ error: | ||
|
|
||
| IMG_Animation *IMG_LoadWEBPAnimation_RW(SDL_RWops *src) | ||
| { | ||
| +#if 0 | ||
| Sint64 start; | ||
| const char *error = NULL; | ||
| Uint32 format; | ||
| @@ -371,6 +376,9 @@ error: | ||
| IMG_SetError("%s", error); | ||
| } | ||
| SDL_RWseek(src, start, RW_SEEK_SET); | ||
| +#else | ||
| + IMG_SetError("WEBP animations are not supported"); | ||
| +#endif | ||
| return NULL; | ||
| } | ||
|
|
||
| -- | ||
| 2.23.0 | ||
|
|
Oops, something went wrong.