Page MenuHomeFreeBSD
Files F28865112

D32008-followup.patch
jbeich (Jan Beich)
Actions

Authored By
jbeich
Sep 17 2021, 6:12 PM
Size
22 KB
Referenced Files
None
Subscribers
None

D32008-followup.patch
View Options

From 33e22819a8663162e61edea46e4c5b59e4c6bec2 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Fri, 17 Sep 2021 18:02:36 +0000
Subject: [PATCH] *: drop more FreeBSD 11 support from my ports
---
devel/aml/files/patch-freebsd11 | 57 -------------------
.../files/patch-rpcs3_Emu_system__config.h | 16 ------
emulators/yuzu/files/patch-freebsd11 | 46 ---------------
graphics/mesa-devel/files/patch-freebsd11 | 34 -----------
.../files/patch-aom__ports_arm__cpudetect.c | 34 +----------
.../files/patch-aom__ports_ppc__cpudetect.c | 12 +---
multimedia/dav1d/files/patch-neon-freebsd11 | 41 -------------
.../files/patch-vpx__ports_arm__cpudetect.c | 34 +----------
.../files/patch-vpx__ports_ppc__cpudetect.c | 12 +---
net/waypipe/files/patch-neon-freebsd11 | 55 ------------------
sysutils/keyd/Makefile | 1 -
www/firefox/files/patch-freebsd11 | 21 -------
.../files/patch-include_wlr_types_wlr__seat.h | 26 ---------
x11-toolkits/wlroots/pkg-message | 2 -
x11-wm/gamescope/Makefile | 1 -
x11-wm/picom/files/patch-src_log.c | 21 -------
x11/taiga/Makefile | 1 -
x11/waybar/Makefile | 1 -
18 files changed, 4 insertions(+), 411 deletions(-)
delete mode 100644 devel/aml/files/patch-freebsd11
delete mode 100644 emulators/rpcs3/files/patch-rpcs3_Emu_system__config.h
delete mode 100644 emulators/yuzu/files/patch-freebsd11
delete mode 100644 graphics/mesa-devel/files/patch-freebsd11
delete mode 100644 multimedia/dav1d/files/patch-neon-freebsd11
delete mode 100644 net/waypipe/files/patch-neon-freebsd11
delete mode 100644 www/firefox/files/patch-freebsd11
delete mode 100644 x11-toolkits/wlroots/files/patch-include_wlr_types_wlr__seat.h
delete mode 100644 x11-wm/picom/files/patch-src_log.c
diff --git a/devel/aml/files/patch-freebsd11 b/devel/aml/files/patch-freebsd11
deleted file mode 100644
index 525b61680b18..000000000000
--- a/devel/aml/files/patch-freebsd11
+++ /dev/null
@@ -1,57 +0,0 @@
-Drop after FreeBSD 11 EOL around 2021-09-30
-https://github.com/freebsd/freebsd-src/commit/92bb8c680916
-https://github.com/freebsd/freebsd-src/commit/2b34e8433514
-
-Header <sys/event.h> has symbol "kqueue" : NO
-meson.build:62:1: ERROR: Problem encountered: Unsupported system
-
-Compiler stderr:
- In file included from _build/meson-private/tmp0rptdqs6/testfile.c:2:
-/usr/include/sys/event.h:75:2: error: unknown type name 'uintptr_t'
- uintptr_t ident; /* identifier for this event */
- ^
-/usr/include/sys/event.h:77:2: error: unknown type name 'u_short'; did you mean 'short'?
- u_short flags; /* action flags for kqueue */
- ^
-/usr/include/sys/event.h:78:2: error: unknown type name 'u_int'
- u_int fflags; /* filter flag value */
- ^
-/usr/include/sys/event.h:79:2: error: unknown type name 'intptr_t'
- intptr_t data; /* filter data value */
- ^
-In file included from ../src/kqueue.c:20:
-/usr/include/sys/event.h:77:2: error: unknown type name 'u_short'; did you mean 'short'?
- u_short flags; /* action flags for kqueue */
- ^
-/usr/include/sys/event.h:78:2: error: unknown type name 'u_int'
- u_int fflags; /* filter flag value */
- ^
-../src/kqueue.c:184:20: error: use of undeclared identifier 'NOTE_ABSTIME'
- NOTE_MSECONDS | NOTE_ABSTIME, deadline, NULL);
- ^
-
---- meson.build.orig 2020-12-31 12:37:18 UTC
-+++ meson.build
-@@ -50,7 +50,7 @@ sources = [
- ]
-
- have_epoll = cc.has_header_symbol('sys/epoll.h', 'epoll_create')
--have_kqueue = cc.has_header_symbol('sys/event.h', 'kqueue')
-+have_kqueue = cc.has_header_symbol('sys/event.h', 'kqueue', prefix: '#include <sys/types.h>')
-
- if have_epoll
- sources += 'src/epoll.c'
---- src/kqueue.c.orig 2020-12-31 12:37:18 UTC
-+++ src/kqueue.c
-@@ -17,6 +17,11 @@
- #include "aml.h"
- #include "backend.h"
-
-+#if defined(__FreeBSD__) && __FreeBSD__ < 12
-+#define NOTE_ABSTIME 0
-+typedef unsigned short u_short;
-+typedef unsigned int u_int;
-+#endif
- #include <sys/event.h>
- #include <stdlib.h>
- #include <unistd.h>
diff --git a/emulators/rpcs3/files/patch-rpcs3_Emu_system__config.h b/emulators/rpcs3/files/patch-rpcs3_Emu_system__config.h
deleted file mode 100644
index 653489f1a9c1..000000000000
--- a/emulators/rpcs3/files/patch-rpcs3_Emu_system__config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=240495
-
---- rpcs3/Emu/system_config.h.orig 2020-05-02 11:57:38 UTC
-+++ rpcs3/Emu/system_config.h
-@@ -28,7 +28,11 @@ struct cfg_root : cfg::node
- cfg::_int<0, INT32_MAX> llvm_threads{ this, "Max LLVM Compile Threads", 0 };
- cfg::_bool thread_scheduler_enabled{ this, "Enable thread scheduler", thread_scheduler_enabled_def };
- cfg::_bool set_daz_and_ftz{ this, "Set DAZ and FTZ", false };
-+#if defined(__FreeBSD__) && __FreeBSD__ < 12
-+ cfg::_enum<spu_decoder_type> spu_decoder{ this, "SPU Decoder", spu_decoder_type::asmjit };
-+#else
- cfg::_enum<spu_decoder_type> spu_decoder{ this, "SPU Decoder", spu_decoder_type::llvm };
-+#endif
- cfg::_bool lower_spu_priority{ this, "Lower SPU thread priority" };
- cfg::_bool spu_debug{ this, "SPU Debug" };
- cfg::_int<0, 6> preferred_spu_threads{ this, "Preferred SPU Threads", 0, true }; // Number of hardware threads dedicated to heavy simultaneous spu tasks
diff --git a/emulators/yuzu/files/patch-freebsd11 b/emulators/yuzu/files/patch-freebsd11
deleted file mode 100644
index c3922e2e2507..000000000000
--- a/emulators/yuzu/files/patch-freebsd11
+++ /dev/null
@@ -1,46 +0,0 @@
-Drop after FreeBSD 11 EOL. OpenSSL 1.0 still works fine.
-
--- Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR: Found unsuitable version "1.0.2u", but required is at least "1.1" (found /usr/lib/libcrypto.so, )
-CMake Error at externals/CMakeLists.txt:83 (add_subdirectory):
-
-In file included from src/core/hle/service/bcat/backend/boxcat.cpp:6:
-externals/./httplib/httplib.h:214:2: error: Sorry, OpenSSL versions prior to 1.1.1 are not supported
-#error Sorry, OpenSSL versions prior to 1.1.1 are not supported
- ^
-
---- externals/CMakeLists.txt.orig 2020-11-18 04:02:27 UTC
-+++ externals/CMakeLists.txt
-@@ -73,7 +73,7 @@ if (NOT LIBZIP_FOUND)
- endif()
-
- if (ENABLE_WEB_SERVICE)
-- find_package(OpenSSL 1.1)
-+ find_package(OpenSSL)
- if (OPENSSL_FOUND)
- set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
- else()
---- externals/cpp-httplib/httplib.h.orig 2021-06-18 12:45:50 UTC
-+++ externals/cpp-httplib/httplib.h
-@@ -219,10 +219,6 @@ using socket_t = int;
- #include <iostream>
- #include <sstream>
-
--#if OPENSSL_VERSION_NUMBER < 0x1010100fL
--#error Sorry, OpenSSL versions prior to 1.1.1 are not supported
--#endif
--
- #if OPENSSL_VERSION_NUMBER < 0x10100000L
- #include <openssl/crypto.h>
- inline const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1) {
-@@ -6729,7 +6725,11 @@ static SSLInit sslinit_;
- inline SSLServer::SSLServer(const char *cert_path, const char *private_key_path,
- const char *client_ca_cert_file_path,
- const char *client_ca_cert_dir_path) {
-+#if OPENSSL_VERSION_NUMBER < 0x10100001L
-+ ctx_ = SSL_CTX_new(SSLv23_server_method());
-+#else
- ctx_ = SSL_CTX_new(TLS_method());
-+#endif
-
- if (ctx_) {
- SSL_CTX_set_options(ctx_,
diff --git a/graphics/mesa-devel/files/patch-freebsd11 b/graphics/mesa-devel/files/patch-freebsd11
deleted file mode 100644
index f5f626705c2a..000000000000
--- a/graphics/mesa-devel/files/patch-freebsd11
+++ /dev/null
@@ -1,34 +0,0 @@
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=225302
-
-../src/util/build_id.c:42:4: error: unknown type name 'Elf_Nhdr'
- ElfW(Nhdr) nhdr;
- ^
-../src/util/build_id.c:38:20: note: expanded from macro 'ElfW'
-#define ElfW(type) Elf_##type
- ^
-<scratch space>:101:1: note: expanded from here
-Elf_Nhdr
-^
-../src/util/build_id.c:91:33: error: use of undeclared identifier 'Elf_Nhdr'
- size_t offset = sizeof(ElfW(Nhdr)) +
- ^
-../src/util/build_id.c:38:20: note: expanded from macro 'ElfW'
-#define ElfW(type) Elf_##type
- ^
-<scratch space>:102:1: note: expanded from here
-Elf_Nhdr
-^
-
---- src/util/build_id.c.orig 2020-05-30 21:28:01 UTC
-+++ src/util/build_id.c
-@@ -38,6 +38,10 @@
- #define ElfW(type) Elf_##type
- #endif
-
-+#if defined(__FreeBSD__) && __FreeBSD__ < 12
-+typedef Elf_Note Elf_Nhdr;
-+#endif
-+
- struct build_id_note {
- ElfW(Nhdr) nhdr;
-
diff --git a/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c b/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c
index 30509f0b1352..16290d94ebb3 100644
--- a/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c
+++ b/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c
@@ -12,42 +12,14 @@
int aom_arm_cpu_caps(void) {
/* This function should actually be a no-op. There is no way to adjust any of
-@@ -143,7 +143,57 @@ int aom_arm_cpu_caps(void) {
+@@ -143,7 +143,25 @@ int aom_arm_cpu_caps(void) {
}
return flags & mask;
}
-#else /* end __linux__ */
+#elif defined(__FreeBSD__)
+
-+#if __FreeBSD__ < 12
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <elf.h>
-+#include <errno.h>
-+#include <unistd.h>
-+
-+static unsigned long getauxval(unsigned long type) {
-+ Elf_Auxinfo auxv[AT_COUNT];
-+ size_t len = sizeof(auxv);
-+ int mib[] = {
-+ CTL_KERN,
-+ KERN_PROC,
-+ KERN_PROC_AUXV,
-+ getpid(),
-+ };
-+
-+ if (sysctl(mib, nitems(mib), auxv, &len, NULL, 0) != -1) {
-+ for (size_t i = 0; i < nitems(auxv); i++)
-+ if ((unsigned long)auxv[i].a_type == type)
-+ return auxv[i].a_un.a_val;
-+
-+ errno = ENOENT;
-+ }
-+ return 0;
-+}
-+#else
+#include <sys/auxv.h>
-+#endif
+
+int aom_arm_cpu_caps(void) {
+ int flags;
@@ -57,11 +29,7 @@
+ return flags;
+ }
+ mask = arm_cpu_env_mask();
-+#if __FreeBSD__ < 12
-+ hwcap = getauxval(AT_HWCAP);
-+#else
+ elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap));
-+#endif
+#if HAVE_NEON
+ if (hwcap & HWCAP_NEON) flags |= HAS_NEON;
+#endif
diff --git a/multimedia/aom/files/patch-aom__ports_ppc__cpudetect.c b/multimedia/aom/files/patch-aom__ports_ppc__cpudetect.c
index c30c21940831..0a714fba1a8a 100644
--- a/multimedia/aom/files/patch-aom__ports_ppc__cpudetect.c
+++ b/multimedia/aom/files/patch-aom__ports_ppc__cpudetect.c
@@ -29,17 +29,12 @@
int ppc_simd_caps(void) {
int flags;
int mask;
-@@ -75,6 +76,44 @@ out_close:
+@@ -75,6 +76,34 @@ out_close:
close(fd);
return flags & mask;
}
+#elif defined(__FreeBSD__)
-+#if __FreeBSD__ < 12
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#else
+#include <sys/auxv.h>
-+#endif
+#include <machine/cpu.h>
+
+int ppc_simd_caps(void) {
@@ -54,12 +49,7 @@
+
+ mask = cpu_env_mask();
+
-+#if __FreeBSD__ < 12
-+ size_t sz = sizeof(hwcap);
-+ sysctlbyname("hw.cpu_features", &hwcap, &sz, NULL, 0);
-+#else
+ elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap));
-+#endif
+#if HAVE_VSX
+ if (hwcap & PPC_FEATURE_HAS_VSX) flags |= HAS_VSX;
+#endif
diff --git a/multimedia/dav1d/files/patch-neon-freebsd11 b/multimedia/dav1d/files/patch-neon-freebsd11
deleted file mode 100644
index 0802fb2290cb..000000000000
--- a/multimedia/dav1d/files/patch-neon-freebsd11
+++ /dev/null
@@ -1,41 +0,0 @@
-- Implement NEON runtime detection on FreeBSD 11.* armv6
-
---- src/arm/cpu.c.orig 2019-05-11 15:23:10 UTC
-+++ src/arm/cpu.c
-@@ -75,6 +75,36 @@ static unsigned parse_proc_cpuinfo(const char *flag) {
- }
- #endif
-
-+#if defined(__FreeBSD__) && __FreeBSD__ < 12
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <elf.h>
-+#include <errno.h>
-+#include <unistd.h>
-+
-+#define HAVE_GETAUXVAL
-+#define NEON_HWCAP HWCAP_NEON
-+static unsigned long getauxval(unsigned long type) {
-+ Elf_Auxinfo auxv[AT_COUNT];
-+ size_t len = sizeof(auxv);
-+ int mib[] = {
-+ CTL_KERN,
-+ KERN_PROC,
-+ KERN_PROC_AUXV,
-+ getpid(),
-+ };
-+
-+ if (sysctl(mib, nitems(mib), auxv, &len, NULL, 0) != -1) {
-+ for (size_t i = 0; i < nitems(auxv); i++)
-+ if ((unsigned long)auxv[i].a_type == type)
-+ return auxv[i].a_un.a_val;
-+
-+ errno = ENOENT;
-+ }
-+ return 0;
-+}
-+#endif
-+
- COLD unsigned dav1d_get_cpu_flags_arm(void) {
- unsigned flags = 0;
- #if ARCH_AARCH64
diff --git a/multimedia/libvpx/files/patch-vpx__ports_arm__cpudetect.c b/multimedia/libvpx/files/patch-vpx__ports_arm__cpudetect.c
index dea4540033ef..6f02489034c0 100644
--- a/multimedia/libvpx/files/patch-vpx__ports_arm__cpudetect.c
+++ b/multimedia/libvpx/files/patch-vpx__ports_arm__cpudetect.c
@@ -9,42 +9,14 @@
int arm_cpu_caps(void) {
/* This function should actually be a no-op. There is no way to adjust any of
-@@ -147,7 +147,57 @@ int arm_cpu_caps(void) {
+@@ -147,7 +147,25 @@ int arm_cpu_caps(void) {
}
return flags & mask;
}
-#else /* end __linux__ */
+#elif defined(__FreeBSD__)
+
-+#if __FreeBSD__ < 12
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <elf.h>
-+#include <errno.h>
-+#include <unistd.h>
-+
-+static unsigned long getauxval(unsigned long type) {
-+ Elf_Auxinfo auxv[AT_COUNT];
-+ size_t len = sizeof(auxv);
-+ int mib[] = {
-+ CTL_KERN,
-+ KERN_PROC,
-+ KERN_PROC_AUXV,
-+ getpid(),
-+ };
-+
-+ if (sysctl(mib, nitems(mib), auxv, &len, NULL, 0) != -1) {
-+ for (size_t i = 0; i < nitems(auxv); i++)
-+ if ((unsigned long)auxv[i].a_type == type)
-+ return auxv[i].a_un.a_val;
-+
-+ errno = ENOENT;
-+ }
-+ return 0;
-+}
-+#else
+#include <sys/auxv.h>
-+#endif
+
+int arm_cpu_caps(void) {
+ int flags;
@@ -54,11 +26,7 @@
+ return flags;
+ }
+ mask = arm_cpu_env_mask();
-+#if __FreeBSD__ < 12
-+ hwcap = getauxval(AT_HWCAP);
-+#else
+ elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap));
-+#endif
+#if HAVE_NEON || HAVE_NEON_ASM
+ if (hwcap & HWCAP_NEON) flags |= HAS_NEON;
+#endif
diff --git a/multimedia/libvpx/files/patch-vpx__ports_ppc__cpudetect.c b/multimedia/libvpx/files/patch-vpx__ports_ppc__cpudetect.c
index 766a1e1eaa56..803f610340c0 100644
--- a/multimedia/libvpx/files/patch-vpx__ports_ppc__cpudetect.c
+++ b/multimedia/libvpx/files/patch-vpx__ports_ppc__cpudetect.c
@@ -27,17 +27,12 @@
int ppc_simd_caps(void) {
int flags;
int mask;
-@@ -73,6 +74,44 @@ out_close:
+@@ -73,6 +74,34 @@ out_close:
close(fd);
return flags & mask;
}
+#elif defined(__FreeBSD__)
-+#if __FreeBSD__ < 12
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#else
+#include <sys/auxv.h>
-+#endif
+#include <machine/cpu.h>
+
+int ppc_simd_caps(void) {
@@ -52,12 +47,7 @@
+
+ mask = cpu_env_mask();
+
-+#if __FreeBSD__ < 12
-+ size_t sz = sizeof(hwcap);
-+ sysctlbyname("hw.cpu_features", &hwcap, &sz, NULL, 0);
-+#else
+ elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap));
-+#endif
+#if HAVE_VSX
+ if (hwcap & PPC_FEATURE_HAS_VSX) flags |= HAS_VSX;
+#endif
diff --git a/net/waypipe/files/patch-neon-freebsd11 b/net/waypipe/files/patch-neon-freebsd11
deleted file mode 100644
index 88402ac0ae27..000000000000
--- a/net/waypipe/files/patch-neon-freebsd11
+++ /dev/null
@@ -1,55 +0,0 @@
-- Implement NEON runtime detection on FreeBSD 11.* armv6
-
---- src/platform.c.orig 2019-08-16 20:55:07 UTC
-+++ src/platform.c
-@@ -41,8 +41,36 @@
- #include <asm/hwcap.h>
- #include <sys/auxv.h>
- #elif defined(__FreeBSD__) && defined(__arm__)
-+#if __FreeBSD__ >= 12
- #include <sys/auxv.h>
-+#else
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <elf.h>
-+#include <errno.h>
-+#include <unistd.h>
-+
-+static unsigned long getauxval(unsigned long type) {
-+ Elf_Auxinfo auxv[AT_COUNT];
-+ size_t len = sizeof(auxv);
-+ int mib[] = {
-+ CTL_KERN,
-+ KERN_PROC,
-+ KERN_PROC_AUXV,
-+ getpid(),
-+ };
-+
-+ if (sysctl(mib, nitems(mib), auxv, &len, NULL, 0) != -1) {
-+ for (size_t i = 0; i < nitems(auxv); i++)
-+ if ((unsigned long)auxv[i].a_type == type)
-+ return auxv[i].a_un.a_val;
-+
-+ errno = ENOENT;
-+ }
-+ return 0;
-+}
- #endif
-+#endif
-
- #if defined(__linux__)
- /* memfd_create was introduced in glibc 2.27 */
-@@ -82,9 +110,13 @@ bool neon_available(void)
- #if defined(__linux__) && defined(__arm__)
- return (getauxval(AT_HWCAP) & HWCAP_NEON) != 0;
- #elif defined(__FreeBSD__) && defined(__arm__)
-+#if __FreeBSD__ < 12
-+ return (getauxval(AT_HWCAP) & HWCAP_NEON) != 0;
-+#else
- unsigned long hwcap = 0;
- elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap));
- return (hwcap & HWCAP_NEON) != 0;
-+#endif
- #endif
- return true;
- }
diff --git a/sysutils/keyd/Makefile b/sysutils/keyd/Makefile
index 95dd80d58fde..8c05dab7d898 100644
--- a/sysutils/keyd/Makefile
+++ b/sysutils/keyd/Makefile
@@ -18,7 +18,6 @@ USE_RC_SUBR= ${PORTNAME}
GH_ACCOUNT= rvaiya
MAKE_ARGS= DESTDIR="${DESTDIR}" PREFIX="${PREFIX}" \
GIT_HASH="${GH_TAGNAME:U${DISTVERSIONFULL}}"
-CFLAGS+= -D_WITH_GETLINE # XXX Remove after FreeBSD 11 EOL
PLIST_FILES= bin/${PORTNAME} \
share/man/man1/${PORTNAME}.1.gz \
"@dir ${ETCDIR}"
diff --git a/www/firefox/files/patch-freebsd11 b/www/firefox/files/patch-freebsd11
deleted file mode 100644
index 4d075051751a..000000000000
--- a/www/firefox/files/patch-freebsd11
+++ /dev/null
@@ -1,21 +0,0 @@
-Drop after FreeBSD 11 EOL, see https://svnweb.freebsd.org/changeset/base/303524
-
-media/libcubeb/src/cubeb_oss.c:362:10: error: implicit declaration of function 'getline' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
- while (getline(&line, &linecap, sndstatfp) > 0) {
- ^
-media/libcubeb/src/cubeb_oss.c:850:13: warning: comparison of integers of different signs: 'long' and 'unsigned int' [-Wsign-compare]
- if (nfr > s->bufframes) {
- ~~~ ^ ~~~~~~~~~~~~
-
---- media/libcubeb/src/cubeb_oss.c.orig 2021-08-31 15:32:30.862769000 +0200
-+++ media/libcubeb/src/cubeb_oss.c 2021-08-31 15:33:07.421620000 +0200
-@@ -10,6 +10,9 @@
- * accompanying file LICENSE for details.
- */
-
-+#if defined(__FreeBSD__) && __FreeBSD__ < 12
-+#define _WITH_GETLINE
-+#endif
- #include "cubeb-internal.h"
- #include "cubeb/cubeb.h"
- #include "cubeb_mixer.h"
diff --git a/x11-toolkits/wlroots/files/patch-include_wlr_types_wlr__seat.h b/x11-toolkits/wlroots/files/patch-include_wlr_types_wlr__seat.h
deleted file mode 100644
index 29f8e9ea55fa..000000000000
--- a/x11-toolkits/wlroots/files/patch-include_wlr_types_wlr__seat.h
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=231425
-
-In file included from ../sway/ipc-json.c:7:
-In file included from ../include/sway/ipc-json.h:5:
-In file included from ../include/sway/input/input-manager.h:6:
-In file included from ../include/sway/server.h:9:
-In file included from /usr/local/include/wlr/types/wlr_data_device.h:13:
-/usr/local/include/wlr/types/wlr_seat.h:197:18: error: field has incomplete type 'struct timespec'
- struct timespec last_event;
- ^
-/usr/local/include/wlr/types/wlr_output.h:123:9: note: forward declaration of 'struct timespec'
- struct timespec *when;
- ^
-
---- include/wlr/types/wlr_seat.h.orig 2019-08-01 16:00:48 UTC
-+++ include/wlr/types/wlr_seat.h
-@@ -10,6 +10,9 @@
- #define WLR_TYPES_WLR_SEAT_H
-
- #include <time.h>
-+#if defined(_C11_SOURCE) && defined(__FreeBSD__) && __FreeBSD__ < 12
-+#include <sys/_timespec.h>
-+#endif
- #include <wayland-server-core.h>
- #include <wlr/types/wlr_input_device.h>
- #include <wlr/types/wlr_keyboard.h>
diff --git a/x11-toolkits/wlroots/pkg-message b/x11-toolkits/wlroots/pkg-message
index 02d12355064e..2e15ad5fce88 100644
--- a/x11-toolkits/wlroots/pkg-message
+++ b/x11-toolkits/wlroots/pkg-message
@@ -2,8 +2,6 @@
{ type: install
message: <<EOM
Known issues:
-- On FreeBSD 11.* kernel needs to be rebuilt with EVDEV_SUPPORT
-- On FreeBSD 11.* drm-kmod needs https://github.com/FreeBSDDesktop/kms-drm/pull/213
- NVIDIA may be affected by https://github.com/aritger/eglstreams-kms-example/issues/7
- VULKAN currently requires vulkan-validation-layers
EOM
diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile
index 0f4bcb9bf308..6212d7f8e6ac 100644
--- a/x11-wm/gamescope/Makefile
+++ b/x11-wm/gamescope/Makefile
@@ -33,7 +33,6 @@ USE_XORG= x11 xcomposite xdamage xext xfixes xrender xres xtst xxf86vm
GH_ACCOUNT= Plagman
GH_TUPLE= emersion:libliftoff:v0.1.0-3-g516cf94:libliftoff/subprojects/libliftoff \
nothings:stb:af1a5bc:stb/subprojects/stb
-CPPFLAGS+= -D_WITH_DPRINTF # XXX Remove after FreeBSD 11 EOL
PLIST_FILES= bin/${PORTNAME}
OPTIONS_DEFINE= PIPEWIRE
diff --git a/x11-wm/picom/files/patch-src_log.c b/x11-wm/picom/files/patch-src_log.c
deleted file mode 100644
index 7dd26a2ea070..000000000000
--- a/x11-wm/picom/files/patch-src_log.c
+++ /dev/null
@@ -1,21 +0,0 @@
-Drop after FreeBSD 11 EOL, other systems had timespec_get() for years.
-
-../src/log.c:162:20: error: use of undeclared identifier 'TIME_UTC'
- timespec_get(&ts, TIME_UTC);
- ^
-log.c:(.text+0x1db): undefined reference to `timespec_get'
-
---- src/log.c.orig 2019-09-21 00:08:00 UTC
-+++ src/log.c
-@@ -159,7 +159,11 @@ attr_printf(4, 5) void log_printf(struct log *l, int l
- }
-
- struct timespec ts;
-+#ifdef TIME_UTC
- timespec_get(&ts, TIME_UTC);
-+#else
-+ clock_gettime(CLOCK_REALTIME, &ts);
-+#endif
- auto tm = localtime(&ts.tv_sec);
- char time_buf[100];
- strftime(time_buf, sizeof time_buf, "%x %T", tm);
diff --git a/x11/taiga/Makefile b/x11/taiga/Makefile
index 7b219a376bc4..4a24a8153711 100644
--- a/x11/taiga/Makefile
+++ b/x11/taiga/Makefile
@@ -15,7 +15,6 @@ LIB_DEPENDS= libwayland-client.so:graphics/wayland \
libavcodec.so:multimedia/ffmpeg
USES= compiler:c11 meson pkgconfig
-CPPFLAGS+= -D_WITH_GETLINE # XXX Remove after FreeBSD 11 EOL
PLIST_FILES= bin/${PORTNAME}
.include <bsd.port.mk>
diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile
index f0e82c970359..438ef7cb5b47 100644
--- a/x11/waybar/Makefile
+++ b/x11/waybar/Makefile
@@ -21,7 +21,6 @@ USE_GITHUB= yes
USE_GNOME= gtkmm30
GH_ACCOUNT= Alexays
GH_PROJECT= Waybar
-CPPFLAGS+= -D_WITH_GETLINE # XXX Remove after FreeBSD 11 EOL
PLIST_FILES= bin/${PORTNAME} \
etc/xdg/${PORTNAME}/config \
etc/xdg/${PORTNAME}/style.css

File Metadata

Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4066787
Default Alt Text
D32008-followup.patch (22 KB)

Event Timeline