svn commit: r340129 - in head/graphics/osg-devel: . files
Matthias Andree
mandree at FreeBSD.org
Fri Jan 17 22:21:38 UTC 2014
Author: mandree
Date: Fri Jan 17 22:21:37 2014
New Revision: 340129
URL: http://svnweb.freebsd.org/changeset/ports/340129
QAT: https://qat.redports.org/buildarchive/r340129/
Log:
- Fix FreeType module build. [1]
- Modernize port: staging, LIB_DEPENDS [2]
PR: ports/185832 [1]
Approved by: amdmi3 (maintainer timeout on ports/185228) [1]
Approved by: portmgr (implicit, blanket) [2]
Obtained from: graphics/osg [1]
Added:
head/graphics/osg-devel/files/patch-CMakeModules_FindFreeType.cmake
- copied unchanged from r340098, head/graphics/osg/files/patch-CMakeModules_FindFreeType.cmake
head/graphics/osg-devel/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp
- copied unchanged from r340098, head/graphics/osg/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp
Modified:
head/graphics/osg-devel/Makefile
Modified: head/graphics/osg-devel/Makefile
==============================================================================
--- head/graphics/osg-devel/Makefile Fri Jan 17 22:11:12 2014 (r340128)
+++ head/graphics/osg-devel/Makefile Fri Jan 17 22:21:37 2014 (r340129)
@@ -13,14 +13,14 @@ DISTNAME= OpenSceneGraph-${PORTVERSION}
MAINTAINER= amdmi3 at FreeBSD.org
COMMENT= C++ OpenGL scene graph library for real-time rendering
-LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
- png15:${PORTSDIR}/graphics/png \
- tiff:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \
+ libpng15.so:${PORTSDIR}/graphics/png \
+ libtiff.so:${PORTSDIR}/graphics/tiff
CONFLICTS= osg-[0-9]*
USE_ZIP= yes
-USES= cmake pkgconfig
+USES= cmake:outsource pkgconfig
USE_GL= gl glu
USE_XORG= x11
USE_LDCONFIG= yes
@@ -45,7 +45,6 @@ OPTIONS_DEFAULT= FREETYPE GIF XRANDR
# broken (openvrml from ports is too old)
# OPENVRML "Support for OpenVRML" off
-NO_STAGE= yes
.include <bsd.port.options.mk>
# GUI toolkits are only needed for building examples, which are not even installed
@@ -56,7 +55,7 @@ FORCE_REQUIRE= Threads OpenGL X11 JPEG P
# options that affect FIND_PACKAGE
.if ${PORT_OPTIONS:MCURL}
FORCE_REQUIRE+= CURL
-LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl
PLIST_SUB+= CURL=""
.else
FORCE_IGNORE+= CURL
@@ -65,7 +64,7 @@ PLIST_SUB+= CURL="@comment "
.if ${PORT_OPTIONS:MFREETYPE}
FORCE_REQUIRE+= FreeType
-LIB_DEPENDS+= freetype:${PORTSDIR}/print/freetype2
+LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2
PLIST_SUB+= FREETYPE=""
.else
FORCE_IGNORE+= FreeType
@@ -74,7 +73,7 @@ PLIST_SUB+= FREETYPE="@comment "
.if ${PORT_OPTIONS:MGDAL}
FORCE_REQUIRE+= GDAL
-LIB_DEPENDS+= gdal:${PORTSDIR}/graphics/gdal
+LIB_DEPENDS+= libgdal.so:${PORTSDIR}/graphics/gdal
PLIST_SUB+= GDAL=""
.else
FORCE_IGNORE+= GDAL
@@ -83,7 +82,7 @@ PLIST_SUB+= GDAL="@comment "
.if ${PORT_OPTIONS:MGIF}
FORCE_REQUIRE+= GIFLIB
-LIB_DEPENDS+= gif:${PORTSDIR}/graphics/giflib
+LIB_DEPENDS+= libgif.so:${PORTSDIR}/graphics/giflib
PLIST_SUB+= GIF=""
.else
FORCE_IGNORE+= GIFLIB
@@ -102,7 +101,7 @@ PLIST_SUB+= INVENTOR="@comment "
.if ${PORT_OPTIONS:MJASPER}
FORCE_REQUIRE+= Jasper
-LIB_DEPENDS+= jasper:${PORTSDIR}/graphics/jasper
+LIB_DEPENDS+= libjasper.so:${PORTSDIR}/graphics/jasper
PLIST_SUB+= JASPER=""
.else
FORCE_IGNORE+= Jasper
@@ -111,7 +110,7 @@ PLIST_SUB+= JASPER="@comment "
#.if ${PORT_OPTIONS:MOPENVRML}
#FORCE_REQUIRE+= OpenVRML
-#LIB_DEPENDS+= openvrml:${PORTSDIR}/www/openvrml
+#LIB_DEPENDS+= libopenvrml.so:${PORTSDIR}/www/openvrml
#PLIST_SUB+= OPENVRML=""
#.else
FORCE_IGNORE+= OpenVRML
@@ -120,7 +119,7 @@ PLIST_SUB+= OPENVRML="@comment "
.if ${PORT_OPTIONS:MXINE}
FORCE_REQUIRE+= Xine
-LIB_DEPENDS+= xine:${PORTSDIR}/multimedia/libxine
+LIB_DEPENDS+= libxine.so:${PORTSDIR}/multimedia/libxine
PLIST_SUB+= XINE=""
.else
FORCE_IGNORE+= Xine
@@ -140,7 +139,7 @@ PLIST_SUB+= ITK="@comment "
.if ${PORT_OPTIONS:MVNC}
FORCE_REQUIRE+= LibVNCServer
-LIB_DEPENDS+= vncserver:${PORTSDIR}/net/libvncserver
+LIB_DEPENDS+= libvncserver.so:${PORTSDIR}/net/libvncserver
PLIST_SUB+= VNC=""
.else
FORCE_IGNORE+= LibVNCServer
@@ -149,7 +148,7 @@ PLIST_SUB+= VNC="@comment "
.if ${PORT_OPTIONS:MOPENEXR}
FORCE_REQUIRE+= OpenEXR
-LIB_DEPENDS+= IlmImf:${PORTSDIR}/graphics/OpenEXR
+LIB_DEPENDS+= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
PLIST_SUB+= OPENEXR=""
.else
FORCE_IGNORE+= OpenEXR
@@ -158,7 +157,7 @@ PLIST_SUB+= OPENEXR="@comment "
.if ${PORT_OPTIONS:MFFMPEG}
FORCE_REQUIRE+= FFmpeg
-LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
PLIST_SUB+= FFMPEG=""
.else
FORCE_IGNORE+= FFmpeg
@@ -175,7 +174,7 @@ FORCE_IGNORE+= SDL
# options that affect PKG_CHECK_MODULES
.if ${PORT_OPTIONS:MSVG}
FORCE_REQUIRE+= RSVG
-LIB_DEPENDS+= rsvg-2:${PORTSDIR}/graphics/librsvg2
+LIB_DEPENDS+= librsvg-2.so:${PORTSDIR}/graphics/librsvg2
PLIST_SUB+= SVG=""
.else
FORCE_IGNORE+= RSVG
@@ -192,7 +191,7 @@ PLIST_SUB+= PDF="@comment "
.endif
.if ${PORT_OPTIONS:MSVG} || ${PORT_OPTIONS:MPDF}
-LIB_DEPENDS+= cairo:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS+= libcairo.so:${PORTSDIR}/graphics/cairo
.endif
# other options
Copied: head/graphics/osg-devel/files/patch-CMakeModules_FindFreeType.cmake (from r340098, head/graphics/osg/files/patch-CMakeModules_FindFreeType.cmake)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/osg-devel/files/patch-CMakeModules_FindFreeType.cmake Fri Jan 17 22:21:37 2014 (r340129, copy of r340098, head/graphics/osg/files/patch-CMakeModules_FindFreeType.cmake)
@@ -0,0 +1,44 @@
+--- CMakeModules/FindFreeType.cmake.orig 2013-12-24 19:18:24.000000000 +0100
++++ CMakeModules/FindFreeType.cmake 2013-12-24 19:19:27.000000000 +0100
+@@ -24,18 +24,18 @@
+ # wants explicit full paths and this trickery doesn't work too well.
+ # I'm going to attempt to cut out the middleman and hope
+ # everything still works.
+-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
++FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h
+ PATHS
+ $ENV{FREETYPE_DIR}
+ NO_DEFAULT_PATH
+ PATH_SUFFIXES include
+ )
+-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
++FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h
+ PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+ NO_DEFAULT_PATH
+ PATH_SUFFIXES include
+ )
+-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
++FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h
+ PATHS
+ /usr/local
+ /usr
+@@ -51,16 +51,16 @@
+ PATH_SUFFIXES include
+ )
+
+-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
++FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
+ $ENV{FREETYPE_DIR}/include/freetype2
+ NO_DEFAULT_PATH
+ )
+-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
++FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
+ PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+ NO_DEFAULT_PATH
+ PATH_SUFFIXES include/freetype2
+ )
+-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
++FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
+ /usr/local/include/freetype2
+ /usr/include/freetype2
+ /usr/local/X11R6/include/freetype2
Copied: head/graphics/osg-devel/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp (from r340098, head/graphics/osg/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/osg-devel/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp Fri Jan 17 22:21:37 2014 (r340129, copy of r340098, head/graphics/osg/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp)
@@ -0,0 +1,14 @@
+--- src/osgPlugins/freetype/FreeTypeFont.cpp.orig 2013-12-24 19:29:26.000000000 +0100
++++ src/osgPlugins/freetype/FreeTypeFont.cpp 2013-12-24 19:30:24.000000000 +0100
+@@ -14,8 +14,9 @@
+ #include "FreeTypeFont.h"
+ #include "FreeTypeLibrary.h"
+
+-#include <freetype/ftoutln.h>
+-#include <freetype/ftbbox.h>
++#include <ft2build.h>
++#include FT_OUTLINE_H
++#include FT_BBOX_H
+
+ #include <osg/Notify>
+ #include <osg/io_utils>
More information about the svn-ports-all
mailing list