diff options
author | Rene Ladan <rene@FreeBSD.org> | 2021-09-11 16:57:58 +0200 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2021-09-30 23:23:30 +0200 |
commit | 620968a43a5f9bb3fa98ab20f257a4c0d864caa7 (patch) | |
tree | 09bef799707f4b6e715b912429bd3b73c1addf4c /graphics | |
parent | security/vuxml: add www/chromium < 94.0.4606.71 (diff) |
cleanup: drop support for EOL FreeBSD 11.X
Search criteria used:
- 11.4
- OSREL*
- OSVER*
- *_FreeBSD_11
Input from:
- adridg: devel/qca-legacy
- jbeich: _WITH_DPRINTF, _WITH_GETLINE, GNU bfd workarounds
- sunpoet: security/p5-*OpenSSL*
Reviewed by: doceng, kde, multimedia, perl, python, ruby, rust
Differential Revision: https://reviews.freebsd.org/D32008
Test Plan: make index
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/Makefile | 1 | ||||
-rw-r--r-- | graphics/blender-lts28/Makefile | 4 | ||||
-rw-r--r-- | graphics/blender/Makefile | 4 | ||||
-rw-r--r-- | graphics/drm-fbsd11.2-kmod/Makefile | 38 | ||||
-rw-r--r-- | graphics/drm-fbsd11.2-kmod/distinfo | 3 | ||||
-rw-r--r-- | graphics/drm-fbsd11.2-kmod/pkg-descr | 6 | ||||
-rw-r--r-- | graphics/drm-fbsd11.2-kmod/pkg-message | 21 | ||||
-rw-r--r-- | graphics/drm-fbsd11.2-kmod/pkg-plist | 8 | ||||
-rw-r--r-- | graphics/drm-fbsd12.0-kmod/Makefile | 2 | ||||
-rw-r--r-- | graphics/drm-kmod/Makefile | 4 | ||||
-rw-r--r-- | graphics/dspdfviewer/Makefile | 2 | ||||
-rw-r--r-- | graphics/libjxl/Makefile | 4 | ||||
-rw-r--r-- | graphics/mesa-devel/Makefile | 5 | ||||
-rw-r--r-- | graphics/mesa-devel/files/patch-freebsd11 | 34 | ||||
-rw-r--r-- | graphics/mesa-dri/Makefile.common | 4 | ||||
-rw-r--r-- | graphics/mesa-dri/files/extra-patch-src_util_build__id.c | 15 | ||||
-rw-r--r-- | graphics/openshadinglanguage/Makefile | 5 | ||||
-rw-r--r-- | graphics/pcl-pointclouds/Makefile | 1 | ||||
-rw-r--r-- | graphics/pixie/Makefile | 1 | ||||
-rw-r--r-- | graphics/rawtherapee/Makefile | 13 |
20 files changed, 3 insertions, 172 deletions
diff --git a/graphics/Makefile b/graphics/Makefile index 4b2b744dbc03..c590d477ee53 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -144,7 +144,6 @@ SUBDIR += drawpile SUBDIR += drm-current-kmod SUBDIR += drm-devel-kmod - SUBDIR += drm-fbsd11.2-kmod SUBDIR += drm-fbsd12.0-kmod SUBDIR += drm-fbsd13-kmod SUBDIR += drm-kmod diff --git a/graphics/blender-lts28/Makefile b/graphics/blender-lts28/Makefile index 21dfe58870bf..9af9aea3b1c9 100644 --- a/graphics/blender-lts28/Makefile +++ b/graphics/blender-lts28/Makefile @@ -42,10 +42,6 @@ CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}} CFLAGS_gcc= -Wno-float-conversion CFLAGS_i386= -march=i586 CXXFLAGS_i386= -march=i586 -# Use LLVM linker where available -.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld) -LDFLAGS+= -fuse-ld=lld -.endif # prevent conflict with other blender versions DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 648f78d193ca..780e3d4fa4ae 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -44,10 +44,6 @@ CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}} CFLAGS_gcc= -Wno-float-conversion CFLAGS_i386= -march=i586 CXXFLAGS_i386= -march=i586 -# Use LLVM linker where available -.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld) -LDFLAGS+= -fuse-ld=lld -.endif PLIST_SUB+= VER=${DISTVERSION:R} OPTIONS_SUB= yes diff --git a/graphics/drm-fbsd11.2-kmod/Makefile b/graphics/drm-fbsd11.2-kmod/Makefile deleted file mode 100644 index 785d1d6878cd..000000000000 --- a/graphics/drm-fbsd11.2-kmod/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# Created by: Johannes Dieterich <jmd@FreeBSD.org> - -PORTNAME= drm-fbsd11.2-kmod -PORTVERSION= 4.11g20200420 -PORTREVISION= 1 -CATEGORIES= graphics - -MAINTAINER= x11@FreeBSD.org -COMMENT= DRM modules for the linuxkpi-based KMS components - -LICENSE= BSD2CLAUSE MIT GPLv2 -LICENSE_COMB= multi - -ONLY_FOR_ARCHS= amd64 -ONLY_FOR_ARCHS_REASON= the new KMS components are only supported on amd64 - -RUN_DEPENDS= gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod - -OPTIONS_DEFINE= DEBUG - -USES= kmod uidfix - -USE_GITHUB= yes -GH_ACCOUNT= FreeBSDDesktop -GH_PROJECT= kms-drm -GH_TAGNAME= d7d433d - -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000 -IGNORE= only supported on FreeBSD 11. -.endif - -.if ${OPSYS} != FreeBSD -IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality) -.endif - -.include <bsd.port.mk> diff --git a/graphics/drm-fbsd11.2-kmod/distinfo b/graphics/drm-fbsd11.2-kmod/distinfo deleted file mode 100644 index f27486cf7577..000000000000 --- a/graphics/drm-fbsd11.2-kmod/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1587398846 -SHA256 (FreeBSDDesktop-kms-drm-4.11g20200420-d7d433d_GH0.tar.gz) = ad292fa6508b98b2f2c576633b79eb080bf9cc84b83bca18dbbb66d7a3c429eb -SIZE (FreeBSDDesktop-kms-drm-4.11g20200420-d7d433d_GH0.tar.gz) = 7362180 diff --git a/graphics/drm-fbsd11.2-kmod/pkg-descr b/graphics/drm-fbsd11.2-kmod/pkg-descr deleted file mode 100644 index d795c513d8bc..000000000000 --- a/graphics/drm-fbsd11.2-kmod/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -amdgpu, i915, and radeon DRM modules for the linuxkpi-based KMS components. -Currently corresponding to Linux 4.11 DRM. -This version is for FreeBSD 11.4. -amdgpu and radeonkms are known to fail with EFI boot. - -WWW: https://github.com/FreeBSDDesktop/kms-drm diff --git a/graphics/drm-fbsd11.2-kmod/pkg-message b/graphics/drm-fbsd11.2-kmod/pkg-message deleted file mode 100644 index 9ffa33a92063..000000000000 --- a/graphics/drm-fbsd11.2-kmod/pkg-message +++ /dev/null @@ -1,21 +0,0 @@ -[ -{ type: install - message: <<EOM -The drm-fbsd11.2-kmod port can be enabled for amdgpu (for AMD GPUs starting -with the HD7000 series / Tahiti) or i915kms (for Intel APUs starting with -HD3000 / Sandy Bridge) through kld_list in /etc/rc.conf. radeonkms for older -AMD GPUs can be loaded and there are some positive reports if EFI boot is NOT -enabled (similar to amdgpu). - -For amdgpu: kld_list="amdgpu" -For Intel: kld_list="/boot/modules/i915kms.ko" -For radeonkms: kld_list="/boot/modules/radeonkms.ko" - -Please ensure that all users requiring graphics are members of the -"video" group. - -Older generations are supported by the legacy kms modules (radeonkms / -i915kms) in base or by installing graphics/drm-legacy-kmod. -EOM -} -] diff --git a/graphics/drm-fbsd11.2-kmod/pkg-plist b/graphics/drm-fbsd11.2-kmod/pkg-plist deleted file mode 100644 index 52a0daf1bb9c..000000000000 --- a/graphics/drm-fbsd11.2-kmod/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -/%%KMODDIR%%/amdgpu.ko -/%%KMODDIR%%/amdkfd.ko -/%%KMODDIR%%/debugfs.ko -/%%KMODDIR%%/drm.ko -/%%KMODDIR%%/i915kms.ko -/%%KMODDIR%%/linuxkpi_gplv2.ko -/%%KMODDIR%%/radeonkms.ko -/%%KMODDIR%%/ttm.ko diff --git a/graphics/drm-fbsd12.0-kmod/Makefile b/graphics/drm-fbsd12.0-kmod/Makefile index f6758b4a739e..b90f7753cc61 100644 --- a/graphics/drm-fbsd12.0-kmod/Makefile +++ b/graphics/drm-fbsd12.0-kmod/Makefile @@ -27,7 +27,7 @@ GH_TAGNAME= 8843e1fc5 .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1200058 || ${OSVERSION} >= 1300000) +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300000 IGNORE= only supported on FreeBSD 12. .endif .if ${OPSYS} != FreeBSD diff --git a/graphics/drm-kmod/Makefile b/graphics/drm-kmod/Makefile index a35293863d2d..d95af0bd1b6c 100644 --- a/graphics/drm-kmod/Makefile +++ b/graphics/drm-kmod/Makefile @@ -16,9 +16,7 @@ USES= metaport IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality) .else .if ${ARCH} == "amd64" -.if ${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000 -RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-kmod -.elif ${OSVERSION} >= 1200058 && ${OSVERSION} < 1300000 +.if ${OSVERSION} < 1300000 RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd12.0-kmod .elif ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300136 IGNORE= not supported on older 13, no kernel support diff --git a/graphics/dspdfviewer/Makefile b/graphics/dspdfviewer/Makefile index bbd6cea9ed8c..6f78c79b8da5 100644 --- a/graphics/dspdfviewer/Makefile +++ b/graphics/dspdfviewer/Makefile @@ -39,7 +39,7 @@ PLIST_FILES= bin/dspdfviewer \ CFLAGS+= -Wno-error=undefined-func-template .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200039 && ${CHOSEN_COMPILER_TYPE} == clang +.if ${OPSYS} == FreeBSD && ${CHOSEN_COMPILER_TYPE} == clang # (rene) also related to issue #191 which is still open as of 2020-10-21 CFLAGS+= -Wno-error=zero-as-null-pointer-constant .endif diff --git a/graphics/libjxl/Makefile b/graphics/libjxl/Makefile index 8de3e64d4913..41b39880038f 100644 --- a/graphics/libjxl/Makefile +++ b/graphics/libjxl/Makefile @@ -51,10 +51,6 @@ JPEG_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_JPEG LTO_CMAKE_BOOL= CMAKE_INTERPROCEDURAL_OPTIMIZATION LTO_CMAKE_ON= -DCMAKE_POLICY_DEFAULT_CMP0069:STRING=NEW -.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld -# --plugin isn't supported by old GNU ld.bfd in base -LTO_LDFLAGS= -fuse-ld=lld -.endif MANPAGES_BUILD_DEPENDS= a2x:textproc/asciidoc MANPAGES_USES= python:build diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 7123ef66c0a0..17a33c863cc1 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -48,11 +48,6 @@ MESON_ARGS= -Dgallium-omx=disabled \ ${NULL} PLIST_SUB= ARCH=${ARCH:S/amd/x86_/} -.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld -# --build-id isn't supported by old GNU ld.bfd in base -LDFLAGS+= -fuse-ld=lld -.endif - OPTIONS_DEFINE= LIBUNWIND LLVM LTO VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD OPTIONS_DEFAULT= LIBUNWIND LLVM LTO VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD OPTIONS_GROUP= DRI GALLIUM VULKAN 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/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common index 36ba47ccbe30..20931bf44980 100644 --- a/graphics/mesa-dri/Makefile.common +++ b/graphics/mesa-dri/Makefile.common @@ -81,10 +81,6 @@ PKGHELP= ${.CURDIR}/pkg-help PKGINSTALL= ${.CURDIR}/pkg-install PKGDEINSTALL= ${.CURDIR}/pkg-deinstall -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200000 -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src_util_build__id.c -.endif - .include <bsd.port.pre.mk> BINARY_ALIAS+= python3=${PYTHON_VERSION} diff --git a/graphics/mesa-dri/files/extra-patch-src_util_build__id.c b/graphics/mesa-dri/files/extra-patch-src_util_build__id.c deleted file mode 100644 index 4b7b69d6b8ee..000000000000 --- a/graphics/mesa-dri/files/extra-patch-src_util_build__id.c +++ /dev/null @@ -1,15 +0,0 @@ -# Elf_ doesn't exist, use Elf32_ or Elf64_ -# ---- src/util/build_id.c.orig 2017-12-21 17:31:22 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/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile index cac0723c870b..06ab523f9067 100644 --- a/graphics/openshadinglanguage/Makefile +++ b/graphics/openshadinglanguage/Makefile @@ -28,11 +28,6 @@ USE_GITHUB= yes GH_ACCOUNT= imageworks GH_PROJECT= OpenShadingLanguage -# Use LLVM linker where available -.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld) -LDFLAGS+= -fuse-ld=lld -.endif - CMAKE_ON= ENABLERTTI OSL_BUILD_TESTS USE_LLVM_BITCODE USE_LIBCPLUSPLUS CMAKE_OFF= USE_BOOST_WAVE CMAKE_ARGS+= -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}" \ diff --git a/graphics/pcl-pointclouds/Makefile b/graphics/pcl-pointclouds/Makefile index 9eb05c01dc42..5d97f4d681ff 100644 --- a/graphics/pcl-pointclouds/Makefile +++ b/graphics/pcl-pointclouds/Makefile @@ -11,7 +11,6 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt BROKEN_i386= undefined reference to `__atomic_load' -BROKEN_FreeBSD_11= surface/CMakeFiles/pcl_surface.dir/src/mls.cpp.o: file not recognized: File format not recognized NOT_FOR_ARCHS= armv6 armv7 NOT_FOR_ARCHS_REASON= common/include/pcl/pcl_macros.h:420:4: error: aligned_malloc not supported on your platform diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile index 04cca76b8a39..f7066ab39631 100644 --- a/graphics/pixie/Makefile +++ b/graphics/pixie/Makefile @@ -17,7 +17,6 @@ BROKEN_aarch64= fails to compile: ri/atomic.h:149:9: use of undeclared identifi BROKEN_armv6= fails to compile: ri/atomic.h:149:9: use of undeclared identifier CRenderer BROKEN_armv7= fails to compile: ri/atomic.h:149:9: use of undeclared identifier CRenderer BROKEN_riscv64= fails to compile: ri/atomic.h:149:9: use of undeclared identifier CRenderer -BROKEN_FreeBSD_11_powerpc64= fails to compile on powerpc64 elfv1: ../common/mathSpec.h:548:37: error: 'max' was not declared in this scope BROKEN_FreeBSD_12_powerpc64= fails to compile on powerpc64 elfv1: ../common/mathSpec.h:548:37: error: 'max' was not declared in this scope LIB_DEPENDS= libOpenEXR.so:graphics/openexr \ diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile index 9a36e086d945..250f94b3d979 100644 --- a/graphics/rawtherapee/Makefile +++ b/graphics/rawtherapee/Makefile @@ -103,19 +103,6 @@ OPENMP_CMAKE_BOOL= OPTION_OMP # ------------------------------------------------------------------- -.if (${OPSYS} == FreeBSD) && (${OSVERSION} < 1200000) -# can't save 16-bit TIFF on FreeBSD 11.3 and 11.4 i386 -# "TIFFWriteDirectoryTagIfdIfd8Array: Attempt to write value -# larger than 0xFFFFFFFF in Classic TIFF file" -# -# And no, the maintainer is not going to spend any time on it -# unless there is a tested proven well-integrated patch offered. -# -# Tier-2 only supported on the latest stable FreeBSD release. -ONLY_FOR_ARCHS= amd64 -ONLY_FOR_ARCHS_REASON=On i386, rawtherapee malfunctions under FreeBSD 11.x - upgrade to 12.x -.endif - .if (${OPSYS} == FreeBSD) && (${OSVERSION} >= 1400000) # don't waste everybody's time with Tier-2 and moving targets. # might add ARM64 later on if they are established by the |