Cache Homebrew and Theos dependencies

.github/workflows/build.yml

@@ -28,6 +28,14 @@ jobs:
         with:
           ref: ${{ inputs.branch || github.ref }}
 
+      - name: Cache Homebrew packages
+        uses: actions/cache@v4
+        with:
+          path: ~/Library/Caches/Homebrew
+          key: brew-${{ runner.os }}-make-ldid
+          restore-keys: |
+            brew-${{ runner.os }}-
+
       - name: Install dependencies
         run: brew install make ldid
 
@@ -36,8 +44,7 @@ jobs:
           echo "$(brew --prefix make)/libexec/gnubin" >> $GITHUB_PATH
           echo "THEOS=${{ github.workspace }}/theos" >> $GITHUB_ENV
 
-      # Original from YTweaks
-      - name: Get Theos commit
+      - name: Get Theos and dependencies commit
         run: |
           get_commit_hash() {
             local repo_url=$1
@@ -51,13 +58,18 @@ jobs:
           fi
           echo "THEOS_REPO=$THEOS_URL" >> $GITHUB_ENV
           echo "THEOS_COMMIT=$(get_commit_hash "$THEOS_URL")" >> $GITHUB_ENV
+          echo "PSHEADER_COMMIT=$(get_commit_hash "https://github.com/PoomSmart/PSHeader.git")" >> $GITHUB_ENV
+          echo "SDK_COMMIT=$(get_commit_hash "https://github.com/Tonwalter888/iOS-SDKs.git")" >> $GITHUB_ENV
 
       - name: Cache Theos
         id: cache-theos
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: theos
-          key: Tweak-18.6-SDK-${{ env.THEOS_COMMIT }}
+          key: Theos-${{ env.THEOS_COMMIT }}-SDK-${{ env.SDK_COMMIT }}-PSHeader-${{ env.PSHEADER_COMMIT }}
+          restore-keys: |
+            Theos-${{ env.THEOS_COMMIT }}-SDK-${{ env.SDK_COMMIT }}-
+            Theos-${{ env.THEOS_COMMIT }}-
 
       - name: Setup Theos
         if: ${{ steps.cache-theos.outputs.cache-hit != 'true' }}
@@ -68,16 +80,8 @@ jobs:
             git sparse-checkout set --no-cone iPhoneOS18.6.sdk
             git checkout --quiet
             mv *.sdk "$THEOS/sdks"
-            
-      - name: Clone headers
-        run: |
-          if [ ! -d "$THEOS/include/PSHeader" ]; then
-            git clone --quiet --depth=1 https://github.com/PoomSmart/PSHeader.git "$THEOS/include/PSHeader"
-          else
-            cd $THEOS/include/PSHeader
-            git pull --quiet --force
             cd ${{ github.workspace }}
-          fi
+            git clone --quiet --depth=1 https://github.com/PoomSmart/PSHeader.git "$THEOS/include/PSHeader"
 
       - name: Build Tweak
         run: |

Infuse/Infuse-tvOS/Infuse.plist

@@ -1,7 +1,7 @@
 {
 	Filter = {
-		Bundles = (
-			"com.firecore.infuse",
+		Executables = (
+			infuse,
 		);
 	};
 }

Infuse/Infuse-tvOS/Makefile

@@ -1,7 +1,6 @@
 TARGET = appletv:latest:18.3
-ARCHS = arm64
+ARCHS = arm64 arm64e
 INSTALL_TARGET_PROCESSES = infuse
-THEOS_PACKAGE_SCHEME = rootless
 
 include $(THEOS)/makefiles/common.mk
 
@@ -10,8 +9,6 @@ TWEAK_NAME = Infuse
 Infuse_FILES = Tweak.x
 Infuse_CFLAGS = -fobjc-arc
 Infuse_FRAMEWORKS = Foundation UIKit
+Infuse_LDFLAGS += $(THEOS)/vendor/lib/appletv/CydiaSubstrate.framework/CydiaSubstrate.tbd
 
 include $(THEOS_MAKE_PATH)/tweak.mk
-test-print:
-	@echo "ARCH is $(THEOS_PACKAGE_ARCH)"
-	@echo "CONTROL is $(_THEOS_DEB_PACKAGE_CONTROL_PATH)"

Infuse/Infuse-tvOS/control

@@ -1,6 +1,6 @@
 Package: io.infuseteam.infuserootless
 Name: Infuse (Rootless)
-Version: 2.1
+Version: 2.2
 Architecture: appletvos-arm64
 Description: Unlock the full potential of Infuse
 Maintainer: Infuse Team

OqeePlus/OqeePlus-tvOS/Makefile

@@ -1,7 +1,6 @@
 TARGET = appletv:latest:18.3
 ARCHS = arm64
 INSTALL_TARGET_PROCESSES = Oqee
-THEOS_PACKAGE_SCHEME = rootless
 
 include $(THEOS)/makefiles/common.mk
 
@@ -9,5 +8,6 @@ TWEAK_NAME = OqeePlus
 
 OqeePlus_FILES = Tweak.x
 OqeePlus_CFLAGS = -fobjc-arc
+OqeePlus_LDFLAGS += $(THEOS)/vendor/lib/appletv/CydiaSubstrate.framework/CydiaSubstrate.tbd
 
 include $(THEOS_MAKE_PATH)/tweak.mk

OqeePlus/OqeePlus-tvOS/control

@@ -1,6 +1,6 @@
 Package: xyz.nohamr.oqeeplus
 Name: Oqee+ (tvOS)
-Version: 1.0
+Version: 1.1
 Architecture: appletvos-arm64
 Description: Oqee+ Ads blocker hook for tvOS
 Maintainer: NohamR

TF1Plus/TF1Plus-tvOS/Makefile

@@ -1,7 +1,6 @@
 TARGET = appletv:latest:18.3
 ARCHS = arm64
 INSTALL_TARGET_PROCESSES = mytf1
-THEOS_PACKAGE_SCHEME = rootless
 
 include $(THEOS)/makefiles/common.mk
 
@@ -9,5 +8,6 @@ TWEAK_NAME = TF1Plus
 
 TF1Plus_FILES = Tweak.x
 TF1Plus_CFLAGS = -fobjc-arc
+TF1Plus_LDFLAGS += $(THEOS)/vendor/lib/appletv/CydiaSubstrate.framework/CydiaSubstrate.tbd
 
 include $(THEOS_MAKE_PATH)/tweak.mk

TF1Plus/TF1Plus-tvOS/control

@@ -1,6 +1,6 @@
 Package: xyz.nohamr.tf1plus
-Name: TF1+ (Rootless)
-Version: 1.0
+Name: TF1+ (Rootful)
+Version: 1.1
 Architecture: appletvos-arm64
 Description: TF1+ Ads blocker hook
 Maintainer: NohamR