Refresh patches

diff --git a/debian/patches/02-rtmidi-pkgconfig.patch b/debian/patches/02-rtmidi-pkgconfig.patch
index 4390f310c5effe039da7483fb8c6b6e80436e0e8..112d07625100fec5770c62378adbed70d3db3ded 100644 (file)
--- a/debian/patches/02-rtmidi-pkgconfig.patch
+++ b/debian/patches/02-rtmidi-pkgconfig.patch
@@ -4,19 +4,36 @@ Subject: build with new rtmidi lib.
 \r
 --- giada.orig/Makefile.am
 +++ giada/Makefile.am
-@@ -360,10 +360,10 @@
- if LINUX
+@@ -358,7 +358,7 @@
+       -D__WINDOWS_DS__
+ 
+ ldAdd += -ldsound -lwsock32 -lm -lfltk -lwininet -lgdi32 -lshell32 -lvfw32 \
+-  -lrpcrt4 -luuid -lcomctl32 -lole32 -lws2_32 -lsndfile -lsamplerate -lrtmidi \
++  -lrpcrt4 -luuid -lcomctl32 -lole32 -lws2_32 -lsndfile -lsamplerate $(RTMIDI_LIBS) \
+   -lwinmm -lsetupapi -lksuser -ljansson -limm32 -lglu32 -lshell32 -lversion \
+   -lopengl32 -loleaut32 -lshlwapi -lcomdlg32 -lflac -lvorbis -logg -lvorbisenc
+ 
+@@ -371,9 +371,10 @@
  
  # Add preprocessor flags to enable ALSA, Pulse and JACK in RtAudio.
--cppFlags += -D__LINUX_ALSA__ -D__LINUX_PULSE__ -D__UNIX_JACK__
+ cppFlags += -D__LINUX_ALSA__ -D__LINUX_PULSE__ -D__UNIX_JACK__
 +cppFlags += $(RTMIDI_CFLAGS)
  
  ldAdd += -lsndfile -lfltk -lXext -lX11 -lXft -lXpm -lm -ljack -lasound \
 -  -lpthread -ldl -lpulse-simple -lpulse -lsamplerate -lrtmidi -ljansson \
 +  -lpthread -ldl -lpulse-simple -lpulse -lsamplerate $(RTMIDI_LIBS) -ljansson \
-   -lfreetype
+   -lfreetype -lfontconfig -lXrender -lXfixes -lXcursor -lXinerama
  
  endif
+@@ -388,7 +389,7 @@
+ # -ObjC++: Juce requires to build some Objective C code
+ cxxFlags += -ObjC++
+ 
+-ldAdd += -lsndfile -lfltk -lrtmidi -lsamplerate -ljansson -lm -lpthread \
++ldAdd += -lsndfile -lfltk $(RTMIDI_LIBS) -lsamplerate -ljansson -lm -lpthread \
+   -lFLAC -logg -lvorbis -lvorbisenc
+ 
+ ldFlags += -framework CoreAudio -framework Cocoa -framework Carbon \
 --- giada.orig/configure.ac
 +++ giada/configure.ac
 @@ -129,23 +129,7 @@