From 1ee14ee4227f3ed7b1c16865ab62a23570216a71 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 1 Jan 2011 02:08:05 +0000 Subject: [PATCH] Updated sdl-mixer patch from GCI student Egor Suvorov to add native Haiku midi support --- .../sdl-mixer/patches/sdl-mixer-1.2.11.patch | 37 +++++++++++++++---- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/media-libs/sdl-mixer/patches/sdl-mixer-1.2.11.patch b/media-libs/sdl-mixer/patches/sdl-mixer-1.2.11.patch index 86044181e..56732f64c 100644 --- a/media-libs/sdl-mixer/patches/sdl-mixer-1.2.11.patch +++ b/media-libs/sdl-mixer/patches/sdl-mixer-1.2.11.patch @@ -12,7 +12,7 @@ diff -urN SDL_mixer-1.2.11/Makefile.in SDL_mixer-1.2.11-haiku/Makefile.in diff -urN SDL_mixer-1.2.11/configure.in SDL_mixer-1.2.11-haiku/configure.in --- SDL_mixer-1.2.11/configure.in 2009-11-12 06:41:28.034865152 +0000 +++ SDL_mixer-1.2.11-haiku/configure.in 2010-12-30 16:26:40.889716736 +0000 -@@ -301,10 +301,17 @@ +@@ -301,10 +301,18 @@ use_music_native_midi=yes EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit -Wl,-framework,CoreServices" ;; @@ -24,22 +24,23 @@ diff -urN SDL_mixer-1.2.11/configure.in SDL_mixer-1.2.11-haiku/configure.in if test x$use_music_native_midi = xyes; then EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_NATIVE_MIDI -I\$(srcdir)/native_midi" SOURCES="$SOURCES $srcdir/native_midi/*.c" -+ elif test x$user_music_native_midi = xyes_cpp; then ++ elif test x$use_music_native_midi = xyes_cpp; then + EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_NATIVE_MIDI -I\$(srcdir)/native_midi" -+ SOURCES_CXX="$SOURCES+CXX $srcdir/native_midi/*.cpp" ++ SOURCES="$SOURCES $srcdir/native_midi/*.c" ++ SOURCES_CXX="$SOURCES_CXX $srcdir/native_midi/*.cpp" fi fi AC_ARG_ENABLE([music-native-midi-gpl], -@@ -536,6 +543,15 @@ +@@ -536,6 +545,15 @@ $(objects)/\2.lo: \1/\2.c\\ \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'` +OBJECTS_CXX=`echo $SOURCES_CXX` +DEPENDS_CXX=`echo $SOURCES_CXX` -+OBJECTS_CXX=`echo "$OBJECTS_CXX" | sed 's,[^ ]*/\([^ ]*\)\.cpp,$(objects)/\1.lo,g'` -+DEPENDS_CXX=`echo "$DEPENDS_CXX" | sed 's,\([^ ]*\)/\([^ ]*\)\.c,\\ ++OBJECTS_CXX=`echo "$OBJECTS_CXX" | sed 's,[[^ ]]*/\([[^ ]]*\)\.cpp,$(objects)/\1.lo,g'` ++DEPENDS_CXX=`echo "$DEPENDS_CXX" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.cpp,\\ +$(objects)/\2.lo: \1/\2.cpp\\ -+ \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'` ++ \$(LIBTOOL) --mode=compile \$(CXX) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'` +OBJECTS="$OBJECTS $OBJECTS_CXX" +DEPENDS="$DEPENDS $DEPENDS_CXX" + @@ -49,8 +50,28 @@ diff -urN SDL_mixer-1.2.11/configure.in SDL_mixer-1.2.11-haiku/configure.in diff -urN SDL_mixer-1.2.11/native_midi/native_midi_haiku.cpp SDL_mixer-1.2.11-haiku/native_midi/native_midi_haiku.cpp --- SDL_mixer-1.2.11/native_midi/native_midi_haiku.cpp 1970-01-01 00:00:00.000000000 +0000 +++ SDL_mixer-1.2.11-haiku/native_midi/native_midi_haiku.cpp 2010-12-29 23:05:51.000000000 +0000 -@@ -0,0 +1,261 @@ +@@ -0,0 +1,281 @@ ++/* ++ native_midi_haiku: Native Midi support on HaikuOS for the SDL_mixer library ++ Copyright (C) 2010 Egor Suvorov + ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Library General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Library General Public License for more details. ++ ++ You should have received a copy of the GNU Library General Public ++ License along with this library; if not, write to the Free ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ ++ Egor Suvorov ++ egor_suvorov@mail.ru ++*/ +#include "SDL_config.h" + +#ifdef __HAIKU__