macos: fix build on homebrew

mcallegari · Jan 6, 2022 · 9e59fcd · 9e59fcd
1 parent 239fa5f
commit 9e59fcd
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 31 deletions.
diff --git a/platforms/macos/libsndfile-nametool.pri b/platforms/macos/libsndfile-nametool.pri
@@ -3,15 +3,20 @@ LIBSNDFILE_FILE     = libsndfile.1.dylib
 LIBSNDFILE_FILEPATH = $$LIBSNDFILE_DIR/$$LIBSNDFILE_FILE
 
 LIBOGG_FILE = libogg.0.dylib
-LIBOGG_FILEPATH = $$LIBSNDFILE_DIR/$$LIBOGG_FILE
+LIBOGG_PATH = $$system("pkg-config --variable libdir ogg")
+LIBOGG_FILEPATH = $$LIBOGG_PATH/$$LIBOGG_FILE
 LIBFLAC_FILE = libFLAC.8.dylib
-LIBFLAC_FILEPATH = $$LIBSNDFILE_DIR/$$LIBFLAC_FILE
+LIBFLAC_PATH = $$system("pkg-config --variable libdir flac")
+LIBFLAC_FILEPATH = $$LIBFLAC_PATH/$$LIBFLAC_FILE
 LIBVORBIS_FILE = libvorbis.0.dylib
-LIBVORBIS_FILEPATH = $$LIBSNDFILE_DIR/$$LIBVORBIS_FILE
+LIBVORBIS_PATH = $$system("pkg-config --variable libdir vorbis")
+LIBVORBIS_FILEPATH = $$LIBVORBIS_PATH/$$LIBVORBIS_FILE
 LIBVORBISENC_FILE = libvorbisenc.2.dylib
-LIBVORBISENC_FILEPATH = $$LIBSNDFILE_DIR/$$LIBVORBISENC_FILE
-#LIBVORBISFILE_FILE = libvorbisfile.3.dylib
-#LIBVORBISFILE_FILEPATH = $$LIBSNDFILE_DIR/$$LIBVORBISFILE_FILE
+LIBVORBISENC_PATH = $$system("pkg-config --variable libdir vorbisenc")
+LIBVORBISENC_FILEPATH = $$LIBVORBISENC_PATH/$$LIBVORBISENC_FILE
+LIBOPUS_FILE = libopus.0.dylib
+LIBOPUS_PATH = $$system("pkg-config --variable libdir opus")
+LIBOPUS_FILEPATH = $$LIBOPUS_PATH/$$LIBOPUS_FILE
 
 LIBSNDFILE_INSTALL_NAME_TOOL = install_name_tool -change $$LIBSNDFILE_FILEPATH \
                 @executable_path/../$$LIBSDIR/$$LIBSNDFILE_FILE
@@ -23,6 +28,8 @@ LIBVORBIS_INSTALL_NAME_TOOL = install_name_tool -change $$LIBVORBIS_FILEPATH \
                 @executable_path/../$$LIBSDIR/$$LIBVORBIS_FILE
 LIBVORBISENC_INSTALL_NAME_TOOL = install_name_tool -change $$LIBVORBISENC_FILEPATH \
                 @executable_path/../$$LIBSDIR/$$LIBVORBISENC_FILE
+LIBOPUS_INSTALL_NAME_TOOL = install_name_tool -change $$LIBOPUS_FILEPATH \
+                @executable_path/../$$LIBSDIR/$$LIBOPUS_FILE
 
 contains(PKGCONFIG, sndfile) {
     !isEmpty(nametool.commands) {
@@ -36,8 +43,8 @@ LIBSNDFILE.path   = $$INSTALLROOT/$$LIBSDIR
 LIBSNDFILE.files += $$LIBOGG_FILEPATH
 LIBSNDFILE.files += $$LIBFLAC_FILEPATH
 LIBSNDFILE.files += $$LIBVORBISENC_FILEPATH
-#LIBSNDFILE.files += $$LIBVORBISFILE_FILEPATH
 LIBSNDFILE.files += $$LIBVORBIS_FILEPATH
+LIBSNDFILE.files += $$LIBOPUS_FILEPATH
 LIBSNDFILE.files += $$LIBSNDFILE_FILEPATH
 
 LIBSNDFILE_INSTALL_NAME_TOOL_ID = install_name_tool -id @executable_path/../$$LIBSDIR/$$LIBSNDFILE_FILE \
@@ -50,10 +57,10 @@ LIBVORBIS_INSTALL_NAME_TOOL_ID = install_name_tool -id @executable_path/../$$LIB
                 $$INSTALLROOT/$$LIBSDIR/$$LIBVORBIS_FILE
 LIBVORBISENC_INSTALL_NAME_TOOL_ID = install_name_tool -id @executable_path/../$$LIBSDIR/$$LIBVORBISENC_FILE \
                 $$INSTALLROOT/$$LIBSDIR/$$LIBVORBISENC_FILE
-
+LIBOPUS_INSTALL_NAME_TOOL_ID = install_name_tool -id @executable_path/../$$LIBSDIR/$$LIBOPUS_FILE \
+                $$INSTALLROOT/$$LIBSDIR/$$LIBOPUS_FILE
 
 LIBSNDFILE_ID.path     = $$INSTALLROOT/$$LIBSDIR
 LIBSNDFILE_ID.commands = $$LIBSNDFILE_INSTALL_NAME_TOOL_ID && $$LIBOGG_INSTALL_NAME_TOOL_ID && \
                          $$LIBFLAC_INSTALL_NAME_TOOL_ID && $$LIBVORBIS_INSTALL_NAME_TOOL_ID && \
-                         $$LIBVORBISENC_INSTALL_NAME_TOOL_ID
-
+                         $$LIBVORBISENC_INSTALL_NAME_TOOL_ID && $$LIBOPUS_INSTALL_NAME_TOOL_ID
diff --git a/platforms/macos/libusb-nametool.pri b/platforms/macos/libusb-nametool.pri
@@ -1,13 +1,7 @@
-LIBUSB0_DIR      = $$system("pkg-config --variable libdir libusb")
-LIBUSB0_FILE     = libusb-0.1.4.dylib
-LIBUSB0_FILEPATH = $$LIBUSB0_DIR/$$LIBUSB0_FILE
-
 LIBUSB1_DIR      = $$system("pkg-config --variable libdir libusb-1.0")
 LIBUSB1_FILE     = libusb-1.0.0.dylib
 LIBUSB1_FILEPATH = $$LIBUSB1_DIR/$$LIBUSB1_FILE
 
-LIBUSB0_INSTALL_NAME_TOOL = install_name_tool -change $$LIBUSB0_FILEPATH \
-                @executable_path/../$$LIBSDIR/$$LIBUSB0_FILE
 LIBUSB1_INSTALL_NAME_TOOL = install_name_tool -change $$LIBUSB1_FILEPATH \
                 @executable_path/../$$LIBSDIR/$$LIBUSB1_FILE
 
@@ -16,17 +10,13 @@ contains(PKGCONFIG, libusb) {
         nametool.commands += "&&"
     }
 
-    nametool.commands += $$LIBUSB0_INSTALL_NAME_TOOL $$OUTFILE && \
-                 $$LIBUSB1_INSTALL_NAME_TOOL $$OUTFILE
+    nametool.commands += $$LIBUSB1_INSTALL_NAME_TOOL $$OUTFILE
 }
 
 LIBUSB.path   = $$INSTALLROOT/$$LIBSDIR
-LIBUSB.files += $$LIBUSB0_FILEPATH
 LIBUSB.files += $$LIBUSB1_FILEPATH
 
-LIBUSB0_INSTALL_NAME_TOOL_ID = install_name_tool -id @executable_path/../$$LIBSDIR/$$LIBUSB0_FILE \
-                $$INSTALLROOT/$$LIBSDIR/$$LIBUSB0_FILE
 LIBUSB1_INSTALL_NAME_TOOL_ID = install_name_tool -id @executable_path/../$$LIBSDIR/$$LIBUSB1_FILE \
                 $$INSTALLROOT/$$LIBSDIR/$$LIBUSB1_FILE
 LIBUSB_ID.path     = $$INSTALLROOT/$$LIBSDIR
-LIBUSB_ID.commands = $$LIBUSB0_INSTALL_NAME_TOOL_ID && $$LIBUSB1_INSTALL_NAME_TOOL_ID
+LIBUSB_ID.commands = $$LIBUSB1_INSTALL_NAME_TOOL_ID
diff --git a/platforms/macos/macos.pro b/platforms/macos/macos.pro
@@ -100,7 +100,7 @@ include(libsndfile-nametool.pri)
 
 INSTALLS += $$libraryTargetID(LIBQLCENGINE, libqlcplusengine.1.dylib)
 INSTALLS += LIBUSB LIBUSB_ID
-INSTALLS += $$systemLibTarget(LIBFTDI, libftdi1.2.dylib, libftdi1) $$libraryTargetID(LIBFTDI, libftdi1.2.dylib)
+INSTALLS += $$systemLibTarget(LIBFTDI, libftdi1.2.5.0.dylib, libftdi1) $$libraryTargetID(LIBFTDI, libftdi1.2.5.0.dylib)
 INSTALLS += $$systemLibTarget(LIBMAD, libmad.0.dylib, mad) $$libraryTargetID(LIBMAD, libmad.0.dylib)
 INSTALLS += LIBSNDFILE LIBSNDFILE_ID
 INSTALLS += $$systemLibTarget(LIBFFTW, libfftw3.3.dylib, fftw3) $$libraryTargetID(LIBFFTW, libfftw3.3.dylib)
@@ -164,16 +164,10 @@ qtnametool.commands += && $$LIBQTCORE_INSTALL_NAME_TOOL \
       $$INSTALLROOT/$$LIBSDIR/$$LIBQTSCRIPT_DIR/$$LIBQTSCRIPT_FILE
 }
 
-# Libftdi depends on libusb0.1 & 1.0
-qtnametool.commands += && $$LIBUSB0_INSTALL_NAME_TOOL \
-    $$INSTALLROOT/$$LIBSDIR/$$LIBFTDI_FILE
+# Libftdi depends on libusb1.0
 qtnametool.commands += && $$LIBUSB1_INSTALL_NAME_TOOL \
     $$INSTALLROOT/$$LIBSDIR/$$LIBFTDI_FILE
 
-# Libusb0.1 depends on libusb1.0
-qtnametool.commands += && $$LIBUSB1_INSTALL_NAME_TOOL \
-    $$INSTALLROOT/$$LIBSDIR/$$LIBUSB0_FILE
-
 # libqlcplusengine depends on libmad, libsndfile, libportaudio and libfftw3
 qtnametool.commands += && $$LIBMAD_INSTALL_NAME_TOOL \
     $$INSTALLROOT/$$LIBSDIR/$$LIBQLCENGINE_FILE
@@ -204,7 +198,7 @@ lessThan(QT_MAJOR_VERSION, 5) {
 qtnametool.commands += && $$LIBFFTW_INSTALL_NAME_TOOL \
     $$INSTALLROOT/$$LIBSDIR/$$LIBQLCENGINE_FILE
 
-# libsndfile depends on flac, libvorbis, libvorbisenc and libogg
+# libsndfile depends on flac, libvorbis, libvorbisenc, libopus and libogg
 qtnametool.commands += && $$LIBOGG_INSTALL_NAME_TOOL \
     $$INSTALLROOT/$$LIBSDIR/$$LIBSNDFILE_FILE
 qtnametool.commands += && $$LIBFLAC_INSTALL_NAME_TOOL \
@@ -213,6 +207,8 @@ qtnametool.commands += && $$LIBVORBIS_INSTALL_NAME_TOOL \
     $$INSTALLROOT/$$LIBSDIR/$$LIBSNDFILE_FILE
 qtnametool.commands += && $$LIBVORBISENC_INSTALL_NAME_TOOL \
     $$INSTALLROOT/$$LIBSDIR/$$LIBSNDFILE_FILE
+qtnametool.commands += && $$LIBOPUS_INSTALL_NAME_TOOL \
+    $$INSTALLROOT/$$LIBSDIR/$$LIBSNDFILE_FILE
 
 # libFLAC depends on libogg
 qtnametool.commands += && $$LIBOGG_INSTALL_NAME_TOOL \

diff --git a/plugins/ola/ola.pro b/plugins/ola/ola.pro
@@ -15,6 +15,7 @@ macx: {
     #QMAKE_CXXFLAGS_X86_64 -= -mmacosx-version-min=10.5
     #QMAKE_CXXFLAGS_X86_64 = -mmacosx-version-min=10.7
     QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
+    QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-declarations
 
     # Check for pkg-config and setup queries accordingly.
     # Otherwise, use MacPorts default paths.