mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-24 04:33:24 +00:00
Update Simgear and Flightgear ports to 3.2.0
PR: 194571 Submitted by: mike.d.ft402@gmail.com
This commit is contained in:
Ganael LAPLANCHE
parent
eefb79ca3f
commit
7600b9791a
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=372111
@ -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/ \
|
||||
@ -22,7 +21,13 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \
|
||||
|
||||
USE_XORG= ice sm x11 xext xi xt xmu
|
||||
USE_GL= gl glu glut
|
||||
USES= tar:bzip2 cmake openal:al,alut
|
||||
CMAKE_ARGS+= -DJPEG_FACTORY:BOOL=ON
|
||||
USES= tar:bzip2 cmake compiler openal:al,alut
|
||||
|
||||
.include <bsd.port.mk>
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
# When building with Gcc, needs Gcc 4.6+
|
||||
.if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 46
|
||||
USE_GCC= 4.6+
|
||||
.endif
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,44 +1,17 @@
|
||||
--- 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 @@
|
||||
endif(HAVE_CLOCK_GETTIME)
|
||||
--- CMakeLists.txt.orig 2014-10-21 07:26:42.608036396 +0200
|
||||
+++ CMakeLists.txt 2014-10-21 07:27:18.571673862 +0200
|
||||
@@ -276,12 +276,12 @@
|
||||
# isnan might not be real symbol, so can't check using function_exists
|
||||
check_cxx_source_compiles(
|
||||
"#include <cmath>
|
||||
- void f() { isnan(0.0);} "
|
||||
+ int main() { return isnan(0.0);} "
|
||||
HAVE_ISNAN)
|
||||
|
||||
set(DL_LIBRARY "")
|
||||
-check_cxx_source_compiles(
|
||||
- "#include <dlfcn.h>
|
||||
- int main(void) {
|
||||
- return 0;
|
||||
- }
|
||||
- "
|
||||
- HAVE_DLFCN_H)
|
||||
-
|
||||
-if(HAVE_DLFCN_H)
|
||||
- check_library_exists(dl dlerror "" HAVE_DL)
|
||||
- set(DL_LIBRARY "dl")
|
||||
-endif()
|
||||
+if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
|
||||
+ check_cxx_source_compiles(
|
||||
+ "#include <dlfcn.h>
|
||||
+ int main(void) {
|
||||
+ return 0;
|
||||
+ }
|
||||
+ "
|
||||
+ HAVE_DLFCN_H)
|
||||
+
|
||||
+ if(HAVE_DLFCN_H)
|
||||
+ check_library_exists(dl dlerror "" HAVE_DL)
|
||||
+ set(DL_LIBRARY "dl")
|
||||
+ endif()
|
||||
+endif (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
|
||||
|
||||
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)
|
||||
check_cxx_source_compiles(
|
||||
"#include <cmath>
|
||||
- void f() { std::isnan(0.0);} "
|
||||
+ int main() { return std::isnan(0.0);} "
|
||||
HAVE_STD_ISNAN)
|
||||
|
||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
--- 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>
|
||||
--- simgear/canvas/ShivaVG/src/shDefs.h.orig 2014-10-28 09:45:41.492715364 +0100
|
||||
+++ simgear/canvas/ShivaVG/src/shDefs.h 2014-10-28 09:54:06.791735417 +0100
|
||||
@@ -156,7 +156,7 @@
|
||||
|
||||
-#ifndef VG_API_MACOSX
|
||||
+#if !defined(VG_API_MACOSX) && !defined(__FreeBSD__)
|
||||
# include <malloc.h>
|
||||
#endif
|
||||
/* OpenGL headers */
|
||||
|
||||
-#if defined(VG_API_LINUX)
|
||||
+#if defined(VG_API_LINUX) || defined(VG_API_FREEBSD)
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glx.h>
|
||||
#elif defined(VG_API_MACOSX)
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
--- simgear/debug/BufferedLogCallback.cxx.orig 2014-10-27 09:26:46.499707738 +0100
|
||||
+++ simgear/debug/BufferedLogCallback.cxx 2014-10-27 09:27:54.034557089 +0100
|
||||
@@ -26,6 +26,8 @@
|
||||
#include <simgear/sg_inlines.h>
|
||||
#include <simgear/threads/SGThread.hxx>
|
||||
#include <simgear/threads/SGGuard.hxx>
|
||||
+
|
||||
+#include <cstdlib> // for malloc
|
||||
|
||||
namespace simgear
|
||||
{
|
||||
@ -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;
|
||||
@ -29,7 +29,7 @@ include/simgear/canvas/CanvasMgr.hxx
|
||||
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/CanvasMap.hxx
|
||||
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/math/sg_types.hxx
|
||||
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/texcoord.hxx
|
||||
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/parse_color.hxx
|
||||
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/StateMachine.hxx
|
||||
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
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= flightgear-aircraft
|
||||
PORTVERSION= 20140319
|
||||
PORTVERSION= 20141022
|
||||
CATEGORIES= games
|
||||
# see http://www.flightgear.org/templates.js
|
||||
MASTER_SITES= http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-3.0/ \
|
||||
http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-3.0/ \
|
||||
ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft-3.0/ \
|
||||
ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft-3.0/ \
|
||||
ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Aircraft-3.0/
|
||||
MASTER_SITES= http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-3.2/ \
|
||||
http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-3.2/ \
|
||||
ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft-3.2/ \
|
||||
ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft-3.2/ \
|
||||
ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Aircraft-3.2/
|
||||
# Selection of production-ready/well-known planes
|
||||
# (planes already included in flightgear-data are excluded)
|
||||
# Please contact the MAINTAINER if a plane is missing
|
||||
@ -25,8 +25,8 @@ DISTFILES= 737-200_20120506.zip \
|
||||
Caudron-G3_20120506.zip \
|
||||
F80C_20120717.zip \
|
||||
Hurricane_20130823.zip \
|
||||
IL-2_20110311.zip \
|
||||
Lightning_20140116.zip \
|
||||
IL-2_20140508.zip \
|
||||
Lightning_20140613.zip \
|
||||
Lockheed1049h_1.0.zip \
|
||||
Messerschmitt-P1101_20130315.zip \
|
||||
MirageIII_20131008.zip \
|
||||
@ -38,12 +38,12 @@ DISTFILES= 737-200_20120506.zip \
|
||||
Super-Etendard_20131008.zip \
|
||||
Supermarine-S.6B_20130312.zip \
|
||||
Superwal_20100330.zip \
|
||||
airwaveXtreme150_July-2013.zip \
|
||||
asw20_July-2013.zip \
|
||||
airwaveXtreme150_June-2014.zip \
|
||||
asw20_June-2014.zip \
|
||||
bf109_20130615.zip \
|
||||
c310_20130209.zip \
|
||||
dhc3_20120506.zip \
|
||||
f16_20120812.zip \
|
||||
f16_20140612.zip \
|
||||
harrier_20130823.zip \
|
||||
pa24-250_20121128.zip \
|
||||
tu154_20081221.zip \
|
||||
|
||||
@ -22,10 +22,10 @@ SHA256 (flightgear-aircraft/F80C_20120717.zip) = 633016a2ea70f9be59927d5201c48af
|
||||
SIZE (flightgear-aircraft/F80C_20120717.zip) = 1528349
|
||||
SHA256 (flightgear-aircraft/Hurricane_20130823.zip) = 10dfe10c5365c7232fdd324a0c3af6c1b2c90cd5373af263ac35eb031b3b4fb5
|
||||
SIZE (flightgear-aircraft/Hurricane_20130823.zip) = 12062976
|
||||
SHA256 (flightgear-aircraft/IL-2_20110311.zip) = 1c7e126956247f7a6ed93cd4fc2abe65c756b07275559ed1f0bd03d731a51ee0
|
||||
SIZE (flightgear-aircraft/IL-2_20110311.zip) = 3933481
|
||||
SHA256 (flightgear-aircraft/Lightning_20140116.zip) = 607ce5957aeac09f1e223d5add0687c7d0e6e5651b0fa9f576934c8150798e3f
|
||||
SIZE (flightgear-aircraft/Lightning_20140116.zip) = 4784925
|
||||
SHA256 (flightgear-aircraft/IL-2_20140508.zip) = 8e6ecb37fa5b5d0c6c8a6aac8a7aad55071582183d16851323e99c68aa451d97
|
||||
SIZE (flightgear-aircraft/IL-2_20140508.zip) = 4801474
|
||||
SHA256 (flightgear-aircraft/Lightning_20140613.zip) = 4c72b9cda1b901cd95c89361cbad3bb730e59cf1084658ce1fb6f619e050ec87
|
||||
SIZE (flightgear-aircraft/Lightning_20140613.zip) = 4785070
|
||||
SHA256 (flightgear-aircraft/Lockheed1049h_1.0.zip) = 624d85fe96380870387bb35c0c43601cbe0fb19506f6915e69bb49853c836371
|
||||
SIZE (flightgear-aircraft/Lockheed1049h_1.0.zip) = 7529095
|
||||
SHA256 (flightgear-aircraft/Messerschmitt-P1101_20130315.zip) = 6a1a53902ffd6ff33c412a1d605e2a43615b3dcdaa7efebdff1f647ebe4b40ec
|
||||
@ -48,18 +48,18 @@ SHA256 (flightgear-aircraft/Supermarine-S.6B_20130312.zip) = 4222889bf64693630d1
|
||||
SIZE (flightgear-aircraft/Supermarine-S.6B_20130312.zip) = 3275253
|
||||
SHA256 (flightgear-aircraft/Superwal_20100330.zip) = cd013f6c6ab073cea4c5eef59acb3b51c8a40d47652a3dfcbebfc79c30504384
|
||||
SIZE (flightgear-aircraft/Superwal_20100330.zip) = 2654839
|
||||
SHA256 (flightgear-aircraft/airwaveXtreme150_July-2013.zip) = 12ca13fe06e7ff4e7a2e9bf7971c2397b86a06b2e83f2eb2e21b640edc5ab817
|
||||
SIZE (flightgear-aircraft/airwaveXtreme150_July-2013.zip) = 1209981
|
||||
SHA256 (flightgear-aircraft/asw20_July-2013.zip) = 22728d2d24c7b54fb7a41789ffe7ebbb73e1acb39e8230d63b2bdc6ce1fbd9f3
|
||||
SIZE (flightgear-aircraft/asw20_July-2013.zip) = 3592090
|
||||
SHA256 (flightgear-aircraft/airwaveXtreme150_June-2014.zip) = 67d58564d244f1aeb3fae20b3a996cf9a8eeb7ff3136039d4e05f8bbfcd9050e
|
||||
SIZE (flightgear-aircraft/airwaveXtreme150_June-2014.zip) = 1219396
|
||||
SHA256 (flightgear-aircraft/asw20_June-2014.zip) = a0a0680fa68933f579f01462703151b907d895dee69d44d8e3007abc0dd9ad3c
|
||||
SIZE (flightgear-aircraft/asw20_June-2014.zip) = 3592394
|
||||
SHA256 (flightgear-aircraft/bf109_20130615.zip) = 1245ba5d1c00a01b74cef208f28f70ffe27f6285f7d52c4ddd901b370e3aca94
|
||||
SIZE (flightgear-aircraft/bf109_20130615.zip) = 24201689
|
||||
SHA256 (flightgear-aircraft/c310_20130209.zip) = 07d765eac4a6cb9bc115dc4d302fed972776f5148cb1154f666b6a7f3c27543a
|
||||
SIZE (flightgear-aircraft/c310_20130209.zip) = 615078
|
||||
SHA256 (flightgear-aircraft/dhc3_20120506.zip) = 808215533d23b9e2a23b0249bacff9504b72a8e4263a562058dea9c6060c12f9
|
||||
SIZE (flightgear-aircraft/dhc3_20120506.zip) = 20789012
|
||||
SHA256 (flightgear-aircraft/f16_20120812.zip) = c4782fbcfeba7fea5204d048a0cb36499e0901b1ef514c8c638b14928ce7396a
|
||||
SIZE (flightgear-aircraft/f16_20120812.zip) = 19445799
|
||||
SHA256 (flightgear-aircraft/f16_20140612.zip) = b40dc7f9eca5976183cea0b0fbf71d7560c8e5166876d41ff682e43c89f59b73
|
||||
SIZE (flightgear-aircraft/f16_20140612.zip) = 19445894
|
||||
SHA256 (flightgear-aircraft/harrier_20130823.zip) = 35d1b2c95b2801651ce0fdd50b5e3015a75a120ab3f709cf2adb1dbd49bc26d7
|
||||
SIZE (flightgear-aircraft/harrier_20130823.zip) = 4208173
|
||||
SHA256 (flightgear-aircraft/pa24-250_20121128.zip) = dd78878bfbf21bb77405a3f5c1586f1043487c6d8499ec28361fbc3131500952
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= flightgear-data
|
||||
PORTVERSION= 3.0.0
|
||||
PORTVERSION= 3.2.0
|
||||
CATEGORIES= games
|
||||
# see http://www.flightgear.org/templates.js
|
||||
MASTER_SITES= http://mirrors.ibiblio.org/flightgear/ftp/Shared/ \
|
||||
@ -25,7 +25,7 @@ DATADIR= ${PREFIX}/share/flightgear
|
||||
PLIST= ${WRKDIR}/pkg-plist
|
||||
PLIST_DIRS= %%DATADIR%%
|
||||
|
||||
MANUAL_PACKAGE_BUILD= very large distfile (>900 MB)
|
||||
MANUAL_PACKAGE_BUILD= very large distfile (>1 GB)
|
||||
|
||||
post-patch:
|
||||
@${RM} -f ${WRKSRC}/COPYING
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (FlightGear-data-3.0.0.tar.bz2) = 048349a167d55c2a6f84a71dd5654cba0b7866ce43c6f06a12a1be8fe0840557
|
||||
SIZE (FlightGear-data-3.0.0.tar.bz2) = 1078366345
|
||||
SHA256 (FlightGear-data-3.2.0.tar.bz2) = bd48708931335698303ad5739146924fe70f1ff00c3cb8c6207c6d45140a27a4
|
||||
SIZE (FlightGear-data-3.2.0.tar.bz2) = 1264837989
|
||||
|
||||
@ -2,8 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= flightgear
|
||||
PORTVERSION= 3.0.0
|
||||
PORTREVISION= 4
|
||||
PORTVERSION= 3.2.0
|
||||
CATEGORIES= games
|
||||
# see http://www.flightgear.org/templates.js
|
||||
MASTER_SITES= http://mirrors.ibiblio.org/flightgear/ftp/Source/ \
|
||||
@ -21,7 +20,8 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \
|
||||
libpng15.so:${PORTSDIR}/graphics/png \
|
||||
libboost_thread.so:${PORTSDIR}/devel/boost-libs \
|
||||
libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
|
||||
libosg.so:${PORTSDIR}/graphics/osg
|
||||
libosg.so:${PORTSDIR}/graphics/osg \
|
||||
libspeex.so:${PORTSDIR}/audio/speex
|
||||
BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
|
||||
${LOCALBASE}/lib/libSimGearCore.a:${PORTSDIR}/devel/simgear
|
||||
RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
|
||||
@ -32,10 +32,9 @@ USE_XORG= ice sm x11 xext xft xi xinerama xt xmu
|
||||
USE_GL= gl glu glut
|
||||
USE_SQLITE= 3
|
||||
|
||||
USES= tar:bzip2 dos2unix cmake compiler:features openal:al,alut
|
||||
USES= tar:bzip2 dos2unix cmake compiler openal:al,alut
|
||||
DOS2UNIX_REGEX= .*\.(c|h|cxx|cpp|hxx|hpp)
|
||||
CMAKE_ARGS+= -DJPEG_FACTORY:BOOL=ON \
|
||||
-DENABLE_JS_SERVER:BOOL=ON \
|
||||
CMAKE_ARGS+= -DENABLE_JS_SERVER:BOOL=ON \
|
||||
-DSYSTEM_SQLITE:BOOL=ON \
|
||||
-DFG_DATA_DIR:PATH=${LOCALBASE}/share/${PORTNAME} \
|
||||
-DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man \
|
||||
@ -49,8 +48,9 @@ DBUS_CMAKE_OFF= -DUSE_DBUS:BOOL=OFF
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if ${COMPILER_FEATURES:Mlibc++}
|
||||
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-FDM-JSBSim-input_output-string_utilities.h
|
||||
# Chase devel/simgear compiler version
|
||||
.if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 46
|
||||
USE_GCC= 4.6+
|
||||
.endif
|
||||
|
||||
post-install:
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (flightgear-3.0.0.tar.bz2) = e4bf1922825920a404539e6611c36eb5567b85d46a726fd8c6f9b19c138ba6e9
|
||||
SIZE (flightgear-3.0.0.tar.bz2) = 5874662
|
||||
SHA256 (flightgear-3.2.0.tar.bz2) = addac512375b9f800a77e5733c7c0e4214442ed61a0b2712abedc0a506ac5f12
|
||||
SIZE (flightgear-3.2.0.tar.bz2) = 6950249
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
--- src/FDM/JSBSim/input_output/string_utilities.h.orig 2014-03-12 18:30:00.000000000 +0100
|
||||
+++ src/FDM/JSBSim/input_output/string_utilities.h 2014-03-12 18:31:18.000000000 +0100
|
||||
@@ -73,9 +73,11 @@
|
||||
extern bool is_number(const std::string& str);
|
||||
std::vector <std::string> split(std::string str, char d);
|
||||
/* Comment out to_string functions when they are defined already - C++ 11 defines these */
|
||||
+/*
|
||||
extern std::string to_string(int);
|
||||
extern std::string to_string(double);
|
||||
extern std::string to_string(float);
|
||||
+*/
|
||||
extern std::string replace(std::string str, const std::string& old, const std::string& newstr);
|
||||
#else
|
||||
#include <cctype>
|
||||
@@ -159,6 +161,7 @@
|
||||
return str_array;
|
||||
}
|
||||
/* Comment out to_string functions when they are defined already - C++ 11 defines these */
|
||||
+/*
|
||||
string to_string(int i)
|
||||
{
|
||||
char buffer[32];
|
||||
@@ -179,6 +182,7 @@
|
||||
if (!(o << x)) cerr << "Bad double to string conversion" << endl;
|
||||
return o.str();
|
||||
}
|
||||
+*/
|
||||
|
||||
string replace(string str, const string& oldstr, const string& newstr)
|
||||
{
|
||||
@ -0,0 +1,11 @@
|
||||
--- 3rdparty/hts_engine_API/lib/HTS_misc.c.orig 2014-10-21 18:20:10.716009721 +0200
|
||||
+++ 3rdparty/hts_engine_API/lib/HTS_misc.c 2014-10-21 18:21:32.200933884 +0200
|
||||
@@ -245,7 +245,7 @@
|
||||
} else if (fp->type == HTS_FILE) {
|
||||
fpos_t pos;
|
||||
fgetpos((FILE *) fp->pointer, &pos);
|
||||
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__)
|
||||
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) || defined(__FreeBSD__)
|
||||
return (size_t) pos;
|
||||
#else
|
||||
return (size_t) pos.__pos;
|
||||
@ -1,11 +1,28 @@
|
||||
--- 3rdparty/iaxclient/lib/CMakeLists.txt.orig 2014-03-12 18:13:58.000000000 +0100
|
||||
+++ 3rdparty/iaxclient/lib/CMakeLists.txt 2014-03-12 18:14:39.000000000 +0100
|
||||
@@ -88,7 +88,7 @@
|
||||
libspeex/vq.c
|
||||
)
|
||||
--- 3rdparty/iaxclient/lib/CMakeLists.txt.orig 2014-10-21 18:27:37.041376820 +0200
|
||||
+++ 3rdparty/iaxclient/lib/CMakeLists.txt 2014-10-21 18:27:53.883368567 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
# CMakeLists.txt, for utils/iaxclient/lib - 20130925
|
||||
# even if we don't select the codec, speex is used for pre-processing audio
|
||||
-set(ENABLE_SPEXX 1)
|
||||
+set(ENABLE_SPEEX 1)
|
||||
|
||||
set(IAXCLIENT_BASE_SOURCES
|
||||
audio_encode.c
|
||||
@@ -57,7 +57,7 @@
|
||||
list(APPEND IAXCLIENT_BASE_SOURCES unixfuncs.c)
|
||||
endif(WIN32)
|
||||
|
||||
-if (ENABLE_SPEXX)
|
||||
+if (ENABLE_SPEEX)
|
||||
list(APPEND IAXCLIENT_BASE_SOURCES codec_speex.c)
|
||||
|
||||
if (SYSTEM_SPEEX)
|
||||
@@ -115,7 +115,7 @@
|
||||
|
||||
- include_directories(${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/include)
|
||||
+ include_directories(BEFORE ${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/include)
|
||||
endif(ENABLE_SPEXX)
|
||||
include_directories(${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/include)
|
||||
endif(SPEEX_FOUND AND SPEEXDSP_FOUND)
|
||||
-endif(ENABLE_SPEXX)
|
||||
+endif(ENABLE_SPEEX)
|
||||
|
||||
if (ENABLE_ALSA)
|
||||
list(APPEND IAXCLIENT_BASE_SOURCES audio_alsa.c)
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- 3rdparty/iaxclient/lib/iaxclient.h.orig 2014-03-17 07:06:55.000000000 +0100
|
||||
+++ 3rdparty/iaxclient/lib/iaxclient.h 2014-03-17 07:09:42.000000000 +0100
|
||||
@@ -45,6 +45,8 @@
|
||||
#include <sys/socket.h>
|
||||
#endif
|
||||
|
||||
+#include <sys/time.h>
|
||||
+
|
||||
#ifdef BUILDING_DLL
|
||||
# if defined(WIN32) || defined(_WIN32_WCE)
|
||||
# ifdef _MSC_VER
|
||||
@ -1,11 +0,0 @@
|
||||
--- 3rdparty/iaxclient/lib/libiax2/src/iax.c.orig 2014-03-12 18:16:21.000000000 +0100
|
||||
+++ 3rdparty/iaxclient/lib/libiax2/src/iax.c 2014-03-12 18:18:38.000000000 +0100
|
||||
@@ -72,7 +72,7 @@
|
||||
#include <arpa/inet.h>
|
||||
#include <time.h>
|
||||
|
||||
-#if !defined(MACOSX) && !defined(__OpenBSD__)
|
||||
+#if !defined(MACOSX) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
|
||||
#include <malloc.h>
|
||||
#if !defined(SOLARIS)
|
||||
#include <error.h>
|
||||
@ -1,11 +1,16 @@
|
||||
--- CMakeLists.txt.orig 2012-08-27 18:14:13.000000000 +0200
|
||||
+++ CMakeLists.txt 2012-08-27 18:14:52.000000000 +0200
|
||||
@@ -225,7 +225,7 @@
|
||||
endif(LIBSVN_FOUND)
|
||||
endif(ENABLE_LIBSVN)
|
||||
--- CMakeLists.txt.orig 2014-10-21 18:32:02.620104085 +0200
|
||||
+++ CMakeLists.txt 2014-10-22 06:52:20.912083280 +0200
|
||||
@@ -96,10 +96,11 @@
|
||||
find_library(COCOA_LIBRARY Cocoa)
|
||||
list(APPEND PLATFORM_LIBS ${COCOA_LIBRARY} ${CORESERVICES_LIBRARY})
|
||||
|
||||
-find_package(PLIB REQUIRED puaux pu js fnt)
|
||||
+find_package(PLIB REQUIRED puaux pu js fnt net)
|
||||
-elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR
|
||||
+ ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
|
||||
set(USE_DBUS_DEFAULT 1)
|
||||
- find_package(UDev)
|
||||
|
||||
# FlightGear and SimGear versions need to match
|
||||
find_package(SimGear ${FLIGHTGEAR_VERSION} REQUIRED)
|
||||
+ find_package(UDev)
|
||||
if(UDEV_FOUND)
|
||||
set(EVENT_INPUT_DEFAULT 1)
|
||||
endif(UDEV_FOUND)
|
||||
|
||||
17
games/flightgear/files/patch-JS_SERVER-CMakeLists.txt
Normal file
17
games/flightgear/files/patch-JS_SERVER-CMakeLists.txt
Normal file
@ -0,0 +1,17 @@
|
||||
--- CMakeLists.txt.orig 2014-10-22 07:01:17.414717967 +0200
|
||||
+++ CMakeLists.txt 2014-10-22 07:01:34.267267822 +0200
|
||||
@@ -266,13 +266,13 @@
|
||||
|
||||
# Sqlite always depends on the threading lib
|
||||
list(APPEND SQLITE3_LIBRARY ${CMAKE_THREAD_LIBS_INIT})
|
||||
|
||||
##############################################################################
|
||||
|
||||
-find_package(PLIB REQUIRED puaux pu js fnt)
|
||||
+find_package(PLIB REQUIRED puaux pu js fnt net)
|
||||
|
||||
# FlightGear and SimGear versions need to match
|
||||
find_package(SimGear ${FLIGHTGEAR_VERSION} REQUIRED)
|
||||
|
||||
##############################################################################
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- src/Airports/airports_fwd.hxx.orig 2013-10-09 15:45:38.000000000 +0200
|
||||
+++ src/Airports/airports_fwd.hxx 2013-10-09 10:56:51.000000000 +0200
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <map>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
+#include <ctime>
|
||||
|
||||
// forward decls
|
||||
class FGAirport;
|
||||
@ -1,12 +0,0 @@
|
||||
--- src/FDM/JSBSim/JSBSim.cxx.orig 2012-04-30 11:31:18.119554386 +0300
|
||||
+++ src/FDM/JSBSim/JSBSim.cxx 2012-04-30 11:31:38.251553602 +0300
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <simgear/compiler.h>
|
||||
#include <simgear/sg_inlines.h>
|
||||
|
||||
-#include <stdio.h> // size_t
|
||||
+#include <cstdlib> // size_t
|
||||
#include <string>
|
||||
|
||||
#include <simgear/constants.h>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user