On 2021/07/12 14:53, Pascal Stumpf wrote:
> CVSROOT: /cvs
> Module name: ports
> Changes by: [email protected] 2021/07/12 14:53:08
>
> Modified files:
> games/flightgear: Makefile.inc
> games/flightgear/base: Makefile distinfo
> games/flightgear/base/pkg: PLIST
> games/flightgear/data: Makefile distinfo
> games/flightgear/data/pkg: PLIST
> Added files:
> games/flightgear/base/patches: patch-man_CMakeLists_txt
> Removed files:
> games/flightgear/base/patches:
>
> patch-3rdparty_hts_engine_API_lib_HTS_misc_c
> patch-CMakeLists_txt
>
> patch-src_AIModel_AIFlightPlanCreatePushBack_cxx
> patch-src_FDM_JSBSim_FGFDMExec_cpp
>
> patch-src_FDM_JSBSim_input_output_FGInputSocket_cpp
> patch-src_FDM_UIUCModel_uiuc_aircraft_h
> patch-src_FDM_UIUCModel_uiuc_parsefile_h
>
> patch-src_FDM_UIUCModel_uiuc_recorder_cpp
> patch-src_Network_native_ctrls_cxx
>
> Log message:
> Update to FlightGear 2020.3.9.
>
/pobj/flightgear-2020.3.9/flightgear-2020.3.9/3rdparty/flite_hts_engine/lib/flite_hts_engine.c:47:10:
fatal error: 'cst_math.h' file not found
#include "cst_math.h"
^~~~~~~~~~~~
1 error generated.
Full log attached.
>>> Building on i386-2 under games/flightgear/base
BDEPENDS =
[devel/plib;devel/boost;graphics/glew;devel/ninja;devel/cmake;databases/sqlite3;graphics/freeglut;archivers/bzip2;x11/dbus;graphics/simgear;devel/libevent2]
DIST = [games/flightgear/base:flightgear-2020.3.9.tar.bz2]
FULLPKGNAME = flightgear-2020.3.9
RDEPENDS =
[graphics/freeglut;devel/libevent2;graphics/simgear;databases/sqlite3;x11/dbus;graphics/glew;games/flightgear/data]
(Junk lock obtained for i386-2 at 1626395613.25)
>>> Running depends in games/flightgear/base at 1626395613.26
last junk was in mail/mailman
/usr/sbin/pkg_add -aI -Drepair boost-1.76.0 bzip2-1.0.8p0 cmake-3.20.3p0v0
dbus-1.12.20p0v0 freeglut-3.0.0p1 glew-2.2.0 libevent-2.1.11 ninja-1.10.2p0
plib-1.8.5p6 simgear-2020.3.9 sqlite3-3.35.5p0
was: /usr/sbin/pkg_add -aI -Drepair boost-1.76.0 bzip2-1.0.8p0 cmake-3.20.3p0v0
dbus-1.12.20p0v0 freeglut-3.0.0p1 glew-2.2.0 libevent-2.1.11 ninja-1.10.2p0
plib-1.8.5p6 simgear-2020.3.9 sqlite3-3.35.5p0
/usr/sbin/pkg_add -aI -Drepair boost-1.76.0 bzip2-1.0.8p0 cmake-3.20.3p0v0
dbus-1.12.20p0v0 freeglut-3.0.0p1 glew-2.2.0 libevent-2.1.11 ninja-1.10.2p0
plib-1.8.5p6 simgear-2020.3.9 sqlite3-3.35.5p0
New and changed readme(s):
/usr/local/share/doc/pkg-readmes/ffmpeg
/usr/local/share/doc/pkg-readmes/proj
>>> Running show-prepare-results in games/flightgear/base at 1626395643.76
===> games/flightgear/base
===> flightgear-2020.3.9 depends on: boost-* -> boost-1.76.0
===> flightgear-2020.3.9 depends on: plib-* -> plib-1.8.5p6
===> flightgear-2020.3.9 depends on: cmake-* -> cmake-3.20.3p0v0
===> flightgear-2020.3.9 depends on: ninja->=1.5.1 -> ninja-1.10.2p0
===> flightgear-2020.3.9 depends on: bzip2-* -> bzip2-1.0.8p0
===> flightgear-2020.3.9 depends on: sqlite3-* -> sqlite3-3.35.5p0
===> flightgear-2020.3.9 depends on: freeglut-* -> freeglut-3.0.0p1
===> flightgear-2020.3.9 depends on: simgear->=2020.3.9 -> simgear-2020.3.9
===> flightgear-2020.3.9 depends on: glew-* -> glew-2.2.0
===> flightgear-2020.3.9 depends on: dbus-* -> dbus-1.12.20p0v0
===> flightgear-2020.3.9 depends on: libevent-* -> libevent-2.1.11
===> Verifying specs: c++ c++abi pthread GL GLEW GLU ICE OpenThreads SM
SimGearCore SimGearScene X11 Xext Xi Xmu c dbus-1 event_core execinfo freetype
glut m osg osgDB osgFX osgGA osgParticle osgSim osgText osgUtil osgViewer png
sqlite3 z
===> found c++.8.0 c++abi.5.0 pthread.26.1 GL.17.1 GLEW.9.0 GLU.9.0 ICE.11.0
OpenThreads.2.0 SM.9.0 SimGearCore.5.0 SimGearScene.5.0 X11.17.1 Xext.13.0
Xi.12.1 Xmu.11.0 c.96.1 dbus-1.11.2 event_core.2.0 execinfo.3.0 freetype.30.0
glut.6.0 m.10.1 osg.2.0 osgDB.2.0 osgFX.2.0 osgGA.2.0 osgParticle.2.0
osgSim.2.0 osgText.2.0 osgUtil.2.0 osgViewer.2.0 png.18.0 sqlite3.37.13 z.6.0
boost-1.76.0
bzip2-1.0.8p0
cmake-3.20.3p0v0
dbus-1.12.20p0v0
freeglut-3.0.0p1
glew-2.2.0
libevent-2.1.11
ninja-1.10.2p0
plib-1.8.5p6
simgear-2020.3.9
sqlite3-3.35.5p0
(Junk lock released for i386-2 at 1626395644.95)
distfiles size=8923743
>>> Running patch in games/flightgear/base at 1626395644.96
===> games/flightgear/base
===> Checking files for flightgear-2020.3.9
`/mnt/distfiles/flightgear-2020.3.9.tar.bz2' is up to date.
>> (SHA256) flightgear-2020.3.9.tar.bz2: OK
===> Extracting for flightgear-2020.3.9
mv /pobj/flightgear-2020.3.9/flightgear-2020.3.9/version
/pobj/flightgear-2020.3.9/flightgear-2020.3.9/version.txt
===> Patching for flightgear-2020.3.9
===> Applying OpenBSD patch patch-man_CMakeLists_txt
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD: patch-man_CMakeLists_txt,v 1.1 2021/07/12 20:53:07 pascal Exp $
|
|Index: man/CMakeLists.txt
|--- man/CMakeLists.txt.orig
|+++ man/CMakeLists.txt
--------------------------
Patching file man/CMakeLists.txt using Plan A...
Hunk #1 succeeded at 1.
done
===> Applying OpenBSD patch patch-src_Network_ATC-Main_cxx
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD: patch-src_Network_ATC-Main_cxx,v 1.1 2015/03/21 01:02:11 pascal Exp $
|--- src/Network/ATC-Main.cxx.orig Sat Jan 3 21:33:30 2015
|+++ src/Network/ATC-Main.cxx Sat Jan 3 21:34:10 2015
--------------------------
Patching file src/Network/ATC-Main.cxx using Plan A...
Hunk #1 succeeded at 39.
done
===> Applying OpenBSD patch patch-utils_GPSsmooth_MIDG_main_cxx
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD: patch-utils_GPSsmooth_MIDG_main_cxx,v 1.1.1.1 2013/11/24 22:04:08
pascal Exp $
|--- utils/GPSsmooth/MIDG_main.cxx.orig Wed Aug 31 16:52:33 2011
|+++ utils/GPSsmooth/MIDG_main.cxx Wed Aug 31 16:52:47 2011
--------------------------
Patching file utils/GPSsmooth/MIDG_main.cxx using Plan A...
Hunk #1 succeeded at 5.
done
===> Applying OpenBSD patch patch-utils_GPSsmooth_UGear_main_cxx
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD: patch-utils_GPSsmooth_UGear_main_cxx,v 1.1.1.1 2013/11/24 22:04:08
pascal Exp $
|--- utils/GPSsmooth/UGear_main.cxx.orig Wed Aug 31 16:53:32 2011
|+++ utils/GPSsmooth/UGear_main.cxx Wed Aug 31 16:53:50 2011
--------------------------
Patching file utils/GPSsmooth/UGear_main.cxx using Plan A...
Hunk #1 succeeded at 5.
done
===> Applying OpenBSD patch patch-utils_GPSsmooth_gps_main_cxx
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD: patch-utils_GPSsmooth_gps_main_cxx,v 1.1.1.1 2013/11/24 22:04:08
pascal Exp $
|--- utils/GPSsmooth/gps_main.cxx.orig Wed Aug 31 16:50:53 2011
|+++ utils/GPSsmooth/gps_main.cxx Wed Aug 31 16:51:11 2011
--------------------------
Patching file utils/GPSsmooth/gps_main.cxx using Plan A...
Hunk #1 succeeded at 5.
done
===> Applying OpenBSD patch patch-utils_TerraSync_terrasync_cxx
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD: patch-utils_TerraSync_terrasync_cxx,v 1.1.1.1 2013/11/24 22:04:08
pascal Exp $
|--- utils/TerraSync/terrasync.cxx.orig Mon Sep 16 20:49:01 2013
|+++ utils/TerraSync/terrasync.cxx Sat Nov 23 16:36:01 2013
--------------------------
Patching file utils/TerraSync/terrasync.cxx using Plan A...
Hunk #1 succeeded at 56.
done
===> Compiler link: clang -> /usr/bin/clang
===> Compiler link: clang++ -> /usr/bin/clang++
===> Compiler link: cc -> /usr/bin/cc
===> Compiler link: c++ -> /usr/bin/c++
>>> Running configure in games/flightgear/base at 1626395646.97
===> games/flightgear/base
===> Generating configure for flightgear-2020.3.9
===> Configuring for flightgear-2020.3.9
perl -pi -e 's/^\.Id.*//'
/pobj/flightgear-2020.3.9/flightgear-2020.3.9/man/*.1.in
Can't open /pobj/flightgear-2020.3.9/flightgear-2020.3.9/man/*.1.in: No such
file or directory.
CMake Deprecation Warning at CMakeLists.txt:29 (cmake_policy):
The OLD behavior for policy CMP0072 will be removed from a future version
of CMake.
The cmake-policies(7) manual explains that the OLD behaviors of all
policies are deprecated and that a policy should be set to OLD only under
specific short-term circumstances. Projects should be ported to the NEW
behavior and not rely on setting a policy to OLD.
-- Setting build type to 'Dev' as none was specified.
CMAKE Build type: Release
-- The C compiler identification is Clang 11.1.0
-- The CXX compiler identification is Clang 11.1.0
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: /pobj/flightgear-2020.3.9/bin/cc - skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Check for working CXX compiler: /pobj/flightgear-2020.3.9/bin/c++ - skipped
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- System is: OpenBSD
-- Web browser launcher command is: firefox
-- Using explicit data directory for base package: /usr/local/share/flightgear
-- Looking for pthread.h
-- Looking for pthread.h - found
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Failed
-- Looking for pthread_create in pthreads
-- Looking for pthread_create in pthreads - not found
-- Looking for pthread_create in pthread
-- Looking for pthread_create in pthread - found
-- Found Threads: TRUE
-- Found X11: /usr/X11R6/include
-- Looking for XOpenDisplay in
/usr/X11R6/lib/libX11.so.17.1;/usr/X11R6/lib/libXext.so.13.0
-- Looking for XOpenDisplay in
/usr/X11R6/lib/libX11.so.17.1;/usr/X11R6/lib/libXext.so.13.0 - found
-- Looking for gethostbyname
-- Looking for gethostbyname - found
-- Looking for connect
-- Looking for connect - found
-- Looking for remove
-- Looking for remove - found
-- Looking for shmat
-- Looking for shmat - found
-- Looking for IceConnectionNumber in ICE
-- Looking for IceConnectionNumber in ICE - found
-- UDev not found.
-- UDev: You can specify includes: -DUDEV_PATH_INCLUDES=/opt/udev/include
-- currently found includes: UDEV_INCLUDE_DIR-NOTFOUND
-- UDev: You can specify libs: -DUDEV_PATH_LIB=/opt/udev/lib
-- currently found libs: UDEV_LIBRARIES-NOTFOUND
-- Found Speex: /usr/local/lib/libspeex.so.8.0
-- Found Speex extended library: /usr/local/lib/libspeexdsp.so.1.1
-- Found GSM: /usr/local/lib/libgsm.so.1.0
-- Found Flite and needed components:
/usr/local/lib/libflite.so.1.2;/usr/local/lib/libflite_cmu_us_kal.so.1.2;/usr/local/lib/libflite_cmulex.so.1.2;/usr/local/lib/libflite_usenglish.so.1.2
-- Checking for module 'dbus-1'
-- Found dbus-1, version 1.12.20
-- Found DBus: /usr/local/include/dbus-1.0;/usr/local/lib/dbus-1.0/include
-- Found LibEvent: /usr/local/include
-- SWIFT support enabled
-- Found Boost: /usr/local/include (found version "1.76.0")
-- Found OpenGL: /usr/X11R6/lib/libGL.so.17.1
-- Found osgText: /usr/local/lib/libosgText.so.2.0
-- Found osgSim: /usr/local/lib/libosgSim.so.2.0
-- Found osgDB: /usr/local/lib/libosgDB.so.2.0
-- Found osgParticle: /usr/local/lib/libosgParticle.so.2.0
-- Found osgFX: /usr/local/lib/libosgFX.so.2.0
-- Found osgUtil: /usr/local/lib/libosgUtil.so.2.0
-- Found osgViewer: /usr/local/lib/libosgViewer.so.2.0
-- Found osgGA: /usr/local/lib/libosgGA.so.2.0
-- Found osg: /usr/local/lib/libosg.so.2.0
-- Found OpenThreads: /usr/local/lib/libOpenThreads.so.2.0
-- Found OpenSceneGraph:
/usr/local/lib/libosgText.so.2.0;/usr/local/lib/libosgSim.so.2.0;/usr/local/lib/libosgDB.so.2.0;/usr/local/lib/libosgParticle.so.2.0;/usr/local/lib/libosgFX.so.2.0;/usr/local/lib/libosgUtil.so.2.0;/usr/local/lib/libosgViewer.so.2.0;/usr/local/lib/libosgGA.so.2.0;/usr/local/lib/libosg.so.2.0;/usr/local/lib/libOpenThreads.so.2.0
(found suitable version "3.6.5", minimum required is "3.2.0")
CMake Warning (dev) at
/usr/local/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:438
(message):
The package name passed to `find_package_handle_standard_args` (SQLITE3)
does not match the name of the calling package (SQLite3). This can lead to
problems in calling code that expects `find_package` result variables
(e.g., `_FOUND`) to follow a certain pattern.
Call Stack (most recent call first):
CMakeModules/FindSQLite3.cmake:36 (FIND_PACKAGE_HANDLE_STANDARD_ARGS)
CMakeLists.txt:343 (find_package)
This warning is for project developers. Use -Wno-dev to suppress it.
-- Found SQLITE3: /usr/local/lib/libsqlite3.so.37.13
-- Using system SQLite3 library
-- Found PkgConfig: /usr/bin/pkg-config (found version "0.29.2")
-- Checking for module 'dbus-1'
-- Found dbus-1, version 1.12.20
-- Using DBus
-- Qt support disabled
-- /usr/local/include
-- Found PLIB:
optimized;/usr/local/lib/libplibpuaux.a;debug;/usr/local/lib/libplibpuaux.a;optimized;/usr/local/lib/libplibpu.a;debug;/usr/local/lib/libplibpu.a;optimized;/usr/local/lib/libplibsg.a;debug;/usr/local/lib/libplibsg.a;optimized;/usr/local/lib/libplibul.a;debug;/usr/local/lib/libplibul.a
-- Min Simgear version is 2020.3.0
-- Found ZLIB: /usr/lib/libz.so.6.0 (found version "1.2.11")
-- Looking for lzma_auto_decoder in /usr/local/lib/liblzma.so.2.1
-- Looking for lzma_auto_decoder in /usr/local/lib/liblzma.so.2.1 - found
-- Looking for lzma_easy_encoder in /usr/local/lib/liblzma.so.2.1
-- Looking for lzma_easy_encoder in /usr/local/lib/liblzma.so.2.1 - found
-- Looking for lzma_lzma_preset in /usr/local/lib/liblzma.so.2.1
-- Looking for lzma_lzma_preset in /usr/local/lib/liblzma.so.2.1 - found
-- Found LibLZMA:
optimized;/usr/local/lib/liblzma.so.2.1;debug;/usr/local/lib/liblzma.so.2.1
(found version "5.2.5")
-- Looking for unistd.h
-- Looking for unistd.h - found
-- Looking for sys/time.h
-- Looking for sys/time.h - found
-- Looking for sys/timeb.h
-- Looking for sys/timeb.h - not found
-- Looking for windows.h
-- Looking for windows.h - not found
-- Looking for timegm
-- Looking for timegm - found
-- Looking for daylight
-- Looking for daylight - found
-- Looking for ftime
-- Looking for ftime - not found
-- Looking for gettimeofday
-- Looking for gettimeofday - found
-- RTI: DISABLED
-- OpenMP: DISABLED
-- SSE/SSE2 support: ENABLED
-- Looking for mkfifo
-- Looking for mkfifo - found
-- Using Flite includes at: /usr/local/include/flite
-- Using Flite libraries:
/usr/local/lib/libflite.so.1.2;/usr/local/lib/libflite_cmu_us_kal.so.1.2;/usr/local/lib/libflite_cmulex.so.1.2;/usr/local/lib/libflite_usenglish.so.1.2
-- Enabling legacy joystick code (from PLIB)
CMake Warning at 3rdparty/joystick/CMakeLists.txt:21 (message):
Unsupported platform for Joystick
-- FGPanel (Raspberry Pi) : DISABLED
-- FGPanel : ENABLED
-- CppUnit: Building the FlightGear supplied CppUnit library
-- Configuring done
-- Generating done
-- Build files have been written to: /pobj/flightgear-2020.3.9/build-i386
>>> Running build in games/flightgear/base at 1626395654.82
===> games/flightgear/base
===> Building for flightgear-2020.3.9
[1/726] /pobj/flightgear-2020.3.9/bin/cc -DFLITE_PLUS_HTS_ENGINE
-DHAVE_CONFIG_H -DSIZEOF_VOID_P=4
-I/pobj/flightgear-2020.3.9/flightgear-2020.3.9/3rdparty/iaxclient/lib/libspeex/include
-I/usr/local/include -I/usr/local/include/dbus-1.0
-I/usr/local/lib/dbus-1.0/include -I/usr/X11R6/include
-I/pobj/flightgear-2020.3.9/flightgear-2020.3.9
-I/pobj/flightgear-2020.3.9/flightgear-2020.3.9/src -Isrc -Isrc/Include
-I/pobj/flightgear-2020.3.9/flightgear-2020.3.9/3rdparty/hts_engine_API/include
-I/pobj/flightgear-2020.3.9/flightgear-2020.3.9/3rdparty/flite_hts_engine/include
-I/usr/local/include/flite -O2 -pipe -msse2 -mfpmath=sse -ftree-vectorize
-ftree-slp-vectorize -Wall -D_REENTRANT -DNDEBUG -msse2 -mfpmath=sse
-ftree-vectorize -ftree-slp-vectorize -MD -MT
3rdparty/flite_hts_engine/CMakeFiles/flite_hts.dir/lib/flite_hts_engine.c.o -MF
3rdparty/flite_hts_engine/CMakeFiles/flite_hts.dir/lib/flite_hts_engine.c.o.d
-o 3rdparty/flite_hts_engine/CMakeFiles/flite_hts.dir/lib/flite_hts_engine.c.o
-c
/pobj/flightgear-2020.3.9/flightgear-2020.3.9/3rdparty/flite_hts_engine/lib/flite_hts_engine.c
FAILED:
3rdparty/flite_hts_engine/CMakeFiles/flite_hts.dir/lib/flite_hts_engine.c.o
/pobj/flightgear-2020.3.9/bin/cc -DFLITE_PLUS_HTS_ENGINE -DHAVE_CONFIG_H
-DSIZEOF_VOID_P=4
-I/pobj/flightgear-2020.3.9/flightgear-2020.3.9/3rdparty/iaxclient/lib/libspeex/include
-I/usr/local/include -I/usr/local/include/dbus-1.0
-I/usr/local/lib/dbus-1.0/include -I/usr/X11R6/include
-I/pobj/flightgear-2020.3.9/flightgear-2020.3.9
-I/pobj/flightgear-2020.3.9/flightgear-2020.3.9/src -Isrc -Isrc/Include
-I/pobj/flightgear-2020.3.9/flightgear-2020.3.9/3rdparty/hts_engine_API/include
-I/pobj/flightgear-2020.3.9/flightgear-2020.3.9/3rdparty/flite_hts_engine/include
-I/usr/local/include/flite -O2 -pipe -msse2 -mfpmath=sse -ftree-vectorize
-ftree-slp-vectorize -Wall -D_REENTRANT -DNDEBUG -msse2 -mfpmath=sse
-ftree-vectorize -ftree-slp-vectorize -MD -MT
3rdparty/flite_hts_engine/CMakeFiles/flite_hts.dir/lib/flite_hts_engine.c.o -MF
3rdparty/flite_hts_engine/CMakeFiles/flite_hts.dir/lib/flite_hts_engine.c.o.d
-o 3rdparty/flite_hts_engine/CMakeFiles/flite_hts.dir/lib/flite_hts_engine.c.o
-c
/pobj/flightgear-2020.3.9/flightgear-2020.3.9/3rdparty/flite_hts_engine/lib/flite_hts_engine.c
/pobj/flightgear-2020.3.9/flightgear-2020.3.9/3rdparty/flite_hts_engine/lib/flite_hts_engine.c:47:10:
fatal error: 'cst_math.h' file not found
#include "cst_math.h"
^~~~~~~~~~~~
1 error generated.
ninja: build stopped: subcommand failed.
*** Error 1 in games/flightgear/base (/usr/ports/devel/cmake/cmake.port.mk:36
'do-build': @cd /pobj/flightgear-2020.3.9/build-i386 && exec /...)
*** Error 2 in games/flightgear/base
(/usr/ports/infrastructure/mk/bsd.port.mk:2952
'/pobj/flightgear-2020.3.9/build-i386/.build_done': @cd ...)
*** Error 2 in games/flightgear/base
(/usr/ports/infrastructure/mk/bsd.port.mk:2602 'build':
@lock=flightgear-2020.3.9; export _LOCKS_HELD=...)
===> Exiting games/flightgear/base with an error
*** Error 1 in /usr/ports (infrastructure/mk/bsd.port.subdir.mk:137 'build': @:
${echo_msg:=echo}; : ${target:=build}; for i in ; do eval...)
>>> Ended at 1626395655.25
max_stuck=26.24/depends=30.50/show-prepare-results=1.20/patch=2.01/configure=7.85/build=0.44
Error: job failed with 512 on i386-2 at 1626395655
