[64723] trunk/dports/devel/libsdl_ttf

nox at macports.org nox at macports.org
Mon Mar 15 06:10:56 PDT 2010


Revision: 64723
          http://trac.macports.org/changeset/64723
Author:   nox at macports.org
Date:     2010-03-15 06:10:55 -0700 (Mon, 15 Mar 2010)
Log Message:
-----------
Fix libsdl_ttf building with libsdl-devel (#23496)

Also install the documentation in an unversioned directory.

Modified Paths:
--------------
    trunk/dports/devel/libsdl_ttf/Portfile

Added Paths:
-----------
    trunk/dports/devel/libsdl_ttf/files/
    trunk/dports/devel/libsdl_ttf/files/patch-glfont.c.diff

Modified: trunk/dports/devel/libsdl_ttf/Portfile
===================================================================
--- trunk/dports/devel/libsdl_ttf/Portfile	2010-03-15 13:10:01 UTC (rev 64722)
+++ trunk/dports/devel/libsdl_ttf/Portfile	2010-03-15 13:10:55 UTC (rev 64723)
@@ -5,6 +5,7 @@
 name            libsdl_ttf
 set my_name	    SDL_ttf
 version         2.0.9
+revision        1
 categories      devel graphics
 platforms       macosx
 maintainers     nox openmaintainer
@@ -22,13 +23,15 @@
                 sha1 6bc3618b08ddbbf565fe8f63f624782c15e1cef2 \
                 rmd160 4e0b0f727f73b5d8a579e3e615ab4f50ec992b82
 
+patchfiles      patch-glfont.c.diff
+
 depends_lib     port:libsdl \
                 port:freetype
 
 configure.args  --disable-sdltest
 
 post-destroot {
-    set docdir ${prefix}/share/doc/${name}-${version}
+    set docdir ${prefix}/share/doc/${name}
     xinstall -d ${destroot}${docdir}
     xinstall -m 0644 -W ${worksrcpath} CHANGES COPYING README \
         ${destroot}${docdir}

Added: trunk/dports/devel/libsdl_ttf/files/patch-glfont.c.diff
===================================================================
--- trunk/dports/devel/libsdl_ttf/files/patch-glfont.c.diff	                        (rev 0)
+++ trunk/dports/devel/libsdl_ttf/files/patch-glfont.c.diff	2010-03-15 13:10:55 UTC (rev 64723)
@@ -0,0 +1,34 @@
+See http://tinyurl.com/sdl-r4463
+
+--- glfont.c	2008/12/08 00:27:32	4211
++++ glfont.c	2009/03/22 06:54:13	4463
+@@ -137,10 +137,15 @@
+ 
+ 	/* Save the alpha blending attributes */
+ 	saved_flags = surface->flags&(SDL_SRCALPHA|SDL_RLEACCELOK);
++#if SDL_VERSION_ATLEAST(1, 3, 0)
++	SDL_GetSurfaceAlphaMod(surface, &saved_alpha);
++	SDL_SetSurfaceAlphaMod(surface, 0xFF);
++#else
+ 	saved_alpha = surface->format->alpha;
+ 	if ( (saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA ) {
+ 		SDL_SetAlpha(surface, 0, 0);
+ 	}
++#endif
+ 
+ 	/* Copy the surface into the GL texture image */
+ 	area.x = 0;
+@@ -150,9 +155,13 @@
+ 	SDL_BlitSurface(surface, &area, image, &area);
+ 
+ 	/* Restore the alpha blending attributes */
++#if SDL_VERSION_ATLEAST(1, 3, 0)
++	SDL_SetSurfaceAlphaMod(surface, saved_alpha);
++#else
+ 	if ( (saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA ) {
+ 		SDL_SetAlpha(surface, saved_flags, saved_alpha);
+ 	}
++#endif
+ 
+ 	/* Create an OpenGL texture for the image */
+ 	glGenTextures(1, &texture);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100315/89de8857/attachment.html>


More information about the macports-changes mailing list