Il 22 apr 2017 05:30, "Jonathan Gray" <[email protected]> ha scritto:
Freetype headers no longer define __FT2_BUILD_UNIX_H__.
Remove the ifdef to fix the clang build:
cc -DPACKAGE_NAME="" -DPACKAGE_TARNAME="" -DPACKAGE_VERSION=""
-DPACKAGE_STRING="" -DPACKAGE_BUGREPORT="" -DPACKAGE="SDL_Pango"
-DVERSION="0.1.2" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1
-DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1
-DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1
-DBUILD_DLL -I. -I. -O2 -pipe -I/usr/local/include/pango-1.0
-I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include
-I/usr/local/include -I/usr/local/include/pango-1.0
-I/usr/local/include/harfbuzz -I/usr/local/include
-I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include
-I/usr/X11R6/include -I/usr/X11R6/include/freetype2 -I/usr/include
-I/usr/local/include -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
-I/usr/X11R6/include -DXTHREADS -MT SDL_Pango.lo -MD -MP -MF
.deps/SDL_Pango.Tpo -c SDL_Pango.c -fPIC -DPIC -o .libs/SDL_Pango.o
SDL_Pango.c:301:5: warning: 'g_type_init' is deprecated
[-Wdeprecated-declarations]
g_type_init();
^
/usr/local/include/glib-2.0/gobject/gtype.h:686:23: note: 'g_type_init' has
been explicitly marked deprecated here
void g_type_init (void);
^
SDL_Pango.c:345:5: warning: implicit declaration of function
'SDLPango_CopyFTBitmapToSurface'
is invalid in C99 [-Wimplicit-function-declaration]
SDLPango_CopyFTBitmapToSurface(
^
SDL_Pango.c:661:1: error: conflicting types for 'SDLPango_
CopyFTBitmapToSurface'
SDLPango_CopyFTBitmapToSurface(
^
SDL_Pango.c:345:5: note: previous implicit declaration is here
SDLPango_CopyFTBitmapToSurface(
^
SDL_Pango.c:735:24: warning: 'pango_ft2_font_map_create_context' is
deprecated [-Wdeprecated-declarations]
context->context = pango_ft2_font_map_create_context
(PANGO_FT2_FONT_MAP (context->font_map));
^
/usr/local/include/pango-1.0/pango/pangoft2.h:114:15: note:
'pango_ft2_font_map_create_context' has been explicitly marked deprecated
here
PangoContext *pango_ft2_font_map_create_context (PangoFT2FontMap
*fontmap);
^
SDL_Pango.c:1071:50: warning: implicit conversion from enumeration type
'SDLPango_Alignment' to different enumeration type 'PangoAlignment'
[-Wenum-conversion]
pango_layout_set_alignment (context->layout, alignment);
~~~~~~~~~~~~~~~~~~~~~~~~~~ ^~~~~~~~~
Index: patches/patch-src_SDL_Pango_h
===================================================================
RCS file: /cvs/ports/devel/sdl-pango/patches/patch-src_SDL_Pango_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_SDL_Pango_h
--- patches/patch-src_SDL_Pango_h 24 May 2007 13:38:11 -0000
1.1.1.1
+++ patches/patch-src_SDL_Pango_h 22 Apr 2017 03:24:48 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_SDL_Pango_h,v 1.1.1.1 2007/05/24 13:38:11 ajacoutot
Exp $
---- src/SDL_Pango.h.orig Tue Mar 27 10:12:28 2007
-+++ src/SDL_Pango.h Tue Mar 27 10:16:11 2007
+--- src/SDL_Pango.h.orig Sat Apr 22 13:16:31 2017
++++ src/SDL_Pango.h Sat Apr 22 13:24:08 2017
@@ -47,10 +47,10 @@ typedef struct _SDLPango_Matrix {
} SDLPango_Matrix;
@@ -73,3 +73,21 @@ $OpenBSD: patch-src_SDL_Pango_h,v 1.1.1.
/*!
Specifies transparent back and transparent letter.
This is useful for KARAOKE like rendering.
+@@ -184,17 +184,11 @@ extern DECLSPEC void SDLCALL
SDLPango_SetBaseDirection
+ SDLPango_Context *context,
+ SDLPango_Direction direction);
+
+-
+-#ifdef __FT2_BUILD_UNIX_H__
+-
+ extern DECLSPEC void SDLCALL SDLPango_CopyFTBitmapToSurface(
+ const FT_Bitmap *bitmap,
+ SDL_Surface *surface,
+ const SDLPango_Matrix *matrix,
+ SDL_Rect *rect);
+-
+-#endif /* __FT2_BUILD_UNIX_H__ */
+-
+
+ #ifdef __PANGO_H__
+
OK with me.
Cheers,
dcoppa
