From: IOhannes m zmölnig Date: Tue, 20 Aug 2019 12:46:26 +0000 (+0200) Subject: Refresh patches with 'gbp pq' X-Git-Tag: archive/raspbian/0.15.4+ds1-1+rpi1^2~10 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c4841538fbd986a15af71f49ad45cb82e8b4ac6a;p=giada.git Refresh patches with 'gbp pq' --- diff --git a/debian/patches/01-rtaudio5.patch b/debian/patches/01-rtaudio5.patch index bedf726..6215633 100644 --- a/debian/patches/01-rtaudio5.patch +++ b/debian/patches/01-rtaudio5.patch @@ -8,9 +8,11 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 src/deps/rtaudio-mod/RtAudio.h | 113 +- 3 files changed, 10401 insertions(+), 10294 deletions(-) ---- giada.orig/src/core/kernelAudio.cpp -+++ giada/src/core/kernelAudio.cpp -@@ -59,7 +59,7 @@ +diff --git a/src/core/kernelAudio.cpp b/src/core/kernelAudio.cpp +index 4d42806..3e7daf7 100644 +--- a/src/core/kernelAudio.cpp ++++ b/src/core/kernelAudio.cpp +@@ -59,7 +59,7 @@ JackState jackState; jack_client_t* jackGetHandle() { @@ -19,8 +21,10 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 } #endif ---- giada.orig/src/deps/rtaudio-mod/RtAudio.cpp -+++ giada/src/deps/rtaudio-mod/RtAudio.cpp +diff --git a/src/deps/rtaudio-mod/RtAudio.cpp b/src/deps/rtaudio-mod/RtAudio.cpp +index 1586aaa..ad8bdaa 100755 +--- a/src/deps/rtaudio-mod/RtAudio.cpp ++++ b/src/deps/rtaudio-mod/RtAudio.cpp @@ -1,10237 +1,10343 @@ -/************************************************************************/ -/*! \class RtAudio @@ -20602,8 +20606,10 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 + // + // vim: et sts=2 sw=2 + ---- giada.orig/src/deps/rtaudio-mod/RtAudio.h -+++ giada/src/deps/rtaudio-mod/RtAudio.h +diff --git a/src/deps/rtaudio-mod/RtAudio.h b/src/deps/rtaudio-mod/RtAudio.h +index ddb42cc..746bcbc 100755 +--- a/src/deps/rtaudio-mod/RtAudio.h ++++ b/src/deps/rtaudio-mod/RtAudio.h @@ -10,7 +10,7 @@ RtAudio WWW site: http://www.music.mcgill.ca/~gary/rtaudio/ @@ -20627,7 +20633,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 #include /*! \typedef typedef unsigned long RtAudioFormat; -@@ -86,6 +86,7 @@ +@@ -86,6 +86,7 @@ static const RtAudioFormat RTAUDIO_FLOAT64 = 0x20; // Normalized between plus/mi - \e RTAUDIO_MINIMIZE_LATENCY: Attempt to set stream parameters for lowest possible latency. - \e RTAUDIO_HOG_DEVICE: Attempt grab device for exclusive use. - \e RTAUDIO_ALSA_USE_DEFAULT: Use the "default" PCM device (ALSA only). @@ -20635,7 +20641,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 By default, RtAudio streams pass and receive audio data from the client in an interleaved format. By passing the -@@ -111,12 +112,15 @@ +@@ -111,12 +112,15 @@ static const RtAudioFormat RTAUDIO_FLOAT64 = 0x20; // Normalized between plus/mi open the input and/or output stream device(s) for exclusive use. Note that this is not possible with all supported audio APIs. @@ -20652,7 +20658,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 */ typedef unsigned int RtAudioStreamFlags; static const RtAudioStreamFlags RTAUDIO_NONINTERLEAVED = 0x1; // Use non-interleaved buffers (default = interleaved). -@@ -124,6 +128,7 @@ +@@ -124,6 +128,7 @@ static const RtAudioStreamFlags RTAUDIO_MINIMIZE_LATENCY = 0x2; // Attempt to s static const RtAudioStreamFlags RTAUDIO_HOG_DEVICE = 0x4; // Attempt grab device and prevent use by others. static const RtAudioStreamFlags RTAUDIO_SCHEDULE_REALTIME = 0x8; // Try to select realtime scheduling for callback thread. static const RtAudioStreamFlags RTAUDIO_ALSA_USE_DEFAULT = 0x10; // Use the "default" PCM device (ALSA only). @@ -20660,7 +20666,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 /*! \typedef typedef unsigned long RtAudioStreamStatus; \brief RtAudio stream status (over- or underflow) flags. -@@ -195,7 +200,7 @@ +@@ -195,7 +200,7 @@ typedef int (*RtAudioCallback)( void *outputBuffer, void *inputBuffer, */ /************************************************************************/ @@ -20669,7 +20675,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 { public: //! Defined RtAudioError types. -@@ -214,25 +219,22 @@ +@@ -214,25 +219,22 @@ class RtAudioError : public std::exception }; //! The constructor. @@ -20703,7 +20709,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 Type type_; }; -@@ -341,7 +343,7 @@ +@@ -341,7 +343,7 @@ class RtAudio open the input and/or output stream device(s) for exclusive use. Note that this is not possible with all supported audio APIs. @@ -20712,7 +20718,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 to select realtime scheduling (round-robin) for the callback thread. The \c priority parameter will only be used if the RTAUDIO_SCHEDULE_REALTIME flag is set. It defines the thread's realtime priority. -@@ -375,7 +377,7 @@ +@@ -375,7 +377,7 @@ class RtAudio }; //! A static function to determine the current RtAudio version. @@ -20721,7 +20727,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 //! A static function to determine the available compiled audio APIs. /*! -@@ -383,7 +385,7 @@ +@@ -383,7 +385,7 @@ class RtAudio the enumerated list values. Note that there can be more than one API compiled for certain operating systems. */ @@ -20730,7 +20736,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 //! The class constructor. /*! -@@ -401,18 +403,18 @@ +@@ -401,18 +403,18 @@ class RtAudio If a stream is running or open, it will be stopped and closed automatically. */ @@ -20753,7 +20759,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 //! Return an RtAudio::DeviceInfo structure for a specified device number. /*! -@@ -435,7 +437,7 @@ +@@ -435,7 +437,7 @@ class RtAudio client's responsibility to verify that a device is available before attempting to open a stream. */ @@ -20762,7 +20768,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 //! A function that returns the index of the default input device. /*! -@@ -445,7 +447,7 @@ +@@ -445,7 +447,7 @@ class RtAudio client's responsibility to verify that a device is available before attempting to open a stream. */ @@ -20771,7 +20777,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 //! A public function for opening a stream with the specified parameters. /*! -@@ -477,7 +479,7 @@ +@@ -477,7 +479,7 @@ class RtAudio from within the callback function. \param options An optional pointer to a structure containing various global stream options, including a list of OR'ed RtAudioStreamFlags @@ -20780,7 +20786,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 control stream latency. More buffers typically result in more robust performance, though at a cost of greater latency. If a value of zero is specified, a system-specific median value is -@@ -498,7 +500,7 @@ +@@ -498,7 +500,7 @@ class RtAudio If a stream is not open, this function issues a warning and returns (no exception is thrown). */ @@ -20789,7 +20795,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 //! A function that starts a stream. /*! -@@ -528,10 +530,10 @@ +@@ -528,10 +530,10 @@ class RtAudio void abortStream( void ); //! Returns true if a stream is open and false if not. @@ -20802,7 +20808,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 //! Returns the number of elapsed seconds since the stream was started. /*! -@@ -565,14 +567,15 @@ +@@ -565,14 +567,15 @@ class RtAudio unsigned int getStreamSampleRate( void ); //! Specify whether warning messages should be printed to stderr. @@ -20822,7 +20828,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 }; // Operating system dependent thread functionality. -@@ -618,7 +621,7 @@ +@@ -618,7 +621,7 @@ struct CallbackInfo { // Default constructor. CallbackInfo() @@ -20831,7 +20837,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 }; // **************************************************************** // -@@ -675,12 +678,6 @@ +@@ -675,12 +678,6 @@ class RtApi { public: @@ -20844,7 +20850,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 RtApi(); virtual ~RtApi(); virtual RtAudio::Api getCurrentApi( void ) = 0; -@@ -790,7 +787,7 @@ +@@ -790,7 +787,7 @@ protected: "warning" message is reported and FAILURE is returned. A successful probe is indicated by a return value of SUCCESS. */ @@ -20853,7 +20859,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 unsigned int firstChannel, unsigned int sampleRate, RtAudioFormat format, unsigned int *bufferSize, RtAudio::StreamOptions *options ); -@@ -824,6 +821,8 @@ +@@ -824,6 +821,8 @@ protected: //! Protected common method that sets up the parameters for buffer conversion. void setConvertInfo( StreamMode mode, unsigned int firstChannel ); @@ -20862,7 +20868,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 }; // **************************************************************** // -@@ -832,22 +831,22 @@ +@@ -832,22 +831,22 @@ protected: // // **************************************************************** // @@ -20893,7 +20899,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 // RtApi Subclass prototypes. -@@ -882,7 +881,7 @@ +@@ -882,7 +881,7 @@ public: private: @@ -20902,7 +20908,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 unsigned int firstChannel, unsigned int sampleRate, RtAudioFormat format, unsigned int *bufferSize, RtAudio::StreamOptions *options ); -@@ -916,10 +915,12 @@ +@@ -916,10 +915,12 @@ public: private: @@ -20916,7 +20922,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 }; #endif -@@ -952,7 +953,7 @@ +@@ -952,7 +953,7 @@ public: std::vector devices_; void saveDeviceInfo( void ); bool coInitialized_; @@ -20925,7 +20931,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 unsigned int firstChannel, unsigned int sampleRate, RtAudioFormat format, unsigned int *bufferSize, RtAudio::StreamOptions *options ); -@@ -991,7 +992,7 @@ +@@ -991,7 +992,7 @@ public: bool buffersRolling; long duplexPrerollBytes; std::vector dsDevices; @@ -20934,7 +20940,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 unsigned int firstChannel, unsigned int sampleRate, RtAudioFormat format, unsigned int *bufferSize, RtAudio::StreamOptions *options ); -@@ -1062,7 +1063,7 @@ +@@ -1062,7 +1063,7 @@ public: std::vector devices_; void saveDeviceInfo( void ); @@ -20943,7 +20949,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 unsigned int firstChannel, unsigned int sampleRate, RtAudioFormat format, unsigned int *bufferSize, RtAudio::StreamOptions *options ); -@@ -1126,7 +1127,7 @@ +@@ -1126,7 +1127,7 @@ public: private: @@ -20952,7 +20958,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 unsigned int firstChannel, unsigned int sampleRate, RtAudioFormat format, unsigned int *bufferSize, RtAudio::StreamOptions *options ); -@@ -1151,7 +1152,7 @@ +@@ -1151,7 +1152,7 @@ public: private: diff --git a/debian/patches/02-rtmidi-pkgconfig.patch b/debian/patches/02-rtmidi-pkgconfig.patch index 112d076..0f5a869 100644 --- a/debian/patches/02-rtmidi-pkgconfig.patch +++ b/debian/patches/02-rtmidi-pkgconfig.patch @@ -1,10 +1,17 @@ -From: James Cowgill -Date: Wed, 25 Oct 2017 14:25:50 +0200 -Subject: build with new rtmidi lib. - ---- giada.orig/Makefile.am -+++ giada/Makefile.am -@@ -358,7 +358,7 @@ +From: James Cowgill +Date: Wed, 25 Oct 2017 14:25:50 +0200 +Subject: build with new rtmidi lib. + +--- + Makefile.am | 7 ++++--- + configure.ac | 18 +----------------- + 2 files changed, 5 insertions(+), 20 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 93e11fc..3c4b47e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -358,7 +358,7 @@ cppFlags += \ -D__WINDOWS_DS__ ldAdd += -ldsound -lwsock32 -lm -lfltk -lwininet -lgdi32 -lshell32 -lvfw32 \ @@ -13,7 +20,7 @@ Subject: build with new rtmidi lib. -lwinmm -lsetupapi -lksuser -ljansson -limm32 -lglu32 -lshell32 -lversion \ -lopengl32 -loleaut32 -lshlwapi -lcomdlg32 -lflac -lvorbis -logg -lvorbisenc -@@ -371,9 +371,10 @@ +@@ -371,9 +371,10 @@ if LINUX # Add preprocessor flags to enable ALSA, Pulse and JACK in RtAudio. cppFlags += -D__LINUX_ALSA__ -D__LINUX_PULSE__ -D__UNIX_JACK__ @@ -25,7 +32,7 @@ Subject: build with new rtmidi lib. -lfreetype -lfontconfig -lXrender -lXfixes -lXcursor -lXinerama endif -@@ -388,7 +389,7 @@ +@@ -388,7 +389,7 @@ cppFlags += -D__MACOSX_CORE__ # -ObjC++: Juce requires to build some Objective C code cxxFlags += -ObjC++ @@ -34,9 +41,11 @@ Subject: build with new rtmidi lib. -lFLAC -logg -lvorbis -lvorbisenc ldFlags += -framework CoreAudio -framework Cocoa -framework Carbon \ ---- giada.orig/configure.ac -+++ giada/configure.ac -@@ -129,23 +129,7 @@ +diff --git a/configure.ac b/configure.ac +index 9f772f6..a416559 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -129,23 +129,7 @@ AC_CHECK_HEADER( ) AC_LANG_POP