frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hyperion-project:master' into feature/hd108

Browse Source
This commit is contained in:
FutureMan 2025-02-22 15:43:19 +01:00 committed by GitHub
commit 2872620072
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/qt5_6.yml vendored
View File

@ -36,7 +36,7 @@ jobs:
Linux: Linux:
name: 🐧 ${{ matrix.os.description }} name: 🐧 ${{ matrix.os.description }}
runs-on: ubuntu-latest runs-on: ubuntu-22.04
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@ -182,7 +182,7 @@ jobs:
- name: Install Vulkan SDK - name: Install Vulkan SDK
if: ${{ inputs.qt_version == '6' }} if: ${{ inputs.qt_version == '6' }}
uses: jakoch/install-vulkan-sdk-action@v1.0.5 uses: jakoch/install-vulkan-sdk-action@v1.0.6
with: with:
install_runtime: false install_runtime: false
cache: true cache: true

4
bin/scripts/docker-compile.sh
View File

@ -200,7 +200,7 @@ if [ ${CURRENT_ARCHITECTURE} == "aarch64" ]; then
USER_ARCHITECTURE="arm/v6" USER_ARCHITECTURE="arm/v6"
fi fi
fi fi
if [ $ARCHITECTURE != $USER_ARCHITECTURE ]; then if [ $CURRENT_ARCHITECTURE != $USER_ARCHITECTURE ]; then
log "Identified user space current architecture: $USER_ARCHITECTURE" log "Identified user space current architecture: $USER_ARCHITECTURE"
CURRENT_ARCHITECTURE=$USER_ARCHITECTURE CURRENT_ARCHITECTURE=$USER_ARCHITECTURE
fi fi
@ -211,7 +211,7 @@ fi
log "Identified kernel current architecture: $CURRENT_ARCHITECTURE" log "Identified kernel current architecture: $CURRENT_ARCHITECTURE"
if [ $ARCHITECTURE != $CURRENT_ARCHITECTURE ]; then if [ $ARCHITECTURE != $CURRENT_ARCHITECTURE ]; then
echo "---> Build is not for the same architecturem, enable emulation for ${PLATFORM_ARCHITECTURE}" echo "---> Build is not for the same architecturem, enable emulation for ${PLATFORM_ARCHITECTURE}"
ENTRYPOINT_OPTION= ENTRYPOINT_OPTION="--entrypoint /usr/bin/qemu-static"
if [ $CURRENT_ARCHITECTURE != "amd64" ]; then if [ $CURRENT_ARCHITECTURE != "amd64" ]; then
echo "---> Emulation builds can only be executed on linux/amd64, linux/x86_64 platforms, current architecture is ${CURRENT_ARCHITECTURE}" echo "---> Emulation builds can only be executed on linux/amd64, linux/x86_64 platforms, current architecture is ${CURRENT_ARCHITECTURE}"

2
libsrc/utils/ImageResampler.cpp
View File

@ -53,7 +53,7 @@ void ImageResampler::processImage(const uint8_t * data, int width, int height, i
int xDestStart {0}; int xDestStart {0};
int xDestEnd = {outputWidth-1}; int xDestEnd = {outputWidth-1};
int yDestStart = {0}; int yDestStart = {0};
int yDestEnd = {outputWidth-1}; int yDestEnd = {outputHeight-1};
switch (_flipMode) switch (_flipMode)
{ {