Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc deps update #1372

Merged
merged 5 commits into from
Jan 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
freebsd_instance:
image_family: freebsd-13-2
image_family: freebsd-14-0

env:
CCACHE_DIR: /tmp/ccache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
distribution: 'temurin'
cache: 'gradle'

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.ccache
key: android-ccache-${{ github.sha }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/c-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
run: ./shell/apple/emulator-ios/OpenMP/build_ios_openmp.sh --disableSimulator
if: matrix.config.name == 'apple-ios'

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ${{ env.CCACHE_DIR }}
key: ccache-${{ matrix.config.name }}-${{ github.sha }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/crowdin_translate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
git commit -m "Fetch translations & Recreate libretro_core_options_intl.h"

- name: GitHub Push
uses: ad-m/github-push-action@v0.6.0
uses: ad-m/github-push-action@v0.8.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: ${{ github.ref }}
4 changes: 2 additions & 2 deletions .github/workflows/switch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ jobs:
- name: Set up build environment
run: |
sudo apt-get update
sudo apt-get -y install awscli ccache ninja-build
sudo apt-get -y install awscli ccache

- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.ccache
key: ccache-switch-${{ matrix.config.name }}-${{ github.sha }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/uwp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
mkdir vcpkg\bincache
vcpkg\bootstrap-vcpkg.bat

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
key: vcpkg-${{ hashFiles( 'vcpkg.json' ) }}
Expand Down
12 changes: 6 additions & 6 deletions core/deps/glad/include/EGL/eglplatform.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ typedef HDC EGLNativeDisplayType;
typedef HBITMAP EGLNativePixmapType;
typedef HWND EGLNativeWindowType;

#elif defined(__QNX__)

typedef khronos_uintptr_t EGLNativeDisplayType;
typedef struct _screen_pixmap* EGLNativePixmapType; /* screen_pixmap_t */
typedef struct _screen_window* EGLNativeWindowType; /* screen_window_t */

#elif defined(__EMSCRIPTEN__)

typedef int EGLNativeDisplayType;
Expand Down Expand Up @@ -139,12 +145,6 @@ typedef void *EGLNativeDisplayType;
typedef khronos_uintptr_t EGLNativePixmapType;
typedef khronos_uintptr_t EGLNativeWindowType;

#elif defined(__QNX__)

typedef khronos_uintptr_t EGLNativeDisplayType;
typedef struct _screen_pixmap* EGLNativePixmapType; /* screen_pixmap_t */
typedef struct _screen_window* EGLNativeWindowType; /* screen_window_t */

#else
#error "Platform not recognized"
#endif
Expand Down
2 changes: 1 addition & 1 deletion core/deps/glad/include/glad/egl.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Loader generated by glad 2.0.4 on Fri Nov 10 07:48:39 2023
* Loader generated by glad 2.0.4 on Sat Jan 20 11:00:00 2024
*
* SPDX-License-Identifier: (WTFPL OR CC0-1.0) AND Apache-2.0
*
Expand Down
20 changes: 17 additions & 3 deletions core/deps/glad/include/glad/gl.h

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/deps/glad/include/glad/glx.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Loader generated by glad 2.0.4 on Fri Nov 10 07:48:39 2023
* Loader generated by glad 2.0.4 on Sat Jan 20 11:00:00 2024
*
* SPDX-License-Identifier: (WTFPL OR CC0-1.0) AND Apache-2.0
*
Expand Down
1,997 changes: 1,003 additions & 994 deletions core/deps/glad/src/gl.c

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions shell/android-studio/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '8.2.0' apply false
id 'com.android.library' version '8.2.0' apply false
id 'com.android.application' version '8.2.1' apply false
id 'com.android.library' version '8.2.1' apply false
}

task clean(type: Delete) {
Expand Down