diff --git a/mygui/all/conandata.yml b/mygui/all/conandata.yml index 3c43665..cdfc27c 100644 --- a/mygui/all/conandata.yml +++ b/mygui/all/conandata.yml @@ -2,10 +2,16 @@ sources: "3.4.0": url: "https://github.com/MyGUI/mygui/archive/refs/tags/MyGUI3.4.0.tar.gz" sha256: "d1d5f294670ae71f7200ed4b30859018281d8cfd45d6a38d18b97a4aba604c42" + "3.4.1": + url: "https://github.com/MyGUI/mygui/archive/refs/tags/MyGUI3.4.1.tar.gz" + sha256: "bdf730bdeb4ad89e6b8223967db01aa5274d2b93adc2c0d6aa4842faeed4de1a" patches: "3.4.0": - patch_file: "patches/3.4.0/CMakeLists.txt.patch" - patch_file: "patches/3.4.0/AddLibPNG.patch" + "3.4.1": + - patch_file: "patches/3.4.1/CMakeLists.txt.patch" + - patch_file: "patches/3.4.1/AddLibPNG.patch" requirements: - "ogre3d/[1.x]@anotherfoxguy/stable" - "freetype/[2.x]" diff --git a/mygui/all/patches/3.4.1/AddLibPNG.patch b/mygui/all/patches/3.4.1/AddLibPNG.patch new file mode 100644 index 0000000..298d48f --- /dev/null +++ b/mygui/all/patches/3.4.1/AddLibPNG.patch @@ -0,0 +1,39 @@ +--- MyGUIEngine/CMakeLists.txt ++++ MyGUIEngine/CMakeLists.txt +@@ -1,5 +1,19 @@ + set (PROJECTNAME MyGUIEngine) + ++# FreeType from conan has seperate libraries ++find_package(PNG) ++find_package(BZip2) ++ ++find_library(BROTLICOMMON_LIBRARY NAMES brotlicommon brotlicommon-static) ++find_library(BROTLIDEC_LIBRARY NAMES brotlidec brotlidec-static) ++ ++if(NOT ${BROTLIDEC_LIBRARY} STREQUAL "BROTLICOMMON_LIBRARY-NOTFOUND" AND NOT ${BROTLIDEC_LIBRARY} STREQUAL "BROTLIDEC_LIBRARY-NOTFOUND") ++ set(BROTLI_LIBRARIES ${BROTLICOMMON_LIBRARY} ${BROTLIDEC_LIBRARY}) ++ message(STATUS "Brotli libraries found: ${BROTLI_LIBRARIES}") ++else() ++ message(WARNING "Brotli library not found: ${BROTLICOMMON_LIBRARY} ${BROTLIDEC_LIBRARY}") ++endif() ++ + project( ${PROJECTNAME} ) + + include(${PROJECTNAME}.list) +@@ -42,10 +56,12 @@ + target_link_libraries(${PROJECTNAME} msdfgen) + endif () + +- target_link_libraries(${PROJECTNAME} ${FREETYPE_LIBRARIES}) +- if (ZLIB_FOUND) # hacky way to check if freetype was built with zlib +- target_link_libraries(${PROJECTNAME} ${ZLIB_LIBRARIES}) +- endif() ++ target_link_libraries(${PROJECTNAME} ++ ${PNG_LIBRARIES} ++ ${BZIP2_LIBRARIES} ++ ${BROTLI_LIBRARIES} ++ ${FREETYPE_LIBRARIES}) ++ + endif() + + # platform specific dependencies diff --git a/mygui/all/patches/3.4.1/CMakeLists.txt.patch b/mygui/all/patches/3.4.1/CMakeLists.txt.patch new file mode 100644 index 0000000..ced9fbb --- /dev/null +++ b/mygui/all/patches/3.4.1/CMakeLists.txt.patch @@ -0,0 +1,12 @@ +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -20,6 +20,8 @@ + cmake_policy(SET CMP0083 NEW) + endif() + ++include(${CMAKE_BINARY_DIR}/conan_paths.cmake) ++ + project(MYGUI) + + # Include necessary submodules + diff --git a/mygui/config.yml b/mygui/config.yml index bc61499..569c0e5 100644 --- a/mygui/config.yml +++ b/mygui/config.yml @@ -1,3 +1,5 @@ versions: "3.4.0": folder: all + "3.4.1": + folder: all \ No newline at end of file