[SCM] milkytracker/master: Update rtmidi patch to detect rtmidi with pkg-config. (Closes: #828957)
jcowgill at users.alioth.debian.org
jcowgill at users.alioth.debian.org
Wed Jun 29 16:49:43 UTC 2016
The following commit has been merged in the master branch:
commit 43c5f4924981d9bb2fb6f230bce8ae68c6a92def
Author: James Cowgill <james410 at cowgill.org.uk>
Date: Wed Jun 29 17:25:11 2016 +0100
Update rtmidi patch to detect rtmidi with pkg-config. (Closes: #828957)
diff --git a/debian/patches/02_debundle-rtmidi.patch b/debian/patches/02_debundle-rtmidi.patch
index b581024..a449f7a 100644
--- a/debian/patches/02_debundle-rtmidi.patch
+++ b/debian/patches/02_debundle-rtmidi.patch
@@ -1,23 +1,9 @@
-Description: Debundle RtMidi
- Changes needed to allow building against the system version of RtMidi
+Description: Use system version of RtMidi
+ Backported from these two upstream patches:
+ https://github.com/Deltafire/MilkyTracker/commit/b36c3a5c232d5d1fdf6a48fd501b5e767366a463
+ https://github.com/Deltafire/MilkyTracker/commit/c3c651cc95bd3a243779ee67a66114e8874ecfb2
Author: Joonas Sarajärvi <muep at iki.fi>
-Origin: vendor, http://pkgs.fedoraproject.org/cgit/rpms/milkytracker.git/tree/milkytracker-0.90.86-system-rtmidi.patch?id=2cf05bf00c3b03e772229dfaad5a570c899b7250
-Applied-Upstream: https://github.com/Deltafire/MilkyTracker/commit/b36c3a5c232d5d1fdf6a48fd501b5e767366a463
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/midi/Makefile.am
-+++ b/src/midi/Makefile.am
-@@ -1,8 +1,8 @@
- noinst_LIBRARIES = libmidi.a
-
--libmidi_a_SOURCES = posix/MidiReceiver_pthread.cpp rtmidi/RtMidi.cpp
-+libmidi_a_SOURCES = posix/MidiReceiver_pthread.cpp
-
--noinst_HEADERS = posix/MidiReceiver_pthread.h rtmidi/RtError.h rtmidi/RtMidi.h \
-+noinst_HEADERS = posix/MidiReceiver_pthread.h \
- MidiTools.h
-
- AM_CPPFLAGS=-D__LINUX_ALSASEQ__ -D__LINUX__ -DMILKYTRACKER ${ALSA_CFLAGS} \
+
--- a/src/midi/posix/MidiReceiver_pthread.cpp
+++ b/src/midi/posix/MidiReceiver_pthread.cpp
@@ -32,7 +32,6 @@
@@ -37,14 +23,101 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
{
error.printMessage();
goto cleanup;
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,15 +31,20 @@ AC_ARG_WITH([alsa],
+
+ if test "x$with_alsa" != xno; then
+ AM_PATH_ALSA([1.0.0],[
+- RTMIDI="../midi/libmidi.a"
+- RTMIDI_DIR="midi"
+- AC_SUBST(RTMIDI)
+- AC_SUBST(RTMIDI_DIR)],
+- [if test "x$with_alsa" != xcheck; then
++ # ALSA found, check for RtMidi
++ PKG_CHECK_MODULES([RTMIDI],[rtmidi])
++ MIDI_LIB="../midi/libmidi.a"
++ MIDI_LIB_DIR="midi"
++ AC_SUBST(MIDI_LIB)
++ AC_SUBST(MIDI_LIB_DIR)
++ ],[
++ # ALSA not found
++ if test "x$with_alsa" != xcheck; then
+ AC_MSG_FAILURE([--with-alsa was given, but test for alsa failed])
+ else
+ AC_MSG_WARN([ALSA not found - midi support disabled])
+- fi])
++ fi
++ ])
+ fi
+
+ AC_SEARCH_LIBS(gzopen, z, AC_DEFINE([HAVE_LIBZ], [1], [Define to 1 if you have the 'libz' library.]),)
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,3 +1,3 @@
+-SUBDIRS = milkyplay ${RTMIDI_DIR} ppui fx compression tracker
++SUBDIRS = milkyplay $(MIDI_LIB_DIR) ppui fx compression tracker
+
+ DIST_SUBDIRS = milkyplay midi ppui fx compression tracker
+--- a/src/midi/Makefile.am
++++ b/src/midi/Makefile.am
+@@ -1,17 +1,16 @@
+ noinst_LIBRARIES = libmidi.a
+
+-libmidi_a_SOURCES = posix/MidiReceiver_pthread.cpp rtmidi/RtMidi.cpp
++libmidi_a_SOURCES = posix/MidiReceiver_pthread.cpp
+
+-noinst_HEADERS = posix/MidiReceiver_pthread.h rtmidi/RtError.h rtmidi/RtMidi.h \
+-MidiTools.h
++noinst_HEADERS = posix/MidiReceiver_pthread.h MidiTools.h
+
+ AM_CPPFLAGS=-D__LINUX_ALSASEQ__ -D__LINUX__ -DMILKYTRACKER ${ALSA_CFLAGS} \
+-${SDL_CFLAGS}
++$(SDL_CFLAGS) $(RTMIDI_CFLAGS)
+
+ AM_CPPFLAGS += -I$(top_srcdir)/src/milkyplay -I$(top_srcdir)/src/ppui \
+ -I$(top_srcdir)/src/tracker -I$(top_srcdir)/src/ppui/osinterface \
+ -I$(top_srcdir)/src/ppui/osinterface/sdl \
+--I$(top_srcdir)/src/ppui/osinterface/posix -I$(top_srcdir)/src/midi/rtmidi
++-I$(top_srcdir)/src/ppui/osinterface/posix
+
+ EXTRA_DIST = win32/LongMsg.cpp win32/LongMsg.h win32/MIDIInDevice.cpp \
+ win32/MIDIInDevice.h win32/MIDIMsg.h win32/MidiReceiver_win32.cpp \
--- a/src/tracker/Makefile.am
+++ b/src/tracker/Makefile.am
-@@ -76,7 +76,7 @@ $(top_builddir)/src/ppui/libppui.a \
+@@ -48,17 +48,18 @@ TabHeaderControl.h TabManager.h TabTitle
+ TitlePageManager.h ToolInvokeHelper.h Tracker.h TrackerConfig.h \
+ TrackerSettingsDatabase.h Undo.h VRand.h Zapper.h sdl/SDL_KeyTranslation.h
+
+-AM_CPPFLAGS = -DMILKYTRACKER -D__THREADTIMER__ -D__LINUX__ ${SDL_CFLAGS}
++AM_CPPFLAGS = -DMILKYTRACKER -D__THREADTIMER__ -D__LINUX__ $(SDL_CFLAGS) \
++$(RTMIDI_CFLAGS)
+
+-AM_CPPFLAGS += -I$(top_srcdir)/src/${RTMIDI_DIR} -I$(top_srcdir)/src/compression \
+--I$(top_srcdir)/src/fx -I$(top_srcdir)/src/milkyplay -I$(top_srcdir)/src/ppui \
+--I$(top_srcdir)/src/tracker -I$(top_srcdir)/src/midi/posix -I../midi/rtmidi \
++AM_CPPFLAGS += -I$(top_srcdir)/src/compression -I$(top_srcdir)/src/fx \
++-I$(top_srcdir)/src/milkyplay -I$(top_srcdir)/src/ppui \
++-I$(top_srcdir)/src/tracker -I$(top_srcdir)/src/midi/posix \
+ -I$(top_srcdir)/src/ppui/osinterface -I$(top_srcdir)/src/ppui/osinterface/sdl \
+ -I$(top_srcdir)/src/ppui/osinterface/posix -I$(top_srcdir)/src/ppui/sdl -Isdl
+
+ # The following cannot be linked as a static library, the linker will regard
+ # the DecompressorXXX files as unused and therefore won't pull them in:
+-compressionLib = $(top_builddir)/src/compression/Decompressor.o \
++COMPRESSION_LIB = $(top_builddir)/src/compression/Decompressor.o \
+ $(top_builddir)/src/compression/DecompressorGZIP.o \
+ $(top_builddir)/src/compression/DecompressorLHA.o \
+ $(top_builddir)/src/compression/DecompressorPP20.o \
+@@ -74,9 +75,9 @@ milkytracker_LDADD = $(top_builddir)/src
+ $(top_builddir)/src/ppui/osinterface/libosinterface.a \
+ $(top_builddir)/src/ppui/libppui.a \
$(top_builddir)/src/ppui/osinterface/libosinterface.a \
- $(top_builddir)/src/fx/libfx.a $(compressionLib) $(RTMIDI) $(SDL_LIBS) \
+-$(top_builddir)/src/fx/libfx.a $(compressionLib) $(RTMIDI) $(SDL_LIBS) \
++$(top_builddir)/src/fx/libfx.a $(COMPRESSION_LIB) $(MIDI_LIB) \
$(top_builddir)/src/compression/zziplib/generic/libzzip.a \
-$(Z_LIBS) $(ALSA_LIBS)
-+$(Z_LIBS) $(ALSA_LIBS) -lrtmidi
++$(SDL_LIBS) $(ALSA_LIBS) $(Z_LIBS) $(RTMIDI_LIBS)
#$(ZZIP_LIBS) read below
# NOTE: The MilkyTracker source contains a MODIFIED version of the zzip
diff --git a/debian/patches/03_debundle-zzlib.patch b/debian/patches/03_debundle-zzlib.patch
index 83cc0f0..2abdab5 100644
--- a/debian/patches/03_debundle-zzlib.patch
+++ b/debian/patches/03_debundle-zzlib.patch
@@ -193,7 +193,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
# Checks for libraries.
AC_ARG_WITH([alsa],
-@@ -43,8 +43,8 @@ if test "x$with_alsa" != xno; then
+@@ -48,8 +48,8 @@ if test "x$with_alsa" != xno; then
fi
AC_SEARCH_LIBS(gzopen, z, AC_DEFINE([HAVE_LIBZ], [1], [Define to 1 if you have the 'libz' library.]),)
@@ -204,7 +204,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
SDL_VERSION=1.2.0
AM_PATH_SDL($SDL_VERSION,, AC_MSG_ERROR([Please install libSDL]))
-@@ -117,7 +117,6 @@ AC_CONFIG_HEADER(config.h)
+@@ -122,7 +122,6 @@ AC_CONFIG_HEADER(config.h)
AC_CONFIG_FILES([Makefile
src/Makefile
src/compression/Makefile
@@ -214,19 +214,19 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
src/milkyplay/Makefile
--- a/src/tracker/Makefile.am
+++ b/src/tracker/Makefile.am
-@@ -75,14 +75,7 @@ $(top_builddir)/src/ppui/osinterface/lib
+@@ -76,14 +76,7 @@ $(top_builddir)/src/ppui/osinterface/lib
$(top_builddir)/src/ppui/libppui.a \
$(top_builddir)/src/ppui/osinterface/libosinterface.a \
- $(top_builddir)/src/fx/libfx.a $(compressionLib) $(RTMIDI) $(SDL_LIBS) \
+ $(top_builddir)/src/fx/libfx.a $(COMPRESSION_LIB) $(MIDI_LIB) \
-$(top_builddir)/src/compression/zziplib/generic/libzzip.a \
--$(Z_LIBS) $(ALSA_LIBS) -lrtmidi
+-$(SDL_LIBS) $(ALSA_LIBS) $(Z_LIBS) $(RTMIDI_LIBS)
-#$(ZZIP_LIBS) read below
-
-# NOTE: The MilkyTracker source contains a MODIFIED version of the zzip
-# library, which is statically linked to the executable. Simply changing the
-# build scripts to link against the system libzzip will result in non-working
-# zip support!
-+$(Z_LIBS) $(ALSA_LIBS) -lrtmidi $(ZZIP_LIBS)
++$(SDL_LIBS) $(ALSA_LIBS) $(Z_LIBS) $(RTMIDI_LIBS) $(ZZIP_LIBS)
EXTRA_DIST = carbon/Carbon_Definitions.h carbon/Carbon_main.cpp \
carbon/InfoPlist.strings carbon/KeyTranslation.cpp carbon/KeyTranslation.h \
diff --git a/debian/patches/04_use-lhasa.patch b/debian/patches/04_use-lhasa.patch
index 7b45675..231b2a6 100644
--- a/debian/patches/04_use-lhasa.patch
+++ b/debian/patches/04_use-lhasa.patch
@@ -38,7 +38,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
#AM_CPPFLAGS = -I../ppui -I../ppui/osinterface -I../ppui/osinterface/posix
--- a/src/tracker/Makefile.am
+++ b/src/tracker/Makefile.am
-@@ -66,8 +66,7 @@ $(top_builddir)/src/compression/Decompre
+@@ -67,8 +67,7 @@ $(top_builddir)/src/compression/Decompre
$(top_builddir)/src/compression/DecompressorZIP.o \
$(top_builddir)/src/compression/zziplib/MyIO.o \
$(top_builddir)/src/compression/PP20.o \
@@ -48,12 +48,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
# add -lGL for experimental OpenGL support (and see ../ppui/Makefile.am)
milkytracker_LDADD = $(top_builddir)/src/milkyplay/libmilkyplay.a \
-@@ -75,7 +74,7 @@ $(top_builddir)/src/ppui/osinterface/lib
+@@ -76,7 +75,7 @@ $(top_builddir)/src/ppui/osinterface/lib
$(top_builddir)/src/ppui/libppui.a \
$(top_builddir)/src/ppui/osinterface/libosinterface.a \
- $(top_builddir)/src/fx/libfx.a $(compressionLib) $(RTMIDI) $(SDL_LIBS) \
--$(Z_LIBS) $(ALSA_LIBS) -lrtmidi $(ZZIP_LIBS)
-+$(Z_LIBS) $(ALSA_LIBS) -lrtmidi $(ZZIP_LIBS) -llhasa
+ $(top_builddir)/src/fx/libfx.a $(COMPRESSION_LIB) $(MIDI_LIB) \
+-$(SDL_LIBS) $(ALSA_LIBS) $(Z_LIBS) $(RTMIDI_LIBS) $(ZZIP_LIBS)
++$(SDL_LIBS) $(ALSA_LIBS) $(Z_LIBS) $(RTMIDI_LIBS) $(ZZIP_LIBS) -llhasa
EXTRA_DIST = carbon/Carbon_Definitions.h carbon/Carbon_main.cpp \
carbon/InfoPlist.strings carbon/KeyTranslation.cpp carbon/KeyTranslation.h \
--
milkytracker packaging
More information about the pkg-multimedia-commits
mailing list