summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2024-06-15 20:44:12 +0200
committerRene Ladan <rene@FreeBSD.org>2024-07-01 22:27:23 +0200
commit19d68720f1dac6176557ffa8d9c1684c4cf22608 (patch)
tree0df1bf503e59370bcb01f06f7f8ba1e1cf742c0f /audio
parentgraphics/intel-backlight: Remove expired port (diff)
all: drop support for FreeBSD 13.2 which reached EOL today
Thanks again to jbeich for noticing various things I overlooked. Reviewed by: acm, ashish, eduardo, ehaupt, eugen, jbeich, martymac, mat, nobukata, sunpoet, tagattie, yuri, arrowd, kde Differential Revision: https://reviews.freebsd.org/D45141
Diffstat (limited to 'audio')
-rw-r--r--audio/audacity/Makefile7
-rw-r--r--audio/audacity/files/extra-libraries_lib-utility_TypeList.cpp23
-rw-r--r--audio/audacity/files/extra-libraries_lib-utility_TypeList.h39
-rw-r--r--audio/audacity/files/extra-libraries_lib-utility_TypeSwitch.h20
-rw-r--r--audio/denemo/Makefile2
-rw-r--r--audio/ncmpc/Makefile2
-rw-r--r--audio/ocp/Makefile2
-rw-r--r--audio/openal-soft/Makefile2
8 files changed, 4 insertions, 93 deletions
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 848085220584..48348b2aaa5f 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -143,13 +143,6 @@ CMAKE_ARGS+= -DHAVE_MMX:BOOL=OFF \
-DHAVE_SSE2:BOOL=OFF
.endif
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1302508
-# Workarounds for buggy libc++ std::conjunction
-EXTRA_PATCHES= ${PATCHDIR}/extra-libraries_lib-utility_TypeList.cpp \
- ${PATCHDIR}/extra-libraries_lib-utility_TypeList.h \
- ${PATCHDIR}/extra-libraries_lib-utility_TypeSwitch.h
-.endif
-
post-install:
@${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt
#delete empty directories: https://github.com/audacity/audacity/issues/808
diff --git a/audio/audacity/files/extra-libraries_lib-utility_TypeList.cpp b/audio/audacity/files/extra-libraries_lib-utility_TypeList.cpp
deleted file mode 100644
index 2575d8f5f745..000000000000
--- a/audio/audacity/files/extra-libraries_lib-utility_TypeList.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- libraries/lib-utility/TypeList.cpp.orig 2023-11-16 11:58:21 UTC
-+++ libraries/lib-utility/TypeList.cpp
-@@ -118,16 +118,16 @@ static_assert(Is_v<NullOrStartsWithInt, Nil>);
- static_assert(Is_v<NullOrStartsWithInt, Example>);
-
- static_assert(Every_v<Fn<is_arithmetic>, Example>);
--static_assert(is_base_of_v<true_type, Every<Fn<is_arithmetic>, Example>>);
-+static_assert(TypeList::is_base_of_v<true_type, Every<Fn<is_arithmetic>, Example>>);
- static_assert(!Every_v<Fn<is_integral>, Example>);
--static_assert(is_base_of_v<is_integral<double>,
-+static_assert(TypeList::is_base_of_v<is_integral<double>,
- Every<Fn<is_integral>, Example>>);
-
- static_assert(Some_v<Fn<is_integral>, Example>);
--static_assert(is_base_of_v<is_integral<int>,
-+static_assert(TypeList::is_base_of_v<is_integral<int>,
- Some<Fn<is_integral>, Example>>);
- static_assert(!Some_v<Fn<is_void>, Example>);
--static_assert(is_base_of_v<false_type, Some<Fn<is_void>, Example>>);
-+static_assert(TypeList::is_base_of_v<false_type, Some<Fn<is_void>, Example>>);
-
- static_assert(NotEvery_v<Fn<is_floating_point>, Example>);
- static_assert(NotAny_v<Fn<is_void>, Example>);
diff --git a/audio/audacity/files/extra-libraries_lib-utility_TypeList.h b/audio/audacity/files/extra-libraries_lib-utility_TypeList.h
deleted file mode 100644
index dfc77dc2be3d..000000000000
--- a/audio/audacity/files/extra-libraries_lib-utility_TypeList.h
+++ /dev/null
@@ -1,39 +0,0 @@
---- libraries/lib-utility/TypeList.h.orig 2023-11-16 11:58:21 UTC
-+++ libraries/lib-utility/TypeList.h
-@@ -54,6 +54,18 @@ namespace TypeList {
- can make compound predicates out of simpler ones.
- */
-
-+template <class...>
-+struct conjunction : std::true_type {};
-+
-+template <class _Arg>
-+struct conjunction<_Arg> : _Arg {};
-+
-+template <class _Arg, class... _Args>
-+struct conjunction<_Arg, _Args...> : std::conditional_t<!bool(_Arg::value), _Arg, conjunction<_Args...>> {};
-+
-+template <class _Bp, class _Dp>
-+inline constexpr bool is_base_of_v = __is_base_of(_Bp, _Dp);
-+
- //! standard in C++20; add a level of indirection to a type
- template<typename T> struct type_identity { using type = T; };
-
-@@ -429,7 +441,7 @@ struct And<Predicate, Predicates...> { (private)
- static constexpr bool value = Is_v<And<Predicates...>, T>;
- };
- public:
-- template<typename T> using typemap = typename std::conjunction<
-+ template<typename T> using typemap = typename TypeList::conjunction<
- typename Predicate::template typemap<T>, Rest<T>
- >;
- };
-@@ -437,7 +449,7 @@ struct And<Predicate, Predicates...> { (private)
- //! Derived from the Predicate, applied to the first of the types (often boolean
- //! constant types), for which the value is false; or std::true_type
- template<typename Predicate, typename TypeList> struct Every
-- : Apply_t<std::conjunction, Map_t<Predicate, TypeList>> {};
-+ : Apply_t<conjunction, Map_t<Predicate, TypeList>> {};
- //! The constant value in the corresponding type
- template<typename Predicate, typename TypeList> constexpr auto Every_v =
- Every<Predicate, TypeList>::value;
diff --git a/audio/audacity/files/extra-libraries_lib-utility_TypeSwitch.h b/audio/audacity/files/extra-libraries_lib-utility_TypeSwitch.h
deleted file mode 100644
index f0291a0356a8..000000000000
--- a/audio/audacity/files/extra-libraries_lib-utility_TypeSwitch.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- libraries/lib-utility/TypeSwitch.h.orig 2023-11-16 11:58:21 UTC
-+++ libraries/lib-utility/TypeSwitch.h
-@@ -127,7 +127,7 @@ struct Executor {
- // Case 1: Compatible, and invocable on the next function, giving
- // another function, that accepts BaseClass:
- struct Case1_;
-- using Case1 = std::conjunction<Compatible, curried, Case1_>;
-+ using Case1 = TypeList::conjunction<Compatible, curried, Case1_>;
- struct Case1_ {
- static constexpr bool value = std::is_invocable_v<
- std::invoke_result_t<F, Dummy &&>, BaseClass&, Args&&...>;
-@@ -135,7 +135,7 @@ struct Executor {
- };
-
- // Case 2: Invocable directly on the object
-- struct Case2 : std::conjunction<
-+ struct Case2 : TypeList::conjunction<
- Compatible, std::negation<curried>,
- std::is_invocable<F, BaseClass&, Args&&...>
- > {
diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index 48d34d2a90bc..ebb3c35205a9 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -68,7 +68,7 @@ LIB_DEPENDS+= libatrilview.so:graphics/atril
.include <bsd.port.pre.mk>
-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
+.if ${COMPILER_TYPE} == clang
CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif
diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile
index a0671fa1f081..d89eecc7f7a3 100644
--- a/audio/ncmpc/Makefile
+++ b/audio/ncmpc/Makefile
@@ -49,7 +49,7 @@ PORTDOCS= *
.include <bsd.port.pre.mk>
-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
+.if ${COMPILER_TYPE} == clang
CPPFLAGS+= -Wno-error=enum-constexpr-conversion
.endif
diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index e51bcdc97f67..cf1d7964d852 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -95,7 +95,7 @@ TIMIDITY_CFG= ${LOCALBASE}/share/timidity/timidity.cfg
.include <bsd.port.pre.mk>
-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
+.if ${COMPILER_TYPE} == clang
CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif
diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile
index bff0cc015271..bbb89eb7b112 100644
--- a/audio/openal-soft/Makefile
+++ b/audio/openal-soft/Makefile
@@ -63,7 +63,7 @@ UTILS_CMAKE_BOOL= ALSOFT_UTILS
# The following is actually meant for lld 15.0 and later, but the ports
# framework does not support LINKER_TYPE and LINKER_VERSION yet.
-.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150
+.if ${COMPILER_TYPE} == "clang"
# Turn off checking of dynamic relocations, to avoid lld diagnostics about
# possibly incorrect addend values.
LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations