diff --git a/bootstrap-mod.sh b/bootstrap-mod.sh index e63812a..e8b0e2d 100755 --- a/bootstrap-mod.sh +++ b/bootstrap-mod.sh @@ -181,7 +181,7 @@ build_make hylia "${HYLIA_VERSION}" "${HYLIA_EXTRAFLAGS}" # --------------------------------------------------------------------------------------------------------------------- # jack2 -JACK2_VERSION="0d730dd3567f250edaa899af906b8a8593e3492f" +JACK2_VERSION="806da09a120f254ae231c2ef87cf9fe2f4fb4f5b" JACK2_URL="https://github.com/jackaudio/jack2.git" JACK2_EXTRAFLAGS="" @@ -197,7 +197,7 @@ JACK2_EXTRAFLAGS+=" --samplerate=no" JACK2_EXTRAFLAGS+=" --systemd=no" if [ "${LINUX}" -eq 1 ]; then - JACK2_EXTRAFLAGS+=" --platform=linux --portaudio=yes --alsa=yes" + JACK2_EXTRAFLAGS+=" --platform=linux --portaudio=yes --alsa=yes --libdbus=yes" elif [ "${MACOS}" -eq 1 ]; then JACK2_EXTRAFLAGS+=" --platform=darwin" elif [ "${WIN32}" -eq 1 ]; then diff --git a/patches/jack2/01_portaudio-for-all.patch b/patches/jack2/01_portaudio-for-all.patch deleted file mode 100644 index 7cf1259..0000000 --- a/patches/jack2/01_portaudio-for-all.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/windows/portaudio/JackPortAudioDriver.h b/windows/portaudio/JackPortAudioDriver.h -index 9897f60..22e3bc1 100644 ---- a/windows/portaudio/JackPortAudioDriver.h -+++ b/windows/portaudio/JackPortAudioDriver.h -@@ -22,7 +22,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - #include "JackAudioDriver.h" - #include "JackPortAudioDevices.h" -+ -+#ifdef _WIN32 - #include "JackMMCSS.h" -+#endif - - namespace Jack - { -@@ -31,7 +34,11 @@ namespace Jack - \brief The PortAudio driver. - */ - --class JackPortAudioDriver : public JackMMCSS, public JackAudioDriver -+class JackPortAudioDriver : -+#ifdef _WIN32 -+ public JackMMCSS, -+#endif -+ public JackAudioDriver - { - - private: -@@ -55,8 +62,11 @@ class JackPortAudioDriver : public JackMMCSS, public JackAudioDriver - - public: - -- JackPortAudioDriver(const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table, PortAudioDevices* pa_devices) -- : JackMMCSS(), JackAudioDriver(name, alias, engine, table), fStream(NULL), fInputBuffer(NULL), fOutputBuffer(NULL), -+ JackPortAudioDriver(const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table, PortAudioDevices* pa_devices) : -+#ifdef _WIN32 -+ JackMMCSS(), -+#endif -+ JackAudioDriver(name, alias, engine, table), fStream(NULL), fInputBuffer(NULL), fOutputBuffer(NULL), - fInputDevice(paNoDevice), fOutputDevice(paNoDevice), fPaDevices(pa_devices) - {} - -diff --git a/wscript b/wscript -index 86eb395..89a0b2a 100644 ---- a/wscript -+++ b/wscript -@@ -151,7 +151,6 @@ def options(opt): - 'portaudio', - help='Enable Portaudio driver', - conf_dest='BUILD_DRIVER_PORTAUDIO') -- portaudio.check(header_name='windows.h') # only build portaudio on windows - portaudio.check_cfg( - package='portaudio-2.0 >= 19', - uselib_store='PORTAUDIO',