Page MenuHomeFreeBSD

D18328.diff
No OneTemporary

D18328.diff

Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -10650,3 +10650,6 @@
java/cacao||2018-12-03|Removed, depends on expired java/classpath
java/jamvm||2018-12-03|Has expired: Abandonware, depends on expired java/classpath
devel/ztcl||2018-12-04|Has expired: Unfetchable, unmaintained, info page unbuildable with recent makeinfo
+graphics/drm-stable-kmod|graphics/drm-fbsd11.2-kmod|2018-12-05|Cleaning up DRM ports nomenclature
+graphics/drm-next-kmod|graphics/drm-fbsd12.0-kmod|2018-12-05|Cleaning up DRM ports nomenclature
+graphics/drm-devel-kmod|graphics/drm-current-kmod|2018-12-05|Cleaning up DRM ports nomenclature
Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -5,6 +5,19 @@
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20181205:
+ AFFECTS: users of DRM ports other than graphics/drm-kmod
+ AUTHOR: jmd@FreeBSD.org
+
+ In order to facilitate future porting efforts and help in supporting multiple
+ FreeBSD versions, the DRM ports other than drm-kmod (graphics/drm-stable-kmod,
+ graphics/drm-next-kmod, graphics/drm-devel-kmod) have been renamed to
+ include the FreeBSD version they are designed for.
+
+ drm-stable-kmod is drm-fbsd11.2-kmod
+ drm-next-kmod is drm-fbsd12.0-kmod
+ drm-devel-kmod is drm-current-kmod
+
20181124:
AFFECTS: users of sysutils/munin-master, sysutils/munin-node, www/owncloud, mail/mailman, net/ntpa
AUTHOR: woodsb02@FreeBSD.org
Index: graphics/Makefile
===================================================================
--- graphics/Makefile
+++ graphics/Makefile
@@ -152,11 +152,11 @@
SUBDIR += dmtx-utils
SUBDIR += drawpile
SUBDIR += driconf
- SUBDIR += drm-devel-kmod
+ SUBDIR += drm-current-kmod
+ SUBDIR += drm-fbsd11.2-kmod
+ SUBDIR += drm-fbsd12.0-kmod
SUBDIR += drm-kmod
SUBDIR += drm-legacy-kmod
- SUBDIR += drm-next-kmod
- SUBDIR += drm-stable-kmod
SUBDIR += dspdfviewer
SUBDIR += duhdraw
SUBDIR += dynamechs
Index: graphics/drm-current-kmod/Makefile
===================================================================
--- graphics/drm-current-kmod/Makefile
+++ graphics/drm-current-kmod/Makefile
@@ -1,7 +1,7 @@
# Created by: Johannes Dieterich <jmd@FreeBSD.org>
# $FreeBSD$
-PORTNAME= drm-devel-kmod
+PORTNAME= drm-current-kmod
PORTVERSION= 4.16.g20181121
CATEGORIES= graphics kld
@@ -16,7 +16,7 @@
RUN_DEPENDS= gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
-CONFLICTS_INSTALL= drm-next-kmod drm-stable-kmod drm-legacy-kmod
+CONFLICTS_INSTALL= drm-fbsd11.2-kmod drm-fbsd12.0-kmod drm-legacy-kmod
OPTIONS_DEFINE= DEBUG
Index: graphics/drm-devel-kmod/Makefile
===================================================================
--- graphics/drm-devel-kmod/Makefile
+++ graphics/drm-devel-kmod/Makefile
@@ -1,61 +0,0 @@
-# Created by: Johannes Dieterich <jmd@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= drm-devel-kmod
-PORTVERSION= 4.16.g20181121
-CATEGORIES= graphics kld
-
-MAINTAINER= jmd@FreeBSD.org
-COMMENT= DRM modules for the linuxkpi-based KMS components (development version)
-
-LICENSE= BSD2CLAUSE MIT GPLv2
-LICENSE_COMB= multi
-
-ONLY_FOR_ARCHS= amd64 i386 powerpc64
-ONLY_FOR_ARCHS_REASON= the new KMS components are only supported on amd64 and i386
-
-RUN_DEPENDS= gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
-
-CONFLICTS_INSTALL= drm-next-kmod drm-stable-kmod drm-legacy-kmod
-
-OPTIONS_DEFINE= DEBUG
-
-USES= kmod uidfix compiler:c++11-lang
-
-USE_GITHUB= yes
-GH_ACCOUNT= FreeBSDDesktop
-GH_PROJECT= kms-drm
-GH_TAGNAME= a45b72a
-
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200067
-IGNORE= not supported on older CURRENT, no kernel support
-.endif
-.if ${OPSYS} != FreeBSD
-IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality)
-.endif
-
-.if ${ARCH} == "amd64"
-PLIST_SUB+= AMDGPU=""
-PLIST_SUB+= AMDKFD=""
-PLIST_SUB+= I915=""
-PLIST_SUB+= VMWGFX=""
-.elif ${ARCH} == "i386"
-PLIST_SUB+= AMDGPU="@comment "
-PLIST_SUB+= AMDKFD="@comment "
-PLIST_SUB+= I915=""
-PLIST_SUB+= VMWGFX=""
-.elif ${ARCH} == "powerpc64"
-PLIST_SUB+= AMDGPU=""
-PLIST_SUB+= AMDKFD="@comment "
-PLIST_SUB+= I915="@comment "
-PLIST_SUB+= VMWGFX="@comment "
-.else
-PLIST_SUB+= AMDGPU="@comment "
-PLIST_SUB+= AMDKFD="@comment "
-PLIST_SUB+= I915="@comment "
-PLIST_SUB+= VMWGFX="@comment "
-.endif
-
-.include <bsd.port.mk>
Index: graphics/drm-devel-kmod/distinfo
===================================================================
--- graphics/drm-devel-kmod/distinfo
+++ graphics/drm-devel-kmod/distinfo
@@ -1,3 +0,0 @@
-TIMESTAMP = 1542816184
-SHA256 (FreeBSDDesktop-kms-drm-4.16.g20181121-a45b72a_GH0.tar.gz) = ea38de931c4b8ac4f3b9a48c9c4b4a96c73558a1b0e94983195568a5cb03ce7a
-SIZE (FreeBSDDesktop-kms-drm-4.16.g20181121-a45b72a_GH0.tar.gz) = 13088779
Index: graphics/drm-devel-kmod/pkg-descr
===================================================================
--- graphics/drm-devel-kmod/pkg-descr
+++ graphics/drm-devel-kmod/pkg-descr
@@ -1,5 +0,0 @@
-amdgpu, i915, and radeon DRM modules for the linuxkpi-based KMS components.
-Currently corresponding to Linux 4.16 DRM. This is the development version.
-amdgpu and radeonkms are known to fail with EFI boot.
-
-WWW: https://github.com/FreeBSDDesktop/kms-drm
Index: graphics/drm-devel-kmod/pkg-message
===================================================================
--- graphics/drm-devel-kmod/pkg-message
+++ graphics/drm-devel-kmod/pkg-message
@@ -1,15 +0,0 @@
-The experimental drm-devel-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.
Index: graphics/drm-devel-kmod/pkg-plist
===================================================================
--- graphics/drm-devel-kmod/pkg-plist
+++ graphics/drm-devel-kmod/pkg-plist
@@ -1,8 +0,0 @@
-%%AMDGPU%%/%%KMODDIR%%/amdgpu.ko
-%%AMDKFD%%/%%KMODDIR%%/amdkfd.ko
-/%%KMODDIR%%/debugfs.ko
-/%%KMODDIR%%/drm.ko
-%%I915%%/%%KMODDIR%%/i915kms.ko
-/%%KMODDIR%%/linuxkpi_gplv2.ko
-/%%KMODDIR%%/radeonkms.ko
-%%VMWGFX%%/%%KMODDIR%%/vmwgfx.ko
Index: graphics/drm-fbsd11.2-kmod/Makefile
===================================================================
--- graphics/drm-fbsd11.2-kmod/Makefile
+++ graphics/drm-fbsd11.2-kmod/Makefile
@@ -1,7 +1,7 @@
# Created by: Johannes Dieterich <jmd@FreeBSD.org>
# $FreeBSD$
-PORTNAME= drm-stable-kmod
+PORTNAME= drm-fbsd11.2-kmod
PORTVERSION= g20180822
PORTREVISION= 1
CATEGORIES= graphics
@@ -17,7 +17,7 @@
RUN_DEPENDS= gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
-CONFLICTS_INSTALL= drm-devel-kmod drm-next-kmod drm-legacy-kmod
+CONFLICTS_INSTALL= drm-fbsd12.0-kmod drm-current-kmod drm-legacy-kmod
OPTIONS_DEFINE= DEBUG
Index: graphics/drm-fbsd12.0-kmod/Makefile
===================================================================
--- graphics/drm-fbsd12.0-kmod/Makefile
+++ graphics/drm-fbsd12.0-kmod/Makefile
@@ -1,7 +1,7 @@
# Created by: Johannes Dieterich <jmd@FreeBSD.org>
# $FreeBSD$
-PORTNAME= drm-next-kmod
+PORTNAME= drm-fbsd12.0-kmod
PORTVERSION= 4.11.g20181027
PORTREVISION= 1
CATEGORIES= graphics
@@ -17,7 +17,7 @@
RUN_DEPENDS= gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
-CONFLICTS_INSTALL= drm-devel-kmod drm-stable-kmod drm-legacy-kmod
+CONFLICTS_INSTALL= drm-fbsd11.2-kmod drm-current-kmod drm-legacy-kmod
OPTIONS_DEFINE= DEBUG
Index: graphics/drm-kmod/Makefile
===================================================================
--- graphics/drm-kmod/Makefile
+++ graphics/drm-kmod/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= drm-kmod
-PORTVERSION= g20180930
+PORTVERSION= g20181126
CATEGORIES= graphics
MAINTAINER= jmd@FreeBSD.org
@@ -23,15 +23,15 @@
.endif
.else
.if ${OSVERSION} >= 1101510 && ${OSVERSION} < 1200000
-RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-stable-kmod
+RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-kmod
.elif ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200045
IGNORE= not supported on older 12, no kernel support
.elif ${OSVERSION} >= 1200045 && ${OSVERSION} < 1200058
-RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-stable-kmod
+RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-kmod
.elif ${OSVERSION} >= 1200058 && ${OSVERSION} < 1300000
-RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-next-kmod
+RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd12.0-kmod
.elif ${OSVERSION} >= 1300000
-RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-devel-kmod
+RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-current-kmod
.else
IGNORE= not supported for this configuration
.endif
Index: graphics/drm-legacy-kmod/Makefile
===================================================================
--- graphics/drm-legacy-kmod/Makefile
+++ graphics/drm-legacy-kmod/Makefile
@@ -18,7 +18,7 @@
OPTIONS_DEFINE= DEBUG
-CONFLICTS_INSTALL= drm-devel-kmod drm-stable-kmod drm-next-kmod
+CONFLICTS_INSTALL= drm-fbsd11.2-kmod drm-fbsd12.0-kmod drm-current-kmod
USE_GITHUB= yes
GH_ACCOUNT= FreeBSDDesktop
Index: graphics/drm-next-kmod/Makefile
===================================================================
--- graphics/drm-next-kmod/Makefile
+++ graphics/drm-next-kmod/Makefile
@@ -1,40 +0,0 @@
-# Created by: Johannes Dieterich <jmd@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= drm-next-kmod
-PORTVERSION= 4.11.g20181027
-PORTREVISION= 1
-CATEGORIES= graphics
-
-MAINTAINER= jmd@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
-
-CONFLICTS_INSTALL= drm-devel-kmod drm-stable-kmod drm-legacy-kmod
-
-OPTIONS_DEFINE= DEBUG
-
-USES= kmod uidfix
-
-USE_GITHUB= yes
-GH_ACCOUNT= FreeBSDDesktop
-GH_PROJECT= kms-drm
-GH_TAGNAME= b545cc4
-
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200058
-IGNORE= not supported on older CURRENT, no kernel support
-.endif
-.if ${OPSYS} != FreeBSD
-IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality)
-.endif
-
-.include <bsd.port.mk>
Index: graphics/drm-next-kmod/distinfo
===================================================================
--- graphics/drm-next-kmod/distinfo
+++ graphics/drm-next-kmod/distinfo
@@ -1,3 +0,0 @@
-TIMESTAMP = 1540633673
-SHA256 (FreeBSDDesktop-kms-drm-4.11.g20181027-b545cc4_GH0.tar.gz) = cb896fd506425c5d6d5aadb47b30bc2f0ae35127d634e6cf3e72e6fb2bab0963
-SIZE (FreeBSDDesktop-kms-drm-4.11.g20181027-b545cc4_GH0.tar.gz) = 7357687
Index: graphics/drm-next-kmod/pkg-descr
===================================================================
--- graphics/drm-next-kmod/pkg-descr
+++ graphics/drm-next-kmod/pkg-descr
@@ -1,5 +0,0 @@
-amdgpu, i915, and radeon DRM modules for the linuxkpi-based KMS components.
-Currently corresponding to Linux 4.11 DRM. Experimental state. amdgpu and
-radeonkms are known to fail with EFI boot.
-
-WWW: https://github.com/FreeBSDDesktop/kms-drm
Index: graphics/drm-next-kmod/pkg-message
===================================================================
--- graphics/drm-next-kmod/pkg-message
+++ graphics/drm-next-kmod/pkg-message
@@ -1,15 +0,0 @@
-The drm-next-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.
Index: graphics/drm-next-kmod/pkg-plist
===================================================================
--- graphics/drm-next-kmod/pkg-plist
+++ graphics/drm-next-kmod/pkg-plist
@@ -1,7 +0,0 @@
-/%%KMODDIR%%/amdgpu.ko
-/%%KMODDIR%%/amdkfd.ko
-/%%KMODDIR%%/debugfs.ko
-/%%KMODDIR%%/drm.ko
-/%%KMODDIR%%/i915kms.ko
-/%%KMODDIR%%/linuxkpi_gplv2.ko
-/%%KMODDIR%%/radeonkms.ko
Index: graphics/drm-stable-kmod/Makefile
===================================================================
--- graphics/drm-stable-kmod/Makefile
+++ graphics/drm-stable-kmod/Makefile
@@ -1,40 +0,0 @@
-# Created by: Johannes Dieterich <jmd@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= drm-stable-kmod
-PORTVERSION= g20180822
-PORTREVISION= 1
-CATEGORIES= graphics
-
-MAINTAINER= jmd@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
-
-CONFLICTS_INSTALL= drm-devel-kmod drm-next-kmod drm-legacy-kmod
-
-OPTIONS_DEFINE= DEBUG
-
-USES= kmod uidfix
-
-USE_GITHUB= yes
-GH_ACCOUNT= FreeBSDDesktop
-GH_PROJECT= kms-drm
-GH_TAGNAME= ef4d156
-
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200045
-IGNORE= not supported on older CURRENT, no kernel support
-.endif
-.if ${OPSYS} != FreeBSD
-IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality)
-.endif
-
-.include <bsd.port.mk>
Index: graphics/drm-stable-kmod/distinfo
===================================================================
--- graphics/drm-stable-kmod/distinfo
+++ graphics/drm-stable-kmod/distinfo
@@ -1,3 +0,0 @@
-TIMESTAMP = 1534993813
-SHA256 (FreeBSDDesktop-kms-drm-g20180822-ef4d156_GH0.tar.gz) = c20bfb2554dc39839f72018f6c15fc4b371233039209132312017141af81dec6
-SIZE (FreeBSDDesktop-kms-drm-g20180822-ef4d156_GH0.tar.gz) = 6678309
Index: graphics/drm-stable-kmod/pkg-descr
===================================================================
--- graphics/drm-stable-kmod/pkg-descr
+++ graphics/drm-stable-kmod/pkg-descr
@@ -1,5 +0,0 @@
-amdgpu, i915, and radeon DRM modules for the linuxkpi-based KMS components.
-Currently corresponding to Linux 4.9 DRM. More stable state. amdgpu and
-radeonkms are known to fail with EFI boot.
-
-WWW: https://github.com/FreeBSDDesktop/kms-drm
Index: graphics/drm-stable-kmod/pkg-message
===================================================================
--- graphics/drm-stable-kmod/pkg-message
+++ graphics/drm-stable-kmod/pkg-message
@@ -1,15 +0,0 @@
-The drm-stable-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.
Index: graphics/drm-stable-kmod/pkg-plist
===================================================================
--- graphics/drm-stable-kmod/pkg-plist
+++ graphics/drm-stable-kmod/pkg-plist
@@ -1,7 +0,0 @@
-/%%KMODDIR%%/amdgpu.ko
-/%%KMODDIR%%/amdkfd.ko
-/%%KMODDIR%%/debugfs.ko
-/%%KMODDIR%%/drm.ko
-/%%KMODDIR%%/i915kms.ko
-/%%KMODDIR%%/linuxkpi_gplv2.ko
-/%%KMODDIR%%/radeonkms.ko

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 31, 3:50 AM (6 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30607726
Default Alt Text
D18328.diff (16 KB)

Event Timeline