From 728d0a60fbee20faec445a6daf7339b32cf133a8 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 15 May 2015 08:14:50 +0000 Subject: [PATCH] ftgl: convert to actual recipe. --- media-libs/ftgl/ftgl-2.1.3.recipe | 30 -------- media-libs/ftgl/ftgl-2.1.3~rc5.recipe | 73 +++++++++++++++++++ media-libs/ftgl/patches/ftgl-2.1.3.patch | 16 ---- .../ftgl/patches/ftgl-2.1.3~rc5.patchset | 33 +++++++++ 4 files changed, 106 insertions(+), 46 deletions(-) delete mode 100644 media-libs/ftgl/ftgl-2.1.3.recipe create mode 100644 media-libs/ftgl/ftgl-2.1.3~rc5.recipe delete mode 100644 media-libs/ftgl/patches/ftgl-2.1.3.patch create mode 100644 media-libs/ftgl/patches/ftgl-2.1.3~rc5.patchset diff --git a/media-libs/ftgl/ftgl-2.1.3.recipe b/media-libs/ftgl/ftgl-2.1.3.recipe deleted file mode 100644 index e9c2e2ec4..000000000 --- a/media-libs/ftgl/ftgl-2.1.3.recipe +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="FTGL is a free cross-platform Open Source C++ library that uses Freetype2 to simplify rendering fonts in OpenGL applications" -HOMEPAGE="http://sourceforge.net/projects/ftgl" -SRC_URI="http://downloads.sourceforge.net/project/ftgl/FTGL%20Source/2.1.3%7Erc5/ftgl-2.1.3-rc5.tar.gz" -CHECKSUM_MD5="fcf4d0567b7de9875d4e99a9f7423633" -REVISION="3" -STATUS_HAIKU="stable" -DEPEND="pkgconfig >= 0.23" - -BUILD() -{ - cd ftgl-2.1.3~rc5 - echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.in" - libtoolize --copy --force --install - aclocal --install -I m4 - ./autogen.sh - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=$COMMON_DOCS/doc/ftgl - make -} - -INSTALL() -{ - cd ftgl-2.1.3~rc5 - make install -} - -LICENSE="MIT" -COPYRIGHT="2001-2004 Unicode, Inc. - 2001-2009 Henry Maddocks" diff --git a/media-libs/ftgl/ftgl-2.1.3~rc5.recipe b/media-libs/ftgl/ftgl-2.1.3~rc5.recipe new file mode 100644 index 000000000..8de4184af --- /dev/null +++ b/media-libs/ftgl/ftgl-2.1.3~rc5.recipe @@ -0,0 +1,73 @@ +SUMMARY="Library to use arbitrary fonts in OpenGL applications." +DESCRIPTION=" +FTGL is a free cross-platform Open Source C++ library that uses Freetype2 \ +to simplify rendering fonts in OpenGL applications." +HOMEPAGE="http://sourceforge.net/projects/ftgl" +COPYRIGHT=" + 2001-2004 Unicode, Inc. + 2001-2009 Henry Maddocks + " +LICENSE="MIT" +SRC_URI="http://downloads.sourceforge.net/project/ftgl/FTGL%20Source/2.1.3%7Erc5/ftgl-2.1.3-rc5.tar.gz" +CHECKSUM_SHA256="5458d62122454869572d39f8aa85745fc05d5518001bcefa63bd6cbb8d26565b" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="ftgl-$portVersion.patchset" + +PROVIDES=" + ftgl$secondaryArchSuffix = $portVersion compat >= 2 + lib:libftgl$secondaryArchSuffix = 2.1.3 compat >= 2 + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libfreetype$secondaryArchSuffix + lib:libgl$secondaryArchSuffix + lib:libglu$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libfreetype$secondaryArchSuffix + devel:libgl$secondaryArchSuffix + devel:libglu$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:pkg_config$secondaryArchSuffix + " + +BUILD() +{ + autoreconf -fi -I m4 + runConfigure ./configure + make $jobArgs ECHO=echo +} + +INSTALL() +{ + make install ECHO=echo + + prepareInstalledDevelLibs libftgl + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + ftgl${secondaryArchSuffix}_devel = $portVersion compat >= 1 + devel:libftgl$secondaryArchSuffix = 2.1.3 compat >= 2 + " +REQUIRES_devel=" + ftgl$secondaryArchSuffix == $portVersion base + " diff --git a/media-libs/ftgl/patches/ftgl-2.1.3.patch b/media-libs/ftgl/patches/ftgl-2.1.3.patch deleted file mode 100644 index 5b013a46f..000000000 --- a/media-libs/ftgl/patches/ftgl-2.1.3.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur ftgl-2.1.3~rc5/Makefile.am ftgl-2.1.3~rc5-haiku/Makefile.am ---- ftgl-2.1.3~rc5/Makefile.am 2008-05-12 15:04:08.014942208 -0300 -+++ ftgl-2.1.3~rc5-haiku/Makefile.am 2010-06-19 02:40:04.067371008 -0300 -@@ -26,12 +26,6 @@ - - # 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 diff --git a/media-libs/ftgl/patches/ftgl-2.1.3~rc5.patchset b/media-libs/ftgl/patches/ftgl-2.1.3~rc5.patchset new file mode 100644 index 000000000..cf8b4c82d --- /dev/null +++ b/media-libs/ftgl/patches/ftgl-2.1.3~rc5.patchset @@ -0,0 +1,33 @@ +From d6d66d07d9a75807ecca8d45bd0d6c68c2d15eb8 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 15 May 2015 07:49:00 +0000 +Subject: Haiku patch + + +diff --git a/configure.ac b/configure.ac +index 53560ea..8b8730e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -6,7 +6,7 @@ AC_INIT(FTGL, 2.1.3~rc5, [sam@zoy.org], ftgl) + AC_CONFIG_SRCDIR(src/FTPoint.cpp) + AC_CONFIG_AUX_DIR(.auto) + AM_INIT_AUTOMAKE([1.6 no-define dist-zip dist-bzip2]) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + FTGL_PROG_CXX + +diff --git a/ftgl.pc.in b/ftgl.pc.in +index 479bf71..1484235 100644 +--- a/ftgl.pc.in ++++ b/ftgl.pc.in +@@ -8,5 +8,5 @@ Description: OpenGL frontend to Freetype 2 + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lftgl + Requires.private: freetype2 +-Libs.private: @GL_LIBS@ -lm ++Libs.private: @GL_LIBS@ + Cflags: -I${includedir} -I${includedir}/FTGL +-- +2.2.2 +