From fb389af99a4802b970a43d8b6cd260584c24dd61 Mon Sep 17 00:00:00 2001 From: "aricloverGitHub (INACTIVE)" <78001398+arichornlover@users.noreply.github.com> Date: Sun, 10 Nov 2024 04:19:14 -0600 Subject: [PATCH] Revert Makefile changes Everything is reverted so users can compile normally on macos-12. But I did keep libFLEX --- Makefile | 73 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index 27f9790..a99b84e 100644 --- a/Makefile +++ b/Makefile @@ -1,47 +1,58 @@ -export TARGET = iphone:clang:16.5:14.0 -export SDK_PATH = $(THEOS)/sdks/iPhoneOS16.5.sdk/ -export SYSROOT = $(SDK_PATH) -export ARCHS = arm64 +TARGET = iphone:clang:16.5:14.0 +ARCHS = arm64 MODULES = jailed -export FINALPACKAGE = 1 -export CODESIGN_IPA = 0 -export REMOVE_EXTENSIONS = 1 -export PACKAGE_NAME = $(TWEAK_NAME) -export PACKAGE_VERSION = X.X.X-X.X +FINALPACKAGE = 1 +CODESIGN_IPA = 0 +PACKAGE_VERSION = X.X.X-X.X -export libcolorpicker_ARCHS = arm64 -export libFLEX_ARCHS = arm64 -export Alderis_XCODEOPTS = LD_DYLIB_INSTALL_NAME=@rpath/Alderis.framework/Alderis -export Alderis_XCODEFLAGS = DYLIB_INSTALL_NAME_BASE=/Library/Frameworks BUILD_LIBRARY_FOR_DISTRIBUTION=YES ARCHS="$(ARCHS)" -export libcolorpicker_LDFLAGS = -F$(TARGET_PRIVATE_FRAMEWORK_PATH) -install_name @rpath/libcolorpicker.dylib -export ADDITIONAL_CFLAGS = -I$(THEOS_PROJECT_DIR)/Tweaks/RemoteLog -I$(THEOS_PROJECT_DIR)/Tweaks -export DEBUGFLAG = -ggdb -Wno-unused-command-line-argument -L$(THEOS_OBJ_DIR) -F$(_THEOS_LOCAL_DATA_DIR)/$(THEOS_OBJ_DIR_NAME)/install/Library/Frameworks +libFLEX_ARCHS = arm64 -INSTALL_TARGET_PROCESSES = YouTube TWEAK_NAME = YTLitePlus DISPLAY_NAME = YouTube BUNDLE_ID = com.google.ios.youtube -$(TWEAK_NAME)_FILES = YTLitePlus.xm $(shell find Source -name '*.xm' -o -name '*.x' -o -name '*.m') -$(TWEAK_NAME)_FRAMEWORKS = UIKit Foundation AVFoundation AVKit Photos Accelerate CoreMotion GameController VideoToolbox Security -$(TWEAK_NAME)_LIBRARIES = bz2 c++ iconv z -$(TWEAK_NAME)_CFLAGS = -fobjc-arc -Wno-deprecated-declarations -Wno-unused-but-set-variable -DTWEAK_VERSION=\"$(PACKAGE_VERSION)\" -$(TWEAK_NAME)_INJECT_DYLIBS = Tweaks/YTLite/var/jb/Library/MobileSubstrate/DynamicLibraries/YTLite.dylib .theos/obj/libFLEX.dylib .theos/obj/libcolorpicker.dylib .theos/obj/iSponsorBlock.dylib .theos/obj/YTUHD.dylib .theos/obj/YouPiP.dylib .theos/obj/YouTubeDislikesReturn.dylib .theos/obj/YTABConfig.dylib .theos/obj/YouMute.dylib .theos/obj/DontEatMyContent.dylib .theos/obj/YTHoldForSpeed.dylib .theos/obj/YTVideoOverlay.dylib .theos/obj/YouGroupSettings.dylib .theos/obj/YouQuality.dylib .theos/obj/YouTimeStamp.dylib .theos/obj/YouLoop.dylib -$(TWEAK_NAME)_EMBED_LIBRARIES = $(THEOS_OBJ_DIR)/libcolorpicker.dylib -$(TWEAK_NAME)_EMBED_FRAMEWORKS = $(_THEOS_LOCAL_DATA_DIR)/$(THEOS_OBJ_DIR_NAME)/install_Alderis.xcarchive/Products/var/jb/Library/Frameworks/Alderis.framework -$(TWEAK_NAME)_EMBED_BUNDLES = $(wildcard Bundles/*.bundle) -$(TWEAK_NAME)_EMBED_EXTENSIONS = $(wildcard Extensions/*.appex) +EXTRA_CFLAGS := -I$(THEOS_PROJECT_DIR)/Tweaks + +# Allow YouTubeHeader to be accessible using #include <...> +export ADDITIONAL_CFLAGS = -I$(THEOS_PROJECT_DIR)/Tweaks + +YTLitePlus_INJECT_DYLIBS = Tweaks/YTLite/var/jb/Library/MobileSubstrate/DynamicLibraries/YTLite.dylib .theos/obj/libFLEX.dylib .theos/obj/libcolorpicker.dylib .theos/obj/iSponsorBlock.dylib .theos/obj/YTUHD.dylib .theos/obj/YouPiP.dylib .theos/obj/YouTubeDislikesReturn.dylib .theos/obj/YTABConfig.dylib .theos/obj/YouMute.dylib .theos/obj/DontEatMyContent.dylib .theos/obj/YTHoldForSpeed.dylib .theos/obj/YTVideoOverlay.dylib .theos/obj/YouGroupSettings.dylib .theos/obj/YouQuality.dylib .theos/obj/YouTimeStamp.dylib .theos/obj/YouLoop.dylib +YTLitePlus_FILES = YTLitePlus.xm $(shell find Source -name '*.xm' -o -name '*.x' -o -name '*.m') $(shell find Tweaks/FLEX -type f \( -iname \*.c -o -iname \*.m -o -iname \*.mm \)) +YTLitePlus_IPA = ./tmp/Payload/YouTube.app +YTLitePlus_CFLAGS = -fobjc-arc -Wno-deprecated-declarations -Wno-unsupported-availability-guard -Wno-unused-but-set-variable -DTWEAK_VERSION=$(PACKAGE_VERSION) $(EXTRA_CFLAGS) +YTLitePlus_FRAMEWORKS = UIKit Security +YTLitePlus_USE_FISHHOOK = 0 include $(THEOS)/makefiles/common.mk include $(THEOS_MAKE_PATH)/tweak.mk -SUBPROJECTS += Tweaks/Alderis Tweaks/DontEatMyContent Tweaks/FLEXing/libflex Tweaks/iSponsorBlock Tweaks/Return-YouTube-Dislikes Tweaks/YTABConfig Tweaks/YouGroupSettings Tweaks/YouLoop Tweaks/YouMute Tweaks/YouPiP Tweaks/YouQuality Tweaks/YouTimeStamp Tweaks/YTHoldForSpeed Tweaks/YTUHD Tweaks/YTVideoOverlay +SUBPROJECTS += Tweaks/Alderis Tweaks/FLEXing/libflex Tweaks/iSponsorBlock Tweaks/YTUHD Tweaks/YouPiP Tweaks/Return-YouTube-Dislikes Tweaks/YTABConfig Tweaks/YouMute Tweaks/DontEatMyContent Tweaks/YTHoldForSpeed Tweaks/YTVideoOverlay Tweaks/YouQuality Tweaks/YouTimeStamp Tweaks/YouGroupSettings Tweaks/YouLoop include $(THEOS_MAKE_PATH)/aggregate.mk -YTLITE_VERSION := 5.0.1 YTLITE_PATH = Tweaks/YTLite +YTLITE_VERSION := 5.0.1 YTLITE_DEB = $(YTLITE_PATH)/com.dvntm.ytlite_$(YTLITE_VERSION)_iphoneos-arm64.deb YTLITE_DYLIB = $(YTLITE_PATH)/var/jb/Library/MobileSubstrate/DynamicLibraries/YTLite.dylib YTLITE_BUNDLE = $(YTLITE_PATH)/var/jb/Library/Application\ Support/YTLite.bundle +before-package:: + @echo -e "==> \033[1mMoving tweak's bundle to Resources/...\033[0m" + @mkdir -p Resources/Frameworks/Alderis.framework && find .theos/obj/install/Library/Frameworks/Alderis.framework -maxdepth 1 -type f -exec cp {} Resources/Frameworks/Alderis.framework/ \; + @cp -R Tweaks/YTLite/var/jb/Library/Application\ Support/YTLite.bundle Resources/ + @cp -R Tweaks/YTUHD/layout/Library/Application\ Support/YTUHD.bundle Resources/ + @cp -R Tweaks/YouPiP/layout/Library/Application\ Support/YouPiP.bundle Resources/ + @cp -R Tweaks/Return-YouTube-Dislikes/layout/Library/Application\ Support/RYD.bundle Resources/ + @cp -R Tweaks/YTABConfig/layout/Library/Application\ Support/YTABC.bundle Resources/ + @cp -R Tweaks/YouMute/layout/Library/Application\ Support/YouMute.bundle Resources/ + @cp -R Tweaks/DontEatMyContent/layout/Library/Application\ Support/DontEatMyContent.bundle Resources/ + @cp -R Tweaks/YTHoldForSpeed/layout/Library/Application\ Support/YTHoldForSpeed.bundle Resources/ + @cp -R Tweaks/iSponsorBlock/layout/Library/Application\ Support/iSponsorBlock.bundle Resources/ + @cp -R Tweaks/YTVideoOverlay/layout/Library/Application\ Support/YTVideoOverlay.bundle Resources/ + @cp -R Tweaks/YouQuality/layout/Library/Application\ Support/YouQuality.bundle Resources/ + @cp -R Tweaks/YouTimeStamp/layout/Library/Application\ Support/YouTimeStamp.bundle Resources/ + @cp -R Tweaks/YouLoop/layout/Library/Application\ Support/YouLoop.bundle Resources/ + @cp -R lang/YTLitePlus.bundle Resources/ + @echo -e "==> \033[1mChanging the installation path of dylibs...\033[0m" + @ldid -r .theos/obj/iSponsorBlock.dylib && install_name_tool -change /usr/lib/libcolorpicker.dylib @rpath/libcolorpicker.dylib .theos/obj/iSponsorBlock.dylib + @codesign --remove-signature .theos/obj/libcolorpicker.dylib && install_name_tool -change /Library/Frameworks/Alderis.framework/Alderis @rpath/Alderis.framework/Alderis .theos/obj/libcolorpicker.dylib internal-clean:: @rm -rf $(YTLITE_PATH)/* @@ -50,12 +61,10 @@ before-all:: @if [[ ! -f $(YTLITE_DEB) ]]; then \ rm -rf $(YTLITE_PATH)/*; \ $(PRINT_FORMAT_BLUE) "Downloading YTLite"; \ + echo "YTLITE_VERSION: $(YTLITE_VERSION)"; \ curl -s -L "https://github.com/dayanch96/YTLite/releases/download/v$(YTLITE_VERSION)/com.dvntm.ytlite_$(YTLITE_VERSION)_iphoneos-arm64.deb" -o $(YTLITE_DEB); \ tar -xf $(YTLITE_DEB) -C $(YTLITE_PATH); tar -xf $(YTLITE_PATH)/data.tar* -C $(YTLITE_PATH); \ if [[ ! -f $(YTLITE_DYLIB) || ! -d $(YTLITE_BUNDLE) ]]; then \ $(PRINT_FORMAT_ERROR) "Failed to extract YTLite"; exit 1; \ fi; \ - fi - -before-package:: - @mkdir -p $(THEOS_STAGING_DIR)/Library/Application\ Support; cp -r lang/YTLitePlus.bundle $(THEOS_STAGING_DIR)/Library/Application\ Support/ + fi