Skip to content
Permalink
Browse files

Merge PR #3646: Build Opus as shared library in static build, copy it…

… into App Bundle
  • Loading branch information...
davidebeatrici committed Apr 5, 2019
2 parents c38d77e + c75aafc commit 1e3d6a5015800c047b8762f079195f522bb9fd7f
Showing with 13 additions and 7 deletions.
  1. +5 −3 3rdparty/opus-build/opus-build.pro
  2. +7 −4 macx/scripts/osxdist.py
  3. +1 −0 scripts/travis-ci/script.bash
@@ -20,6 +20,11 @@ VPATH = ../$$SOURCEDIR
TARGET = opus
DEFINES += HAVE_CONFIG_H

CONFIG(static) {
CONFIG -= static
CONFIG += shared
}

!CONFIG(third-party-warnings) {
# We ignore warnings in third party builds. We won't actually look
# at them and they clutter out our warnings.
@@ -33,9 +38,6 @@ win32 {
DEFINES += WIN32 _WIN32
INCLUDEPATH += ../$$BUILDDIR/win32

CONFIG -= static
CONFIG += shared

CONFIG(sse2) {
TARGET_VERSION_EXT = .sse2
} else {
@@ -129,12 +129,12 @@ def copy_resources(self, rsrcs):

def copy_codecs(self):
'''
Try to copy the dynamic CELT libraries into the App Bundle.
Try to copy the dynamic audio codec libraries into the App Bundle.
'''
print ' * Attempting to copy CELT libraries into App Bundle'
print ' * Attempting to copy audio codec libraries into App Bundle'
dst = os.path.join(self.bundle, 'Contents', 'Codecs')
os.makedirs(dst)
codecs = ('release/libcelt0.0.7.0.dylib', 'release/libcelt0.0.11.0.dylib')
codecs = ('release/libcelt0.0.7.0.dylib', 'release/libcelt0.0.11.0.dylib', 'release/libopus.dylib')
for codec in codecs:
if os.path.exists(codec):
shutil.copy(codec, dst)
@@ -296,7 +296,8 @@ def package_client():
a.copy_resources(['icons/mumble.icns'])
a.update_plist()
if not options.universal:
a.add_compat_warning()
if options.compat_warning:
a.add_compat_warning()
a.set_min_macosx_version('10.6.0')
else:
a.set_min_macosx_version('10.4.8')
@@ -311,6 +312,7 @@ def package_client():
'release/Mumble.app/Contents/Plugins/libmanual.dylib',
'release/Mumble.app/Contents/Codecs/libcelt0.0.7.0.dylib',
'release/Mumble.app/Contents/Codecs/libcelt0.0.11.0.dylib',
'release/Mumble.app/Contents/Codecs/libopus.dylib',
'release/Mumble.app/Contents/MacOS/mumble-g15-helper',
'release/Mumble.app/Contents/MacOS/sbcelt-helper',
)
@@ -387,6 +389,7 @@ def package_server():
parser.add_option('', '--universal', dest='universal', help='Build an universal snapshot.', action='store_true', default=False)
parser.add_option('', '--only-appbundle', dest='only_appbundle', help='Only prepare the appbundle. Do not package.', action='store_true', default=False)
parser.add_option('', '--only-overlay', dest='only_overlay', help='Only create the overlay installer.', action='store_true', default=False)
parser.add_option('', '--no-compat-warning', dest='compat_warning', help='No warning message when running the image on x86. This option should only be used when the warning application cannot be built as 32 bit (rendering it useless).', action='store_false', default=True)
parser.add_option('', '--developer-id', dest='developer_id', help='Identity (Developer ID) to use for code signing. The name is also used for GPG signing. (If not set, no code signing will occur)')
parser.add_option('', '--keychain', dest='keychain', help='The keychain to use when invoking code signing utilities. (Defaults to login.keychain', default='login.keychain')
parser.add_option('', '--server', dest='server', help='Build a Murmur package.', action='store_true', default=False)
@@ -54,6 +54,7 @@ elif [ "${TRAVIS_OS_NAME}" == "osx" ]; then
export MUMBLE_PREFIX=/usr/local
export MUMBLE_ICE_PREFIX=/usr/local/opt/ice
qmake CONFIG+="release tests warnings-as-errors" && make -j2 && make check
./macx/scripts/osxdist.py --no-compat-warning
else
exit 1
fi

0 comments on commit 1e3d6a5

Please sign in to comment.
You can’t perform that action at this time.