Skip to content

Commit a4e75b6

Browse files
committed
webOS: enable wayland by default for GLES 3 binary, keep GLES 2 without wayland
1 parent 68768fc commit a4e75b6

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

.github/workflows/webOS.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,23 +68,26 @@ jobs:
6868
RARCH_VERSION=$(grep -Po '(?<=#define PACKAGE_VERSION ")[^"]+' version.all)
6969
echo "RARCH_VERSION=$RARCH_VERSION" >> "$GITHUB_ENV"
7070
71-
- name: Compile RA (GLES3 variant)
71+
- name: Compile RA (GLES3 and Wayland variant)
7272
shell: bash
7373
run: |
7474
. /tmp/arm-webos-linux-gnueabi_sdk-buildroot/environment-setup
75+
export SDK_PATH=/tmp/arm-webos-linux-gnueabi_sdk-buildroot
7576
make -f Makefile.webos clean
77+
bash gfx/common/wayland/generate_wayland_protos.sh
7678
make -f Makefile.webos ipk PACKAGE_NAME=${PACKAGE_NAME} ADD_SDL2_LIB=1 \
79+
HAVE_XKBCOMMON=1 HAVE_USERLAND=1 HAVE_EGL=1 HAVE_WAYLAND=1 \
7780
HAVE_OPENGLES3=1 HAVE_OPENGLES3_1=1 HAVE_OPENGLES3_2=1 -j"$(getconf _NPROCESSORS_ONLN)"
7881
mv webos/com.retroarch.webos_${RARCH_VERSION}_arm.ipk \
79-
webos/com.retroarch.webos.gles3_${RARCH_VERSION}_arm.ipk
82+
webos/com.retroarch.webos.gles3w_${RARCH_VERSION}_arm.ipk
8083
env:
8184
DEBUG: ${{ github.event_name == 'release' && '0' || '1' }}
8285

83-
- name: Upload GLES3 artifact
86+
- name: Upload GLES3 and Wayland artifact
8487
uses: actions/upload-artifact@v4
8588
with:
86-
name: com.retroarch.webos.gles3_${{ env.RARCH_VERSION }}_${{ github.sha }}_arm.ipk
87-
path: webos/com.retroarch.webos.gles3_${{ env.RARCH_VERSION }}_arm.ipk
89+
name: com.retroarch.webos.gles3w_${{ env.RARCH_VERSION }}_${{ github.sha }}_arm.ipk
90+
path: webos/com.retroarch.webos.gles3w_${{ env.RARCH_VERSION }}_arm.ipk
8891

8992
- name: Compile RA (default)
9093
shell: bash
@@ -121,5 +124,5 @@ jobs:
121124
omitPrereleaseDuringUpdate: true
122125
artifacts: |
123126
webos/com.retroarch.webos_${{ env.RARCH_VERSION }}_arm.ipk
124-
webos/com.retroarch.webos.gles3_${{ env.RARCH_VERSION }}_arm.ipk
127+
webos/com.retroarch.webos.gles3w_${{ env.RARCH_VERSION }}_arm.ipk
125128
webos/${{ env.PACKAGE_NAME }}.manifest.json

0 commit comments

Comments
 (0)