From 2ebefcec56f27ece26882ee21d48dbb2c1819c63 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Wed, 4 Jan 2012 23:20:37 +0000
Subject: [PATCH] Updated sdl-mixer to reflect recent license change.  Removed
 patch as it's been applied upstream.

---
 .../sdl-mixer/patches/sdl-mixer-1.2-hg.patch  | 27 -------------------
 media-libs/sdl-mixer/sdl-mixer-1.2-hg.bep     |  8 ++----
 2 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 media-libs/sdl-mixer/patches/sdl-mixer-1.2-hg.patch

diff --git a/media-libs/sdl-mixer/patches/sdl-mixer-1.2-hg.patch b/media-libs/sdl-mixer/patches/sdl-mixer-1.2-hg.patch
deleted file mode 100644
index 6f47373de..000000000
--- a/media-libs/sdl-mixer/patches/sdl-mixer-1.2-hg.patch
+++ /dev/null
@@ -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__ */
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2-hg.bep b/media-libs/sdl-mixer/sdl-mixer-1.2-hg.bep
index 406daca06..53fad17fc 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2-hg.bep
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2-hg.bep
@@ -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"