mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

- Update to 3.1.0

Browse Source
This commit is contained in:
Dmitry Marakasov 2012-04-26 00:48:15 +00:00
parent eb22aa0d9c
commit 4fc90590ae
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=295537
5 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
graphics/osg-devel/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= osg
PORTVERSION= 2.9.11
PORTREVISION= 3
PORTVERSION= 3.1.0
CATEGORIES= graphics
MASTER_SITES= http://www.openscenegraph.org/downloads/developer_releases/ \
http://mirror.amdmi3.ru/distfiles/
@ -32,8 +31,8 @@ USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
PLIST_SUB= OSG_VERSION=${PORTVERSION} \
OSG_SHLIBVER=71 \
OPENTHREADS_VERSION=2.5.0 \
OSG_SHLIBVER=90 \
OPENTHREADS_VERSION=2.6.0 \
OPENTHREADS_SHLIBVER=12
PORTSCOUT= limitw:1,odd
@ -61,7 +60,7 @@ OPTIONS= CURL "Support for cURL" off \
# GUI toolkits are only needed for building examples, which are not even installed
FORCE_IGNORE= FLTK GLUT FOX Qt3 Qt4 wxWidgets OpenAL GtkGl # only for examples
FORCE_IGNORE+= COLLADA Performer OurDCMTK XUL FBX # not in ports
FORCE_IGNORE+= COLLADA Performer OurDCMTK XUL FBX GTA # not in ports
FORCE_REQUIRE= Threads OpenGL X11 JPEG PNG TIFF ZLIB # common & lightweight
# options that affect FIND_PACKAGE

4
graphics/osg-devel/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (OpenSceneGraph-2.9.11.zip) = 7c19dc42062a230b6b2448c204a3b7c3757b4c3df93350e5620e1f4400dc97d6
SIZE (OpenSceneGraph-2.9.11.zip) = 6868869
SHA256 (OpenSceneGraph-3.1.0.zip) = 327d84495dff893c879b4617de1f58c5130fa1f270548f51fe8f9dec59ab551b
SIZE (OpenSceneGraph-3.1.0.zip) = 7190113

4
graphics/osg-devel/files/patch-src-OpenThreads-pthreads-PThread.c++ → graphics/osg-devel/files/patch-src-OpenThreads-pthreads-PThread.cpp
View File

@ -1,5 +1,5 @@
--- src/OpenThreads/pthreads/PThread.c++.orig 2009-11-20 13:27:43.000000000 +0300
+++ src/OpenThreads/pthreads/PThread.c++ 2009-12-15 20:26:51.000000000 +0300
--- src/OpenThreads/pthreads/PThread.cpp.orig 2009-11-20 13:27:43.000000000 +0300
+++ src/OpenThreads/pthreads/PThread.cpp 2009-12-15 20:26:51.000000000 +0300
@@ -21,6 +21,7 @@
#include <sys/types.h>
#include <unistd.h>

28
graphics/osg-devel/files/patch-src-osgPlugins-xine-video_out_rgb.c
View File

@ -1,5 +1,5 @@
--- src/osgPlugins/xine/video_out_rgb.c.orig
+++ src/osgPlugins/xine/video_out_rgb.c
--- src/osgPlugins/xine/video_out_rgb.c.orig 2012-02-09 20:42:47.000000000 +0400
+++ src/osgPlugins/xine/video_out_rgb.c 2012-03-06 23:06:37.317706687 +0400
@@ -51,6 +51,11 @@
#include "xine/video_out.h"
#include "video_out_rgb.h"
@ -12,7 +12,7 @@
#define THIS "video_out_rgb"
@@ -2237,9 +2242,15 @@ rgbout_frame_dispose(vo_frame_t* vo_fram
@@ -2237,9 +2242,15 @@
EVAL(vo_frame != NULL)
@ -28,7 +28,7 @@
free(frame);
FAILURE:
@@ -2303,9 +2314,15 @@ rgbout_update_frame_format(vo_driver_t*
@@ -2303,9 +2314,15 @@
this->frame_width = frame->width;
this->frame_height = frame->height;
@ -44,7 +44,7 @@
CHECK_FRAME:
switch(frame->format)
@@ -2322,6 +2339,7 @@ CHECK_FRAME:
@@ -2322,6 +2339,7 @@
frame->vo_frame.pitches[0] = (frame->width > 7) ? frame->width : 8;
frame->vo_frame.pitches[1] = (frame->width > 15) ? (frame->width >> 1) : 8;
frame->vo_frame.pitches[2] = frame->vo_frame.pitches[1];
@ -52,7 +52,7 @@
frame->vo_frame.base[0] = (uint8_t*) xine_xmalloc_aligned(16,
frame->vo_frame.pitches[0] * frame->height,
&(frame->chunk[0]));
@@ -2331,6 +2349,14 @@ CHECK_FRAME:
@@ -2331,6 +2349,14 @@
frame->vo_frame.base[2] = (uint8_t*) xine_xmalloc_aligned(16,
frame->vo_frame.pitches[2] * (frame->height >> 1),
&(frame->chunk[2]));
@ -67,7 +67,7 @@
}
break;
@@ -2346,9 +2372,14 @@ CHECK_FRAME:
@@ -2346,9 +2372,14 @@
frame->vo_frame.pitches[0] = (frame->width > 3) ? (frame->width << 1) : 8;
frame->vo_frame.pitches[1] = 0;
frame->vo_frame.pitches[2] = 0;
@ -82,17 +82,3 @@
frame->vo_frame.base[1] = NULL;
frame->vo_frame.base[2] = NULL;
}
@@ -2769,8 +2800,13 @@ init_class(xine_t* xine, void* vo_visual
clear(rgb_class, sizeof(rgbout_class_t));
rgb_class->driver_class.open_plugin = open_plugin;
+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
rgb_class->driver_class.get_identifier = get_identifier;
rgb_class->driver_class.get_description = get_description;
+#else
+ rgb_class->driver_class.identifier = get_identifier(NULL);
+ rgb_class->driver_class.description = get_description(NULL);
+#endif
rgb_class->driver_class.dispose = dispose_class;
return(rgb_class);

11
graphics/osg-devel/pkg-plist
View File

@ -75,6 +75,7 @@ include/osg/GLU
include/osg/Geode
include/osg/Geometry
include/osg/GraphicsContext
include/osg/GraphicsCostEstimator
include/osg/GraphicsThread
include/osg/Group
include/osg/Hint
@ -164,6 +165,8 @@ include/osg/Transform
include/osg/TriangleFunctor
include/osg/TriangleIndexFunctor
include/osg/Uniform
include/osg/UserDataContainer
include/osg/ValueObject
include/osg/Vec2
include/osg/Vec2b
include/osg/Vec2d
@ -244,6 +247,7 @@ include/osgDB/DatabaseRevisions
include/osgDB/DotOsgWrapper
include/osgDB/DynamicLibrary
include/osgDB/Export
include/osgDB/ExternalFileWriter
include/osgDB/FileCache
include/osgDB/FileNameUtils
include/osgDB/FileUtils
@ -392,6 +396,7 @@ include/osgShadow/OccluderGeometry
include/osgShadow/ParallelSplitShadowMap
include/osgShadow/ProjectionShadowMap
include/osgShadow/ShadowMap
include/osgShadow/ShadowSettings
include/osgShadow/ShadowTechnique
include/osgShadow/ShadowTexture
include/osgShadow/ShadowVolume
@ -399,6 +404,7 @@ include/osgShadow/ShadowedScene
include/osgShadow/SoftShadowMap
include/osgShadow/StandardShadowMap
include/osgShadow/Version
include/osgShadow/ViewDependentShadowMap
include/osgShadow/ViewDependentShadowTechnique
include/osgSim/BlinkSequence
include/osgSim/ColorRange
@ -454,7 +460,6 @@ include/osgUtil/DrawElementTypeSimplifier
include/osgUtil/EdgeCollector
include/osgUtil/Export
include/osgUtil/GLObjectsVisitor
include/osgUtil/GraphicsCostEstimator
include/osgUtil/HalfWayMapGenerator
include/osgUtil/HighlightMapGenerator
include/osgUtil/IncrementalCompileOperation
@ -464,6 +469,7 @@ include/osgUtil/LineSegmentIntersector
include/osgUtil/MeshOptimizers
include/osgUtil/OperationArrayFunctor
include/osgUtil/Optimizer
include/osgUtil/PerlinNoise
include/osgUtil/PlaneIntersector
include/osgUtil/PolytopeIntersector
include/osgUtil/PositionalStateContainer
@ -489,10 +495,7 @@ include/osgUtil/UpdateVisitor
include/osgUtil/Version
include/osgViewer/CompositeViewer
include/osgViewer/Export
include/osgViewer/GraphicsHandleX11
include/osgViewer/GraphicsWindow
include/osgViewer/GraphicsWindowX11
include/osgViewer/PixelBufferX11
include/osgViewer/Renderer
include/osgViewer/Scene
include/osgViewer/Version