diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2022-06-29 16:44:41 +0300 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2022-08-02 10:26:03 +0300 |
| commit | 88b0ae2bb9c65edc63073dc211fb57e3dec05a9e (patch) | |
| tree | 943e77a11d7a0e8543a313f667f665f47a7e5854 /x11-drivers | |
| parent | 6b5d28d49606f7743689735dd6f78ff7f99dade3 (diff) | |
xorg: upgrade to 21.1.4
Port changes:
- flavorize the port
- decouple Xwayland as it has been split from Xorg
- switch to meson
- cleanup non necessary patches anymore
- stop butchering the build system to play with Xorg.wrap but do it
in post-install
- remove dmx (no longer existing)
- use libmd for sha1 (remove dependency on open/libre ssl)
- always activate RPC security
- simplify postinstall/deinstall script and make them cross install friendly
- remove the SUID option and make it the default, we cannot startx as user without it
- only keep the mesa-dri dependency on xorg-server not others
xf86-video-ati: fix build with recent xorg
While here incorporate a patch which prevent crash of the driver
when xrandr is invoked
Update x11/libxcvt to provide cvt(1) and friends which are not provided anymore
Xorg
Reviewed by: tcberner, manu, jbeich
Approved by: tcberner, manu
Differential Revision: https://reviews.freebsd.org/D35661
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/xf86-video-ati/Makefile | 5 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-ati/distinfo | 4 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-ati/files/0001_dont_set_sourcevalidate_pointer_to_null.diff | 27 |
3 files changed, 34 insertions, 2 deletions
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile index 893396b1785e..2f28d5ba0315 100644 --- a/x11-drivers/xf86-video-ati/Makefile +++ b/x11-drivers/xf86-video-ati/Makefile @@ -1,6 +1,6 @@ PORTNAME= xf86-video-ati PORTVERSION= 19.1.0 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= x11-drivers @@ -12,6 +12,9 @@ PATCHFILES+= f223035f4ffcff2a9296d1e907a5193f8e8845a3.patch:-p1 PATCHFILES+= 4d84cf438e7f1bebf0053035ef0292e9fed257d1.patch:-p1 PATCHFILES+= c0eb5dbd9c1db6b6d5b1574bcd8c584170d7ab54.patch:-p1 PATCHFILES+= 3845392426e9798c1fb2a6fc5e97bf5dfd5c443d.patch:-p1 +PATCHFILES+= 8da3e4561ef82bb78c9a17b8cd8bf139b9cfd680.patch:-p1 + +EXTRA_PATCHES= ${FILESDIR}/0001_dont_set_sourcevalidate_pointer_to_null.diff:-p1 LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING diff --git a/x11-drivers/xf86-video-ati/distinfo b/x11-drivers/xf86-video-ati/distinfo index 47fcfa2331fa..f816e412dfa2 100644 --- a/x11-drivers/xf86-video-ati/distinfo +++ b/x11-drivers/xf86-video-ati/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1586946702 +TIMESTAMP = 1656682698 SHA256 (xorg/driver/xf86-video-ati-19.1.0.tar.bz2) = 659f5a1629eea5f5334d9b39b18e6807a63aa1efa33c1236d9cc53acbb223c49 SIZE (xorg/driver/xf86-video-ati-19.1.0.tar.bz2) = 904558 SHA256 (xorg/driver/f223035f4ffcff2a9296d1e907a5193f8e8845a3.patch) = 34395b16c7849b342a2db62a08eb41dacbb1878583d47692cb6a798b7fd0a60d @@ -9,3 +9,5 @@ SHA256 (xorg/driver/c0eb5dbd9c1db6b6d5b1574bcd8c584170d7ab54.patch) = 00c001f873 SIZE (xorg/driver/c0eb5dbd9c1db6b6d5b1574bcd8c584170d7ab54.patch) = 3679 SHA256 (xorg/driver/3845392426e9798c1fb2a6fc5e97bf5dfd5c443d.patch) = ba978104ed1209a4e4f0a1e6067b5044745786c6f0183ba756e9860faa8ef914 SIZE (xorg/driver/3845392426e9798c1fb2a6fc5e97bf5dfd5c443d.patch) = 1867 +SHA256 (xorg/driver/8da3e4561ef82bb78c9a17b8cd8bf139b9cfd680.patch) = fb3c215b742def4a3a412adbcefe5f4d9f36ce9c56af274dbcf50c389d2cd171 +SIZE (xorg/driver/8da3e4561ef82bb78c9a17b8cd8bf139b9cfd680.patch) = 14196 diff --git a/x11-drivers/xf86-video-ati/files/0001_dont_set_sourcevalidate_pointer_to_null.diff b/x11-drivers/xf86-video-ati/files/0001_dont_set_sourcevalidate_pointer_to_null.diff new file mode 100644 index 000000000000..080de79e37bd --- /dev/null +++ b/x11-drivers/xf86-video-ati/files/0001_dont_set_sourcevalidate_pointer_to_null.diff @@ -0,0 +1,27 @@ +diff --git a/src/radeon_kms.c b/src/radeon_kms.c +index 62962d61d8ee22a02567b7125b4bb3a7f7230be4..51b00dd9b013d183bf93d7f5578014dc16c80ce8 100644 +--- a/src/radeon_kms.c ++++ b/src/radeon_kms.c +@@ -931,6 +931,13 @@ radeon_dirty_update(ScrnInfoPtr scrn) + } + } + ++static void ++radeonSourceValidate(DrawablePtr draw, int x, int y, int w, int h, ++ unsigned int subWindowMode) ++{ ++} ++ ++ + + Bool + radeon_scanout_do_update(xf86CrtcPtr xf86_crtc, int scanout_id, +@@ -993,7 +1000,7 @@ radeon_scanout_do_update(xf86CrtcPtr xf86_crtc, int scanout_id, + SetPicturePictFilter(src, xf86_crtc->filter, xf86_crtc->params, + xf86_crtc->nparams); + +- pScreen->SourceValidate = NULL; ++ pScreen->SourceValidate = radeonSourceValidate; + CompositePicture(PictOpSrc, + src, NULL, dst, + extents.x1, extents.y1, 0, 0, extents.x1, |