Attachment 148604 Details for Bug 194571 – devel/simgear

[patch] devel/simgear

simgear.svndif (text/plain), 7.86 KB, created by Anonymized Account on 2014-10-24 06:56:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anonymized Account

Created: 2014-10-24 06:56:05 UTC

Size: 7.86 KB

patch

obsolete

>Index: devel/simgear/Makefile
>===================================================================
>--- devel/simgear/Makefile	(revision 371400)
>+++ devel/simgear/Makefile	(working copy)
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	simgear
>-PORTVERSION=	3.0.0
>-PORTREVISION=	2
>+PORTVERSION=	3.2.0
> CATEGORIES=	devel games
> MASTER_SITES=	http://mirrors.ibiblio.org/simgear/ftp/Source/ \
> 		ftp://ftp.de.flightgear.org/pub/simgear/Source/ \
>Index: devel/simgear/distinfo
>===================================================================
>--- devel/simgear/distinfo	(revision 371400)
>+++ devel/simgear/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (simgear-3.0.0.tar.bz2) = 09448f87e6c2b5b6101a5a4eac331c1e1b998d61ec2e59614449110de2e68016
>-SIZE (simgear-3.0.0.tar.bz2) = 969971
>+SHA256 (simgear-3.2.0.tar.bz2) = b456cdc63b37d609bc24b347d43dc275eb7d06f5d92b18aeb0e66eedd3819c86
>+SIZE (simgear-3.2.0.tar.bz2) = 1020432
>Index: devel/simgear/files/patch-CMakeLists.txt
>===================================================================
>--- devel/simgear/files/patch-CMakeLists.txt	(revision 371400)
>+++ devel/simgear/files/patch-CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- CMakeLists.txt.orig	2014-02-15 01:04:11.000000000 +0100
>-+++ CMakeLists.txt	2014-03-10 18:06:13.000000000 +0100
>-@@ -259,18 +259,20 @@
>+--- CMakeLists.txt.orig	2014-08-17 19:40:41.000000000 +0600
>++++ CMakeLists.txt
>+@@ -253,20 +253,20 @@
>  endif(HAVE_CLOCK_GETTIME)
>  
>  set(DL_LIBRARY "")
>@@ -14,7 +14,9 @@
> -
> -if(HAVE_DLFCN_H)
> -    check_library_exists(dl dlerror "" HAVE_DL)
>--    set(DL_LIBRARY "dl")
>+-    if(HAVE_DL)
>+-        set(DL_LIBRARY "dl")
>+-    endif()
> -endif()
> +if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
> +    check_cxx_source_compiles(
>@@ -33,12 +35,3 @@
>  
>  SET(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "add a postfix, usually 'd' on windows")
>  SET(CMAKE_RELEASE_POSTFIX "" CACHE STRING "add a postfix, usually empty on windows")
>-@@ -342,7 +344,7 @@
>- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS_CXX} ${MSVC_FLAGS} ${BOOST_CXX_FLAGS}")
>- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MSVC_LD_FLAGS}")
>- 
>--include_directories(${PROJECT_SOURCE_DIR})
>-+include_directories(BEFORE ${PROJECT_SOURCE_DIR})
>- include_directories(${PROJECT_SOURCE_DIR}/simgear/canvas/ShivaVG/include)
>- include_directories(${PROJECT_BINARY_DIR}/simgear)
>- 
>Index: devel/simgear/files/patch-simgear-canvas-ShivaVG-src-shDefs.h
>===================================================================
>--- devel/simgear/files/patch-simgear-canvas-ShivaVG-src-shDefs.h	(revision 371400)
>+++ devel/simgear/files/patch-simgear-canvas-ShivaVG-src-shDefs.h	(working copy)
>@@ -1,11 +0,0 @@
>---- simgear/canvas/ShivaVG/src/shDefs.h.orig	2013-02-20 17:17:38.000000000 +0100
>-+++ simgear/canvas/ShivaVG/src/shDefs.h	2013-02-20 17:18:16.000000000 +0100
>-@@ -34,7 +34,7 @@
>- #include <math.h>
>- #include <float.h>
>- 
>--#ifndef VG_API_MACOSX
>-+#if !defined(VG_API_MACOSX) && !defined(__FreeBSD__)
>- #  include <malloc.h>
>- #endif
>- 
>Index: devel/simgear/files/patch-simgear-timing-timestamp.cxx
>===================================================================
>--- devel/simgear/files/patch-simgear-timing-timestamp.cxx	(revision 371400)
>+++ devel/simgear/files/patch-simgear-timing-timestamp.cxx	(working copy)
>@@ -1,20 +0,0 @@
>---- simgear/timing/timestamp.cxx.orig	2012-03-09 10:37:52.770699568 +0100
>-+++ simgear/timing/timestamp.cxx	2012-03-09 10:38:40.266717310 +0100
>-@@ -139,7 +139,7 @@
>- // the timer tick) accuracy which is too bad to catch 60Hz...
>- bool SGTimeStamp::sleepUntil(const SGTimeStamp& abstime)
>- {
>--#if defined(_POSIX_TIMERS) && (0 < _POSIX_TIMERS)
>-+#if defined(_POSIX_TIMERS) && (0 < _POSIX_TIMERS) && !defined(__FreeBSD__)
>-     SGTimeStamp abstimeForSleep = abstime;
>- 
>-     // Always undersleep by resolution of the clock
>-@@ -234,7 +234,7 @@
>- 
>- bool SGTimeStamp::sleepFor(const SGTimeStamp& reltime)
>- {
>--#if defined(_POSIX_TIMERS) && (0 < _POSIX_TIMERS)
>-+#if defined(_POSIX_TIMERS) && (0 < _POSIX_TIMERS) && !defined(__FreeBSD__)
>-     struct timespec ts;
>-     ts.tv_sec = reltime._sec;
>-     ts.tv_nsec = reltime._nsec;
>Index: devel/simgear/pkg-plist
>===================================================================
>--- devel/simgear/pkg-plist	(revision 371400)
>+++ devel/simgear/pkg-plist	(working copy)
>@@ -29,7 +29,7 @@
> include/simgear/canvas/CanvasObjectPlacement.hxx
> include/simgear/canvas/CanvasPlacement.hxx
> include/simgear/canvas/CanvasSystemAdapter.hxx
>-include/simgear/canvas/MouseEvent.hxx
>+include/simgear/canvas/CanvasWindow.hxx
> include/simgear/canvas/ODGauge.hxx
> include/simgear/canvas/ShivaVG/openvg.h
> include/simgear/canvas/ShivaVG/vgu.h
>@@ -42,6 +42,13 @@
> include/simgear/canvas/elements/CanvasPath.hxx
> include/simgear/canvas/elements/CanvasText.hxx
> include/simgear/canvas/elements/detail/add_segment_variadic.hxx
>+include/simgear/canvas/events/CustomEvent.hxx
>+include/simgear/canvas/events/MouseEvent.hxx
>+include/simgear/canvas/layout/BoxLayout.hxx
>+include/simgear/canvas/layout/Layout.hxx
>+include/simgear/canvas/layout/LayoutItem.hxx
>+include/simgear/canvas/layout/NasalWidget.hxx
>+include/simgear/canvas/layout/SpacerItem.hxx
> include/simgear/compiler.h
> include/simgear/constants.h
> include/simgear/debug/BufferedLogCallback.hxx
>@@ -117,6 +124,8 @@
> include/simgear/misc/CSSBorder.hxx
> include/simgear/misc/ListDiff.hxx
> include/simgear/misc/ResourceManager.hxx
>+include/simgear/misc/SVGpreserveAspectRatio.hxx
>+include/simgear/misc/SimpleMarkdown.hxx
> include/simgear/misc/gzcontainerfile.hxx
> include/simgear/misc/interpolator.hxx
> include/simgear/misc/make_new.hxx
>@@ -131,7 +140,9 @@
> include/simgear/misc/zfstream.hxx
> include/simgear/nasal/cppbind/Ghost.hxx
> include/simgear/nasal/cppbind/NasalCallContext.hxx
>+include/simgear/nasal/cppbind/NasalContext.hxx
> include/simgear/nasal/cppbind/NasalHash.hxx
>+include/simgear/nasal/cppbind/NasalObject.hxx
> include/simgear/nasal/cppbind/NasalObjectHolder.hxx
> include/simgear/nasal/cppbind/NasalString.hxx
> include/simgear/nasal/cppbind/detail/from_nasal_function_templates.hxx
>@@ -258,7 +269,6 @@
> include/simgear/scene/util/project.hxx
> include/simgear/screen/colors.hxx
> include/simgear/screen/extensions.hxx
>-include/simgear/screen/jpgfactory.hxx
> include/simgear/screen/screen-dump.hxx
> include/simgear/screen/tr.h
> include/simgear/serial/serial.hxx
>@@ -287,8 +297,10 @@
> include/simgear/structure/StringTable.hxx
> include/simgear/structure/callback.hxx
> include/simgear/structure/commands.hxx
>+include/simgear/structure/detail/function_list_template.hxx
> include/simgear/structure/event_mgr.hxx
> include/simgear/structure/exception.hxx
>+include/simgear/structure/function_list.hxx
> include/simgear/structure/intern.hxx
> include/simgear/structure/map.hxx
> include/simgear/structure/singleton.hpp
>@@ -304,3 +316,39 @@
> include/simgear/xml/easyxml.hxx
> lib/libSimGearCore.a
> lib/libSimGearScene.a
>+@dir include/simgear/bucket
>+@dir include/simgear/bvh
>+@dir include/simgear/canvas/ShivaVG
>+@dir include/simgear/canvas/elements/detail
>+@dir include/simgear/canvas/elements
>+@dir include/simgear/canvas/events
>+@dir include/simgear/canvas/layout
>+@dir include/simgear/canvas
>+@dir include/simgear/debug
>+@dir include/simgear/environment
>+@dir include/simgear/ephemeris
>+@dir include/simgear/io
>+@dir include/simgear/magvar
>+@dir include/simgear/math
>+@dir include/simgear/misc
>+@dir include/simgear/nasal/cppbind/detail
>+@dir include/simgear/nasal/cppbind
>+@dir include/simgear/nasal
>+@dir include/simgear/package
>+@dir include/simgear/props
>+@dir include/simgear/scene/material
>+@dir include/simgear/scene/model
>+@dir include/simgear/scene/sky
>+@dir include/simgear/scene/tgdb
>+@dir include/simgear/scene/tsync
>+@dir include/simgear/scene/util
>+@dir include/simgear/scene
>+@dir include/simgear/screen
>+@dir include/simgear/serial
>+@dir include/simgear/sound
>+@dir include/simgear/structure/detail
>+@dir include/simgear/structure
>+@dir include/simgear/threads
>+@dir include/simgear/timing
>+@dir include/simgear/xml
>+@dir include/simgear

Actions: View | Diff

Attachments on bug 194571: 148602 | 148603 | 148604 | 148760 | 148761 | 148762 | 148763