Date: Sun, 8 Oct 2023 11:32:29 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9b2af8bb36b2 - main - devel/godot2: Remove expired port Message-ID: <202310081132.398BWTEn001600@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b2af8bb36b23b836e2504a3fee0b435e50356df commit 9b2af8bb36b23b836e2504a3fee0b435e50356df Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2023-10-08 11:32:12 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2023-10-08 11:32:12 +0000 devel/godot2: Remove expired port 2023-07-08 devel/godot2: Requires legacy OpenSSL 1.1.1 so use devel/godot --- MOVED | 1 + devel/Makefile | 1 - devel/godot2/Makefile | 120 --------------------- devel/godot2/distinfo | 5 - devel/godot2/files/patch-SConstruct | 36 ------- devel/godot2/files/patch-drivers_SCsub | 11 -- ...atch-drivers_rtaudio_audio__driver__rtaudio.cpp | 18 ---- devel/godot2/files/patch-drivers_unix_os__unix.cpp | 54 ---------- ...patch-modules_openssl_stream__peer__openssl.cpp | 12 --- .../patch-modules_speex_audio__stream__speex.cpp | 11 -- devel/godot2/files/patch-modules_squish_SCsub | 11 -- devel/godot2/files/patch-platform_x11_detect.py | 94 ---------------- devel/godot2/files/patch-thirdparty_glew_glew.c | 11 -- .../files/patch-thirdparty_rtaudio_RtAudio.cpp | 89 --------------- .../files/patch-thirdparty_rtaudio_RtAudio.h | 16 --- devel/godot2/pkg-descr | 7 -- 16 files changed, 1 insertion(+), 496 deletions(-) diff --git a/MOVED b/MOVED index 3902035f85e6..4768067a5bf4 100644 --- a/MOVED +++ b/MOVED @@ -7940,3 +7940,4 @@ devel/gitlab-metrics-exporter||2023-10-06|Removed net/rubygem-octokit5|net/rubygem-octokit|2023-10-06|Use net/rubygem-octokit games/minilens||2023-10-08|Has expired: Depends on expired devel/godot2 (use devel/godot instead) games/tanks-of-freedom||2023-10-08|Has expired: Depends on expired devel/godot2 (use devel/godot instead) +devel/godot2|devel/godot|2023-10-08|Has expired: Requires legacy OpenSSL 1.1.1 so use devel/godot diff --git a/devel/Makefile b/devel/Makefile index 47287e05e2a6..e358569a45c1 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -892,7 +892,6 @@ SUBDIR += gocritic SUBDIR += godot SUBDIR += godot-tools - SUBDIR += godot2 SUBDIR += godot35 SUBDIR += godot35-tools SUBDIR += goffice diff --git a/devel/godot2/Makefile b/devel/godot2/Makefile deleted file mode 100644 index ff29a0db93ca..000000000000 --- a/devel/godot2/Makefile +++ /dev/null @@ -1,120 +0,0 @@ -PORTNAME= godot -DISTVERSION= 2.1.6 -DISTVERSIONSUFFIX= -stable -PORTREVISION= 6 -CATEGORIES= devel games -PKGNAMESUFFIX?= 2 - -MAINTAINER= FreeBSD@Shaneware.biz -COMMENT?= Game runtime engine -WWW= https://www.godotengine.org/ - -LICENSE= MIT CC-BY-3.0 -LICENSE_COMB= multi -LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/LOGO_LICENSE.md -LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.txt - -DEPRECATED= Requires legacy OpenSSL 1.1.1 so use devel/godot -EXPIRATION_DATE= 2023-07-08 - -LIB_DEPENDS= libfreetype.so:print/freetype2 \ - libpng.so:graphics/png \ - libmpcdec.so:audio/musepack \ - libspeex.so:audio/speex -RUN_DEPENDS= xdg-user-dir:devel/xdg-user-dirs \ - xdg-open:devel/xdg-utils \ - xmessage:x11/xmessage - -USES= compiler:c++11-lib cpe gl pkgconfig scons ssl xorg -CPE_VENDOR= godotengine -USE_XORG= x11 xcursor xi xinerama xrandr -USE_GL= gl glu - -USE_GITHUB= yes -GH_ACCOUNT= godotengine - -MAKE_ARGS+= platform=x11 builtin_freetype=no builtin_libmpcdec=no \ - builtin_libpng=no builtin_openssl=no builtin_speex=no \ - builtin_zlib=no verbose=yes -MAKE_ARGS+= ${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}} -MAKE_ARGS_clang= use_llvm=yes -CXXFLAGS+= -DGLEW_NO_GLU -DRTAUDIO_ENABLED -DCRIOGET_NOT_NEEDED -CXXFLAGS_i386= ${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}} -CXXFLAGS_i386_gcc= -march=i586 -CXXFLAGS_aarch64= -DNO_THREADS -CXXFLAGS_sparc64= -DNO_THREADS -CXXFLAGS_mips= -DNO_THREADS -CXXFLAGS_mips64= -DNO_THREADS -LDFLAGS+= -lspeex -lmpcdec - -OPTIONS_DEFINE= EXAMPLES TOOLS -OPTIONS_DEFAULT= OSS -# Moved to devel/godot-tools -OPTIONS_EXCLUDE?= EXAMPLES TOOLS -OPTIONS_GROUP= AUDIO -OPTIONS_GROUP_AUDIO= ALSA OSS PULSEAUDIO - -AUDIO_DESC= Audio support -ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_MAKE_ARGS= alsa=yes -EXAMPLES_GH_PROJECT= godot-demo-projects:DEMOS -EXAMPLES_GH_TAGNAME= 2.1.4-stable:DEMOS -EXAMPLES_PORTEXAMPLES= * -OSS_MAKE_ARGS= oss=yes -PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio -PULSEAUDIO_MAKE_ARGS= pulseaudio=yes -TOOLS_DESC= Include development tools (IDE) -TOOLS_MAKE_ARGS= target=release_debug tools=yes -TOOLS_MAKE_ARGS_OFF= target=release tools=no -TOOLS_LDFLAGS= -lexecinfo -TOOLS_DESKTOP_ENTRIES= "Godot-v2" "${COMMENT}" "${GODOTFILE}" \ - "${GODOTFILE}" "Development;IDE;" "" -TOOLS_PLIST_FILES= share/pixmaps/${GODOTFILE}.png \ - share/pixmaps/${GODOTFILE}.svg - -GODOTFILE= ${PORTNAME}${PKGNAMESUFFIX} -PLIST_FILES= bin/${GODOTFILE} -# rename to prevent conflict with godot v3 -EXAMPLESDIR= ${PREFIX}/share/examples/godot2 - -.ifmake makesum -# Always include optional distfiles -.MAKEFLAGS: WITH="${OPTIONS_DEFINE}" OPTIONS_EXCLUDE= -.endif - -.include <bsd.port.pre.mk> - -.if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != i386 && ${ARCH} != armv6 && ${ARCH} != armv7 -# use system libvpx on archs that break with built-in -LIB_DEPENDS+= libvpx.so:multimedia/libvpx -MAKE_ARGS+= builtin_libvpx=False -.endif - -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 -CXXFLAGS+= -Dregister= -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|custom_build|${OPSYS}_Ports_build|' \ - ${WRKSRC}/methods.py - @${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|' \ - ${WRKSRC}/platform/x11/os_x11.cpp - -# The official godot binary name reflects options used to compile -# We just want a simple name matching the portname -# This gives us bin/godot for runtime and bin/godot-tools for the IDE -do-install: - cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} godot.x11* \ - ${STAGEDIR}/${PREFIX}/bin/${GODOTFILE} - -do-install-EXAMPLES-on: - (cd ${WRKSRC_DEMOS} && ${COPYTREE_SHARE} "${PORTEXAMPLES}" \ - ${STAGEDIR}${EXAMPLESDIR}) - -do-install-TOOLS-on: - ${INSTALL_DATA} ${WRKSRC}/icon.png \ - ${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.png - ${INSTALL_DATA} ${WRKSRC}/icon.svg \ - ${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.svg - -.include <bsd.port.post.mk> diff --git a/devel/godot2/distinfo b/devel/godot2/distinfo deleted file mode 100644 index 7310fd0fa8fc..000000000000 --- a/devel/godot2/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1579663149 -SHA256 (godotengine-godot-2.1.6-stable_GH0.tar.gz) = 5bfc57f2ee24dccfdcefe491a3be1a07b39299f2fcfa03202b8b4c6c2dd5122b -SIZE (godotengine-godot-2.1.6-stable_GH0.tar.gz) = 15043275 -SHA256 (godotengine-godot-demo-projects-2.1.4-stable_GH0.tar.gz) = f474381ba834d37cfce45c0130dad16d907a4ce28cde94f35c7d96a72f164d75 -SIZE (godotengine-godot-demo-projects-2.1.4-stable_GH0.tar.gz) = 20534045 diff --git a/devel/godot2/files/patch-SConstruct b/devel/godot2/files/patch-SConstruct deleted file mode 100644 index 653fed2d4ab7..000000000000 --- a/devel/godot2/files/patch-SConstruct +++ /dev/null @@ -1,36 +0,0 @@ ---- SConstruct.orig 2019-07-08 12:01:42 UTC -+++ SConstruct -@@ -65,7 +65,7 @@ elif (os.name == "nt"): - if (os.getenv("VCINSTALLDIR") == None or platform_arg == "android" or platform_arg == "javascript"): - custom_tools = ['mingw'] - --env_base = Environment(tools=custom_tools) -+env_base = Environment(tools=custom_tools, ENV = os.environ) - if 'TERM' in os.environ: - env_base['ENV']['TERM'] = os.environ['TERM'] - env_base.AppendENVPath('PATH', os.getenv('PATH')) -@@ -272,15 +272,16 @@ if selected_platform in platform_list: - if env["extra_suffix"] != '': - env.extra_suffix += '.' + env["extra_suffix"] - -- CCFLAGS = env.get('CCFLAGS', '') -- env['CCFLAGS'] = '' -- -- env.Append(CCFLAGS=str(CCFLAGS).split()) -- -- CFLAGS = env.get('CFLAGS', '') -- env['CFLAGS'] = '' -- -+ env['CC'] = os.environ['CC'] -+ env['CXX'] = os.environ['CXX'] -+ -+ CFLAGS = os.environ['CFLAGS'] -+ env['CFLAGS'] = [] - env.Append(CFLAGS=str(CFLAGS).split()) -+ -+ CCFLAGS = os.environ['CXXFLAGS'] -+ env['CCFLAGS'] = [] -+ env.Append(CCFLAGS=str(CCFLAGS).split()) - - LINKFLAGS = env.get('LINKFLAGS', '') - env['LINKFLAGS'] = '' diff --git a/devel/godot2/files/patch-drivers_SCsub b/devel/godot2/files/patch-drivers_SCsub deleted file mode 100644 index f04d9e18c919..000000000000 --- a/devel/godot2/files/patch-drivers_SCsub +++ /dev/null @@ -1,11 +0,0 @@ ---- drivers/SCsub.orig 2019-07-08 12:01:42 UTC -+++ drivers/SCsub -@@ -14,7 +14,7 @@ SConscript('windows/SCsub') - # Sounds drivers - SConscript('alsa/SCsub') - SConscript('pulseaudio/SCsub') --if (env["platform"] == "windows"): -+if (env["platform"] == "windows") or (env["platform"] == "x11"): - SConscript("rtaudio/SCsub") - SConscript("wasapi/SCsub") - diff --git a/devel/godot2/files/patch-drivers_rtaudio_audio__driver__rtaudio.cpp b/devel/godot2/files/patch-drivers_rtaudio_audio__driver__rtaudio.cpp deleted file mode 100644 index 93d5b7a4959b..000000000000 --- a/devel/godot2/files/patch-drivers_rtaudio_audio__driver__rtaudio.cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- drivers/rtaudio/audio_driver_rtaudio.cpp.orig 2019-07-08 12:01:42 UTC -+++ drivers/rtaudio/audio_driver_rtaudio.cpp -@@ -38,8 +38,14 @@ const char *AudioDriverRtAudio::get_name() const { - - #ifdef OSX_ENABLED - return "RtAudio-OSX"; --#elif defined(UNIX_ENABLED) -+#elif defined(UNIX_ENABLED) && (defined(ALSA_ENABLED) || defined(PULSEAUDIO_ENABLED) || defined(OSS_ENABLED)) -+#if defined(OSS_ENABLED) -+ return "RtAudio-OSS"; -+#elif defined(ALSA_ENABLED) - return "RtAudio-ALSA"; -+#elif defined(PULSEAUDIO_ENABLED) -+ return "RtAudio-PulseAudio"; -+#endif - #elif defined(WINDOWS_ENABLED) - return "RtAudio-DirectSound"; - #else diff --git a/devel/godot2/files/patch-drivers_unix_os__unix.cpp b/devel/godot2/files/patch-drivers_unix_os__unix.cpp deleted file mode 100644 index 60d52a05a749..000000000000 --- a/devel/godot2/files/patch-drivers_unix_os__unix.cpp +++ /dev/null @@ -1,54 +0,0 @@ ---- drivers/unix/os_unix.cpp.orig 2019-07-08 12:01:42 UTC -+++ drivers/unix/os_unix.cpp -@@ -51,6 +51,7 @@ - - #if defined(__FreeBSD__) || defined(__OpenBSD__) - #include <sys/param.h> -+#include <sys/sysctl.h> - #endif - #include "globals.h" - #include <assert.h> -@@ -379,17 +380,7 @@ Error OS_Unix::execute(const String &p_path, const Lis - args.push_back((char *)cs[i].get_data()); // shitty C cast - args.push_back(0); - --#ifdef __FreeBSD__ -- if (p_path.find("/")) { -- // exec name contains path so use it -- execv(p_path.utf8().get_data(), &args[0]); -- } else { -- // use program name and search through PATH to find it -- execvp(getprogname(), &args[0]); -- } --#else - execv(p_path.utf8().get_data(), &args[0]); --#endif - // still alive? something failed.. - fprintf(stderr, "**ERROR** OS_Unix::execute - Could not create child process while executing: %s\n", p_path.utf8().get_data()); - abort(); -@@ -503,12 +494,24 @@ String OS_Unix::get_executable_path() const { - return OS::get_executable_path(); - } - return b; --#elif defined(__FreeBSD__) || defined(__OpenBSD__) -+#elif defined(__OpenBSD__) - char resolved_path[MAXPATHLEN]; - - realpath(OS::get_executable_path().utf8().get_data(), resolved_path); - - return String(resolved_path); -+ -+#elif defined(__FreeBSD__) -+ int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; -+ char buf[MAXPATHLEN]; -+ size_t len = sizeof(buf); -+ if (sysctl(mib, 4, buf, &len, NULL, 0) != 0) { -+ WARN_PRINT("Couldn't get executable path from sysctl"); -+ return OS::get_executable_path(); -+ } -+ String b; -+ b.parse_utf8(buf); -+ return b; - #elif defined(__APPLE__) - char temp_path[1]; - uint32_t buff_size = 1; diff --git a/devel/godot2/files/patch-modules_openssl_stream__peer__openssl.cpp b/devel/godot2/files/patch-modules_openssl_stream__peer__openssl.cpp deleted file mode 100644 index 8f3b2da6e94d..000000000000 --- a/devel/godot2/files/patch-modules_openssl_stream__peer__openssl.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- modules/openssl/stream_peer_openssl.cpp.orig 2023-08-06 17:18:41 UTC -+++ modules/openssl/stream_peer_openssl.cpp -@@ -596,7 +596,9 @@ void StreamPeerOpenSSL::initialize_ssl() { - #endif - SSL_library_init(); // Initialize OpenSSL's SSL libraries - SSL_load_error_strings(); // Load SSL error strings -+#if OPENSSL_VERSION_NUMBER < 0x30000000L - ERR_load_BIO_strings(); // Load BIO error strings -+#endif - OpenSSL_add_all_algorithms(); // Load all available encryption algorithms - String certs_path = GLOBAL_DEF("ssl/certificates", ""); - Globals::get_singleton()->set_custom_property_info("ssl/certificates", PropertyInfo(Variant::STRING, "ssl/certificates", PROPERTY_HINT_FILE, "*.crt")); diff --git a/devel/godot2/files/patch-modules_speex_audio__stream__speex.cpp b/devel/godot2/files/patch-modules_speex_audio__stream__speex.cpp deleted file mode 100644 index 9cb0eac898e6..000000000000 --- a/devel/godot2/files/patch-modules_speex_audio__stream__speex.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/speex/audio_stream_speex.cpp.orig 2017-12-28 01:20:49 UTC -+++ modules/speex/audio_stream_speex.cpp -@@ -29,7 +29,7 @@ - #include "audio_stream_speex.h" - - #include "os/os.h" --#include "os_support.h" -+#include "thirdparty/speex/os_support.h" - #define READ_CHUNK 1024 - - static _FORCE_INLINE_ uint16_t le_short(uint16_t s) { diff --git a/devel/godot2/files/patch-modules_squish_SCsub b/devel/godot2/files/patch-modules_squish_SCsub deleted file mode 100644 index 307d0a3ccb25..000000000000 --- a/devel/godot2/files/patch-modules_squish_SCsub +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/squish/SCsub.orig 2018-06-13 13:01:57 UTC -+++ modules/squish/SCsub -@@ -23,7 +23,7 @@ if (env['builtin_squish'] != 'no'): - thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] - - env_squish.add_source_files(env.modules_sources, thirdparty_sources) -- env_squish.Append(CPPPATH=[thirdparty_dir]) -+ env_squish.Prepend(CPPPATH=[thirdparty_dir]) - - # Godot source files - env_squish.add_source_files(env.modules_sources, "*.cpp") diff --git a/devel/godot2/files/patch-platform_x11_detect.py b/devel/godot2/files/patch-platform_x11_detect.py deleted file mode 100644 index 748b31f4ca16..000000000000 --- a/devel/godot2/files/patch-platform_x11_detect.py +++ /dev/null @@ -1,94 +0,0 @@ ---- platform/x11/detect.py.orig 2019-07-08 12:01:42 UTC -+++ platform/x11/detect.py -@@ -56,7 +56,9 @@ def get_opts(): - ('use_sanitizer', 'Use llvm compiler sanitize address', 'no'), - ('use_leak_sanitizer', 'Use llvm compiler sanitize memory leaks', 'no'), - ('use_lto', 'Use link time optimization', 'no'), -- ('pulseaudio', 'Detect & Use pulseaudio', 'yes'), -+ ('alsa','Detect & Use alsa audio','no'), -+ ('oss','Detect & Use OSS audio','no'), -+ ('pulseaudio', 'Detect & Use pulseaudio', 'no'), - ('udev', 'Use udev for gamepad connection callbacks', 'no'), - ('debug_release', 'Add debug symbols to release version', 'no'), - ('touch', 'Enable touch events', 'yes'), -@@ -80,10 +82,6 @@ def configure(env): - - env.Append(CPPPATH=['#platform/x11']) - if (env["use_llvm"] == "yes"): -- if 'clang++' not in env['CXX']: -- env["CC"] = "clang" -- env["CXX"] = "clang++" -- env["LD"] = "clang++" - env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND']) - env.extra_suffix = ".llvm" - elif (os.system("gcc --version > /dev/null 2>&1") == 0): # GCC -@@ -121,19 +119,14 @@ def configure(env): - env.Append(LINKFLAGS=['-pipe']) - - if (env["target"] == "release"): -- env.Prepend(CCFLAGS=['-Ofast']) -- if (env["debug_release"] == "yes"): -- env.Prepend(CCFLAGS=['-g2']) -+ pass - - elif (env["target"] == "release_debug"): -- -- env.Prepend(CCFLAGS=['-O2', '-ffast-math', '-DDEBUG_ENABLED']) -- if (env["debug_release"] == "yes"): -- env.Prepend(CCFLAGS=['-g2']) -- -+ env.Prepend(CCFLAGS=['-DDEBUG_ENABLED']) -+ - elif (env["target"] == "debug"): - -- env.Prepend(CCFLAGS=['-g2', '-DDEBUG_ENABLED', '-DDEBUG_MEMORY_ENABLED']) -+ env.Prepend(CCFLAGS=['-DDEBUG_ENABLED', '-DDEBUG_MEMORY_ENABLED']) - env.Append(LINKFLAGS=['-rdynamic']) - - env.ParseConfig('pkg-config x11 --cflags --libs') -@@ -150,7 +143,12 @@ def configure(env): - env.Append(CPPFLAGS=['-DTOUCH_ENABLED']) - - if (env['builtin_openssl'] == 'no'): -- env.ParseConfig('pkg-config openssl --cflags --libs') -+ try: -+ # try to find a port installed openssl -+ env.ParseConfig('pkg-config openssl --cflags --libs') -+ except: -+ # if none found use base system openssl -+ env.ParseConfig('echo -lssl -lcrypto') - - if (env['builtin_libwebp'] == 'no'): - env.ParseConfig('pkg-config libwebp --cflags --libs') -@@ -195,12 +193,13 @@ def configure(env): - if (env['builtin_glew'] == 'no'): - env.ParseConfig('pkg-config glew --cflags --libs') - -- if os.system("pkg-config --exists alsa") == 0: -- print("Enabling ALSA") -- env.Append(CPPFLAGS=["-DALSA_ENABLED"]) -- env.ParseConfig('pkg-config alsa --cflags --libs') -- else: -- print("ALSA libraries not found, disabling driver") -+ if (env["alsa"]=="yes"): -+ if os.system("pkg-config --exists alsa")==0: -+ print("Enabling ALSA") -+ env.Append(CPPFLAGS=["-DALSA_ENABLED"]) -+ env.Append(LIBS=['asound']) -+ else: -+ print("ALSA libraries not found, disabling driver") - - if (platform.system() == "Linux"): - env.Append(CPPFLAGS=["-DJOYDEV_ENABLED"]) -@@ -214,6 +213,11 @@ def configure(env): - env.ParseConfig('pkg-config libudev --cflags --libs') - else: - print("libudev development libraries not found, disabling udev support") -+ -+ if (env["oss"]=="yes"): -+ print("Enabling OSS Audio") -+ env.Append(CPPFLAGS=["-DOSS_ENABLED"]) -+ env.Append(CCFLAGS=['-Ithirdparty/rtaudio']) - - if (env["pulseaudio"] == "yes"): - if not os.system("pkg-config --exists libpulse-simple"): diff --git a/devel/godot2/files/patch-thirdparty_glew_glew.c b/devel/godot2/files/patch-thirdparty_glew_glew.c deleted file mode 100644 index 3c7c2653c2c5..000000000000 --- a/devel/godot2/files/patch-thirdparty_glew_glew.c +++ /dev/null @@ -1,11 +0,0 @@ ---- thirdparty/glew/glew.c.orig 2017-12-28 02:06:18 UTC -+++ thirdparty/glew/glew.c -@@ -30,7 +30,7 @@ - ** THE POSSIBILITY OF SUCH DAMAGE. - */ - --#include <GL/glew.h> -+#include "thirdparty/glew/GL/glew.h" - - #if defined(_WIN32) - # include <GL/wglew.h> diff --git a/devel/godot2/files/patch-thirdparty_rtaudio_RtAudio.cpp b/devel/godot2/files/patch-thirdparty_rtaudio_RtAudio.cpp deleted file mode 100644 index 02dd71439c98..000000000000 --- a/devel/godot2/files/patch-thirdparty_rtaudio_RtAudio.cpp +++ /dev/null @@ -1,89 +0,0 @@ ---- thirdparty/rtaudio/RtAudio.cpp.orig 2016-08-09 07:52:15 UTC -+++ thirdparty/rtaudio/RtAudio.cpp -@@ -8589,6 +8589,12 @@ bool RtApiPulse::probeDeviceOpen( unsign - #include <errno.h> - #include <math.h> - -+#if defined(__FreeBSD__) -+#define SND_DEVICE "/dev/dsp" -+#else -+#define SND_DEVICE "/dev/mixer" -+#endif -+ - static void *ossCallbackHandler(void * ptr); - - // A structure to hold various information related to the OSS API -@@ -8615,9 +8621,11 @@ RtApiOss :: ~RtApiOss() - - unsigned int RtApiOss :: getDeviceCount( void ) - { -- int mixerfd = open( "/dev/mixer", O_RDWR, 0 ); -+ int mixerfd = open( SND_DEVICE, O_RDWR, 0 ); - if ( mixerfd == -1 ) { -- errorText_ = "RtApiOss::getDeviceCount: error opening '/dev/mixer'."; -+ errorText_ = "RtApiOss::getDeviceCount: error opening '"; -+ errorText_ += SND_DEVICE; -+ errorText_ += "'."; - error( RtAudioError::WARNING ); - return 0; - } -@@ -8639,9 +8647,11 @@ RtAudio::DeviceInfo RtApiOss :: getDevic - RtAudio::DeviceInfo info; - info.probed = false; - -- int mixerfd = open( "/dev/mixer", O_RDWR, 0 ); -+ int mixerfd = open( SND_DEVICE, O_RDWR, 0 ); - if ( mixerfd == -1 ) { -- errorText_ = "RtApiOss::getDeviceInfo: error opening '/dev/mixer'."; -+ errorText_ = "RtApiOss::getDeviceInfo: error opening '"; -+ errorText_ += SND_DEVICE; -+ errorText_ += "'."; - error( RtAudioError::WARNING ); - return info; - } -@@ -8697,8 +8707,10 @@ RtAudio::DeviceInfo RtApiOss :: getDevic - info.nativeFormats |= RTAUDIO_SINT8; - if ( mask & AFMT_S32_LE || mask & AFMT_S32_BE ) - info.nativeFormats |= RTAUDIO_SINT32; -+#if defined(AFMT_FLOAT) - if ( mask & AFMT_FLOAT ) - info.nativeFormats |= RTAUDIO_FLOAT32; -+#endif - if ( mask & AFMT_S24_LE || mask & AFMT_S24_BE ) - info.nativeFormats |= RTAUDIO_SINT24; - -@@ -8757,9 +8769,11 @@ bool RtApiOss :: probeDeviceOpen( unsign - RtAudioFormat format, unsigned int *bufferSize, - RtAudio::StreamOptions *options ) - { -- int mixerfd = open( "/dev/mixer", O_RDWR, 0 ); -+ int mixerfd = open( SND_DEVICE, O_RDWR, 0 ); - if ( mixerfd == -1 ) { -- errorText_ = "RtApiOss::probeDeviceOpen: error opening '/dev/mixer'."; -+ errorText_ = "RtApiOss::probeDeviceOpen: error opening '"; -+ errorText_ += SND_DEVICE; -+ errorText_ += "'."; - return FAILURE; - } - -@@ -8787,7 +8801,11 @@ bool RtApiOss :: probeDeviceOpen( unsign - } - - oss_audioinfo ainfo; -+#if defined(__FreeBSD__) -+ ainfo.dev = -1; // specify -1 to get default device -+#else - ainfo.dev = device; -+#endif - result = ioctl( mixerfd, SNDCTL_AUDIOINFO, &ainfo ); - close( mixerfd ); - if ( result == -1 ) { -@@ -9025,7 +9043,7 @@ bool RtApiOss :: probeDeviceOpen( unsign - } - - // Verify the sample rate setup worked. -- if ( abs( srate - sampleRate ) > 100 ) { -+ if ( abs( srate - (int)sampleRate ) > 100 ) { - close( fd ); - errorStream_ << "RtApiOss::probeDeviceOpen: device (" << ainfo.name << ") does not support sample rate (" << sampleRate << ")."; - errorText_ = errorStream_.str(); diff --git a/devel/godot2/files/patch-thirdparty_rtaudio_RtAudio.h b/devel/godot2/files/patch-thirdparty_rtaudio_RtAudio.h deleted file mode 100644 index 010a8222e1a8..000000000000 --- a/devel/godot2/files/patch-thirdparty_rtaudio_RtAudio.h +++ /dev/null @@ -1,16 +0,0 @@ ---- thirdparty/rtaudio/RtAudio.h.orig 2016-08-09 07:52:15 UTC -+++ thirdparty/rtaudio/RtAudio.h -@@ -5,7 +5,13 @@ - #if defined(OSX_ENABLED) - #define __MACOSX_CORE__ - #elif defined(UNIX_ENABLED) -+#if defined(OSS_ENABLED) -+ #define __LINUX_OSS__ -+#elif defined(ALSA_ENABLED) - #define __LINUX_ALSA__ -+#elif defined(PULSEAUDIO_ENABLED) -+ #define __LINUX_PULSE__ -+#endif - #elif defined(WINDOWS_ENABLED) - #if defined(WINRT_ENABLED) - #define __RTAUDIO_DUMMY__ diff --git a/devel/godot2/pkg-descr b/devel/godot2/pkg-descr deleted file mode 100644 index 55211af5be0f..000000000000 --- a/devel/godot2/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Godot is a multi-platform 2D and 3D game engine. It also provides a -feature rich development environment. - -Easily deploy your game on IOS, android, OSX, Linux, Steam, Windows or PS3. - -This port installs the older v2 to support projects that -haven't been updated for v3.0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310081132.398BWTEn001600>