From fc8be041ac2184ea90a3ff55d1920abbe5f7867e Mon Sep 17 00:00:00 2001
From: Adam Samalik <asamalik@redhat.com>
Date: Thu, 29 Jun 2023 18:03:19 +0200
Subject: [PATCH] re-import sources as agreed with the maintainer

---
 .gitignore            | 40 +++++++++++++++++++++++++++++++++++++++-
 fix-dri-removal.patch | 24 ++++++++++++++++++++++++
 gating.yaml           |  6 ++++++
 make-git-snapshot.sh  | 22 ++++++++++++++++++++++
 4 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 fix-dri-removal.patch
 create mode 100644 gating.yaml
 create mode 100644 make-git-snapshot.sh

diff --git a/.gitignore b/.gitignore
index aa05958..50cbef8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,40 @@
-SOURCES/xf86-video-ati-19.1.0.tar.bz2
+xf86-video-ati-20100705.tar.xz
+/xf86-video-ati-20101109.tar.xz
+/xf86-video-ati-20101201.tar.xz
+/xf86-video-ati-20110107.tar.xz
+/xf86-video-ati-20110124.tar.xz
+/xf86-video-ati-20110204.tar.xz
+/xf86-video-ati-20110315.tar.xz
+/xf86-video-ati-20110316.tar.xz
+/xf86-video-ati-20110504.tar.xz
+/xf86-video-ati-20110727.tar.xz
+/xf86-video-ati-6.14.3.tar.bz2
+/xf86-video-ati-20111125.tar.xz
+/xf86-video-ati-20120128.tar.xz
+/xf86-video-ati-20120206.tar.xz
+/xf86-video-ati-20120329.tar.xz
+/xf86-video-ati-20120417.tar.xz
+/xf86-video-ati-20120602.tar.xz
+/xf86-video-ati-20120629.tar.xz
+/xf86-video-ati-20120816.tar.xz
+/xf86-video-ati-20120910.tar.xz
+/xf86-video-ati-20121015.tar.xz
+/xf86-video-ati-7.1.0.tar.bz2
+/xf86-video-ati-20130408.tar.xz
+/xf86-video-ati-7.2.0.tar.bz2
+/xf86-video-ati-20131101.tar.xz
+/xf86-video-ati-20140419.tar.xz
+/xf86-video-ati-7.4.0.tar.bz2
+/xf86-video-ati-7.5.0.tar.bz2
+/xf86-video-ati-20150709.tar.xz
+/xf86-video-ati-20150729.tar.xz
+/xf86-video-ati-20151116.tar.xz
+/xf86-video-ati-20160215.tar.xz
+/xf86-video-ati-20160518.tar.xz
+/xf86-video-ati-20160928.tar.xz
+/xf86-video-ati-7.9.0.tar.bz2
+/xf86-video-ati-7.10.0.tar.bz2
+/xf86-video-ati-18.0.1.tar.bz2
+/xf86-video-ati-18.1.0.tar.bz2
+/xf86-video-ati-19.0.1.tar.bz2
 /xf86-video-ati-19.1.0.tar.bz2
diff --git a/fix-dri-removal.patch b/fix-dri-removal.patch
new file mode 100644
index 0000000..dd2e05f
--- /dev/null
+++ b/fix-dri-removal.patch
@@ -0,0 +1,24 @@
+diff -up xf86-video-ati-20160518/src/drmmode_display.c.da xf86-video-ati-20160518/src/drmmode_display.c
+--- xf86-video-ati-20160518/src/drmmode_display.c.da	2016-05-18 06:14:02.886748541 +1000
++++ xf86-video-ati-20160518/src/drmmode_display.c	2016-05-18 06:14:16.236094662 +1000
+@@ -44,7 +44,7 @@
+ #include "radeon_reg.h"
+ 
+ #ifdef RADEON_PIXMAP_SHARING
+-#include <dri.h>
++#include <dri2.h>
+ #endif
+ 
+ #include "drmmode_display.h"
+diff -up xf86-video-ati-20160518/src/radeon_probe.c.da xf86-video-ati-20160518/src/radeon_probe.c
+--- xf86-video-ati-20160518/src/radeon_probe.c.da	2016-05-18 06:13:57.751615418 +1000
++++ xf86-video-ati-20160518/src/radeon_probe.c	2016-05-18 06:14:10.043934112 +1000
+@@ -48,7 +48,7 @@
+ #include "xf86.h"
+ 
+ #include "xf86drmMode.h"
+-#include "dri.h"
++#include "dri2.h"
+ 
+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <xf86_OSproc.h>
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..6617a78
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: manual.sst_graphics_infrastructure.xorg-x11-drv-ati.sanity}
diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
new file mode 100644
index 0000000..3f2c592
--- /dev/null
+++ b/make-git-snapshot.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Usage: ./make-git-snapshot.sh [COMMIT]
+#
+# to make a snapshot of the given tag/branch.  Defaults to HEAD.
+# Point env var REF to a local mesa repo to reduce clone time.
+
+DIRNAME=xf86-video-ati-$( date +%Y%m%d )
+
+echo REF ${REF:+--reference $REF}
+echo DIRNAME $DIRNAME
+echo HEAD ${1:-HEAD}
+
+rm -rf $DIRNAME
+
+git clone ${REF:+--reference $REF} \
+	git://git.freedesktop.org/git/xorg/driver/xf86-video-ati $DIRNAME
+
+GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
+	| xz > $DIRNAME.tar.xz
+
+# rm -rf $DIRNAME