From bac0f534a9985edb6db4b37930a6f6ccbfafc581 Mon Sep 17 00:00:00 2001
From: Friedrich Oslage <bluebird@gentoo.org>
Date: Sat, 16 Aug 2008 11:37:46 +0000
Subject: motion_comp_vis.c checks for ENABLE_VIS therefore we also need to
 check for it.

---
 src/libmpeg2/motion_comp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libmpeg2/motion_comp.c b/src/libmpeg2/motion_comp.c
index 8779c1296..f8faa3ee5 100644
--- a/src/libmpeg2/motion_comp.c
+++ b/src/libmpeg2/motion_comp.c
@@ -68,7 +68,7 @@ void mpeg2_mc_init (uint32_t mm_accel)
 	mpeg2_mc = mpeg2_mc_altivec;
     } else
 #endif
-#ifdef ARCH_SPARC
+#if defined(ARCH_SPARC) && defined(ENABLE_VIS)
     if (mm_accel & MM_ACCEL_SPARC_VIS) {
 #ifdef LOG
 	fprintf (stderr, "Using VIS for motion compensation\n");
-- 
cgit v1.2.3


From 5634c45aaddd9ffd28c1eb6fa121c1fe7fdd0f14 Mon Sep 17 00:00:00 2001
From: Erik Hovland <erik@hovland.org>
Date: Wed, 17 Sep 2008 22:15:00 +0000
Subject: Remove an extra const directive for goom_csc_methods

---
 src/post/goom/xine_goom.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/post/goom/xine_goom.c b/src/post/goom/xine_goom.c
index 5cd5406b2..db7079423 100644
--- a/src/post/goom/xine_goom.c
+++ b/src/post/goom/xine_goom.c
@@ -48,7 +48,7 @@
 #define GOOM_HEIGHT 240
 
 /* colorspace conversion methods */
-static const char const * goom_csc_methods[]={
+static const char* goom_csc_methods[]={
   "Fast but not photorealistic",
   "Slow but looks better",
   NULL
-- 
cgit v1.2.3


From a2e9c61995d019dab809b42e87c5e85f2f9abf08 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Wed, 21 May 2008 17:40:03 +0100
Subject: Free up resources when we finish with Freetype.

---
 src/xine-engine/osd.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index 05acd4779..f8cbfefb2 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -121,6 +121,18 @@ struct osd_ft2context_s {
   FT_Face    face;
   int        size;
 };
+
+static void osd_free_ft2 (osd_object_t *osd)
+{
+  if( osd->ft2 ) {
+    if ( osd->ft2->library )
+      FT_Done_FreeType(osd->ft2->library);
+    free( osd->ft2 );
+    osd->ft2 = NULL;
+  }
+}
+#else
+static inline void osd_free_ft2 (osd_object_t *osd __attr_unused) {}
 #endif
 
 /*
@@ -874,16 +886,14 @@ static int osd_set_font_freetype2( osd_object_t *osd, const char *fontname, int
 	    _("osd: error loading font %s with ft2\n"), fontname);
   }
 
-  free(osd->ft2);
-  osd->ft2 = NULL;
+  osd_free_ft2 (osd);
   return 0;
 
  end:
   if (FT_Set_Pixel_Sizes(osd->ft2->face, 0, size)) {
     xprintf(osd->renderer->stream->xine, XINE_VERBOSITY_LOG,
 	    _("osd: error setting font size (no scalable font?)\n"));
-    free(osd->ft2);
-    osd->ft2 = NULL;
+    osd_free_ft2 (osd);
     return 0;
   }
 
@@ -1458,15 +1468,7 @@ static void osd_free_object (osd_object_t *osd_to_close) {
     if ( osd == osd_to_close ) {
       free( osd->area );
 
-#ifdef HAVE_FT2
-      if( osd->ft2 ) {
-	if ( osd->ft2->library )
-	  FT_Done_FreeType(osd->ft2->library);
-
-	free( osd->ft2 );
-      }
-#endif
-
+      osd_free_ft2 (osd);
       osd_free_encoding(osd);
       
       if( last )
-- 
cgit v1.2.3


From 1b86d0b5362a7b3f317b85696f9fc35d8bc0e7c4 Mon Sep 17 00:00:00 2001
From: Maximilian Schwerin <post@mschwerin.de>
Date: Mon, 3 Nov 2008 16:06:15 +0100
Subject: Free up resources when we finish with a Freetype font.

---
 src/xine-engine/osd.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index f8cbfefb2..af8286831 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -125,6 +125,8 @@ struct osd_ft2context_s {
 static void osd_free_ft2 (osd_object_t *osd)
 {
   if( osd->ft2 ) {
+    if ( osd->ft2->face )
+      FT_Done_Face (osd->ft2->face);
     if ( osd->ft2->library )
       FT_Done_FreeType(osd->ft2->library);
     free( osd->ft2 );
@@ -828,6 +830,11 @@ static int osd_set_font_freetype2( osd_object_t *osd, const char *fontname, int
       return 0;
     }
   }
+
+  if (osd->ft2->face) {
+      FT_Done_Face (osd->ft2->face);
+      osd->ft2->face = NULL;
+  }
    
 #ifdef HAVE_FONTCONFIG
   do {
-- 
cgit v1.2.3