aboutsummaryrefslogtreecommitdiff
path: root/graphics/osg-devel
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/osg-devel')
-rw-r--r--graphics/osg-devel/Makefile164
-rw-r--r--graphics/osg-devel/distinfo4
-rw-r--r--graphics/osg-devel/files/patch-CMakeLists.txt8
-rw-r--r--graphics/osg-devel/files/patch-CMakeModules-FindGTA.cmake25
-rw-r--r--graphics/osg-devel/files/patch-src-OpenThreads-pthreads-PThread.cpp14
-rw-r--r--graphics/osg-devel/files/patch-src-osgPlugins-xine-video__out__rgb.c84
-rw-r--r--graphics/osg-devel/pkg-plist64
7 files changed, 179 insertions, 184 deletions
diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
index a7685b96e7ad..1287ed4a06dd 100644
--- a/graphics/osg-devel/Makefile
+++ b/graphics/osg-devel/Makefile
@@ -2,19 +2,23 @@
# $FreeBSD$
PORTNAME= osg
-PORTVERSION= 3.1.3
-PORTREVISION= 6
+PORTVERSION= 3.3.0
CATEGORIES= graphics
-MASTER_SITES= http://www.openscenegraph.org/downloads/developer_releases/ \
+MASTER_SITES= http://trac.openscenegraph.org/downloads/developer_releases/ \
http://mirror.amdmi3.ru/distfiles/
-PKGNAMESUFFIX= -devel
DISTNAME= OpenSceneGraph-${PORTVERSION}
+PKGNAMESUFFIX= -devel
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= C++ OpenGL scene graph library for real-time rendering
+LICENSE= OSGPL
+LICENSE_NAME= OpenSceneGraph Public License
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \
- libpng15.so:${PORTSDIR}/graphics/png \
+ libpng.so:${PORTSDIR}/graphics/png \
libtiff.so:${PORTSDIR}/graphics/tiff
CONFLICTS= osg-[0-9]*
@@ -26,187 +30,179 @@ USE_XORG= x11
USE_LDCONFIG= yes
PLIST_SUB= OSG_VERSION=${PORTVERSION} \
- OSG_SHLIBVER=93 \
- OPENTHREADS_VERSION=2.6.0 \
- OPENTHREADS_SHLIBVER=12
+ OSG_SHLIBVER=110 \
+ OPENTHREADS_VERSION=${PORTVERSION} \
+ OPENTHREADS_SHLIBVER=14
PORTSCOUT= limitw:1,odd
-OPTIONS_DEFINE= CURL FREETYPE GDAL GIF INVENTOR JASPER XINE ITK \
- VNC OPENEXR FFMPEG SVG PDF XRANDR SDL
+OPTIONS_DEFINE= CURL FREETYPE GDAL GIF INVENTOR JASPER XINE GTA \
+ VNC OPENEXR FFMPEG SVG PDF SDL NVTT QT4 XRANDR \
+ LUA V8 PYTHON
+OPTIONS_DEFAULT=FREETYPE GIF FFMPEG XRANDR
+
GDAL_DESC= GDAL support
INVENTOR_DESC= SGI OpenInventor support
-ITK_DESC= InsightToolkit support
+GTA_DESC= GTA file format support
VNC_DESC= LibVNCServer support
SDL_DESC= Use SDL (joystick support in present3d)
-
-OPTIONS_DEFAULT= FREETYPE GIF XRANDR
-
-# broken (openvrml from ports is too old)
-# OPENVRML "Support for OpenVRML" off
+NVTT_DESC= Use NVidia texture tools
+LUA_DESC= Lua strict engine support
+V8_DESC= V8 script engine support
+PYTHON_DESC= Python strict engine support
+
+OPTIONS_SUB= yes
+
+CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
+FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
+GDAL_LIB_DEPENDS= libgdal.so:${PORTSDIR}/graphics/gdal
+GIF_LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib
+INVENTOR_LIB_DEPENDS= libInventor.so:${PORTSDIR}/graphics/inventor
+JASPER_LIB_DEPENDS= libjasper.so:${PORTSDIR}/graphics/jasper
+XINE_LIB_DEPENDS= libxine.so:${PORTSDIR}/multimedia/libxine
+GTA_LIB_DEPENDS= libgta.so:${PORTSDIR}/devel/libgta
+VNC_LIB_DEPENDS= libvncserver.so:${PORTSDIR}/net/libvncserver
+OPENEXR_LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+FFMPEG_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+SVG_LIB_DEPENDS= librsvg-2.so:${PORTSDIR}/graphics/librsvg2
+PDF_LIB_DEPENDS= libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+SDL_USE= SDL=sdl
+NVTT_LIB_DEPENDS= libnvtt.so:${PORTSDIR}/graphics/nvidia-texture-tools
+XRANDR_CMAKE_ON= -DOSGVIEWER_USE_XRANDR:BOOL=ON
+XRANDR_CMAKE_OFF= -DOSGVIEWER_USE_XRANDR:BOOL=OFF
+QT4_USE= QT4=corelib,gui,opengl,qmake_build,moc_build,uic_build,rcc_build
+QT4_CMAKE_ON= -DOSG_USE_QT=ON
+QT4_CMAKE_OFF= -DOSG_USE_QT=OFF
+LUA_USE= LUA=5.1
+V8_LIB_DEPENDS= libv8.so:${PORTSDIR}/lang/v8
+PYTHON_USE= PYTHON=2
.include <bsd.port.options.mk>
# 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 GTA # not in ports
+FORCE_IGNORE= FLTK GLUT FOX Qt3 Qt5Widgets wxWidgets OpenAL GtkGl # only for examples
+FORCE_IGNORE+= COLLADA Performer OurDCMTK XUL FBX # not in ports
+FORCE_IGNORE+= OpenVRML # ports version too old
+FORCE_IGNORE+= ITK # ports version doesn't build on 10.x
FORCE_REQUIRE= Threads OpenGL X11 JPEG PNG TIFF ZLIB # common & lightweight
# options that affect FIND_PACKAGE
.if ${PORT_OPTIONS:MCURL}
FORCE_REQUIRE+= CURL
-LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl
-PLIST_SUB+= CURL=""
.else
FORCE_IGNORE+= CURL
-PLIST_SUB+= CURL="@comment "
.endif
.if ${PORT_OPTIONS:MFREETYPE}
FORCE_REQUIRE+= FreeType
-LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2
-PLIST_SUB+= FREETYPE=""
.else
FORCE_IGNORE+= FreeType
-PLIST_SUB+= FREETYPE="@comment "
.endif
.if ${PORT_OPTIONS:MGDAL}
FORCE_REQUIRE+= GDAL
-LIB_DEPENDS+= libgdal.so:${PORTSDIR}/graphics/gdal
-PLIST_SUB+= GDAL=""
.else
FORCE_IGNORE+= GDAL
-PLIST_SUB+= GDAL="@comment "
.endif
.if ${PORT_OPTIONS:MGIF}
FORCE_REQUIRE+= GIFLIB
-LIB_DEPENDS+= libgif.so:${PORTSDIR}/graphics/giflib
-PLIST_SUB+= GIF=""
.else
FORCE_IGNORE+= GIFLIB
-PLIST_SUB+= GIF="@comment "
.endif
.if ${PORT_OPTIONS:MINVENTOR}
FORCE_REQUIRE+= Inventor
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libInventor.so:${PORTSDIR}/graphics/inventor
-RUN_DEPENDS+= ${LOCALBASE}/lib/libInventor.so:${PORTSDIR}/graphics/inventor
-PLIST_SUB+= INVENTOR=""
.else
FORCE_IGNORE+= Inventor
-PLIST_SUB+= INVENTOR="@comment "
.endif
.if ${PORT_OPTIONS:MJASPER}
FORCE_REQUIRE+= Jasper
-LIB_DEPENDS+= libjasper.so:${PORTSDIR}/graphics/jasper
-PLIST_SUB+= JASPER=""
.else
FORCE_IGNORE+= Jasper
-PLIST_SUB+= JASPER="@comment "
.endif
-#.if ${PORT_OPTIONS:MOPENVRML}
-#FORCE_REQUIRE+= OpenVRML
-#LIB_DEPENDS+= libopenvrml.so:${PORTSDIR}/www/openvrml
-#PLIST_SUB+= OPENVRML=""
-#.else
-FORCE_IGNORE+= OpenVRML
-PLIST_SUB+= OPENVRML="@comment "
-#.endif
-
.if ${PORT_OPTIONS:MXINE}
FORCE_REQUIRE+= Xine
-LIB_DEPENDS+= libxine.so:${PORTSDIR}/multimedia/libxine
-PLIST_SUB+= XINE=""
.else
FORCE_IGNORE+= Xine
-PLIST_SUB+= XINE="@comment "
.endif
-.if ${PORT_OPTIONS:MITK}
-FORCE_REQUIRE+= ITK
-BUILD_DEPENDS+= ${LOCALBASE}/lib/InsightToolkit/UseITK.cmake:${PORTSDIR}/science/InsightToolkit
-RUN_DEPENDS+= ${LOCALBASE}/lib/InsightToolkit/UseITK.cmake:${PORTSDIR}/science/InsightToolkit
-PLIST_SUB+= ITK=""
-CXXFLAGS+= -DVCL_CAN_STATIC_CONST_INIT_FLOAT=0
+.if ${PORT_OPTIONS:MGTA}
+FORCE_REQUIRE+= GTA
.else
-FORCE_IGNORE+= ITK
-PLIST_SUB+= ITK="@comment "
+FORCE_IGNORE+= GTA
.endif
.if ${PORT_OPTIONS:MVNC}
FORCE_REQUIRE+= LibVNCServer
-LIB_DEPENDS+= libvncserver.so:${PORTSDIR}/net/libvncserver
-PLIST_SUB+= VNC=""
.else
FORCE_IGNORE+= LibVNCServer
-PLIST_SUB+= VNC="@comment "
.endif
.if ${PORT_OPTIONS:MOPENEXR}
FORCE_REQUIRE+= OpenEXR
-LIB_DEPENDS+= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
-PLIST_SUB+= OPENEXR=""
.else
FORCE_IGNORE+= OpenEXR
-PLIST_SUB+= OPENEXR="@comment "
.endif
.if ${PORT_OPTIONS:MFFMPEG}
FORCE_REQUIRE+= FFmpeg
-LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
-PLIST_SUB+= FFMPEG=""
.else
FORCE_IGNORE+= FFmpeg
-PLIST_SUB+= FFMPEG="@comment "
.endif
.if ${PORT_OPTIONS:MSDL}
FORCE_REQUIRE+= SDL
-USE_SDL= sdl
.else
FORCE_IGNORE+= SDL
.endif
+.if ${PORT_OPTIONS:MNVTT}
+FORCE_REQUIRE+= NVTT
+.else
+FORCE_IGNORE+= NVTT
+.endif
+
+.if ${PORT_OPTIONS:MLUA}
+FORCE_REQUIRE+= Lua51
+.else
+FORCE_IGNORE+= Lua51
+.endif
+
+.if ${PORT_OPTIONS:MV8}
+FORCE_REQUIRE+= V8
+.else
+FORCE_IGNORE+= V8
+.endif
+
+.if ${PORT_OPTIONS:MPYTHON}
+FORCE_REQUIRE+= PythonLibs
+.else
+FORCE_IGNORE+= PythonLibs
+.endif
+
# options that affect PKG_CHECK_MODULES
.if ${PORT_OPTIONS:MSVG}
FORCE_REQUIRE+= RSVG
-LIB_DEPENDS+= librsvg-2.so:${PORTSDIR}/graphics/librsvg2
-PLIST_SUB+= SVG=""
.else
FORCE_IGNORE+= RSVG
-PLIST_SUB+= SVG="@comment "
.endif
.if ${PORT_OPTIONS:MPDF}
FORCE_REQUIRE+= Poppler-glib
-LIB_DEPENDS+= libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
-PLIST_SUB+= PDF=""
.else
FORCE_IGNORE+= Poppler-glib
-PLIST_SUB+= PDF="@comment "
.endif
.if ${PORT_OPTIONS:MSVG} || ${PORT_OPTIONS:MPDF}
-LIB_DEPENDS+= libcairo.so:${PORTSDIR}/graphics/cairo
+USE_GNOME= cairo
.endif
# other options
.if ${PORT_OPTIONS:MXRANDR}
-CMAKE_ARGS+= -DOSGVIEWER_USE_XRANDR:BOOL=ON
USE_XORG+= xrandr
-.else
-CMAKE_ARGS+= -DOSGVIEWER_USE_XRANDR:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MXRANDR}
-CMAKE_ARGS+= -DOSGVIEWER_USE_XRANDR:BOOL=ON
-USE_XORG+= xrandr
-.else
-CMAKE_ARGS+= -DOSGVIEWER_USE_XRANDR:BOOL=OFF
.endif
post-patch:
diff --git a/graphics/osg-devel/distinfo b/graphics/osg-devel/distinfo
index df42995acb88..1495ca2315ca 100644
--- a/graphics/osg-devel/distinfo
+++ b/graphics/osg-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (OpenSceneGraph-3.1.3.zip) = 59a5fecd19aa3c642309363a6c355bc6984615f3b1eb1a1545bfb14cc22f9de9
-SIZE (OpenSceneGraph-3.1.3.zip) = 7218005
+SHA256 (OpenSceneGraph-3.3.0.zip) = 55224da955d58705d1cf9ec46a4129f29e8f37e69f4e9430c28f978594e1a5c6
+SIZE (OpenSceneGraph-3.3.0.zip) = 7627299
diff --git a/graphics/osg-devel/files/patch-CMakeLists.txt b/graphics/osg-devel/files/patch-CMakeLists.txt
index d47608af17b2..f1df43923067 100644
--- a/graphics/osg-devel/files/patch-CMakeLists.txt
+++ b/graphics/osg-devel/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2009-05-22 12:31:58.000000000 +0400
-+++ CMakeLists.txt 2009-06-25 17:51:06.000000000 +0400
-@@ -486,7 +486,7 @@
+--- CMakeLists.txt.orig 2011-07-31 11:50:34.000000000 +0400
++++ CMakeLists.txt 2012-03-05 05:54:52.485029323 +0400
+@@ -588,7 +588,7 @@
IF(UNIX AND NOT WIN32 AND NOT APPLE)
IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
@@ -9,7 +9,7 @@
MARK_AS_ADVANCED(LIB_POSTFIX)
ENDIF()
ENDIF()
-@@ -822,7 +822,7 @@
+@@ -972,7 +972,7 @@
${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc
@ONLY
)
diff --git a/graphics/osg-devel/files/patch-CMakeModules-FindGTA.cmake b/graphics/osg-devel/files/patch-CMakeModules-FindGTA.cmake
new file mode 100644
index 000000000000..8a648a5ac524
--- /dev/null
+++ b/graphics/osg-devel/files/patch-CMakeModules-FindGTA.cmake
@@ -0,0 +1,25 @@
+--- CMakeModules/FindGTA.cmake.orig 2014-01-19 17:46:13.693927259 +0400
++++ CMakeModules/FindGTA.cmake 2014-01-19 18:38:17.868997891 +0400
+@@ -8,16 +8,6 @@
+ # correspond to the ./configure --prefix=$GTA_DIR
+ # used in building libgta.
+
+-INCLUDE(FindPkgConfig OPTIONAL)
+-
+-IF(PKG_CONFIG_FOUND)
+-
+- INCLUDE(FindPkgConfig)
+-
+- PKG_CHECK_MODULES(GTA gta)
+-
+-ELSE(PKG_CONFIG_FOUND)
+-
+ FIND_PATH(GTA_INCLUDE_DIRS gta/gta.hpp
+ $ENV{GTA_DIR}/include
+ $ENV{GTA_DIR}
+@@ -52,5 +42,3 @@
+ IF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS)
+ SET(GTA_FOUND "YES")
+ ENDIF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS)
+-
+-ENDIF(PKG_CONFIG_FOUND)
diff --git a/graphics/osg-devel/files/patch-src-OpenThreads-pthreads-PThread.cpp b/graphics/osg-devel/files/patch-src-OpenThreads-pthreads-PThread.cpp
index 848a41b55eef..eeaba23f077d 100644
--- a/graphics/osg-devel/files/patch-src-OpenThreads-pthreads-PThread.cpp
+++ b/graphics/osg-devel/files/patch-src-OpenThreads-pthreads-PThread.cpp
@@ -1,5 +1,5 @@
---- 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
+--- src/OpenThreads/pthreads/PThread.cpp.orig 2011-06-24 00:09:26.000000000 +0400
++++ src/OpenThreads/pthreads/PThread.cpp 2012-03-05 05:57:02.886704932 +0400
@@ -21,6 +21,7 @@
#include <sys/types.h>
#include <unistd.h>
@@ -7,8 +7,8 @@
+#include <pthread_np.h>
#include <limits.h>
- #if defined __linux || defined __sun || defined __APPLE__
-@@ -123,7 +124,7 @@
+ #if defined __linux || defined __sun || defined __APPLE__ || ANDROID
+@@ -136,7 +137,7 @@
#if defined(__sgi)
pthread_setrunon_np( pd->cpunum );
#elif defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
@@ -17,7 +17,7 @@
CPU_ZERO( &cpumask );
CPU_SET( pd->cpunum, &cpumask );
-@@ -539,7 +540,7 @@
+@@ -569,7 +570,7 @@
if (pd->isRunning && Thread::CurrentThread()==this)
{
@@ -26,7 +26,7 @@
CPU_ZERO( &cpumask );
CPU_SET( pd->cpunum, &cpumask );
#if defined(HAVE_PTHREAD_SETAFFINITY_NP)
-@@ -969,7 +970,7 @@
+@@ -1031,7 +1032,7 @@
else
{
#if defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
@@ -34,4 +34,4 @@
+ cpuset_t cpumask;
CPU_ZERO( &cpumask );
CPU_SET( cpunum, &cpumask );
-
+ #if defined(HAVE_PTHREAD_SETAFFINITY_NP)
diff --git a/graphics/osg-devel/files/patch-src-osgPlugins-xine-video__out__rgb.c b/graphics/osg-devel/files/patch-src-osgPlugins-xine-video__out__rgb.c
deleted file mode 100644
index 40ef08509ccc..000000000000
--- a/graphics/osg-devel/files/patch-src-osgPlugins-xine-video__out__rgb.c
+++ /dev/null
@@ -1,84 +0,0 @@
---- 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"
-
-+#if !(XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2))
-+#define round round_not
-+#include <libavutil/mem.h>
-+#undef round
-+#endif
-
- #define THIS "video_out_rgb"
-
-@@ -2237,9 +2242,15 @@
-
- EVAL(vo_frame != NULL)
-
-+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
- release(frame->chunk[0]);
- release(frame->chunk[1]);
- release(frame->chunk[2]);
-+#else
-+ av_freep(frame->chunk[0]);
-+ av_freep(frame->chunk[1]);
-+ av_freep(frame->chunk[2]);
-+#endif
- free(frame);
-
- FAILURE:
-@@ -2303,9 +2314,15 @@
- this->frame_width = frame->width;
- this->frame_height = frame->height;
-
-+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
- release(frame->chunk[0]);
- release(frame->chunk[1]);
- release(frame->chunk[2]);
-+#else
-+ av_freep(frame->chunk[0]);
-+ av_freep(frame->chunk[1]);
-+ av_freep(frame->chunk[2]);
-+#endif
-
- CHECK_FRAME:
- switch(frame->format)
-@@ -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];
-+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
- 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 @@
- frame->vo_frame.base[2] = (uint8_t*) xine_xmalloc_aligned(16,
- frame->vo_frame.pitches[2] * (frame->height >> 1),
- &(frame->chunk[2]));
-+#else
-+ frame->vo_frame.base[0] = (uint8_t*)(frame->chunk[0] =
-+ av_mallocz(frame->vo_frame.pitches[0] * frame->height));
-+ frame->vo_frame.base[1] = (uint8_t*)(frame->chunk[1] =
-+ av_mallocz(frame->vo_frame.pitches[1] * (frame->height >> 1)));
-+ frame->vo_frame.base[2] = (uint8_t*)(frame->chunk[2] =
-+ av_mallocz(frame->vo_frame.pitches[2] * (frame->height >> 1)));
-+#endif
- }
- break;
-
-@@ -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;
-+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
- frame->vo_frame.base[0] = (uint8_t*) xine_xmalloc_aligned(16,
- frame->vo_frame.pitches[0] * frame->height,
- &(frame->chunk[0]));
-+#else
-+ frame->vo_frame.base[0] = (uint8_t*)(frame->chunk[0] =
-+ av_mallocz(frame->vo_frame.pitches[0] * frame->height));
-+#endif
- frame->vo_frame.base[1] = NULL;
- frame->vo_frame.base[2] = NULL;
- }
diff --git a/graphics/osg-devel/pkg-plist b/graphics/osg-devel/pkg-plist
index ffcafa15d9b0..92249c2f9fcd 100644
--- a/graphics/osg-devel/pkg-plist
+++ b/graphics/osg-devel/pkg-plist
@@ -34,7 +34,6 @@ include/osg/BoundsChecking
include/osg/BufferIndexBinding
include/osg/BufferObject
include/osg/Camera
-include/osg/CameraNode
include/osg/CameraView
include/osg/ClampColor
include/osg/ClearNode
@@ -112,6 +111,7 @@ include/osg/OccluderNode
include/osg/OcclusionQueryNode
include/osg/OperationThread
include/osg/PagedLOD
+include/osg/PatchParameter
include/osg/Plane
include/osg/Point
include/osg/PointSprite
@@ -120,6 +120,7 @@ include/osg/PolygonOffset
include/osg/PolygonStipple
include/osg/Polytope
include/osg/PositionAttitudeTransform
+include/osg/PrimitiveRestartIndex
include/osg/PrimitiveSet
include/osg/Program
include/osg/Projection
@@ -127,7 +128,9 @@ include/osg/ProxyNode
include/osg/Quat
include/osg/Referenced
include/osg/RenderInfo
+include/osg/SampleMaski
include/osg/Scissor
+include/osg/ScriptEngine
include/osg/Sequence
include/osg/ShadeModel
include/osg/Shader
@@ -157,6 +160,7 @@ include/osg/Texture2D
include/osg/Texture2DArray
include/osg/Texture2DMultisample
include/osg/Texture3D
+include/osg/TextureBuffer
include/osg/TextureCubeMap
include/osg/TextureRectangle
include/osg/Timer
@@ -171,18 +175,29 @@ include/osg/Vec2
include/osg/Vec2b
include/osg/Vec2d
include/osg/Vec2f
+include/osg/Vec2i
include/osg/Vec2s
+include/osg/Vec2ub
+include/osg/Vec2ui
+include/osg/Vec2us
include/osg/Vec3
include/osg/Vec3b
include/osg/Vec3d
include/osg/Vec3f
+include/osg/Vec3i
include/osg/Vec3s
+include/osg/Vec3ub
+include/osg/Vec3ui
+include/osg/Vec3us
include/osg/Vec4
include/osg/Vec4b
include/osg/Vec4d
include/osg/Vec4f
+include/osg/Vec4i
include/osg/Vec4s
include/osg/Vec4ub
+include/osg/Vec4ui
+include/osg/Vec4us
include/osg/Version
include/osg/VertexProgram
include/osg/View
@@ -288,6 +303,7 @@ include/osgFX/Version
include/osgGA/AnimationPathManipulator
include/osgGA/CameraManipulator
include/osgGA/CameraViewSwitchManipulator
+include/osgGA/Device
include/osgGA/DriveManipulator
include/osgGA/EventQueue
include/osgGA/EventVisitor
@@ -379,12 +395,36 @@ include/osgParticle/SmokeTrailEffect
include/osgParticle/VariableRateCounter
include/osgParticle/Version
include/osgParticle/range
+include/osgPresentation/Action
include/osgPresentation/AnimationMaterial
+include/osgPresentation/Audio
include/osgPresentation/CompileSlideCallback
+include/osgPresentation/Cursor
+include/osgPresentation/Element
include/osgPresentation/Export
+include/osgPresentation/Group
+include/osgPresentation/Image
+include/osgPresentation/KeyEventHandler
+include/osgPresentation/Layer
+include/osgPresentation/Model
+include/osgPresentation/Movie
include/osgPresentation/PickEventHandler
+include/osgPresentation/Presentation
+include/osgPresentation/PropertyManager
+include/osgPresentation/Section
+include/osgPresentation/Slide
include/osgPresentation/SlideEventHandler
include/osgPresentation/SlideShowConstructor
+include/osgPresentation/Text
+include/osgPresentation/Timeout
+include/osgPresentation/Volume
+%%QT4%%include/osgQt/Export
+%%QT4%%include/osgQt/GraphicsWindowQt
+%%QT4%%include/osgQt/QFontImplementation
+%%QT4%%include/osgQt/QGraphicsViewAdapter
+%%QT4%%include/osgQt/QWebViewImage
+%%QT4%%include/osgQt/QWidgetImage
+include/osgDB/PropertyInterface
include/osgShadow/ConvexPolyhedron
include/osgShadow/DebugShadowMap
include/osgShadow/Export
@@ -474,6 +514,7 @@ include/osgUtil/PlaneIntersector
include/osgUtil/PolytopeIntersector
include/osgUtil/PositionalStateContainer
include/osgUtil/PrintVisitor
+include/osgUtil/RayIntersector
include/osgUtil/ReflectionMapGenerator
include/osgUtil/RenderBin
include/osgUtil/RenderLeaf
@@ -496,6 +537,7 @@ include/osgUtil/Version
include/osgViewer/CompositeViewer
include/osgViewer/Export
include/osgViewer/GraphicsWindow
+include/osgViewer/Keystone
include/osgViewer/Renderer
include/osgViewer/Scene
include/osgViewer/Version
@@ -567,6 +609,9 @@ lib/libosgParticle.so.%%OSG_SHLIBVER%%
lib/libosgPresentation.so
lib/libosgPresentation.so.%%OSG_VERSION%%
lib/libosgPresentation.so.%%OSG_SHLIBVER%%
+%%QT4%%lib/libosgQt.so
+%%QT4%%lib/libosgQt.so.%%OSG_VERSION%%
+%%QT4%%lib/libosgQt.so.%%OSG_SHLIBVER%%
lib/libosgShadow.so
lib/libosgShadow.so.%%OSG_VERSION%%
lib/libosgShadow.so.%%OSG_SHLIBVER%%
@@ -618,24 +663,28 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_dxf.so
%%FFMPEG%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_ffmpeg.so
%%FREETYPE%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_freetype.so
%%GDAL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gdal.so
-lib/osgPlugins-%%OSG_VERSION%%/osgdb_geo.so
%%GIF%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gif.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_glsl.so
+%%GTA%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gta.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_gz.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_hdr.so
%%INVENTOR%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_iv.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_ive.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_jpeg.so
%%JASPER%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_jp2.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_ktx.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_logo.so
+%%LUA%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_lua.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_lwo.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_lws.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_md2.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_mdl.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_normals.so
+%%NVTT%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_nvtt.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_obj.so
%%GDAL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_ogr.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_openflight.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_osc.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_osg.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_osga.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgshadow.so
@@ -650,6 +699,8 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_png.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_pnm.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_pov.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_pvr.so
+%%PYTHON%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_python.so
+%%QT4%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_qfont.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_revisions.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_rgb.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_rot.so
@@ -657,13 +708,17 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_scale.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osg.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osganimation.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgfx.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgga.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgmanipulator.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgparticle.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgpresentation.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgshadow.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgsim.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgterrain.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgtext.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgviewer.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgvolume.so
+%%SDL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_sdl.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_shp.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_stl.so
%%SVG%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_svg.so
@@ -671,10 +726,11 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_tga.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_tgz.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_tiff.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_trans.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_trk.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_txf.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_txp.so
+%%V8%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_v8.so
%%VNC%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_vnc.so
-%%OPENVRML%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_vrml.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_vtf.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_x.so
%%XINE%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_xine.so
@@ -686,6 +742,7 @@ libdata/pkgconfig/openscenegraph-osgFX.pc
libdata/pkgconfig/openscenegraph-osgGA.pc
libdata/pkgconfig/openscenegraph-osgManipulator.pc
libdata/pkgconfig/openscenegraph-osgParticle.pc
+%%QT4%%libdata/pkgconfig/openscenegraph-osgQt.pc
libdata/pkgconfig/openscenegraph-osgShadow.pc
libdata/pkgconfig/openscenegraph-osgSim.pc
libdata/pkgconfig/openscenegraph-osgTerrain.pc
@@ -707,6 +764,7 @@ libdata/pkgconfig/openthreads.pc
@dirrm include/osgTerrain
@dirrm include/osgSim
@dirrm include/osgShadow
+%%QT4%%@dirrm include/osgQt
@dirrm include/osgPresentation
@dirrm include/osgParticle
@dirrm include/osgManipulator
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 10:26:04 +0000