[122714] trunk/dports/devel/libsdl_pango

[jmr at macports.org]

Revision: 122714
          https://trac.macports.org/changeset/122714
Author:   jmr at macports.org
Date:     2014-07-27 07:35:07 -0700 (Sun, 27 Jul 2014)
Log Message:
-----------
libsdl_pango: apply buildfix from freebsd, remove unused libffi dep

Modified Paths:
--------------
    trunk/dports/devel/libsdl_pango/Portfile
    trunk/dports/devel/libsdl_pango/files/patch-SDL_Pango-0.1.2-API-adds.diff

Added Paths:
-----------
    trunk/dports/devel/libsdl_pango/files/patch-src_SDL_Pango.c

Modified: trunk/dports/devel/libsdl_pango/Portfile
===================================================================
--- trunk/dports/devel/libsdl_pango/Portfile	2014-07-27 14:09:00 UTC (rev 122713)
+++ trunk/dports/devel/libsdl_pango/Portfile	2014-07-27 14:35:07 UTC (rev 122714)
@@ -22,12 +22,15 @@
                     sha256  7f75d3b97acf707c696ea126424906204ebfa07660162de925173cdd0257eba4
 
 depends_build       port:pkgconfig
-depends_lib         port:libffi \
-                    port:libsdl \
+depends_lib         port:libsdl \
                     port:fontconfig \
                     path:lib/pkgconfig/pango.pc:pango
 
-patchfiles          patch-SDL_Pango-0.1.2-API-adds.diff
+pre-patch {
+    reinplace "s/\r//" ${worksrcpath}/src/SDL_Pango.c ${worksrcpath}/src/SDL_Pango.h
+}
+patchfiles          patch-SDL_Pango-0.1.2-API-adds.diff \
+                    patch-src_SDL_Pango.c
 
 use_autoreconf      yes
 autoreconf.args     -fvi

Modified: trunk/dports/devel/libsdl_pango/files/patch-SDL_Pango-0.1.2-API-adds.diff
===================================================================
--- trunk/dports/devel/libsdl_pango/files/patch-SDL_Pango-0.1.2-API-adds.diff	2014-07-27 14:09:00 UTC (rev 122713)
+++ trunk/dports/devel/libsdl_pango/files/patch-SDL_Pango-0.1.2-API-adds.diff	2014-07-27 14:35:07 UTC (rev 122714)
@@ -1,6 +1,6 @@
---- src/SDL_Pango.c	2004-12-10 10:06:33.000000000 +0100
-+++ src/SDL_Pango.c	2006-09-24 22:46:24.000000000 +0200
-@@ -723,13 +723,8 @@
+--- src/SDL_Pango.c.orig	2004-12-10 20:06:33.000000000 +1100
++++ src/SDL_Pango.c	2014-07-28 00:32:29.000000000 +1000
+@@ -723,13 +723,8 @@ SDLPango_CopyFTBitmapToSurface(
      SDL_UnlockSurface(surface);
  }
  
@@ -15,7 +15,7 @@
  {
      SDLPango_Context *context = g_malloc(sizeof(SDLPango_Context));
      G_CONST_RETURN char *charset;
-@@ -743,8 +738,7 @@
+@@ -743,8 +738,7 @@ SDLPango_CreateContext()
      pango_context_set_language (context->context, pango_language_from_string (charset));
      pango_context_set_base_dir (context->context, PANGO_DIRECTION_LTR);
  
@@ -25,7 +25,7 @@
  
      context->layout = pango_layout_new (context->context);
  
-@@ -762,6 +756,17 @@
+@@ -762,6 +756,17 @@ SDLPango_CreateContext()
  }
  
  /*!
@@ -43,7 +43,7 @@
      Free a context.
  
      @param *context [i/o] Context to be free
-@@ -1053,6 +1058,20 @@
+@@ -1053,6 +1058,20 @@ SDLPango_SetMarkup(
      pango_layout_set_font_description (context->layout, context->font_desc);
  }
  
@@ -64,7 +64,7 @@
  /*!
      Set plain text to context.
      Text must be utf-8.
-@@ -1067,11 +1086,7 @@
+@@ -1067,11 +1086,7 @@ SDLPango_SetText(
      const char *text,
      int length)
  {
@@ -77,9 +77,9 @@
  }
  
  /*!
---- src/SDL_Pango.h	2004-12-10 10:06:33.000000000 +0100
-+++ src/SDL_Pango.h	2006-09-24 22:46:01.000000000 +0200
-@@ -109,12 +109,20 @@
+--- src/SDL_Pango.h.orig	2004-12-10 20:06:33.000000000 +1100
++++ src/SDL_Pango.h	2014-07-28 00:32:29.000000000 +1000
+@@ -109,12 +109,20 @@ typedef enum {
      SDLPANGO_DIRECTION_NEUTRAL	/*! Neutral */
  } SDLPango_Direction;
  
@@ -101,7 +101,7 @@
  extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext();
  
  extern DECLSPEC void SDLCALL SDLPango_FreeContext(
-@@ -157,6 +165,12 @@
+@@ -157,6 +165,12 @@ extern DECLSPEC void SDLCALL SDLPango_Se
      const char *markup,
      int length);
  

Added: trunk/dports/devel/libsdl_pango/files/patch-src_SDL_Pango.c
===================================================================
--- trunk/dports/devel/libsdl_pango/files/patch-src_SDL_Pango.c	                        (rev 0)
+++ trunk/dports/devel/libsdl_pango/files/patch-src_SDL_Pango.c	2014-07-27 14:35:07 UTC (rev 122714)
@@ -0,0 +1,14 @@
+--- src/SDL_Pango.c.orig	2014-07-27 23:46:29.000000000 +1000
++++ src/SDL_Pango.c	2014-07-27 23:47:57.000000000 +1000
+@@ -330,6 +330,11 @@ SDLPango_WasInit()
+     @param *rect [in] Draw on this area
+     @param baseline [in] Horizontal location of glyphs
+ */
++void SDLPango_CopyFTBitmapToSurface(
++    const FT_Bitmap *bitmap,
++    SDL_Surface *surface,
++    const SDLPango_Matrix *matrix,
++    SDL_Rect *rect);
+ static void
+ drawGlyphString(
+     SDLPango_Context *context,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140727/0c28e881/attachment.html>