fix: only use png and svgs, since jpeg isn't available with mt support

also convert the mgerhold.jpg to png
OpenBrickProtocolFoundation · Nov 17, 2024 · 2898d62 · 2898d62
1 parent 2d0f123
commit 2898d62
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/assets/authors/mgerhold.jpg b/assets/authors/mgerhold.jpg
diff --git a/assets/authors/mgerhold.png b/assets/authors/mgerhold.png
diff --git a/platforms/build-web.sh b/platforms/build-web.sh
@@ -19,7 +19,7 @@ fi
 EMSDK_QUIET=1 source "$EMSCRIPTEN_ROOT/emsdk_env.sh" >/dev/null
 
 ## build theneeded dependencies
-embuilder build sdl2-mt harfbuzz-mt freetype zlib sdl2_ttf mpg123 sdl2_mixer_mp3 libpng-mt libjpeg "sdl2_image:formats=png,jpg,svg" icu-mt
+embuilder build sdl2-mt harfbuzz-mt freetype zlib sdl2_ttf mpg123 sdl2_mixer_mp3 libpng-mt "sdl2_image:formats=png,svg" icu-mt
 
 export EMSCRIPTEN_SYS_ROOT="$EMSCRIPTEN_ROOT/upstream/emscripten/cache/sysroot"
 
@@ -38,7 +38,7 @@ export ENDIANESS="little"
 
 export ROMFS="platforms/romfs"
 
-export PACKAGE_FLAGS="'--use-port=sdl2', '--use-port=harfbuzz', '--use-port=freetype', '--use-port=zlib', '--use-port=sdl2_ttf', '--use-port=mpg123', '--use-port=sdl2_mixer', '-sSDL2_MIXER_FORMATS=[\"mp3\"]','--use-port=libpng', '--use-port=libjpeg', '--use-port=sdl2_image','-sSDL2_IMAGE_FORMATS=[\"png\",\"jpg\",\"svg\"]', '--use-port=icu'"
+export PACKAGE_FLAGS="'--use-port=sdl2', '--use-port=harfbuzz', '--use-port=freetype', '--use-port=zlib', '--use-port=sdl2_ttf', '--use-port=mpg123', '--use-port=sdl2_mixer', '-sSDL2_MIXER_FORMATS=[\"mp3\"]','--use-port=libpng', '--use-port=sdl2_image','-sSDL2_IMAGE_FORMATS=[\"png\",\"svg\"]', '--use-port=icu'"
 
 export COMMON_FLAGS="'-fexceptions', '-pthread', '-sEXCEPTION_CATCHING_ALLOWED=[..]', $PACKAGE_FLAGS"
 

diff --git a/src/scenes/about_page/about_page.hpp b/src/scenes/about_page/about_page.hpp
@@ -15,7 +15,7 @@ namespace scenes {
 
         static constexpr std::initializer_list<std::tuple<const char* const, const char* const, const char* const>>
                 authors{
-                    { "mgerhold", "https://github.com/mgerhold", "mgerhold.jpg" },
+                    { "mgerhold", "https://github.com/mgerhold", "mgerhold.png" },
                     {  "Totto16",  "https://github.com/Totto16",  "Totto16.png" }
         };
 

diff --git a/tools/dependencies/meson.build b/tools/dependencies/meson.build
@@ -53,7 +53,7 @@ if meson.is_cross_build()
             ['SDL2_ttf'],
             ['mpg123'],
             ['SDL2_mixer_mp3', 'SDL2_mixer'],
-            ['SDL2_image_jpg-png-svg', 'SDL2_image'],
+            ['SDL2_image_png-svg', 'SDL2_image'],
             ['icu_common-mt', 'icu-uc'],
         ]
         foreach native_dependency_tuple : map_native_dependencies
@@ -118,7 +118,6 @@ if meson.is_cross_build()
             'z',
             'mpg123',
             'png-mt',
-            'jpeg',
             'fetch-mt',
         ]