haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated sdl-mixer to reflect recent license change. Removed patch as it's been applied upstream.

Browse Source
This commit is contained in:
Scott McCreary
2012-01-04 23:20:37 +00:00
parent 9b2534f5b6
commit 2ebefcec56
2 changed files with 2 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
media-libs/sdl-mixer/patches/sdl-mixer-1.2-hg.patch
View File

@@ -1,27 +0,0 @@
diff -urN sdl-mixer-1.2-hg/native_midi/native_midi_haiku.cpp sdl-mixer-1.2-hg-haiku/native_midi/native_midi_haiku.cpp
--- sdl-mixer-1.2-hg/native_midi/native_midi_haiku.cpp 2011-04-06 14:55:40.152305664 +0000
+++ sdl-mixer-1.2-hg-haiku/native_midi/native_midi_haiku.cpp 2011-04-06 14:08:15.000000000 +0000
@@ -259,3 +259,23 @@
currentSong = song;
}
void native_midi_stop()
+{
+ if (currentSong == NULL) return;
+ currentSong->store->Stop();
+ currentSong->store->Disconnect(&synth);
+ while (currentSong->store->IsPlaying())
+ usleep(1000);
+ currentSong = NULL;
+}
+int native_midi_active()
+{
+ if (currentSong == NULL) return 0;
+ return currentSong->store->CurrentEvent() < currentSong->store->CountEvents();
+}
+
+const char* native_midi_error(void)
+{
+ return lasterr;
+}
+
+#endif /* __HAIKU__ */

8
media-libs/sdl-mixer/sdl-mixer-1.2-hg.bep
View File

@@ -14,10 +14,6 @@ DEPEND="libsdl >= 1.2.14
BUILD {
cd sdl-mixer-1.2-hg
libtoolize --force --copy --install
cp ltmain.sh build-scripts/ltmain.sh
aclocal --install -I acinclude
./autogen.sh
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -32,5 +28,5 @@ INSTALL {
make install
}
LICENSE="GNU LGPL v2.1"
COPYRIGHT="1997-2011 Sam Lantinga"
LICENSE="Zlib"
COPYRIGHT="1997-2012 Sam Lantinga"