Browse Source

package/macosx: Fix bundling without Growl framework

When the macOS notifications module was disabled due to lack of Growl
framework in contribs, this was not properly checked for in the package
Makefile, resulting in a failure due to the missing framework.
pull/135/head
Marvin Scholz 5 years ago
parent
commit
fff5aa90bf
  1. 3
      configure.ac
  2. 2
      extras/package/macosx/package.mak

3
configure.ac

@ -4200,8 +4200,11 @@ AS_IF([test "${enable_osx_notifications}" != "no"], [
VLC_ADD_PLUGIN([osx_notifications])
VLC_ADD_LIBS([osx_notifications], [-Wl,-framework,Growl,-framework,Foundation])
VLC_ADD_OBJCFLAGS([osx_notifications], [-fobjc-exceptions] )
else
enable_osx_notifications="no"
fi
])
AM_CONDITIONAL(HAVE_OSX_NOTIFICATIONS, [test "$enable_osx_notifications" != "no"])
dnl
dnl Libnotify notification plugin

2
extras/package/macosx/package.mak

@ -24,7 +24,9 @@ VLC.app: install
xcrun plutil -convert binary1 $@/Contents/Info.plist
## Create Frameworks dir and copy required ones
mkdir -p $@/Contents/Frameworks
if HAVE_OSX_NOTIFICATIONS
cp -R $(CONTRIB_DIR)/Frameworks/Growl.framework $@/Contents/Frameworks
endif
if HAVE_SPARKLE
cp -R $(CONTRIB_DIR)/Frameworks/Sparkle.framework $@/Contents/Frameworks
endif

Loading…
Cancel
Save