Apothecary fixes for linux / emscripten brotli / split ios (#500)

* Apothecary fixes for linux / emscripten brotli / split ios

* Apothecary formuale brotli move / pixman move and add "all"

* apothecary fix

* brotli

* package indiv opt _ fix. brotli android fix

* pixman fix / brotli include libpng emscripten

* brotli arm64ec vs fix with M define

* brotli use git for vs

* actions vs artifacts arch in name

* emscripten libpng

* libpng include

* libpng

* whats going on libpng

* freetype

* freetype emscripten

* freetype fix

* eh

* what

* i dont

* libpng

* libpng

* freetype include dir

Author: danoli3

.github/workflows/build-linux-cross.yml

@@ -98,4 +98,4 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
         tag_name: ${{ env.RELEASE }}
         draft: false
-        files: out/openFrameworksLibs_${{ env.RELEASE }}_${{ env.TARGET }}_${{ env.ARCH }}_$github{{ env.GCC }}.tar.bz2
+        files: out/openFrameworksLibs_${{ env.RELEASE }}_${{ env.TARGET }}_${{ env.ARCH }}_${{ env.GCC }}.tar.bz2

.github/workflows/build-vs2022-arm64.yml

@@ -125,7 +125,7 @@ jobs:
           const max = 1;
 
           for (const artifact of artifacts.data.artifacts) {
-            const isArtifactMatch = artifact.name.includes(`libs-${release}-${target}`) && !artifact.expired;
+            const isArtifactMatch = artifact.name.includes(`libs-${release}-${target}-${arch}`) && !artifact.expired;
             if (isArtifactMatch) {
               const download = await github.rest.actions.downloadArtifact({
                 owner: context.repo.owner,

.github/workflows/build-vs2022-arm64ec.yml

@@ -58,8 +58,6 @@ jobs:
         fi
     - name: Setup MSBuild
       uses: microsoft/setup-msbuild@v2
-      #with:
-      #  msbuild-architecture: arm64
 
     - name: Setup msys2
       uses: msys2/setup-msys2@v2
@@ -130,7 +128,7 @@ jobs:
           const max = 1;
 
           for (const artifact of artifacts.data.artifacts) {
-            const isArtifactMatch = artifact.name.includes(`libs-${release}-${target}`) && !artifact.expired;
+            const isArtifactMatch = artifact.name.includes(`libs-${release}-${target}-${arch}`) && !artifact.expired;
             if (isArtifactMatch) {
               const download = await github.rest.actions.downloadArtifact({
                 owner: context.repo.owner,

.github/workflows/build-vs2022-x64.yml

@@ -125,7 +125,7 @@ jobs:
           const max = 1;
 
           for (const artifact of artifacts.data.artifacts) {
-            const isArtifactMatch = artifact.name.includes(`libs-${release}-${target}`) && !artifact.expired;
+            const isArtifactMatch = artifact.name.includes(`libs-${release}-${target}-${arch}`) && !artifact.expired;
             if (isArtifactMatch) {
               const download = await github.rest.actions.downloadArtifact({
                 owner: context.repo.owner,

apothecary/apothecary

@@ -605,7 +605,7 @@ if [ "$TYPE" = "vs" ]; then
     export EXE_FLAGS=""
   else
     if [ $ARCH == "arm64ec" ]; then
-      export VS_C_FLAGS="/Gy /GL- /guard:cf"
+      export VS_C_FLAGS="/Gy /GL- /guard:cf -D_M_ARM64EC"
     else
       export VS_C_FLAGS="/GL-"
     fi
@@ -1212,37 +1212,43 @@ function doCommand() {
 
     # process all formulas in formulas dir, ignore depends subdir
     if [ "$1" == "core" ] ; then
-      source ${CALCULATE_FORMULAS_SCRIPT}
-      if [ -z "$FORMULAS" ]; then
+        source ${CALCULATE_FORMULAS_SCRIPT}
+        if [ -z "$FORMULAS" ]; then
           echo "No formulas to build"
           exit 0
-      fi
-      local formula
-      #for formula in $( ls -1 $FORMULAS_DIR | grep -v $DEPENDS_SUBDIR) ; do
-      for formula in "${FORMULAS[@]}"; do
-        doCommand $shouldSource $cmd "${formula%.*}"
-      done
-      echoInfo " ----- Apothecary Core Build Sucessfully completed for $TYPE -----"
+        fi
+        local formula
+        #for formula in $( ls -1 $FORMULAS_DIR | grep -v $DEPENDS_SUBDIR) ; do
+        for formula in "${FORMULAS[@]}"; do
+            doCommand $shouldSource $cmd "${formula%.*}"
+        done
+        echoInfo " ----- Apothecary All Build Sucessfully completed for $TYPE -----"
+    elif [ "$1" == "all" ] ; then
+        local formula
+        for formula in $( ls -1 $FORMULAS_DIR | grep -v $DEPENDS_SUBDIR) ; do
+            doCommand $shouldSource $cmd "${formula%.*}"
+        done
+        echoInfo " ----- Apothecary All Build Sucessfully completed for $TYPE -----"
     # process all addons in the addons dir
     elif [ "$1" == "addons" ] ; then
-      local addon
-      for addon in $(ls -1 $REL_ADDONS_DIR) ; do
-        if [ -d $REL_ADDONS_DIR/$addon ] ; then
-          doCommand $shouldSource $cmd $addon
-        fi
-      done
+        local addon
+        for addon in $(ls -1 $REL_ADDONS_DIR) ; do
+            if [ -d $REL_ADDONS_DIR/$addon ] ; then
+                doCommand $shouldSource $cmd $addon
+            fi
+        done
 
     # process all formulas in the dependencies dir
     elif [ "$1" == "depends" ] ; then
-      local depend
-      for depends in $( ls -1 $FORMULAS_DIR/$DEPENDS_SUBDIR) ; do
-        OUTPUT_DEPEND=$(realpath ${LIBS_DIR}/)/${depends}/${TYPE}
-        echo "Making Dependencies to ${OUTPUT_DEPEND}"
-        # if [ -f "$LIBS_DIR/${depends}/$TYPE/$ABI/lib.a" ]; then
-        #      echo "Build Already exists at $LIBS_DIR/${depends}/$TYPE/ skipping"
-        # fi
-        doCommand $shouldSource $cmd "${depend%.*}"
-      done
+        local depend
+        for depends in $( ls -1 $FORMULAS_DIR/$DEPENDS_SUBDIR) ; do
+            OUTPUT_DEPEND=$(realpath ${LIBS_DIR}/)/${depends}/${TYPE}
+            echoInfo "Making Dependencies to [${OUTPUT_DEPEND}]"
+            # if [ -f "$LIBS_DIR/${depends}/$TYPE/$ABI/lib.a" ]; then
+            #      echo "Build Already exists at $LIBS_DIR/${depends}/$TYPE/ skipping"
+            # fi
+            doCommand $shouldSource $cmd "${depend%.*}"
+        done
 
     else # process given lib, addon, or dependency
 
@@ -1278,7 +1284,7 @@ function doCommand() {
             LIBS_DIR=$tmpLibsDir
           fi
         else
-          echoInfo " Skipping addon \"$1\": no formulas found"
+          echoInfo " Skipping addon [\"$1\"]: no formulas found"
         fi
 
       else # OF lib or dependency formula
@@ -1299,7 +1305,7 @@ function doCommand() {
           local bFormulaType=0 # bool
           isFormulaType $TYPE bFormulaType
           if [ $bFormulaType == 0 ] && [ $TYPE != "macos" ] ; then
-            echoInfo " Skipping \"$currentLib\": $cmd not needed for type \"$TYPE\""
+            echoInfo " Skipping [\"$currentLib\":] $cmd not needed for type \"$TYPE\""
           else
             # do command
             $cmd $currentLib

apothecary/formulas/_depends/brotli.sh renamed to apothecary/formulas/brotli.sh

@@ -5,7 +5,7 @@
 # It is similar in speed with deflate but offers more dense compression.
 # https://github.com/google/brotli
 
-FORMULA_TYPES=("osx" "vs" "ios" "watchos" "catos" "xros" "tvos" "linux")
+FORMULA_TYPES=("osx" "vs" "ios" "watchos" "catos" "xros" "tvos" "linux" "android" )
 FORMULA_DEPENDS=()
 
 # define the version
@@ -21,10 +21,12 @@ GIT_TAG=v$VER
 function download() {
     . "$DOWNLOADER_SCRIPT"
     if [ "$TYPE" == "vs" ]; then
-        downloader ${GIT_URL}/archive/refs/tags/v${VER}.zip
-        unzip -q v${VER}.zip
-        mv brotli-${VER} brotli
-        rm -f v${VER}.zip
+        # downloader ${GIT_URL}/archive/refs/tags/v${VER}.zip
+        # unzip -q v${VER}.zip
+        # mv brotli-${VER} brotli
+        # rm -f v${VER}.zip
+        git clone "$GIT_URL.git" brotli
+        # https://github.com/google/brotli/issues/1105 # using git for VS due to my report fix on upstream
     else
         downloader ${GIT_URL}/archive/refs/tags/v${VER}.tar.gz
         tar -xf v${VER}.tar.gz
@@ -41,6 +43,21 @@ function prepare() {
 # executed inside the lib src dir
 function build() {
     LIBS_ROOT=$(realpath $LIBS_DIR)
+
+    if [[ $FORCE_DOWNLOAD -eq 0 ]] && [[ $USE_SAVE == 1 ]]; then
+        result=$(load "brotli" | tail -n 1)
+        echoInfo "===Build $1 - Checking if Precompiled binary :[$result]==="
+        if [ $result -eq 1 ]; then
+            echoInfo "===Build \"$1\" Precompiled binary validated. Skipping updateFormula==="
+            return 0
+        else
+            echoInfo "===Build Precompiled not found or outdated. Continue updateFormula for \"$1\"=== "
+        fi
+    else
+        echoInfo "===Build  Not using cache : [FORCE_DOWNLOAD=$FORCE_DOWNLOAD] [USE_SAVE=$USE_SAVE == 1] for updateFormula \"$1\" ==="
+    fi
+
+
     if [ "$TYPE" == "vs" ]; then
         echo "building $TYPE | $ARCH | $VS_VER | vs: $VS_VER_GEN"
         echo "--------------------"
@@ -163,9 +180,7 @@ function build() {
         cd ..
     elif [[ "$TYPE" =~ ^(android)$ ]]; then
 
-        if [ $CROSSCOMPILING -eq 1 ]; then
-            source $APOTHECARY_DIR/configure/${TYPE}${PLATFORM}_configure.sh
-        fi
+        source $APOTHECARY_DIR/configure/android_configure.sh $ABI cmake
 
         mkdir -p "build_${TYPE}_${PLATFORM}"
         cd "build_${TYPE}_${PLATFORM}"
@@ -181,13 +196,13 @@ function build() {
             -DCMAKE_INSTALL_PREFIX=Release \
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_TOOLCHAIN_FILE=$APOTHECARY_DIR/toolchains/android.toolchain.cmake \
+            -DCMAKE_ANDROID_ARCH_ABI=$ABI \
             -DPLATFORM=$PLATFORM \
             -DANDROID_PLATFORM=${ANDROID_PLATFORM} \
             -DANDROID_ABI=${ABI} \
             -DANDROID_API=${ANDROID_API} \
             -DANDROID_TOOLCHAIN=clang \
             -DANDROID_NDK_ROOT=$ANDROID_NDK_ROOT \
-            -DURIPARSER_ENABLE_INSTALL=ON \
             -DBUILD_SHARED_LIBS=OFF \
             -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
             -DCMAKE_MINIMUM_REQUIRED_VERSION=3.22 \
@@ -196,7 +211,6 @@ function build() {
             -DENABLE_VISIBILITY=OFF \
             -DCMAKE_VERBOSE_MAKEFILE=${VERBOSE_MAKEFILE} \
             -DCMAKE_CXX_EXTENSIONS=OFF \
-            -DGCC_VERSION=${GCC_VERSION} \
             -DCMAKE_SYSTEM_NAME=$TYPE \
             -DBROTLI_DISABLE_TESTS=ON \
             -DBROTLI_BUILD_TOOLS=OFF \

apothecary/formulas/freetype/CMakeLists.txt

@@ -537,10 +537,15 @@ if (BZIP2_FOUND)
     list(APPEND PKGCONFIG_LIBS_PRIVATE "-lbz2")
   endif ()
 endif ()
+message(STATUS "PNG_FOUND: ${PNG_FOUND}")
 if (PNG_FOUND)
+message(STATUS "PNG_INCLUDE_DIRS: ${PNG_INCLUDE_DIRS}")
+message(STATUS "PNG_LIBRARIES: ${PNG_LIBRARIES}")
+message(STATUS "PNG_DEFINITIONS: ${PNG_DEFINITIONS}")
   target_link_libraries(freetype PRIVATE ${PNG_LIBRARIES})
   target_compile_definitions(freetype PRIVATE ${PNG_DEFINITIONS})
-  target_include_directories(freetype PRIVATE ${PNG_INCLUDE_DIRS})
+  target_include_directories(freetype PRIVATE ${LIBPNG_INCLUDE_DIR})
+  target_include_directories(freetype PRIVATE ${ZLIB_INCLUDE_DIR})
   list(APPEND PKGCONFIG_REQUIRES_PRIVATE "libpng")
 endif ()
 if (HarfBuzz_FOUND)
@@ -680,4 +685,4 @@ set(CPACK_COMPONENT_HEADERS_DEPENDS libraries)
 set(CPACK_COMPONENT_LIBRARIES_GROUP "Development")
 set(CPACK_COMPONENT_HEADERS_GROUP "Development")
 
-include(CPack)
+include(CPack)