Fixed MacOS lib dependency links.

belangeo · Aug 28, 2020 · 98b24f9 · 98b24f9
1 parent ad24141
commit 98b24f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/scripts/release_wheels_OSX.sh b/scripts/release_wheels_OSX.sh
@@ -32,12 +32,14 @@ sudo cp /usr/local/lib/libFLAC.8.dylib temp_libs/libFLAC.8.dylib
 sudo cp /usr/local/lib/libvorbisenc.2.dylib temp_libs/libvorbisenc.2.dylib
 sudo cp /usr/local/lib/libvorbis.0.dylib temp_libs/libvorbis.0.dylib
 sudo cp /usr/local/lib/libogg.0.dylib temp_libs/libogg.0.dylib
+sudo cp /usr/local/lib/libopus.0.dylib temp_libs/libopus.0.dylib
 
 cd temp_libs
 sudo install_name_tool -change /usr/local/opt/flac/lib/libFLAC.8.dylib @loader_path/libFLAC.8.dylib libsndfile.1.dylib
 sudo install_name_tool -change /usr/local/opt/libogg/lib/libogg.0.dylib @loader_path/libogg.0.dylib libsndfile.1.dylib
 sudo install_name_tool -change /usr/local/opt/libvorbis/lib/libvorbis.0.dylib @loader_path/libvorbis.0.dylib libsndfile.1.dylib
 sudo install_name_tool -change /usr/local/opt/libvorbis/lib/libvorbisenc.2.dylib @loader_path/libvorbisenc.2.dylib libsndfile.1.dylib
+sudo install_name_tool -change /usr/local/opt/opus/lib/libopus.0.dylib @loader_path/libopus.0.dylib libsndfile.1.dylib
 sudo install_name_tool -change /usr/local/opt/libogg/lib/libogg.0.dylib @loader_path/libogg.0.dylib libvorbis.0.dylib
 #sudo install_name_tool -change /usr/local/lib/libogg.0.dylib @loader_path/libogg.0.dylib libvorbis.0.dylib
 sudo install_name_tool -change /usr/local/opt/libogg/lib/libogg.0.dylib @loader_path/libogg.0.dylib libvorbisenc.2.dylib
@@ -46,7 +48,7 @@ sudo install_name_tool -change /usr/local/opt/libogg/lib/libogg.0.dylib @loader_
 #sudo install_name_tool -change /usr/local/opt/libogg/lib/libogg.0.dylib @loader_path/libogg.0.dylib libFLAC.8.dylib
 
 ### Make sure libvorbis version is correct in this path!
-sudo install_name_tool -change /usr/local/Cellar/libvorbis/1.3.67/lib/libvorbis.0.dylib @loader_path/libvorbis.0.dylib libvorbisenc.2.dylib
+sudo install_name_tool -change /usr/local/Cellar/libvorbis/1.3.7/lib/libvorbis.0.dylib @loader_path/libvorbis.0.dylib libvorbisenc.2.dylib
 
 cd ..
 

diff --git a/setup.py b/setup.py
@@ -222,7 +222,8 @@ def get_jack_api():
                                 "temp_libs/libFLAC.8.dylib",
                                 "temp_libs/libvorbisenc.2.dylib",
                                 "temp_libs/libvorbis.0.dylib",
-                                "temp_libs/libogg.0.dylib"])]
+                                "temp_libs/libogg.0.dylib",
+                                "temp_libs/libopus.0.dylib"])]
     else:
         data_files = []
 else:
@@ -285,10 +286,7 @@ def get_jack_api():
 
                 # Specify the Python versions you support here. In particular, ensure
                 # that you indicate whether you support Python 2, Python 3 or both.
-                'Programming Language :: Python :: 2',
-                'Programming Language :: Python :: 2.7',
                 'Programming Language :: Python :: 3',
-                'Programming Language :: Python :: 3.5',
                 'Programming Language :: Python :: 3.6',
                 'Programming Language :: Python :: 3.7',
                 'Programming Language :: Python :: 3.8',
@@ -308,7 +306,7 @@ def get_jack_api():
         classifiers = classifiers,
         keywords = "audio sound dsp synthesis signal-processing music",
         license = "LGPLv3+",
-        python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4',
+        python_requires='>=3.6, <4',
         zip_safe = False,
         packages = packages,
         package_data = {'pyo.lib.snds': soundfiles,