media-libs/ftgl: winnt support for 2.1.3_rc5

2014-12-05 17:06:51 +11:00 · 2014-12-05 17:06:51 +11:00 · 674a128068
commit 674a128068
parent 379ca9474c
6 changed files with 129 additions and 3 deletions
--- a/media-libs/ftgl/Manifest
+++ b/media-libs/ftgl/Manifest
@ -1,2 +1,6 @@
+AUX ftgl-2.1.3_rc5-ft2_pkgconfig.patch 320 SHA256 a49fefcc439ab272be62a854074ddade5058e6bfecadbdbb94d582f3dd63a673 SHA512 9992b3f8c61860200a12a3c6a158281ccdc60dadde1b736f67c6ca4bf8d6c21fed4dcb16c2628d9f7f97b2a7fe7fbfe2bf593a4460079d5074061deecea5cdf1 WHIRLPOOL f9c2b4491d9154b6a623056eaef422b8d512db5a7e92c9b7af28e6f562a71b348094c5d6c6052b1e5a732d86cd3dcaccfad0a1e4eac24fd4b662b3271586cf4c
+AUX ftgl-2.1.3_rc5-gentoo.patch 1399 SHA256 1c5d8e3e0d37db1174bc00e9876c306fbda1491ec6216c5bd3f3e2856d629f58 SHA512 6dc2ef3467bf57a1fc62fcb512d3e5235f086d1f837768a7ddd1af5dbf0a91104e706e3ef8c875ef0fa38d2f8f934c874ff570f5fa2066abc74d4af15f30a0cd WHIRLPOOL d5a2fe4a71194eeaf65f4715cd5058fa9867f995e2696f5834a2f5370135ef35103c199938a238be1f09cfa8fbaf5f002bda8b375ba9cb8acc0da2f78e36dd80
+AUX ftgl-2.1.3_rc5-underlink.patch 349 SHA256 9a3540ff4705476f22718a5614aa3a7f64b8e748839e92d1bcbc8a29364ca590 SHA512 aa7a33577a7096e68b47d6e623f99511b54d277ed334e0a2aff6e69e3d915f575e943a556aa22c5f4fe5d884eb6b4425f2b0ecb0aea95f9a36799ad65c1b7399 WHIRLPOOL a35ae3e743778e1fb05853271d5e689347c5634ef0612bae2c6a6a03179fa3711e6ca37d7ec58a3cb70a031510065cf879db2935d29ef3c433639f82f502070c
+AUX ftgl-2.1.3_rc5-win32_gl.patch 1610 SHA256 beb9ebf923a8b46d51e1b1fe6e9c82c4677ed220fc2040a20fa814975f2a4ca4 SHA512 33172b79e020d7af6c1da0763eb9556e9358e7ed1d34daa4fc1859f6b9888dbb9ec265e9d89140956faae93e2647526a900cc79a5f9cf96e757a3eeb0bd381e2 WHIRLPOOL 9e4e2aed0553912fc318123e08db09344982c733bfbe0359b98930d862a8cfb1da5fc30597e06e6f23f50c52b35153c8610d62d2266a9a85c676d7a85322c7b3
 DIST ftgl-2.1.3-rc5.tar.bz2 707854 SHA256 521ff7bd62c459ff5372e269c223e2a6107a6a99a36afdc2ae634a973af70c59 SHA512 9841bdbe7e299dd0ae3bcbef08dc3a8787a863389bf242aa023b1c2442f3ffc8a2c6768a35d093d27e3ad7197c8228a9b15e795a36824424f05bef66b68c89a4 WHIRLPOOL 330e19923e51739d336c3c44345e1f8ae6907606be0635c55536409c7bb0caea6a61ede49b793c25c1542f60575cdf04f656e9b6436e8f8a43dcfea784e0056c
-EBUILD ftgl-2.1.3_rc5.ebuild 1310 SHA256 0aeadb7155f53d8d60a125e317e0d707e94d62e9529317c15196ec347782b932 SHA512 6796842410785360d5714f5c1692376b8efb496ce76d63f39a518e2155e21aa2f8c67d1dfa575aa16959af1e45e0af59f3c1d3b74dbc790f87732b97c741516d WHIRLPOOL a06bd69d0a21530344d097ec8842186e39a5d0aab84db4135135b14a14ed19b1c7cbbc6703dd5bf234aa13fab709d168331b54a79d3053232e04173e56713384
+EBUILD ftgl-2.1.3_rc5.ebuild 1444 SHA256 d55ce52e278601e7770acd7ba521aa9f74cf29d99798c4bda7c54602b84fa06c SHA512 989760c99ece66ab90a9d352b5d04d8c176fc8d803ac9524a664f094356adbd38d512a62d8636ebd258ad0a13d8fb0fc03c4501b2f7f4665540d85b1fe05e88f WHIRLPOOL 99547cfd67719adcb3556c9a6c284214ecd1acfbbecd97af6db464fd518532d5b0e903a9e091d2235c7688886497e1b3cb344187623b954a853c56d43551dff0
--- a/media-libs/ftgl/files/ftgl-2.1.3_rc5-ft2_pkgconfig.patch
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-ft2_pkgconfig.patch
@ -0,0 +1,14 @@
+--- configure.ac.old
+++ configure.ac	2014-12-03 15:58:23.955998467 +1100
+@@ -41,8 +41,9 @@
+ 
+ AC_PATH_X
+ 
+-AC_CHECK_FT2([9.0.3],[],
+-             [AC_MSG_ERROR([FreeType2 is required to compile this library])])
+PKG_CHECK_MODULES([FT2], [freetype2 >= 9.0.3])
+AC_SUBST(FT2_CFLAGS)
+AC_SUBST(FT2_LIBS)
+ 
+ AC_PATH_XTRA
+ 
--- a/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch
@ -0,0 +1,42 @@
+--- configure.ac.old    2008-11-21 14:41:15.000000000 +0100
+++ configure.ac        2008-11-21 14:44:19.000000000 +0100
+@@ -64,19 +64,11 @@
+ CFLAGS="${CFLAGS} -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs"
+ 
+ # Build HTML documentatin?
+-AC_PATH_PROG(DOXYGEN, doxygen, no)
+DOXYGEN="no"
+ AM_CONDITIONAL(HAVE_DOXYGEN, test "x$DOXYGEN" != "xno")
+ 
+ # Build PDF documentation?
+-AC_PATH_PROG(LATEX, pdflatex, no)
+-AC_PATH_PROG(KPSEWHICH, kpsewhich, no)
+-AC_PATH_PROG(DVIPS, dvips, no)
+-AC_PATH_PROG(CONVERT, convert, no)
+-AC_PATH_PROG(EPSTOPDF, epstopdf, no)
+-if test "${DVIPS}" = "no" -o "${KPSEWHICH}" = "no" -o "${EPSTOPDF}" = "no" \
+-     -o "${CONVERT}" = "no"; then
+   LATEX="no"
+-fi
+ if test "x${LATEX}" != "xno"; then
+   AC_MSG_CHECKING(for a4.sty and a4wide.sty)
+   if "${KPSEWHICH}" a4.sty >/dev/null 2>&1; then
+--- Makefile.am.old	2008-11-24 22:35:16.000000000 +0100
+++ Makefile.am	2008-11-24 22:36:32.000000000 +0100
+@@ -24,16 +24,6 @@
+ 	m4 \
+ 	$(NULL)
+ 
+-# Print out an informative summary.
+-all-local:
+-	@$(ECHO) "Done."
+-	@$(ECHO)
+-	@if test "x$(MAKECMDGOALS)" = "xall-am" -o "x$(.TARGETS)" = "xall-am" -o "x$(MAKECMDGOALS)" = "x" -o "x$(.TARGETS)" = "x" ; then \
+-	  $(ECHO) "---" ;\
+-	  $(ECHO) "Run 'make install' to begin installation into $(prefix)" ;\
+-	fi
+-	@$(ECHO)
+-
+ # Upload documentation
+ DOC = docs/html docs/latex/ftgl.pdf
+ HOST = ftgl.sf.net
--- a/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch
@ -0,0 +1,11 @@
+--- demo/Makefile.am.old	2011-05-20 11:13:18.822445466 +0200
+++ demo/Makefile.am	2011-05-20 11:13:28.271042994 +0200
+@@ -17,7 +17,7 @@
+     $(NULL)
+ c_demo_CFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
+ c_demo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS)
+-c_demo_LDADD = ../src/libftgl.la
+c_demo_LDADD = ../src/libftgl.la -lm
+ 
+ FTGLDemo_SOURCES = \
+ 	FTGLDemo.cpp \
--- a/media-libs/ftgl/files/ftgl-2.1.3_rc5-win32_gl.patch
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-win32_gl.patch
@ -0,0 +1,51 @@
+--- m4/gl.m4.old
+++ m4/gl.m4	2014-12-03 15:41:30.154998588 +1100
+@@ -7,9 +7,9 @@
+ AC_REQUIRE([AC_PATH_X])
+ AC_REQUIRE([AC_PATH_XTRA])
+ 
+-AC_ARG_WITH([--with-gl-inc],
+AC_ARG_WITH([gl-inc],
+     AC_HELP_STRING([--with-gl-inc=DIR],[Directory where GL/gl.h is installed]))
+-AC_ARG_WITH([--with-gl-lib],
+AC_ARG_WITH([gl-lib],
+     AC_HELP_STRING([--with-gl-lib=DIR],[Directory where OpenGL libraries are installed]))
+ 
+ AC_LANG_SAVE
+@@ -48,16 +48,18 @@
+ # -Xlinker is used because libtool is busted prior to 1.6 wrt frameworks
+ AC_TRY_LINK([#include <OpenGL/gl.h>], [glBegin(GL_POINTS)],
+     [FRAMEWORK_OPENGL="-Xlinker -framework -Xlinker OpenGL" ; ac_cv_search_glBegin="-Xlinker -framework -Xlinker OpenGL" ; AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])
+-with_gl_lib="$FRAMEWORK_OPENGL"
+-AC_SUBST(FRAMEWORK_OPENGL)
+-LIBS="$PRELIBS"
+if test "x$FRAMEWORK_OPENGL" != "x"; then
+    with_gl_lib="$FRAMEWORK_OPENGL"
+    AC_SUBST(FRAMEWORK_OPENGL)
+    LIBS="$PRELIBS"
+fi
+ 
+ AC_MSG_CHECKING([for GL library])
+ if test "x$with_gl_lib" != "x" ; then
+     if test -d "$with_gl_lib" ; then
+         LIBS="-L$with_gl_lib -lGL"
+     else
+-        LIBS="$with_gl_lib"
+        LIBS="-l$with_gl_lib"
+     fi
+ else
+     LIBS="-lGL"
+@@ -111,6 +113,13 @@
+         AC_LINK_IFELSE([AC_LANG_CALL([],[gluNewTess])],[HAVE_GLU=yes], [HAVE_GLU=no])
+     fi
+ fi
+
+if test "x$HAVE_GLU" != "xyes" ; then
+    # Test win32 libraries
+    LIBS="-lglu32 $GL_LIBS"
+    AC_LINK_IFELSE([AC_LANG_CALL([], [gluNewTess])], [HAVE_GLU=yes], [HAVE_GLU=no])
+fi
+
+ if test "x$HAVE_GLU" = xyes ; then
+     AC_MSG_RESULT([yes])
+     GL_LIBS="$LIBS"
--- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
@ -32,7 +32,10 @@ DOCS="AUTHORS BUGS ChangeLog INSTALL NEWS README TODO docs/projects_using_ftgl.t

 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-underlink.patch
+		"${FILESDIR}"/${P}-underlink.patch \
+		"${FILESDIR}"/${P}-ft2_pkgconfig.patch \
+		"${FILESDIR}"/${P}-win32_gl.patch
+
 #	AT_M4DIR=m4 eautoreconf
 	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
 	eautoreconf
@ -41,7 +44,8 @@ src_prepare() {
 src_configure() {
 	strip-flags # ftgl is sensitive - bug #112820
 	econf \
-		$(use_enable static-libs static)
+		$(use_enable static-libs static) \
+		$(usex amd64-winnt "--with-gl-lib=opengl32" '')
 }

 src_install() {