From bcf0d94e32f033500c878301c41fa3443a613d1e Mon Sep 17 00:00:00 2001 From: Markus Kalkbrenner Date: Tue, 4 Feb 2025 01:21:31 +0100 Subject: [PATCH 1/4] libzedmd 0.9.1, re-use cargs anf FrameUtil from libzedmd, removed RGBOrder and SaveSettings --- include/DMDUtil/Config.h | 6 ---- platforms/android/arm64-v8a/external.sh | 39 ++--------------------- platforms/ios-simulator/arm64/external.sh | 35 ++------------------ platforms/ios/arm64/external.sh | 36 ++------------------- platforms/linux/aarch64/external.sh | 34 ++------------------ platforms/linux/x64/external.sh | 34 ++------------------ platforms/macos/arm64/external.sh | 36 ++------------------- platforms/macos/x64/external.sh | 36 ++------------------- platforms/tvos/arm64/external.sh | 33 ++----------------- platforms/win/x64/cargs/001.patch | 38 ---------------------- platforms/win/x64/external.sh | 38 +++------------------- platforms/win/x86/external.sh | 38 +++------------------- src/Config.cpp | 2 -- src/DMD.cpp | 14 -------- 14 files changed, 34 insertions(+), 385 deletions(-) delete mode 100644 platforms/win/x64/cargs/001.patch diff --git a/include/DMDUtil/Config.h b/include/DMDUtil/Config.h index 07eee63..b89b57c 100644 --- a/include/DMDUtil/Config.h +++ b/include/DMDUtil/Config.h @@ -56,12 +56,8 @@ class DMDUTILAPI Config void SetZeDMDDevice(const char* port) { m_zedmdDevice = port; } bool IsZeDMDDebug() const { return m_zedmdDebug; } void SetZeDMDDebug(bool debug) { m_zedmdDebug = debug; } - int GetZeDMDRGBOrder() const { return m_zedmdRgbOrder; } - void SetZeDMDRGBOrder(int rgbOrder) { m_zedmdRgbOrder = rgbOrder; } int GetZeDMDBrightness() const { return m_zedmdBrightness; } void SetZeDMDBrightness(int brightness) { m_zedmdBrightness = brightness; } - bool IsZeDMDSaveSettings() const { return m_zedmdSaveSettings; } - void SetZeDMDSaveSettings(bool saveSettings) { m_zedmdSaveSettings = saveSettings; } bool IsZeDMDWiFiEnabled() const { return m_zedmdWiFiEnabled; } void SetZeDMDWiFiEnabled(bool WiFiEnabled) { m_zedmdWiFiEnabled = WiFiEnabled; } const char* GetZeDMDWiFiAddr() const { return m_zedmdWiFiAddr.c_str(); } @@ -102,9 +98,7 @@ class DMDUTILAPI Config bool m_zedmd; std::string m_zedmdDevice; bool m_zedmdDebug; - int m_zedmdRgbOrder; int m_zedmdBrightness; - bool m_zedmdSaveSettings; bool m_zedmdWiFiEnabled; std::string m_zedmdWiFiAddr; bool m_dmdServer; diff --git a/platforms/android/arm64-v8a/external.sh b/platforms/android/arm64-v8a/external.sh index b5c9b98..ea7c784 100755 --- a/platforms/android/arm64-v8a/external.sh +++ b/platforms/android/arm64-v8a/external.sh @@ -2,11 +2,9 @@ set -e -CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251 -LIBZEDMD_SHA=d9ef6f7833ee9c6917c5cd85a917b935e15bbc8b +LIBZEDMD_SHA=794508521a83c1e90e31b9f24b11b574b42c93fe LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612 -LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182 if [[ $(uname) == "Linux" ]]; then NUM_PROCS=$(nproc) @@ -17,11 +15,9 @@ else fi echo "Building libraries..." -echo " CARGS_SHA: ${CARGS_SHA}" echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}" echo " LIBSERUM_SHA: ${LIBSERUM_SHA}" echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}" -echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}" echo " NUM_PROCS: ${NUM_PROCS}" echo "" @@ -37,27 +33,6 @@ rm -rf external mkdir external cd external -# -# build cargs and copy to external -# - -curl -sL https://github.com/likle/cargs/archive/${CARGS_SHA}.zip -o cargs.zip -unzip cargs.zip -cd cargs-${CARGS_SHA} -cmake \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_SYSTEM_NAME=Android \ - -DCMAKE_SYSTEM_VERSION=30 \ - -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a \ - -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \ - -DCMAKE_INSTALL_RPATH="\$ORIGIN" \ - -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ - -B build -cmake --build build -- -j${NUM_PROCS} -cp include/cargs.h ../../third-party/include/ -cp build/*.so ../../third-party/runtime-libs/android/arm64-v8a/ -cd .. - # # build libzedmd and copy to external # @@ -75,7 +50,9 @@ cmake \ -B build cmake --build build -- -j${NUM_PROCS} cp src/ZeDMD.h ../../third-party/include/ +cp third-party/include/cargs.h ../../third-party/include/ cp -r third-party/include/sockpp ../../third-party/include/ +cp third-party/include/FrameUtil.h ../../third-party/include/ cp -a third-party/runtime-libs/android/arm64-v8a/*.so ../../third-party/runtime-libs/android/arm64-v8a/ cp build/libzedmd.so ../../third-party/runtime-libs/android/arm64-v8a/ cp -r test ../../ @@ -118,13 +95,3 @@ cmake --build build -- -j${NUM_PROCS} cp src/pupdmd.h ../../third-party/include/ cp build/libpupdmd.so ../../third-party/runtime-libs/android/arm64-v8a/ cd .. - -# -# copy libframeutil -# - -curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip -unzip libframeutil.zip -cd libframeutil-$LIBFRAMEUTIL_SHA -cp include/* ../../third-party/include -cd .. diff --git a/platforms/ios-simulator/arm64/external.sh b/platforms/ios-simulator/arm64/external.sh index fdc2970..57125ec 100755 --- a/platforms/ios-simulator/arm64/external.sh +++ b/platforms/ios-simulator/arm64/external.sh @@ -3,7 +3,7 @@ set -e CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251 -LIBZEDMD_SHA=d9ef6f7833ee9c6917c5cd85a917b935e15bbc8b +LIBZEDMD_SHA=794508521a83c1e90e31b9f24b11b574b42c93fe LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182 @@ -11,11 +11,9 @@ LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182 NUM_PROCS=$(sysctl -n hw.ncpu) echo "Building libraries..." -echo " CARGS_SHA: ${CARGS_SHA}" echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}" echo " LIBSERUM_SHA: ${LIBSERUM_SHA}" echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}" -echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}" echo "" if [ -z "${BUILD_TYPE}" ]; then @@ -30,25 +28,6 @@ rm -rf external mkdir external cd external -# -# build cargs and copy to external -# - -curl -sL https://github.com/likle/cargs/archive/${CARGS_SHA}.zip -o cargs.zip -unzip cargs.zip -cd cargs-${CARGS_SHA} -cmake \ - -DCMAKE_SYSTEM_NAME=iOS \ - -DCMAKE_OSX_SYSROOT=iphonesimulator \ - -DCMAKE_OSX_ARCHITECTURES=arm64 \ - -DCMAKE_OSX_DEPLOYMENT_TARGET=17.0 \ - -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ - -B build -cmake --build build -- -j${NUM_PROCS} -cp include/cargs.h ../../third-party/include/ -cp build/*.a ../../third-party/build-libs/ios-simulator/arm64/ -cd .. - # # build libzedmd and copy to external # @@ -66,7 +45,9 @@ cmake \ -B build cmake --build build -- -j${NUM_PROCS} cp src/ZeDMD.h ../../third-party/include/ +cp third-party/include/cargs.h ../../third-party/include/ cp -r third-party/include/sockpp ../../third-party/include/ +cp third-party/include/FrameUtil.h ../../third-party/include/ cp -a third-party/build-libs/ios-simulator/arm64/*.a ../../third-party/build-libs/ios-simulator/arm64/ cp build/libzedmd.a ../../third-party/build-libs/ios-simulator/arm64/ cp -r test ../../ @@ -110,13 +91,3 @@ cmake --build build -- -j${NUM_PROCS} cp src/pupdmd.h ../../third-party/include/ cp build/libpupdmd.a ../../third-party/build-libs/ios-simulator/arm64/ cd .. - -# -# copy libframeutil -# - -curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip -unzip libframeutil.zip -cd libframeutil-$LIBFRAMEUTIL_SHA -cp include/* ../../third-party/include -cd .. diff --git a/platforms/ios/arm64/external.sh b/platforms/ios/arm64/external.sh index b0f05e6..b9c53f5 100755 --- a/platforms/ios/arm64/external.sh +++ b/platforms/ios/arm64/external.sh @@ -2,20 +2,16 @@ set -e -CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251 -LIBZEDMD_SHA=d9ef6f7833ee9c6917c5cd85a917b935e15bbc8b +LIBZEDMD_SHA=794508521a83c1e90e31b9f24b11b574b42c93fe LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612 -LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182 NUM_PROCS=$(sysctl -n hw.ncpu) echo "Building libraries..." -echo " CARGS_SHA: ${CARGS_SHA}" echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}" echo " LIBSERUM_SHA: ${LIBSERUM_SHA}" echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}" -echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}" echo "" if [ -z "${BUILD_TYPE}" ]; then @@ -30,24 +26,6 @@ rm -rf external mkdir external cd external -# -# build cargs and copy to external -# - -curl -sL https://github.com/likle/cargs/archive/${CARGS_SHA}.zip -o cargs.zip -unzip cargs.zip -cd cargs-${CARGS_SHA} -cmake \ - -DCMAKE_SYSTEM_NAME=iOS \ - -DCMAKE_OSX_ARCHITECTURES=arm64 \ - -DCMAKE_OSX_DEPLOYMENT_TARGET=17.0 \ - -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ - -B build -cmake --build build -- -j${NUM_PROCS} -cp include/cargs.h ../../third-party/include/ -cp build/*.a ../../third-party/build-libs/ios/arm64/ -cd .. - # # build libzedmd and copy to external # @@ -65,7 +43,9 @@ cmake \ -B build cmake --build build -- -j${NUM_PROCS} cp src/ZeDMD.h ../../third-party/include/ +cp third-party/include/cargs.h ../../third-party/include/ cp -r third-party/include/sockpp ../../third-party/include/ +cp third-party/include/FrameUtil.h ../../third-party/include/ cp -a third-party/build-libs/ios/arm64/*.a ../../third-party/build-libs/ios/arm64/ cp build/libzedmd.a ../../third-party/build-libs/ios/arm64/ cp -r test ../../ @@ -109,13 +89,3 @@ cmake --build build -- -j${NUM_PROCS} cp src/pupdmd.h ../../third-party/include/ cp build/libpupdmd.a ../../third-party/build-libs/ios/arm64/ cd .. - -# -# copy libframeutil -# - -curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip -unzip libframeutil.zip -cd libframeutil-$LIBFRAMEUTIL_SHA -cp include/* ../../third-party/include -cd .. diff --git a/platforms/linux/aarch64/external.sh b/platforms/linux/aarch64/external.sh index 90a744c..aaeff90 100755 --- a/platforms/linux/aarch64/external.sh +++ b/platforms/linux/aarch64/external.sh @@ -2,20 +2,16 @@ set -e -CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251 -LIBZEDMD_SHA=d9ef6f7833ee9c6917c5cd85a917b935e15bbc8b +LIBZEDMD_SHA=794508521a83c1e90e31b9f24b11b574b42c93fe LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612 -LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182 NUM_PROCS=$(nproc) echo "Building libraries..." -echo " CARGS_SHA: ${CARGS_SHA}" echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}" echo " LIBSERUM_SHA: ${LIBSERUM_SHA}" echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}" -echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}" echo "" if [ -z "${BUILD_TYPE}" ]; then @@ -30,22 +26,6 @@ rm -rf external mkdir external cd external -# -# build cargs and copy to external -# - -curl -sL https://github.com/likle/cargs/archive/${CARGS_SHA}.zip -o cargs.zip -unzip cargs.zip -cd cargs-${CARGS_SHA} -cmake \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ - -B build -cmake --build build -- -j${NUM_PROCS} -cp include/cargs.h ../../third-party/include/ -cp -a build/*.so ../../third-party/runtime-libs/linux/aarch64/ -cd .. - # # build libzedmd and copy to external # @@ -64,7 +44,9 @@ cmake \ cmake --build build -- -j${NUM_PROCS} cp src/ZeDMD.h ../../third-party/include/ cp third-party/include/libserialport.h ../../third-party/include/ +cp third-party/include/cargs.h ../../third-party/include/ cp -r third-party/include/sockpp ../../third-party/include/ +cp third-party/include/FrameUtil.h ../../third-party/include/ cp -a third-party/runtime-libs/linux/aarch64/*.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/ cp -a build/*.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/ cp -r test ../../ @@ -109,13 +91,3 @@ cmake --build build -- -j${NUM_PROCS} cp src/pupdmd.h ../../third-party/include/ cp -a build/libpupdmd.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/ cd .. - -# -# copy libframeutil -# - -curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip -unzip libframeutil.zip -cd libframeutil-$LIBFRAMEUTIL_SHA -cp include/* ../../third-party/include -cd .. diff --git a/platforms/linux/x64/external.sh b/platforms/linux/x64/external.sh index b118f09..5f3ba11 100755 --- a/platforms/linux/x64/external.sh +++ b/platforms/linux/x64/external.sh @@ -2,20 +2,16 @@ set -e -CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251 -LIBZEDMD_SHA=d9ef6f7833ee9c6917c5cd85a917b935e15bbc8b +LIBZEDMD_SHA=794508521a83c1e90e31b9f24b11b574b42c93fe LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612 -LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182 NUM_PROCS=$(nproc) echo "Building libraries..." -echo " CARGS_SHA: ${CARGS_SHA}" echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}" echo " LIBSERUM_SHA: ${LIBSERUM_SHA}" echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}" -echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}" echo "" if [ -z "${BUILD_TYPE}" ]; then @@ -30,22 +26,6 @@ rm -rf external mkdir external cd external -# -# build cargs and copy to external -# - -curl -sL https://github.com/likle/cargs/archive/${CARGS_SHA}.zip -o cargs.zip -unzip cargs.zip -cd cargs-${CARGS_SHA} -cmake \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ - -B build -cmake --build build -- -j${NUM_PROCS} -cp include/cargs.h ../../third-party/include/ -cp -a build/*.so ../../third-party/runtime-libs/linux/x64/ -cd .. - # # build libzedmd and copy to external # @@ -64,7 +44,9 @@ cmake \ cmake --build build -- -j${NUM_PROCS} cp src/ZeDMD.h ../../third-party/include/ cp third-party/include/libserialport.h ../../third-party/include/ +cp third-party/include/cargs.h ../../third-party/include/ cp -r third-party/include/sockpp ../../third-party/include/ +cp third-party/include/FrameUtil.h ../../third-party/include/ cp -a third-party/runtime-libs/linux/x64/*.{so,so.*} ../../third-party/runtime-libs/linux/x64/ cp -a build/*.{so,so.*} ../../third-party/runtime-libs/linux/x64/ cp -r test ../../ @@ -108,13 +90,3 @@ cmake --build build -- -j${NUM_PROCS} cp src/pupdmd.h ../../third-party/include/ cp -a build/libpupdmd.{so,so.*} ../../third-party/runtime-libs/linux/x64/ cd .. - -# -# copy libframeutil -# - -curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip -unzip libframeutil.zip -cd libframeutil-$LIBFRAMEUTIL_SHA -cp include/* ../../third-party/include -cd .. diff --git a/platforms/macos/arm64/external.sh b/platforms/macos/arm64/external.sh index c9ee5bb..f2e3cac 100755 --- a/platforms/macos/arm64/external.sh +++ b/platforms/macos/arm64/external.sh @@ -2,20 +2,16 @@ set -e -CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251 -LIBZEDMD_SHA=d9ef6f7833ee9c6917c5cd85a917b935e15bbc8b +LIBZEDMD_SHA=794508521a83c1e90e31b9f24b11b574b42c93fe LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612 -LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182 NUM_PROCS=$(sysctl -n hw.ncpu) echo "Building libraries..." -echo " CARGS_SHA: ${CARGS_SHA}" echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}" echo " LIBSERUM_SHA: ${LIBSERUM_SHA}" echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}" -echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}" echo "" if [ -z "${BUILD_TYPE}" ]; then @@ -30,24 +26,6 @@ rm -rf external mkdir external cd external -# -# build cargs and copy to external -# - -curl -sL https://github.com/likle/cargs/archive/${CARGS_SHA}.zip -o cargs.zip -unzip cargs.zip -cd cargs-${CARGS_SHA} -cmake \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_OSX_ARCHITECTURES=arm64 \ - -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 \ - -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ - -B build -cmake --build build -- -j${NUM_PROCS} -cp include/cargs.h ../../third-party/include/ -cp -a build/*.dylib ../../third-party/runtime-libs/macos/arm64/ -cd .. - # # build libzedmd and copy to external # @@ -66,7 +44,9 @@ cmake \ cmake --build build -- -j${NUM_PROCS} cp src/ZeDMD.h ../../third-party/include/ cp third-party/include/libserialport.h ../../third-party/include/ +cp third-party/include/cargs.h ../../third-party/include/ cp -r third-party/include/sockpp ../../third-party/include/ +cp third-party/include/FrameUtil.h ../../third-party/include/ cp -a third-party/runtime-libs/macos/arm64/*.dylib ../../third-party/runtime-libs/macos/arm64/ cp -a build/*.dylib ../../third-party/runtime-libs/macos/arm64/ cp -r test ../../ @@ -111,13 +91,3 @@ cmake --build build -- -j${NUM_PROCS} cp src/pupdmd.h ../../third-party/include/ cp -a build/*.dylib ../../third-party/runtime-libs/macos/arm64/ cd .. - -# -# copy libframeutil -# - -curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip -unzip libframeutil.zip -cd libframeutil-$LIBFRAMEUTIL_SHA -cp include/* ../../third-party/include -cd .. diff --git a/platforms/macos/x64/external.sh b/platforms/macos/x64/external.sh index 5f5fcaf..9f12b4d 100755 --- a/platforms/macos/x64/external.sh +++ b/platforms/macos/x64/external.sh @@ -2,20 +2,16 @@ set -e -CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251 -LIBZEDMD_SHA=d9ef6f7833ee9c6917c5cd85a917b935e15bbc8b +LIBZEDMD_SHA=794508521a83c1e90e31b9f24b11b574b42c93fe LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612 -LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182 NUM_PROCS=$(sysctl -n hw.ncpu) echo "Building libraries..." -echo " CARGS_SHA: ${CARGS_SHA}" echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}" echo " LIBSERUM_SHA: ${LIBSERUM_SHA}" echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}" -echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}" echo "" if [ -z "${BUILD_TYPE}" ]; then @@ -30,24 +26,6 @@ rm -rf external mkdir external cd external -# -# build cargs and copy to external -# - -curl -sL https://github.com/likle/cargs/archive/${CARGS_SHA}.zip -o cargs.zip -unzip cargs.zip -cd cargs-${CARGS_SHA} -cmake \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_OSX_ARCHITECTURES=x86_64 \ - -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 \ - -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ - -B build -cmake --build build -- -j${NUM_PROCS} -cp include/cargs.h ../../third-party/include/ -cp -a build/*.dylib ../../third-party/runtime-libs/macos/x64/ -cd .. - # # build libzedmd and copy to external # @@ -66,7 +44,9 @@ cmake \ cmake --build build -- -j${NUM_PROCS} cp src/ZeDMD.h ../../third-party/include/ cp third-party/include/libserialport.h ../../third-party/include/ +cp third-party/include/cargs.h ../../third-party/include/ cp -r third-party/include/sockpp ../../third-party/include/ +cp third-party/include/FrameUtil.h ../../third-party/include/ cp -a third-party/runtime-libs/macos/x64/*.dylib ../../third-party/runtime-libs/macos/x64/ cp -a build/*.dylib ../../third-party/runtime-libs/macos/x64/ cp -r test ../../ @@ -111,13 +91,3 @@ cmake --build build -- -j${NUM_PROCS} cp src/pupdmd.h ../../third-party/include/ cp -a build/*.dylib ../../third-party/runtime-libs/macos/x64/ cd .. - -# -# copy libframeutil -# - -curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip -unzip libframeutil.zip -cd libframeutil-$LIBFRAMEUTIL_SHA -cp include/* ../../third-party/include -cd .. diff --git a/platforms/tvos/arm64/external.sh b/platforms/tvos/arm64/external.sh index e9579b4..6c5a340 100755 --- a/platforms/tvos/arm64/external.sh +++ b/platforms/tvos/arm64/external.sh @@ -2,20 +2,16 @@ set -e -CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251 -LIBZEDMD_SHA=d9ef6f7833ee9c6917c5cd85a917b935e15bbc8b +LIBZEDMD_SHA=794508521a83c1e90e31b9f24b11b574b42c93fe LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612 -LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182 NUM_PROCS=$(sysctl -n hw.ncpu) echo "Building libraries..." -echo " CARGS_SHA: ${CARGS_SHA}" echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}" echo " LIBSERUM_SHA: ${LIBSERUM_SHA}" echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}" -echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}" echo "" if [ -z "${BUILD_TYPE}" ]; then @@ -30,21 +26,6 @@ rm -rf external mkdir external cd external -# -# build cargs and copy to external -# - -curl -sL https://github.com/likle/cargs/archive/${CARGS_SHA}.zip -o cargs.zip -unzip cargs.zip -cd cargs-${CARGS_SHA} -cmake \ - -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ - -B build -cmake --build build -- -j${NUM_PROCS} -cp include/cargs.h ../../third-party/include/ -cp build/*.a ../../third-party/build-libs/tvos/arm64/ -cd .. - # # build libzedmd and copy to external # @@ -62,7 +43,9 @@ cmake \ -B build cmake --build build -- -j${NUM_PROCS} cp src/ZeDMD.h ../../third-party/include/ +cp third-party/include/cargs.h ../../third-party/include/ cp -r third-party/include/sockpp ../../third-party/include/ +cp third-party/include/FrameUtil.h ../../third-party/include/ cp -a third-party/build-libs/tvos/arm64/*.a ../../third-party/build-libs/tvos/arm64/ cp build/libzedmd.a ../../third-party/build-libs/tvos/arm64/ cp -r test ../../ @@ -107,13 +90,3 @@ cmake --build build -- -j${NUM_PROCS} cp src/pupdmd.h ../../third-party/include/ cp build/libpupdmd.a ../../third-party/build-libs/tvos/arm64/ cd .. - -# -# copy libframeutil -# - -curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip -unzip libframeutil.zip -cd libframeutil-$LIBFRAMEUTIL_SHA -cp include/* ../../third-party/include -cd .. diff --git a/platforms/win/x64/cargs/001.patch b/platforms/win/x64/cargs/001.patch deleted file mode 100644 index 3bde423..0000000 --- a/platforms/win/x64/cargs/001.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b6f828f..6be0845 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -18,7 +18,7 @@ - set(CMAKE_C_STANDARD 11) - - # setup target and directory names --set(LIBRARY_TARGET "cargs") -+set(LIBRARY_TARGET "cargs64") - set(INCLUDE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include") - set(SOURCE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src") - -@@ -51,12 +51,12 @@ - $ - $ - ) --set_target_properties(cargs PROPERTIES PUBLIC_HEADER "${INCLUDE_DIRECTORY}/cargs.h") --set_target_properties(cargs PROPERTIES DEFINE_SYMBOL CAG_EXPORTS) -+set_target_properties(cargs64 PROPERTIES PUBLIC_HEADER "${INCLUDE_DIRECTORY}/cargs.h") -+set_target_properties(cargs64 PROPERTIES DEFINE_SYMBOL CAG_EXPORTS) - - # add shared library macro - if(BUILD_SHARED_LIBS) -- target_compile_definitions(cargs PUBLIC CAG_SHARED) -+ target_compile_definitions(cargs64 PUBLIC CAG_SHARED) - endif() - - # add tests -@@ -104,7 +104,7 @@ - COMPATIBILITY SameMajorVersion) - - # installing --install(TARGETS cargs -+install(TARGETS cargs64 - EXPORT CargsTargets) - - install(FILES diff --git a/platforms/win/x64/external.sh b/platforms/win/x64/external.sh index c9131c2..586eb46 100755 --- a/platforms/win/x64/external.sh +++ b/platforms/win/x64/external.sh @@ -2,18 +2,14 @@ set -e -CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251 -LIBZEDMD_SHA=d9ef6f7833ee9c6917c5cd85a917b935e15bbc8b +LIBZEDMD_SHA=794508521a83c1e90e31b9f24b11b574b42c93fe LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612 -LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182 echo "Building libraries..." -echo " CARGS_SHA: ${CARGS_SHA}" echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}" echo " LIBSERUM_SHA: ${LIBSERUM_SHA}" echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}" -echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}" echo "" if [ -z "${BUILD_TYPE}" ]; then @@ -27,24 +23,6 @@ rm -rf external mkdir external cd external -# -# build cargs and copy to external -# - -curl -sL https://github.com/likle/cargs/archive/${CARGS_SHA}.zip -o cargs.zip -unzip cargs.zip -cd cargs-${CARGS_SHA} -patch -p1 < ../../platforms/win/x64/cargs/001.patch -cmake \ - -G "Visual Studio 17 2022" \ - -DBUILD_SHARED_LIBS=ON \ - -B build -cmake --build build --config ${BUILD_TYPE} -cp include/cargs.h ../../third-party/include/ -cp build/${BUILD_TYPE}/cargs64.lib ../../third-party/build-libs/win/x64/ -cp build/${BUILD_TYPE}/cargs64.dll ../../third-party/runtime-libs/win/x64/ -cd .. - # # build libzedmd and copy to external # @@ -62,8 +40,12 @@ cmake \ -B build cmake --build build --config ${BUILD_TYPE} cp src/ZeDMD.h ../../third-party/include/ +cp third-party/include/cargs.h ../../third-party/include/ cp -r third-party/include/sockpp ../../third-party/include/ +cp third-party/include/FrameUtil.h ../../third-party/include/ cp third-party/include/libserialport.h ../../third-party/include/ +cp third-party/build-libs/win/x64/cargs64.lib ../../third-party/build-libs/win/x64/ +cp third-party/runtime-libs/win/x64/cargs64.dll ../../third-party/runtime-libs/win/x64/ cp third-party/build-libs/win/x64/libserialport64.lib ../../third-party/build-libs/win/x64/ cp third-party/runtime-libs/win/x64/libserialport64.dll ../../third-party/runtime-libs/win/x64/ cp third-party/build-libs/win/x64/sockpp64.lib ../../third-party/build-libs/win/x64/ @@ -114,13 +96,3 @@ cp src/pupdmd.h ../../third-party/include/ cp build/${BUILD_TYPE}/pupdmd64.lib ../../third-party/build-libs/win/x64/ cp build/${BUILD_TYPE}/pupdmd64.dll ../../third-party/runtime-libs/win/x64/ cd .. - -# -# copy libframeutil -# - -curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip -unzip libframeutil.zip -cd libframeutil-$LIBFRAMEUTIL_SHA -cp include/* ../../third-party/include -cd .. diff --git a/platforms/win/x86/external.sh b/platforms/win/x86/external.sh index acfe70f..74f639e 100755 --- a/platforms/win/x86/external.sh +++ b/platforms/win/x86/external.sh @@ -2,18 +2,14 @@ set -e -CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251 -LIBZEDMD_SHA=d9ef6f7833ee9c6917c5cd85a917b935e15bbc8b +LIBZEDMD_SHA=794508521a83c1e90e31b9f24b11b574b42c93fe LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612 -LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182 echo "Building libraries..." -echo " CARGS_SHA: ${CARGS_SHA}" echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}" echo " LIBSERUM_SHA: ${LIBSERUM_SHA}" echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}" -echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}" echo "" if [ -z "${BUILD_TYPE}" ]; then @@ -27,24 +23,6 @@ rm -rf external mkdir external cd external -# -# build cargs and copy to external -# - -curl -sL https://github.com/likle/cargs/archive/${CARGS_SHA}.zip -o cargs.zip -unzip cargs.zip -cd cargs-${CARGS_SHA} -cmake \ - -G "Visual Studio 17 2022" \ - -DBUILD_SHARED_LIBS=ON \ - -A Win32 \ - -B build -cmake --build build --config ${BUILD_TYPE} -cp include/cargs.h ../../third-party/include/ -cp build/${BUILD_TYPE}/cargs.lib ../../third-party/build-libs/win/x86/ -cp build/${BUILD_TYPE}/cargs.dll ../../third-party/runtime-libs/win/x86/ -cd .. - # # build libzedmd and copy to external # @@ -64,7 +42,11 @@ cmake \ cmake --build build --config ${BUILD_TYPE} cp src/ZeDMD.h ../../third-party/include/ cp third-party/include/libserialport.h ../../third-party/include/ +cp third-party/include/cargs.h ../../third-party/include/ cp -r third-party/include/sockpp ../../third-party/include/ +cp third-party/include/FrameUtil.h ../../third-party/include/ +cp third-party/build-libs/win/x86/cargs.lib ../../third-party/build-libs/win/x86/ +cp third-party/runtime-libs/win/x86/cargs.dll ../../third-party/runtime-libs/win/x86/ cp third-party/build-libs/win/x86/libserialport.lib ../../third-party/build-libs/win/x86/ cp third-party/runtime-libs/win/x86/libserialport.dll ../../third-party/runtime-libs/win/x86/ cp third-party/build-libs/win/x86/sockpp.lib ../../third-party/build-libs/win/x86/ @@ -117,13 +99,3 @@ cp src/pupdmd.h ../../third-party/include/ cp build/${BUILD_TYPE}/pupdmd.lib ../../third-party/build-libs/win/x86/ cp build/${BUILD_TYPE}/pupdmd.dll ../../third-party/runtime-libs/win/x86/ cd .. - -# -# copy libframeutil -# - -curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip -unzip libframeutil.zip -cd libframeutil-$LIBFRAMEUTIL_SHA -cp include/* ../../third-party/include -cd .. diff --git a/src/Config.cpp b/src/Config.cpp index edc5461..c900159 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -26,9 +26,7 @@ Config::Config() m_zedmd = true; m_zedmdDevice.clear(); m_zedmdDebug = false; - m_zedmdRgbOrder = -1; m_zedmdBrightness = -1; - m_zedmdSaveSettings = false; m_pixelcade = true; m_pixelcadeDevice.clear(); m_dmdServer = false; diff --git a/src/DMD.cpp b/src/DMD.cpp index 3830607..e2370ea 100644 --- a/src/DMD.cpp +++ b/src/DMD.cpp @@ -505,20 +505,6 @@ void DMD::FindDisplays() if ((openSerial = pZeDMD->Open())) { if (pConfig->GetZeDMDBrightness() != -1) pZeDMD->SetBrightness(pConfig->GetZeDMDBrightness()); - if (pConfig->IsZeDMDSaveSettings()) - { - if (pConfig->GetZeDMDRGBOrder() != -1) pZeDMD->SetRGBOrder(pConfig->GetZeDMDRGBOrder()); - pZeDMD->SaveSettings(); - if (pConfig->GetZeDMDRGBOrder() != -1) - { - // Setting the RGBOrder requires a reboot. - pZeDMD->Reset(); - std::this_thread::sleep_for(std::chrono::seconds(8)); - pZeDMD->Close(); - std::this_thread::sleep_for(std::chrono::seconds(1)); - openSerial = pZeDMD->Open(); - } - } } } From 21238092a89fa918b517d7f2a725fd02fda8737a Mon Sep 17 00:00:00 2001 From: Markus Kalkbrenner Date: Tue, 4 Feb 2025 01:25:43 +0100 Subject: [PATCH 2/4] fixed dmdserver --- src/dmdServer.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/dmdServer.cpp b/src/dmdServer.cpp index 8caa279..73bc10c 100644 --- a/src/dmdServer.cpp +++ b/src/dmdServer.cpp @@ -283,9 +283,7 @@ int main(int argc, char* argv[]) pConfig->SetZeDMD(r.Get("ZeDMD", "Enabled", true)); pConfig->SetZeDMDDevice(r.Get("ZeDMD", "Device", "").c_str()); pConfig->SetZeDMDDebug(r.Get("ZeDMD", "Debug", false)); - pConfig->SetZeDMDRGBOrder(r.Get("ZeDMD", "RGBOrder", -1)); pConfig->SetZeDMDBrightness(r.Get("ZeDMD", "Brightness", -1)); - pConfig->SetZeDMDSaveSettings(r.Get("ZeDMD", "SaveSettings", false)); // ZeDMD WiFi pConfig->SetZeDMDWiFiEnabled(r.Get("ZeDMD-WiFi", "Enabled", false)); pConfig->SetZeDMDWiFiAddr(r.Get("ZeDMD-WiFi", "WiFiAddr", "").c_str()); From a812b0f7d283cb7f77089bdfbce1cc7ecd750e51 Mon Sep 17 00:00:00 2001 From: Markus Kalkbrenner Date: Tue, 4 Feb 2025 10:19:54 +0100 Subject: [PATCH 3/4] no cargs on mobile devices --- platforms/android/arm64-v8a/external.sh | 1 - platforms/ios-simulator/arm64/external.sh | 1 - platforms/ios/arm64/external.sh | 1 - platforms/tvos/arm64/external.sh | 1 - 4 files changed, 4 deletions(-) diff --git a/platforms/android/arm64-v8a/external.sh b/platforms/android/arm64-v8a/external.sh index ea7c784..93783ba 100755 --- a/platforms/android/arm64-v8a/external.sh +++ b/platforms/android/arm64-v8a/external.sh @@ -50,7 +50,6 @@ cmake \ -B build cmake --build build -- -j${NUM_PROCS} cp src/ZeDMD.h ../../third-party/include/ -cp third-party/include/cargs.h ../../third-party/include/ cp -r third-party/include/sockpp ../../third-party/include/ cp third-party/include/FrameUtil.h ../../third-party/include/ cp -a third-party/runtime-libs/android/arm64-v8a/*.so ../../third-party/runtime-libs/android/arm64-v8a/ diff --git a/platforms/ios-simulator/arm64/external.sh b/platforms/ios-simulator/arm64/external.sh index 57125ec..4e3b274 100755 --- a/platforms/ios-simulator/arm64/external.sh +++ b/platforms/ios-simulator/arm64/external.sh @@ -45,7 +45,6 @@ cmake \ -B build cmake --build build -- -j${NUM_PROCS} cp src/ZeDMD.h ../../third-party/include/ -cp third-party/include/cargs.h ../../third-party/include/ cp -r third-party/include/sockpp ../../third-party/include/ cp third-party/include/FrameUtil.h ../../third-party/include/ cp -a third-party/build-libs/ios-simulator/arm64/*.a ../../third-party/build-libs/ios-simulator/arm64/ diff --git a/platforms/ios/arm64/external.sh b/platforms/ios/arm64/external.sh index b9c53f5..0e9e83d 100755 --- a/platforms/ios/arm64/external.sh +++ b/platforms/ios/arm64/external.sh @@ -43,7 +43,6 @@ cmake \ -B build cmake --build build -- -j${NUM_PROCS} cp src/ZeDMD.h ../../third-party/include/ -cp third-party/include/cargs.h ../../third-party/include/ cp -r third-party/include/sockpp ../../third-party/include/ cp third-party/include/FrameUtil.h ../../third-party/include/ cp -a third-party/build-libs/ios/arm64/*.a ../../third-party/build-libs/ios/arm64/ diff --git a/platforms/tvos/arm64/external.sh b/platforms/tvos/arm64/external.sh index 6c5a340..5f7763b 100755 --- a/platforms/tvos/arm64/external.sh +++ b/platforms/tvos/arm64/external.sh @@ -43,7 +43,6 @@ cmake \ -B build cmake --build build -- -j${NUM_PROCS} cp src/ZeDMD.h ../../third-party/include/ -cp third-party/include/cargs.h ../../third-party/include/ cp -r third-party/include/sockpp ../../third-party/include/ cp third-party/include/FrameUtil.h ../../third-party/include/ cp -a third-party/build-libs/tvos/arm64/*.a ../../third-party/build-libs/tvos/arm64/ From 226d2a763c376db3bca4b193344641b00de7ffa9 Mon Sep 17 00:00:00 2001 From: Markus Kalkbrenner Date: Tue, 4 Feb 2025 10:22:36 +0100 Subject: [PATCH 4/4] no cargs on mobile devices --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 00423d5..7e82663 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,12 +117,12 @@ if(BUILD_SHARED) target_link_directories(dmdutil_shared PUBLIC third-party/build-libs/${PLATFORM}/${ARCH} ) - target_link_libraries(dmdutil_shared PUBLIC cargs zedmd serum sockpp pupdmd) + target_link_libraries(dmdutil_shared PUBLIC zedmd serum sockpp pupdmd) elseif(PLATFORM STREQUAL "android") target_link_directories(dmdutil_shared PUBLIC third-party/runtime-libs/${PLATFORM}/${ARCH} ) - target_link_libraries(dmdutil_shared PUBLIC cargs zedmd serum sockpp pupdmd) + target_link_libraries(dmdutil_shared PUBLIC zedmd serum sockpp pupdmd) endif() if(PLATFORM STREQUAL "win" AND ARCH STREQUAL "x64")