[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: macosx/build.sh: Replace CFNetwork with CoreServices framework for intel builds

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC


Commits:
b3626920 by David Fuhrmann at 2022-11-26T13:17:10+00:00
macosx/build.sh: Replace CFNetwork with CoreServices framework for intel builds

CFNetwork library is automatically added by recent SDKs. By replacing
this framework with CoreServices.framework, we retain support for Mac OS
X 10.7.

- - - - -
94035013 by David Fuhrmann at 2022-11-26T13:17:10+00:00
contribs: growl: Replace CFNetwork with CoreServices framework for intel builds

CFNetwork library is automatically added by recent SDKs. By replacing
this framework with CoreServices.framework, we retain support for Mac OSX 10.7.

- - - - -


2 changed files:

- contrib/src/growl/rules.mak
- extras/package/macosx/build.sh


Changes:

=====================================
contrib/src/growl/rules.mak
=====================================
@@ -24,6 +24,12 @@ growl: GrowlSDK-$(GROWL_VERSION)-src.tar.gz .sum-growl
 
 .growl: growl
 	cd $< && xcodebuild $(XCODE_FLAGS) MACOSX_DEPLOYMENT_TARGET=10.7 CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY="" GCC_TREAT_WARNINGS_AS_ERRORS=NO -target Growl.framework -configuration Release
+
+	# Support for macOS 10.7 on intel builds
+ifeq ($(ARCH),x86_64)
+	cd $< && install_name_tool -change /System/Library/Frameworks/CFNetwork.framework/Versions/A/CFNetwork /System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices build/Release/Growl.framework/Growl
+endif
+
 	install -d $(PREFIX)
 	cd $< && mkdir -p "$(PREFIX)/Frameworks" && rm -Rf $(PREFIX)/Frameworks/Growl.framework && \
 	         cp -Rf build/Release/Growl.framework "$(PREFIX)/Frameworks"


=====================================
extras/package/macosx/build.sh
=====================================
@@ -341,6 +341,11 @@ make -j$JOBS
 info "Preparing VLC.app"
 make VLC.app
 
+# Workaround for macOS 10.7: CFNetwork only exists as part of CoreServices framework
+if [ "$ARCH" = "x86_64" ]; then
+    install_name_tool -change /System/Library/Frameworks/CFNetwork.framework/Versions/A/CFNetwork /System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices VLC.app/Contents/MacOS/lib/libvlccore.dylib
+fi
+
 if [ "$PACKAGETYPE" = "u" ]; then
     info "Copying app with debug symbols into VLC-debug.app and stripping"
     rm -rf VLC-debug.app



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/52df7ff818cc517a55220c6b89017fe51404c7c3...94035013a041e1e2590059e8801f2b39c025146a

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/52df7ff818cc517a55220c6b89017fe51404c7c3...94035013a041e1e2590059e8801f2b39c025146a
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance