[csw-devel] SF.net SVN: gar:[11064] csw/mgar/pkg/ftgl/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Tue Sep 28 14:03:51 CEST 2010


Revision: 11064
          http://gar.svn.sourceforge.net/gar/?rev=11064&view=rev
Author:   dmichelsen
Date:     2010-09-28 12:03:51 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
ftgl: Add patches and compiler directives

Modified Paths:
--------------
    csw/mgar/pkg/ftgl/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/ftgl/trunk/files/0001-Do-not-use-gcc-specific-flags.patch
    csw/mgar/pkg/ftgl/trunk/files/0002-Use-Sun-Studio-__func__-instead-of-gcc-__FUNCTION__.patch
    csw/mgar/pkg/ftgl/trunk/files/0003-Force-GNU-sed-when-using-i.patch
    csw/mgar/pkg/ftgl/trunk/files/0004-Keep-libtool-from-stripping-norunpath-during-linking.patch

Modified: csw/mgar/pkg/ftgl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ftgl/trunk/Makefile	2010-09-28 10:41:16 UTC (rev 11063)
+++ csw/mgar/pkg/ftgl/trunk/Makefile	2010-09-28 12:03:51 UTC (rev 11064)
@@ -1,5 +1,7 @@
 GARNAME = ftgl
-GARVERSION = 2.1.3-rc5
+GARVERSION = 2.1.3rc5
+FILEVERSION = 2.1.3-rc5
+DISTVERSION = 2.1.3~rc5
 CATEGORIES = lib
 
 DESCRIPTION = Library that uses Freetype2 to simplify rendering fonts in OpenGL applications
@@ -7,28 +9,45 @@
 endef
 
 MASTER_SITES = $(SF_MIRROR)
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
+DISTFILES  = $(GARNAME)-$(FILEVERSION).tar.bz2
+DISTNAME = $(GARNAME)-$(DISTVERSION)
 
+PATCHFILES  = 0001-Do-not-use-gcc-specific-flags.patch 
+PATCHFILES += 0002-Use-Sun-Studio-__func__-instead-of-gcc-__FUNCTION__.patch
+PATCHFILES += 0003-Force-GNU-sed-when-using-i.patch
+PATCHFILES += 0004-Keep-libtool-from-stripping-norunpath-during-linking.patch
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
-WORKSRC = $(WORKDIR)/$(GARNAME)-2.1.3~rc5
+PACKAGES = CSWftgl CSWftgldevel
 
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+CATALOGNAME_CSWftgl = ftgl
+CATALOGNAME_CSWftgldevel = ftgl_devel
 
+SPKG_DESC_CSWftgl = $(DESCRIPTION)
+SPKG_DESC_CSWftgldevel = FTGL Development Files
+
+DEP_PKGS_CSWftgl = CSWmesa CSWzlib CSWftype2
+RUNTIME_DEP_PKGS_CSWftgldevel = CSWftgl
+CHECKPKG_OVERRIDES_CSWftgldevel = surplus-dependency|CSWftgl
+
+PKGFILES_CSWftgl = $(PKGFILES_RT)
+
 NOISAEXEC = 1
 NOISALIST = 1
-BUILD64 = 1
 
-# Remove after rebuild of CSWmesa against OpenCSW X11
-EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so.0
+# First we need CSWfreeglut in 64 bit
+# BUILD64 = 1
 
+# Needed for __func__ used in Patch 0002
+EXTRA_CXXFLAGS = -features=extensions -norunpath
+EXTRA_LDFLAGS = -lm
+
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --x-include=$(prefix)/X11/include
-CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 CONFIGURE_ARGS += --with-gl-inc=$(includedir)
 CONFIGURE_ARGS += --with-gl-lib=$(libdir)
+CONFIGURE_ARGS += --with-glut-inc=$(includedir)
+CONFIGURE_ARGS += --with-glut-lib=$(libdir)
 
 include gar/category.mk

Added: csw/mgar/pkg/ftgl/trunk/files/0001-Do-not-use-gcc-specific-flags.patch
===================================================================
--- csw/mgar/pkg/ftgl/trunk/files/0001-Do-not-use-gcc-specific-flags.patch	                        (rev 0)
+++ csw/mgar/pkg/ftgl/trunk/files/0001-Do-not-use-gcc-specific-flags.patch	2010-09-28 12:03:51 UTC (rev 11064)
@@ -0,0 +1,27 @@
+From 32ffda7617d493a749b236f946fa1e4c2cc56537 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 28 Sep 2010 12:26:53 +0200
+Subject: [PATCH] Do not use gcc-specific flags
+
+---
+ configure |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index bcaecab..bc3efc2 100755
+--- a/configure
++++ b/configure
+@@ -23977,8 +23977,8 @@ fi
+ CPPFLAGS="$CPPFLAGS -I\${top_srcdir}/src"
+ 
+ # Warning flags
+-CPPFLAGS="${CPPFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Wsign-compare"
+-CFLAGS="${CFLAGS} -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs"
++#CPPFLAGS="${CPPFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Wsign-compare"
++#CFLAGS="${CFLAGS} -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs"
+ 
+ # Build HTML documentatin?
+ # Extract the first word of "doxygen", so it can be a program name with args.
+-- 
+1.7.3
+

Added: csw/mgar/pkg/ftgl/trunk/files/0002-Use-Sun-Studio-__func__-instead-of-gcc-__FUNCTION__.patch
===================================================================
--- csw/mgar/pkg/ftgl/trunk/files/0002-Use-Sun-Studio-__func__-instead-of-gcc-__FUNCTION__.patch	                        (rev 0)
+++ csw/mgar/pkg/ftgl/trunk/files/0002-Use-Sun-Studio-__func__-instead-of-gcc-__FUNCTION__.patch	2010-09-28 12:03:51 UTC (rev 11064)
@@ -0,0 +1,94 @@
+From 544ab77e5e33cd8c571b4d73900ff8d486f53ad9 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 28 Sep 2010 12:37:43 +0200
+Subject: [PATCH 2/2] Use Sun Studio __func__ instead of gcc __FUNCTION__
+
+---
+ src/FTFont/FTFontGlue.cpp     |    2 +-
+ src/FTGlyph/FTGlyphGlue.cpp   |    2 +-
+ src/FTLayout/FTLayoutGlue.cpp |   12 ++++++------
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/FTFont/FTFontGlue.cpp b/src/FTFont/FTFontGlue.cpp
+index b23e787..dfcacce 100644
+--- a/src/FTFont/FTFontGlue.cpp
++++ b/src/FTFont/FTFontGlue.cpp
+@@ -127,7 +127,7 @@ void ftglDestroyFont(FTGLfont *f)
+ {
+     if(!f || !f->ptr)
+     {
+-        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __FUNCTION__);
++        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __func__);
+         return;
+     }
+     delete f->ptr;
+diff --git a/src/FTGlyph/FTGlyphGlue.cpp b/src/FTGlyph/FTGlyphGlue.cpp
+index 0fbbc01..dcc90a1 100644
+--- a/src/FTGlyph/FTGlyphGlue.cpp
++++ b/src/FTGlyph/FTGlyphGlue.cpp
+@@ -150,7 +150,7 @@ void ftglDestroyGlyph(FTGLglyph *g)
+ {
+     if(!g || !g->ptr)
+     {
+-        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __FUNCTION__);
++        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __func__);
+         return;
+     }
+     delete g->ptr;
+diff --git a/src/FTLayout/FTLayoutGlue.cpp b/src/FTLayout/FTLayoutGlue.cpp
+index 60f428d..651396f 100644
+--- a/src/FTLayout/FTLayoutGlue.cpp
++++ b/src/FTLayout/FTLayoutGlue.cpp
+@@ -67,7 +67,7 @@ void ftglDestroyLayout(FTGLlayout *l)
+ {
+     if(!l || !l->ptr)
+     {
+-        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __FUNCTION__);
++        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __func__);
+         return;
+     }
+     delete l->ptr;
+@@ -100,13 +100,13 @@ void ftglSetLayoutFont(FTGLlayout *l, FTGLfont *font)
+ {
+     if(!l || !l->ptr)
+     {
+-        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __FUNCTION__);
++        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __func__);
+         return;
+     }
+     if(l->type != FTGL::LAYOUT_SIMPLE)
+     {
+         fprintf(stderr, "FTGL warning: %s not implemented for %d\n",
+-                        __FUNCTION__, l->type);
++                        __func__, l->type);
+     }
+     l->font = font;
+     return dynamic_cast<FTSimpleLayout*>(l->ptr)->SetFont(font->ptr);
+@@ -117,13 +117,13 @@ FTGLfont *ftglGetLayoutFont(FTGLlayout *l)
+ {
+     if(!l || !l->ptr)
+     {
+-        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __FUNCTION__);
++        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __func__);
+         return NULL;
+     }
+     if(l->type != FTGL::LAYOUT_SIMPLE)
+     {
+         fprintf(stderr, "FTGL warning: %s not implemented for %d\n",
+-                        __FUNCTION__, l->type);
++                        __func__, l->type);
+     }
+     return l->font;
+ }
+@@ -141,7 +141,7 @@ FTGLfont *ftglGetLayoutFont(FTGLlayout *l)
+         if(l->type != FTGL::LAYOUT_SIMPLE) \
+         { \
+             fprintf(stderr, "FTGL warning: %s not implemented for %d\n", \
+-                            __FUNCTION__, l->type); \
++                            __func__, l->type); \
+             cxxerr; \
+         } \
+         return dynamic_cast<FTSimpleLayout*>(l->ptr)->cxxname cxxarg; \
+-- 
+1.7.3
+

Added: csw/mgar/pkg/ftgl/trunk/files/0003-Force-GNU-sed-when-using-i.patch
===================================================================
--- csw/mgar/pkg/ftgl/trunk/files/0003-Force-GNU-sed-when-using-i.patch	                        (rev 0)
+++ csw/mgar/pkg/ftgl/trunk/files/0003-Force-GNU-sed-when-using-i.patch	2010-09-28 12:03:51 UTC (rev 11064)
@@ -0,0 +1,25 @@
+From 2302430dbe3c40beb52c30b62dfe999f61e76d4d Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 28 Sep 2010 13:07:12 +0200
+Subject: [PATCH 3/3] Force GNU sed when using -i
+
+---
+ docs/Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/docs/Makefile.in b/docs/Makefile.in
+index 2deabd6..1e52bae 100644
+--- a/docs/Makefile.in
++++ b/docs/Makefile.in
+@@ -455,7 +455,7 @@ stamp-eps: $(PNGS)
+ html/doxygen.css: stamp-doxygen
+ stamp-doxygen: doxygen.cfg stamp-eps
+ 	$(DOXYGEN) $^
+-	sed -i 's/%FTGL/FTGL/' html/*html
++	gsed -i 's/%FTGL/FTGL/' html/*html
+ 	touch $@
+ 
+ latex/ftgl.pdf: stamp-latex
+-- 
+1.7.3
+

Added: csw/mgar/pkg/ftgl/trunk/files/0004-Keep-libtool-from-stripping-norunpath-during-linking.patch
===================================================================
--- csw/mgar/pkg/ftgl/trunk/files/0004-Keep-libtool-from-stripping-norunpath-during-linking.patch	                        (rev 0)
+++ csw/mgar/pkg/ftgl/trunk/files/0004-Keep-libtool-from-stripping-norunpath-during-linking.patch	2010-09-28 12:03:51 UTC (rev 11064)
@@ -0,0 +1,25 @@
+From 69188e3dd08b92b9447ceb4f4dd4eb6a768b707f Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 28 Sep 2010 13:54:31 +0200
+Subject: [PATCH 4/4] Keep libtool from stripping -norunpath during linking
+
+---
+ .auto/ltmain.sh |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/.auto/ltmain.sh b/.auto/ltmain.sh
+index 0bf3848..bda2ca2 100644
+--- a/.auto/ltmain.sh
++++ b/.auto/ltmain.sh
+@@ -1676,7 +1676,7 @@ EOF
+       # -F/path gives path to uninstalled frameworks, gcc on darwin
+       # @file GCC response files
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-xnorunpath|-norunpath)
+ 
+ 	# Unknown arguments in both finalize_command and compile_command need
+ 	# to be aesthetically quoted because they are evaled later.
+-- 
+1.7.3
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list