CVS commit: pkgsrc/games/flightgear

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Jul 22 09:33:09 UTC 2023

Modified Files:
        pkgsrc/games/flightgear: Makefile distinfo
Added Files:
        pkgsrc/games/flightgear/patches: patch-CMakeLists.txt

Log Message:
flightgear: Add some missing dependencies.


To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 pkgsrc/games/flightgear/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/games/flightgear/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/games/flightgear/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/flightgear/Makefile
diff -u pkgsrc/games/flightgear/Makefile:1.154 pkgsrc/games/flightgear/Makefile:1.155
--- pkgsrc/games/flightgear/Makefile:1.154      Tue Jun  6 08:02:09 2023
+++ pkgsrc/games/flightgear/Makefile    Sat Jul 22 09:33:08 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.154 2023/06/06 08:02:09 wiz Exp $
+# $NetBSD: Makefile,v 1.155 2023/07/22 09:33:08 nia Exp $
 
 DISTNAME=      flightgear-2020.3.11
 PKGREVISION=   26
@@ -26,7 +26,11 @@ CMAKE_ARGS+=         -DFG_BUILD_TYPE=Release
 pre-configure:
        cd ${WRKSRC} && ${MKDIR} fgbuild
 
+.include "../../audio/flite/buildlink3.mk"
+.include "../../audio/gsm/buildlink3.mk"
+.include "../../audio/hts_engine/buildlink3.mk"
 .include "../../audio/openal-soft/buildlink3.mk"
+.include "../../audio/speexdsp/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libevent+=       libevent>=2
 .include "../../devel/libevent/buildlink3.mk"

Index: pkgsrc/games/flightgear/distinfo
diff -u pkgsrc/games/flightgear/distinfo:1.17 pkgsrc/games/flightgear/distinfo:1.18
--- pkgsrc/games/flightgear/distinfo:1.17       Tue Oct 26 10:43:58 2021
+++ pkgsrc/games/flightgear/distinfo    Sat Jul 22 09:33:08 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2021/10/26 10:43:58 nia Exp $
+$NetBSD: distinfo,v 1.18 2023/07/22 09:33:08 nia Exp $
 
 BLAKE2s (flightgear-2020.3.11.tar.bz2) = 93c6b10fa14eba5282fd8a57f60e63ca1233bc9f121199b16a90ba2c0ce37c75
 SHA512 (flightgear-2020.3.11.tar.bz2) = 9a7c6f262da8daf3d954df7a2a8a96e555f3212c1d949211d0dbddd08a8f7380fa8f4986d60f48e17db563154d250184ee772b79b10277a2c5819fabec3930ee
@@ -6,4 +6,5 @@ Size (flightgear-2020.3.11.tar.bz2) = 89
 SHA1 (patch-3rdparty_hts__engine__API_lib_HTS__misc.c) = b6deb149e54dc92cb748fd149a806a016ba76a2e
 SHA1 (patch-3rdparty_iaxclient_lib_libiax2_src_iax.c) = d6ae7b47253c1ba8f79e42cde27189d32e603eea
 SHA1 (patch-3rdparty_joystick_jsNone.cxx) = 4a662c71f97dd2d5093f09d4631d672e5278f082
+SHA1 (patch-CMakeLists.txt) = cbbd41dd41764050765e15faf6269199a64e00cb
 SHA1 (patch-src_Input_fgjs.cxx) = e3d986b67142bac8c7084a026a730ebca48b15f5

Added files:

Index: pkgsrc/games/flightgear/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/games/flightgear/patches/patch-CMakeLists.txt:1.3
--- /dev/null   Sat Jul 22 09:33:09 2023
+++ pkgsrc/games/flightgear/patches/patch-CMakeLists.txt        Sat Jul 22 09:33:09 2023
@@ -0,0 +1,35 @@
+$NetBSD: patch-CMakeLists.txt,v 1.3 2023/07/22 09:33:09 nia Exp $
+
+Treat linux/freebsd/openbsd branches as "generic unix" branches.
+
+--- CMakeLists.txt.orig        2021-07-29 09:35:40.000000000 +0000
++++ CMakeLists.txt
+@@ -137,9 +137,7 @@ elseif(WIN32)
+     include(InstallRequiredSystemLibraries)
+     MESSAGE("Installing: ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}")
+ 
+-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR
+-      ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR
+-      ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
++else()
+     find_package(Threads REQUIRED)
+     find_package(X11 REQUIRED)
+ 
+@@ -253,7 +251,7 @@ if(EVENT_INPUT)
+       add_definitions(-DWITH_EVENTINPUT)
+       find_library(IOKIT_FRAMEWORK IOKit)
+       list(APPEND EVENT_INPUT_LIBRARIES ${IOKIT_FRAMEWORK})
+-    elseif(CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD|OpenBSD")
++    else()
+         if(NOT UDEV_FOUND)
+             message(WARNING "UDev not found, event input is disabled!")
+             set(EVENT_INPUT 0)
+@@ -266,8 +264,6 @@ if(EVENT_INPUT)
+             set(EVENT_INPUT_LIBRARIES ${UDEV_LIBRARIES})
+             message(STATUS "event-based input enabled. Using ${UDEV_LIBRARIES}")
+         endif()
+-    else()
+-        add_definitions(-DWITH_EVENTINPUT)
+     endif()
+ 
+     if (ENABLE_HID_INPUT)