From 7dedee0f7c4c6dba53fdf606f362051df1b8f227 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sat, 29 Apr 2023 04:42:55 +0000
Subject: [PATCH] ati: drop X11 support and the xf86-video-ati package

---
 config/graphic                                |  8 +++---
 .../xf86-video-ati/config/xorg-radeon.conf    |  8 ------
 packages/x11/driver/xf86-video-ati/package.mk | 26 -------------------
 projects/ARM/options                          |  2 +-
 projects/Generic/devices/x11/options          |  6 ++---
 5 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 100644 packages/x11/driver/xf86-video-ati/config/xorg-radeon.conf
 delete mode 100644 packages/x11/driver/xf86-video-ati/package.mk

diff --git a/config/graphic b/config/graphic
index 6615dc42fb..4b2e18af25 100644
--- a/config/graphic
+++ b/config/graphic
@@ -97,24 +97,22 @@ get_graphicdrivers() {
 
   if listcontains "${GRAPHIC_DRIVERS}" "r300"; then
     GALLIUM_DRIVERS+=" r300"
-    XORG_DRIVERS+=" ati"
     LLVM_SUPPORT="yes"
     COMPOSITE_SUPPORT="yes"
-    VDPAU_SUPPORT="yes"
+    VDPAU_SUPPORT="no"
   fi
 
   if listcontains "${GRAPHIC_DRIVERS}" "r600"; then
     GALLIUM_DRIVERS+=" r600"
-    XORG_DRIVERS+=" ati"
     LLVM_SUPPORT="yes"
     COMPOSITE_SUPPORT="yes"
-    VDPAU_SUPPORT="yes"
+    VDPAU_SUPPORT="no"
     VAAPI_SUPPORT="yes"
   fi
 
   if listcontains "${GRAPHIC_DRIVERS}" "radeonsi"; then
     GALLIUM_DRIVERS+=" radeonsi"
-    XORG_DRIVERS+=" ati amdgpu"
+    XORG_DRIVERS+=" amdgpu"
     VULKAN_DRIVERS_MESA+=" amd"
     LLVM_SUPPORT="yes"
     COMPOSITE_SUPPORT="yes"
diff --git a/packages/x11/driver/xf86-video-ati/config/xorg-radeon.conf b/packages/x11/driver/xf86-video-ati/config/xorg-radeon.conf
deleted file mode 100644
index b5de54afa1..0000000000
--- a/packages/x11/driver/xf86-video-ati/config/xorg-radeon.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-Section "Device"
-        Identifier  "AMD Graphics"
-        Driver      "radeon"
-
-        # uncomment the following options to use DRI3 and glamor, otherwise DRI2 and exa
-        # Option      "DRI3"        "1"
-        # Option      "AccelMethod" "glamor"
-Endsection
diff --git a/packages/x11/driver/xf86-video-ati/package.mk b/packages/x11/driver/xf86-video-ati/package.mk
deleted file mode 100644
index 544363d555..0000000000
--- a/packages/x11/driver/xf86-video-ati/package.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="xf86-video-ati"
-PKG_VERSION="22.0.0"
-PKG_SHA256="c8c8bb56d3f6227c97e59c3a3c85a25133584ceb82ab5bc05a902a743ab7bf6d"
-PKG_ARCH="x86_64"
-PKG_LICENSE="OSS"
-PKG_SITE="https://www.x.org/wiki/RadeonFeature/"
-PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain xorg-server"
-PKG_LONGDESC="ATI/AMD Radeon video driver for the Xorg X server."
-PKG_TOOLCHAIN="autotools"
-
-PKG_CONFIGURE_OPTS_TARGET="--enable-glamor \
-                           --with-xorg-module-dir=${XORG_PATH_MODULES}"
-
-post_configure_target() {
-  libtool_remove_rpath libtool
-}
-
-post_makeinstall_target() {
-  mkdir -p ${INSTALL}/etc/X11
-    cp ${PKG_DIR}/config/*.conf ${INSTALL}/etc/X11
-}
diff --git a/projects/ARM/options b/projects/ARM/options
index b2e0ac7e85..d67abbb95c 100644
--- a/projects/ARM/options
+++ b/projects/ARM/options
@@ -99,7 +99,7 @@
   # build and install diskmounter support (udevil)
     UDEVIL="no"
 
-  # Xorg Graphic drivers to use (all / r300,r600,nvidia)
+  # Xorg Graphic drivers to use (all / nvidia)
     GRAPHIC_DRIVERS="mesa"
 
   # build and install remote support (yes / no)
diff --git a/projects/Generic/devices/x11/options b/projects/Generic/devices/x11/options
index b4b917e9c0..f2739f3a9c 100644
--- a/projects/Generic/devices/x11/options
+++ b/projects/Generic/devices/x11/options
@@ -19,7 +19,7 @@
 # set the addon project
   ADDON_PROJECT="Generic-legacy"
 
-# Mesa 3D / Xorg Graphic drivers to use (all / crocus,i915,iris,r300,r600,radeonsi,nvidia,vmware,virtio)
+# Mesa 3D / Xorg Graphic drivers to use (all / crocus,i915,iris,radeonsi,nvidia,vmware,virtio)
 # Space separated list is supported,
-# e.g. GRAPHIC_DRIVERS="crocus i915 iris r300 r600 radeonsi nvidia vmware virtio"
-  GRAPHIC_DRIVERS="crocus i915 iris r300 r600 radeonsi nvidia vmware virtio"
+# e.g. GRAPHIC_DRIVERS="crocus i915 iris radeonsi nvidia vmware virtio"
+  GRAPHIC_DRIVERS="crocus i915 iris radeonsi nvidia vmware virtio"