diff --git a/platforms/android/arm64-v8a/external.sh b/platforms/android/arm64-v8a/external.sh index 85cf3463..5dd3ff07 100755 --- a/platforms/android/arm64-v8a/external.sh +++ b/platforms/android/arm64-v8a/external.sh @@ -52,9 +52,9 @@ cd .. # build libserum and copy to external # -curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz +curl -sL https://github.com/PPUC/libserum_concentrate/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz tar xzf libserum-${LIBSERUM_SHA}.tar.gz -mv libserum-${LIBSERUM_SHA} libserum +mv libserum_concentrate-${LIBSERUM_SHA} libserum cd libserum cmake \ -DPLATFORM=android \ diff --git a/platforms/config.sh b/platforms/config.sh index 7c02444f..6791c125 100755 --- a/platforms/config.sh +++ b/platforms/config.sh @@ -3,7 +3,7 @@ set -e LIBZEDMD_SHA=154772800e8f36378c629f066bfee563862728ac -LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c +LIBSERUM_SHA=708183391968307e1b45f9e60cf033fdd1d31f7d LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612 if [ -z "${BUILD_TYPE}" ]; then diff --git a/platforms/ios-simulator/arm64/external.sh b/platforms/ios-simulator/arm64/external.sh index f10ca998..922946bb 100755 --- a/platforms/ios-simulator/arm64/external.sh +++ b/platforms/ios-simulator/arm64/external.sh @@ -46,9 +46,9 @@ cd .. # build libserum and copy to external # -curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz +curl -sL https://github.com/PPUC/libserum_concentrate/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz tar xzf libserum-${LIBSERUM_SHA}.tar.gz -mv libserum-${LIBSERUM_SHA} libserum +mv libserum_concentrate-${LIBSERUM_SHA} libserum cd libserum cmake \ -DPLATFORM=ios-simulator \ diff --git a/platforms/ios/arm64/external.sh b/platforms/ios/arm64/external.sh index b150381e..b791d0f9 100755 --- a/platforms/ios/arm64/external.sh +++ b/platforms/ios/arm64/external.sh @@ -46,9 +46,9 @@ cd .. # build libserum and copy to external # -curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz +curl -sL https://github.com/PPUC/libserum_concentrate/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz tar xzf libserum-${LIBSERUM_SHA}.tar.gz -mv libserum-${LIBSERUM_SHA} libserum +mv libserum_concentrate-${LIBSERUM_SHA} libserum cd libserum cmake \ -DPLATFORM=ios \ diff --git a/platforms/linux/aarch64/external.sh b/platforms/linux/aarch64/external.sh index 26175873..665c04df 100755 --- a/platforms/linux/aarch64/external.sh +++ b/platforms/linux/aarch64/external.sh @@ -50,9 +50,9 @@ cd .. # build libserum and copy to external # -curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz +curl -sL https://github.com/PPUC/libserum_concentrate/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz tar xzf libserum-${LIBSERUM_SHA}.tar.gz -mv libserum-${LIBSERUM_SHA} libserum +mv libserum_concentrate-${LIBSERUM_SHA} libserum cd libserum cmake \ -DPLATFORM=linux \ diff --git a/platforms/linux/x64/external.sh b/platforms/linux/x64/external.sh index d328897b..851b89ae 100755 --- a/platforms/linux/x64/external.sh +++ b/platforms/linux/x64/external.sh @@ -50,9 +50,9 @@ cd .. # build libserum and copy to external # -curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz +curl -sL https://github.com/PPUC/libserum_concentrate/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz tar xzf libserum-${LIBSERUM_SHA}.tar.gz -mv libserum-${LIBSERUM_SHA} libserum +mv libserum_concentrate-${LIBSERUM_SHA} libserum cd libserum cmake \ -DPLATFORM=linux \ diff --git a/platforms/macos/arm64/external.sh b/platforms/macos/arm64/external.sh index 4a3c75a5..0ee051eb 100755 --- a/platforms/macos/arm64/external.sh +++ b/platforms/macos/arm64/external.sh @@ -50,9 +50,9 @@ cd .. # build libserum and copy to external # -curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz +curl -sL https://github.com/PPUC/libserum_concentrate/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz tar xzf libserum-${LIBSERUM_SHA}.tar.gz -mv libserum-${LIBSERUM_SHA} libserum +mv libserum_concentrate-${LIBSERUM_SHA} libserum cd libserum cmake \ -DPLATFORM=macos \ diff --git a/platforms/macos/x64/external.sh b/platforms/macos/x64/external.sh index b675e02a..782fde17 100755 --- a/platforms/macos/x64/external.sh +++ b/platforms/macos/x64/external.sh @@ -50,9 +50,9 @@ cd .. # build libserum and copy to external # -curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz +curl -sL https://github.com/PPUC/libserum_concentrate/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz tar xzf libserum-${LIBSERUM_SHA}.tar.gz -mv libserum-${LIBSERUM_SHA} libserum +mv libserum_concentrate-${LIBSERUM_SHA} libserum cd libserum cmake \ -DPLATFORM=macos \ diff --git a/platforms/tvos/arm64/external.sh b/platforms/tvos/arm64/external.sh index 7e3fd77f..14dddbc4 100755 --- a/platforms/tvos/arm64/external.sh +++ b/platforms/tvos/arm64/external.sh @@ -46,9 +46,9 @@ cd .. # build libserum and copy to external # -curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz +curl -sL https://github.com/PPUC/libserum_concentrate/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz tar xzf libserum-${LIBSERUM_SHA}.tar.gz -mv libserum-${LIBSERUM_SHA} libserum +mv libserum_concentrate-${LIBSERUM_SHA} libserum cd libserum cmake \ -DPLATFORM=tvos \ diff --git a/platforms/win/x64/external.sh b/platforms/win/x64/external.sh index 03ff5974..d14c3079 100755 --- a/platforms/win/x64/external.sh +++ b/platforms/win/x64/external.sh @@ -52,9 +52,9 @@ cd .. # build libserum and copy to external # -curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz +curl -sL https://github.com/PPUC/libserum_concentrate/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz tar xzf libserum-${LIBSERUM_SHA}.tar.gz -mv libserum-${LIBSERUM_SHA} libserum +mv libserum_concentrate-${LIBSERUM_SHA} libserum cd libserum cmake \ -G "Visual Studio 17 2022" \ diff --git a/platforms/win/x86/external.sh b/platforms/win/x86/external.sh index 877d417c..d41586fb 100755 --- a/platforms/win/x86/external.sh +++ b/platforms/win/x86/external.sh @@ -53,9 +53,9 @@ cd .. # build libserum and copy to external # -curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz +curl -sL https://github.com/PPUC/libserum_concentrate/archive/${LIBSERUM_SHA}.tar.gz -o libserum-${LIBSERUM_SHA}.tar.gz tar xzf libserum-${LIBSERUM_SHA}.tar.gz -mv libserum-${LIBSERUM_SHA} libserum +mv libserum_concentrate-${LIBSERUM_SHA} libserum cd libserum cmake \ -G "Visual Studio 17 2022" \ diff --git a/src/DMD.cpp b/src/DMD.cpp index 21bd4892..9a9495a9 100644 --- a/src/DMD.cpp +++ b/src/DMD.cpp @@ -836,10 +836,10 @@ void DMD::SerumThread() } if (m_altColorPath[0] == '\0') strcpy(m_altColorPath, Config::GetInstance()->GetAltColorPath()); - - m_pSerum = (name[0] != '\0') - ? Serum_Load(m_altColorPath, m_romName, FLAG_REQUEST_32P_FRAMES | FLAG_REQUEST_64P_FRAMES) - : nullptr; + uint8_t flags = FLAG_REQUEST_32P_FRAMES; + // At the moment, ZeDMD HD is the only device supporting 64P frames. Not requesting 64P saves memory + if (m_pZeDMD && m_pZeDMD->GetWidth() == 256) flags |= FLAG_REQUEST_64P_FRAMES; + m_pSerum = (name[0] != '\0') ? Serum_Load(m_altColorPath, m_romName, flags) : nullptr; if (m_pSerum) { Log(DMDUtil_LogLevel_INFO, "Loaded Serum v%d colorization for %s", m_pSerum->SerumVersion, m_romName);