Apothecary - XCFrameworks / PKL updates (#380)

* Assimp pkl

* Brotli copy license

* Pixman pkl and copy

* Cairo fixed pkl and load

* fmt pkl

* OpenCV fixed download to use downloader / PKL / fixes for output / fixed etc

* tess2 pkl

* Secure fix for actual filename when passing name

* Build force fix

* Apothecary - Optimisations warnings

* Fmod add pkl

* rtaudio pkl load

* Build script smaller tail on good

* OpenCV License and copy fixes

* Apothecary - XCFramework updates and fixes. Integrates PKL generation for combined binaries. Secure script fix name/params

* Build and deploy osx changes

* Fmod fix vs

* Downloader in sync with oF

* OpenCV fix release path for VS

* Tess2 arch/platform VS fix - conforming all to PLATFORM

* assimp emscripten path fix

* Pixman path

* pixman operand fix

* Apothecary fix watchOS sim

* Minimise Builds [watchos, xros, catos]
- Disabled until mega / metal

* Downloader fix for name

* OpenSSL [3.0.12] to [3.3.0]

* cURL [8.6.0] > [8.8.0]

* opencv emscripten

* curl fixes for new include path

* curl include was fine

Author: danoli3

.github/workflows/build-catos.yml renamed to .github/disabled/build-catos.yml

@@ -32,26 +32,26 @@ jobs:
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         workflow: 'build-macos.yml'
-    - name: Wait build-xros
-      uses: NathanFirmo/wait-for-other-action@v1.0.4
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        workflow: 'build-xros.yml'
-    - name: Wait build-catos
-      uses: NathanFirmo/wait-for-other-action@v1.0.4
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        workflow: 'build-catos.yml'
+    # - name: Wait build-xros
+    #   uses: NathanFirmo/wait-for-other-action@v1.0.4
+    #   with:
+    #     token: ${{ secrets.GITHUB_TOKEN }}
+    #     workflow: 'build-xros.yml'
+    # - name: Wait build-catos
+    #   uses: NathanFirmo/wait-for-other-action@v1.0.4
+    #   with:
+    #     token: ${{ secrets.GITHUB_TOKEN }}
+    #     workflow: 'build-catos.yml'
     - name: Wait build-tvos
       uses: NathanFirmo/wait-for-other-action@v1.0.4
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         workflow: 'build-tvos.yml'
-    - name: Wait build-watchos
-      uses: NathanFirmo/wait-for-other-action@v1.0.4
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        workflow: 'build-watchos.yml'
+    # - name: Wait build-watchos
+    #   uses: NathanFirmo/wait-for-other-action@v1.0.4
+    #   with:
+    #     token: ${{ secrets.GITHUB_TOKEN }}
+    #     workflow: 'build-watchos.yml'
   build-xcframework:
     runs-on: macos-14
     if: github.repository == 'openframeworks/apothecary' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')

.github/workflows/build-watchos.yml renamed to .github/disabled/build-watchos.yml

@@ -132,6 +132,12 @@ function copy() {
     cp -v "build_${TYPE}_${PLATFORM}/Release/"*.lib $1/lib/$TYPE/$PLATFORM/
     secure $1/lib/$TYPE/$PLATFORM/brotlidec.lib brotli.pkl
 	fi
+
+  if [ -d "$1/license" ]; then
+        rm -rf $1/license
+    fi
+  mkdir -p $1/license
+  cp -v LICENSE $1/license/
 }
 
 # executed inside the lib src dir

.github/workflows/build-xros.yml renamed to .github/disabled/build-xros.yml

@@ -88,8 +88,8 @@ function build() {
         echo "building $TYPE | $ARCH | $VS_VER | vs: $VS_VER_GEN"
         echo "--------------------"
         GENERATOR_NAME="Visual Studio ${VS_VER_GEN}"
-		mkdir -p "build_${TYPE}_${ARCH}"
-		cd "build_${TYPE}_${ARCH}"
+		mkdir -p "build_${TYPE}_${PLATFORM}"
+		cd "build_${TYPE}_${PLATFORM}"
          rm -f CMakeCache.txt *.a *.o *.lib
         cmake  .. \
             -DCMAKE_C_STANDARD=17 \
@@ -124,29 +124,26 @@ function build() {
 # executed inside the lib src dir, first arg $1 is the dest libs dir root
 function copy() {
 
+    . "$SECURE_SCRIPT"
+    mkdir -p $1/include
+    if [ -d "$1/license" ]; then
+            rm -rf $1/license
+    fi
+    mkdir -p $1/license
 	if [ "$TYPE" == "vs" ] ; then		
 
 		mkdir -p $1/lib/$TYPE/$PLATFORM/
-        cp -v "build_${TYPE}_${ARCH}/Release/lib/pixman-1_static.lib" $1/lib/$TYPE/$PLATFORM/libpixman-1.lib
-    	cp -RvT "build_${TYPE}_${ARCH}/Release/include/pixman-1" $1/include
-
-    	# copy license file
-		if [ -d "$1/license" ]; then
-	        rm -rf $1/license
-	    fi
-		mkdir -p $1/license
-		cp -v COPYING $1/license/LICENSE
-
+        cp -v "build_${TYPE}_${PLATFORM}/Release/lib/pixman-1_static.lib" $1/lib/$TYPE/$PLATFORM/libpixman-1.lib
+    	cp -Rv "build_${TYPE}_${PLATFORM}/Release/include/pixman-1/"* $1/include
+        secure $1/lib/$TYPE/$PLATFORM/libpixman-1.lib pixman.pkl
 	else # osx
 		# lib
 		mkdir -p $1/lib/$TYPE/$PLATFORM/
         cp -v "build_${TYPE}_${PLATFORM}/pixman/lib/libpixman-1.a" $1/lib/$TYPE/$PLATFORM/libpixman-1.a
-    	cp -Rv "build_${TYPE}_${PLATFORM}/Release/include/pixman-1" $1/include
-
-    	# copy license file
-		mkdir -p $1/license
-		cp -v COPYING $1/license/LICENSE
+    	cp -Rv "build_${TYPE}_${PLATFORM}/Release/include/pixman-1/"* $1/include
+        secure $1/lib/$TYPE/$PLATFORM/libpixman-1.a pixman.pkl
 	fi
+    cp -v COPYING $1/license/LICENSE
 
 }
 

.github/workflows/build-xcframework.yml

@@ -357,7 +357,7 @@ function copy() {
     rm -rf $1/include/*
     cp -Rv include/* $1/include
 
-
+    . "$SECURE_SCRIPT"
     # libs
     mkdir -p $1/lib/$TYPE
     if [ "$TYPE" == "vs" ] ; then            
@@ -369,17 +369,21 @@ function copy() {
         cp -v "build_${TYPE}_${PLATFORM}/bin/Debug/assimp-vc${VC_VERSION}-mtd.dll" $1/lib/$TYPE/$PLATFORM/Debug/assimp-vc${VC_VERSION}-mtd.dll
         cp -v "build_${TYPE}_${PLATFORM}/lib/Release/assimp-vc${VC_VERSION}-mt.lib" $1/lib/$TYPE/$PLATFORM/Release/libassimp.lib 
         cp -v "build_${TYPE}_${PLATFORM}/lib/Debug/assimp-vc${VC_VERSION}-mtd.lib" $1/lib/$TYPE/$PLATFORM/Debug/libassimpD.lib
+        secure $1/lib/$TYPE/$PLATFORM/libassimp.a assimp.pkl
     elif [[ "$TYPE" =~ ^(osx|ios|tvos|xros|catos|watchos)$ ]]; then
         cp -v -r build_${TYPE}_${PLATFORM}/include/* $1/include
         mkdir -p $1/lib/$TYPE/$PLATFORM/
         cp -Rv build_${TYPE}_${PLATFORM}/lib/libassimp.a $1/lib/$TYPE/$PLATFORM/assimp.a
+        secure $1/lib/$TYPE/$PLATFORM/assimp.a assimp.pkl
     elif [ "$TYPE" == "android" ]; then
         mkdir -p $1/lib/$TYPE/$ABI/
         cp -Rv build_${TYPE}_${ABI}/include/* $1/include
         cp -Rv build_${TYPE}_${ABI}/lib/libassimp.a $1/lib/$TYPE/$ABI/libassimp.a
+        secure $1/lib/$TYPE/$PLATFORM/libassimp.a assimp.pkl
     elif [ "$TYPE" == "emscripten" ]; then
         cp -Rv build_emscripten/include/* $1/include
         cp -v "build_${TYPE}/lib/libassimp.a" $1/lib/$TYPE/libassimp.a
+        secure $1/lib/$TYPE/libassimp.a assimp.pkl
     fi
 
     # copy license files

apothecary/apothecary

@@ -310,21 +310,19 @@ function build() {
 # executed inside the lib src dir, first arg $1 is the dest libs dir root
 function copy() {
 	mkdir -p $1/include
+	. "$SECURE_SCRIPT"
 	if [ "$TYPE" == "vs" ] ; then
 		mkdir -p $1/include/cairo	
 		mkdir -p $1/lib/$TYPE/$PLATFORM/
 		cp -Rv "build_${TYPE}_${ARCH}/Release/include/"* $1/include/
     	cp -v "build_${TYPE}_${ARCH}/Release/lib/cairo-static.lib" $1/lib/$TYPE/$PLATFORM/libcairo.lib 
-    	. "$SECURE_SCRIPT"
-		secure $1/lib/$TYPE/$PLATFORM/libcairo.lib
+		secure $1/lib/$TYPE/$PLATFORM/libcairo.lib cairo.pkl
 	elif [ "$TYPE" == "osx" ] ; then
 		mkdir -p $1/lib/$TYPE/$PLATFORM/
 		cp -v "build_${TYPE}_${PLATFORM}/Release/lib/libcairo-static.a" $1/lib/$TYPE/$PLATFORM/libcairo.a
-		. "$SECURE_SCRIPT"
-		secure $1/lib/$TYPE/$PLATFORM/libcairo.a
+		secure $1/lib/$TYPE/$PLATFORM/libcairo.a cairo.pkl
 		cp -Rv "build_${TYPE}_${PLATFORM}/Release/include/"* $1/include/
 	fi
-
 	# copy license files
 	if [ -d "$1/license" ]; then
         rm -rf $1/license
@@ -345,16 +343,14 @@ function clean() {
 	make clean
 }
 
-function save() {
-    . "$SAVE_SCRIPT" 
-    savestatus ${TYPE} "cairo" ${ARCH} ${VER} true "${SAVE_FILE}"
-}
 
 function load() {
-    . "$LOAD_SCRIPT"
-    if loadsave ${TYPE} "cairo" ${ARCH} ${VER} "${SAVE_FILE}"; then
-      return 0;
+     . "$LOAD_SCRIPT"
+    LOAD_RESULT=$(loadsave ${TYPE} "cairo" ${ARCH} ${VER} "$LIBS_DIR_REAL/$1/lib/$TYPE/$PLATFORM" ${PLATFORM} )
+    PREBUILT=$(echo "$LOAD_RESULT" | tail -n 1)
+    if [ "$PREBUILT" -eq 1 ]; then
+        echo 1
     else
-      return 1;
+        echo 0
     fi
 }

apothecary/formulas/_depends/brotli.sh

@@ -14,12 +14,12 @@ FORMULA_TYPES=( "vs" "osx" "ios" "xros" )
 FORMULA_DEPENDS=( "openssl" "zlib" )
 
 # define the version by sha
-VER=8_6_0
-VER_D=8.6.0
-SHA1=ec363b8c17ce83af85f4f18f6c5a2f19efd4e0e3
+VER=8.8.0
+VER_D=8_8_0
+SHA1=27b90781ec6353d9b52e88e4802c7436b1ed0529
 
 # tools for git use
-GIT_URL=https://github.com/curl/curl.git
+GIT_URL=https://github.com/curl/curl
 GIT_TAG=$VER
 
 
@@ -28,18 +28,16 @@ function download() {
 
     . "$DOWNLOADER_SCRIPT"
 
-    curl -Lk https://github.com/curl/curl/releases/download/curl-$VER/curl-$VER_D.tar.gz -o curl-$VER.tar.gz   
+    downloader $GIT_URL/releases/download/curl-$VER_D/curl-$VER.tar.gz
     tar -xf curl-$VER.tar.gz
-    mv curl-$VER_D curl 
+    mv curl-$VER curl
     local CHECKSHA=$(shasum curl-$VER.tar.gz | awk '{print $1}')
     if [ "$CHECKSHA" != "$SHA1" ] ; then
         echoError "ERROR! SHA did not Verify: [$CHECKSHA] SHA on Record:[$SHA1] - Developer has not updated SHA or Man in the Middle Attack"
     else
         echo "SHA for Download Verified Successfully: [$CHECKSHA] SHA on Record:[$SHA1]"
     fi
     rm curl*.tar.gz
-    
-    
 
 }
 
@@ -332,20 +330,20 @@ function copy() {
 
 	if [ "$TYPE" == "vs" ] ; then
         mkdir -p $1/lib/$TYPE/$PLATFORM/
-        cp -Rv "build_${TYPE}_${ARCH}/Release/include/" $1/ 
+        cp -Rv "build_${TYPE}_${ARCH}/Release/include/"* $1/ 
         cp -v "build_${TYPE}_${ARCH}/Release/lib/libcurl.lib" $1/lib/$TYPE/$PLATFORM/libcurl.lib  
         . "$SECURE_SCRIPT"
         secure $1/lib/$TYPE/$PLATFORM/libcurl.lib curl.pkl
 	elif [[ "$TYPE" =~ ^(osx|ios|tvos|xros|catos|watchos)$ ]]; then
         mkdir -p $1/lib/$TYPE/$PLATFORM/
-		cp -Rv "build_${TYPE}_${PLATFORM}/Release/include/" $1/include
+		cp -Rv "build_${TYPE}_${PLATFORM}/Release/include/"* $1/include
         cp -v "build_${TYPE}_${PLATFORM}/Release/lib/libcurl.a" $1/lib/$TYPE/$PLATFORM/curl.a
         . "$SECURE_SCRIPT"
         secure $1/lib/$TYPE/$PLATFORM/curl.a curl.pkl
 	elif [ "$TYPE" == "android" ] ; then
         #mkdir -p $1/lib/$TYPE/$ABI
         mkdir -p $1/lib/$TYPE/$ABI
-        cp -Rv build/$TYPE/$ABI/include/curl/* $1/include/curl/
+        cp -Rv build/$TYPE/$ABI/include/* $1/include/curl/
 		# copy lib
         cp -Rv build/$TYPE/$ABI/lib/libcurl.a $1/lib/$TYPE/$ABI/libcurl.a
         . "$SECURE_SCRIPT"

apothecary/formulas/_depends/pixman.sh

@@ -63,9 +63,25 @@ function build() {
 # executed inside the lib src dir, first arg $1 is the dest libs dir root
 function copy() {
 	cp -r ../fmod/ $1/
+
+	if [ "$TYPE" == "osx" ]; then
+		. "$SECURE_SCRIPT"
+		secure $1/lib/$TYPE/libfmod.dylib fmod
+	fi
 }
 
 # executed inside the lib src dir
 function clean() {
 	: # noop
 }
+
+function load() {
+    . "$LOAD_SCRIPT"
+    LOAD_RESULT=$(loadsave ${TYPE} "fmod" ${ARCH} ${VER} "$LIBS_DIR_REAL/$1/lib/$TYPE" ${PLATFORM} )
+    PREBUILT=$(echo "$LOAD_RESULT" | tail -n 1)
+    if [ "$PREBUILT" -eq 1 ]; then
+        echo 1
+    else
+        echo 0
+    fi
+}

apothecary/formulas/assimp.sh

@@ -215,45 +215,38 @@ function build() {
 # executed inside the lib src dir, first arg $1 is the dest libs dir root
 function copy() {
 	mkdir -p $1/include
+	. "$SECURE_SCRIPT"
 	if [ "$TYPE" == "vs" ] ; then
 		mkdir -p $1/lib/$TYPE/$PLATFORM/
-		mkdir -p $1/include
 		cp -v "build_${TYPE}_${ARCH}/Release/lib/fmt.lib" $1/lib/$TYPE/$PLATFORM/fmt.lib
 		cp -RT "build_${TYPE}_${ARCH}/Release/include/" $1/include
+		secure $1/lib/$TYPE/$PLATFORM/fmt.lib fmt.pkl
 	elif [[ "$TYPE" =~ ^(osx|ios|tvos|xros|catos|watchos)$ ]]; then
 		mkdir -p $1/lib/$TYPE/$PLATFORM/
-		mkdir -p $1/include
 		cp -v "build_${TYPE}_${PLATFORM}/Release/lib/libfmt.a" $1/lib/$TYPE/$PLATFORM/libfmt.a
-		. "$SECURE_SCRIPT"
-		secure $1/lib/$TYPE/$ABI/libfmt.a
+		secure $1/lib/$TYPE/$PLATFORM/libfmt.a fmt.pkl
 		cp -R "build_${TYPE}_${PLATFORM}/Release/include/" $1/include
 	elif [ "$TYPE" == "android" ] ; then
 		mkdir -p $1/lib/$TYPE/$ABI/
-		mkdir -p $1/include
 		cp -v "build_${TYPE}_${ABI}/Release/lib/libfmt.lib" $1/lib/$TYPE/$ABI/libfmt.a
-		. "$SECURE_SCRIPT"
-		secure $1/lib/$TYPE/$ABI/libfmt.a
+		secure $1/lib/$TYPE/$ABI/libfmt.a fmt.pkl
 		cp -R "build_${TYPE}_${ABI}/Release/include/" $1/include
 	elif [ "$TYPE" == "emscripten" ] ; then
 		mkdir -p $1/lib/$TYPE/
-		mkdir -p $1/include
 		cp -v "build_${TYPE}/bin/fmt_wasm.wasm" $1/lib/$TYPE/libfmt.wasm
 		cp -R "build_${TYPE}/Release/include/" $1/include
-		. "$SECURE_SCRIPT"
-		secure $1/lib/$TYPE/libfmt.wasm
+		secure $1/lib/$TYPE/libfmt.wasm fmt.pkl
 	else
-		mkdir -p $1/include
 		mkdir -p $1/lib/$TYPE/$PLATFORM/
 		cp -v "build_${TYPE}_${PLATFORM}/Release/bin/.a" $1/lib/$TYPE/$PLATFORM/libfmt.a
-		. "$SECURE_SCRIPT"
-		secure $1/lib/$TYPE/$PLATFORM/libfmt.a
+		secure $1/lib/$TYPE/$PLATFORM/libfmt.a fmt.pkl
 		cp -R "build_${TYPE}_${PLATFORM}/Release/include/" $1/include	
 	fi
 
 	# copy license file
 	if [ -d "$1/license" ]; then
-    rm -rf $1/license
-  fi
+		rm -rf $1/license
+  	fi
 	mkdir -p $1/license
 	cp -v LICENSE $1/license/
 }