From df64619ea6fd483f5b240a78ac4dfada6161ff55 Mon Sep 17 00:00:00 2001
From: Rezzie <jarnie@gmail.com>
Date: Thu, 11 Aug 2011 10:11:19 +0200
Subject: [PATCH 1/2] Added missing Stg namespace scoping to fix compile
 conflixt with X11 Regions.

---
 libstage/region.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libstage/region.cc b/libstage/region.cc
index 1c8cf5143..ac4f39eeb 100644
--- a/libstage/region.cc
+++ b/libstage/region.cc
@@ -8,29 +8,29 @@
 #include "region.hh"
 using namespace Stg;
 
-std::vector<Stg::Cell*> Region::dead_pool;
+std::vector<Stg::Cell*> Stg::Region::dead_pool;
 
-Region::Region() : 
+Stg::Region::Region() : 
   cells(NULL), 
   count(0),
   superregion(NULL)
 {
 }
 
-Region::~Region()
+Stg::Region::~Region()
 {
   if( cells )
     delete[] cells;
 }
 
-void Region::AddBlock()
+void Stg::Region::AddBlock()
 { 
   ++count; 
   assert(count>0);
   superregion->AddBlock();
 }
 
-void Region::RemoveBlock()
+void Stg::Region::RemoveBlock()
 {
   --count; 
   assert(count>=0); 

From 131ffaa26e3587b27fc10533ec6aa01ff7cefe3b Mon Sep 17 00:00:00 2001
From: Richard Vaughan <rtvaughan@gmail.com>
Date: Fri, 12 Aug 2011 17:42:03 -0700
Subject: [PATCH 2/2] re-enabled Player building by default (when detected)

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0700a4863..8ec303325 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,9 +158,9 @@ ADD_SUBDIRECTORY(assets)
 ADD_SUBDIRECTORY(worlds)
 ADD_SUBDIRECTORY(avonstage)		 
 
-#IF ( BUILD_PLAYER_PLUGIN AND PLAYER_FOUND )
-#  ADD_SUBDIRECTORY(libstageplugin)
-#ENDIF ( BUILD_PLAYER_PLUGIN AND PLAYER_FOUND )	 
+IF ( BUILD_PLAYER_PLUGIN AND PLAYER_FOUND )
+  ADD_SUBDIRECTORY(libstageplugin)
+ENDIF ( BUILD_PLAYER_PLUGIN AND PLAYER_FOUND )	 
 
 
 # generate a cpack config file used to create packaged tarballs