diff --git a/media-libs/libsdl/libsdl-1.2-hg.bep b/media-libs/libsdl/libsdl-1.2-hg.bep
index 7359e7ae6..d2148dd3d 100644
--- a/media-libs/libsdl/libsdl-1.2-hg.bep
+++ b/media-libs/libsdl/libsdl-1.2-hg.bep
@@ -25,5 +25,77 @@ INSTALL {
 	cd libsdl-1.2-hg
 	make install
 }
+
+TEST {
+	cd libsdl-1.2-hg/test
+	autogen.sh
+	./configure
+	make
+	echo testvidoinfo
+	testvidinfo
+	echo testgl
+	testgl
+	echo testwm
+	testwm
+	echo testhread
+	testhread
+	echo testsprite
+	testsprite
+	echo testdyngl
+	testdyngl
+	echo testoverlay
+	testoverlay
+	echo testoverlay2
+	testoverlay2
+	echo threadwin
+	threadwin
+	echo testalpha
+	testalpha
+	echo testiconv
+	testiconv
+	echo testtimer
+	testtimer
+	echo graywin
+	graywin
+	echo testerror
+	testerror
+	echo torturethread
+	torturethread
+	echo testbitmap
+	testbitmap
+	echo testjoystick
+	testjoystick
+	echo testver
+	testver
+	echo testfile
+	testfile
+	echo testpalette
+	testpalette
+	echo loopwave
+	loopwave
+	echo testblitspeed
+	testblitspeed
+	echo testkeys
+	testkeys
+	echo testcursor
+	testcursor
+	echo checkkeys
+	checkkeys
+	echo testgamma
+	testgamma
+	echo testplatform
+	testplatform
+	echo testcdrom
+	testcdrom
+	echo testloadso
+	testloadso
+	echo testwim
+	testwin
+	echo testsem
+	testsem
+	echo testlock
+	testlock
+}
+
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1997-2010 Sam Lantinga"
diff --git a/media-libs/libsdl/patches/libsdl-1.2-hg.patch b/media-libs/libsdl/patches/libsdl-1.2-hg.patch
index 47c72dba7..2b17e153a 100644
--- a/media-libs/libsdl/patches/libsdl-1.2-hg.patch
+++ b/media-libs/libsdl/patches/libsdl-1.2-hg.patch
@@ -1,6 +1,43 @@
-diff -NaurbE libsdl-1.2-hg/src/video/bwindow/SDL_sysevents.cc libsdl-1.2-hg-gci/src/video/bwindow/SDL_sysevents.cc
---- libsdl-1.2-hg/src/video/bwindow/SDL_sysevents.cc	2010-12-06 18:12:49.755761152 +0100
-+++ libsdl-1.2-hg-gci/src/video/bwindow/SDL_sysevents.cc	2010-12-06 18:10:31.250871808 +0100
+diff -r 930614179450 src/video/bwindow/SDL_BWin.h
+--- a/src/video/bwindow/SDL_BWin.h	Fri Dec 03 16:55:25 2010 -0800
++++ b/src/video/bwindow/SDL_BWin.h	Thu Dec 23 09:38:48 2010 +0000
+@@ -113,7 +113,9 @@
+ 				SDL_GLView = new BGLView(Bounds(), "SDL GLView",
+ 					 	B_FOLLOW_ALL_SIDES, (B_WILL_DRAW|B_FRAME_EVENTS),
+ 					 	gl_flags);
+-				SDL_GLView->EnableDirectMode(true);
++				//TODO: Figure out why directmode isn't working
++				//SDL_GLView->EnableDirectMode(true);
++				SDL_GLView->EnableDirectMode(false);
+ 			}
+ 			if ( the_view != SDL_GLView ) {
+ 				if ( the_view ) {
+@@ -133,17 +135,17 @@
+ 			}
+ 			if ( the_view != SDL_View ) {
+ 				if ( the_view ) {
+-#if SDL_VIDEO_OPENGL
+-					if ( the_view == SDL_GLView ) {
+-						SDL_GLView->UnlockGL();
+-					}
+-#endif
+ 					RemoveChild(the_view);
+ 				}
+ 				AddChild(SDL_View);
+ 				the_view = SDL_View;
+ 			}
+ 		}
++#if SDL_VIDEO_OPENGL
++		if ( the_view == SDL_GLView ) {
++			SDL_GLView->UnlockGL();
++		}
++#endif
+ 		Unlock();
+ 		return(retval);
+ 	}
+diff -r 930614179450 src/video/bwindow/SDL_sysevents.cc
+--- a/src/video/bwindow/SDL_sysevents.cc	Fri Dec 03 16:55:25 2010 -0800
++++ b/src/video/bwindow/SDL_sysevents.cc	Thu Dec 23 09:38:48 2010 +0000
 @@ -36,6 +36,7 @@
  #include "../../events/SDL_sysevents.h"
  #include "../../events/SDL_events_c.h"