Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 qt6/qt6base/DEPENDS                             |    2 -
 qt6/qt6base/HISTORY                             |    3 ++
 xorg-driver/xf86-video-ati/DEPENDS              |    2 -
 xorg-driver/xf86-video-ati/DETAILS              |    2 -
 xorg-driver/xf86-video-ati/HISTORY              |    5 ++++
 xorg-driver/xf86-video-ati/patches/gcc-10.patch |   25 
++++++++++++++++++++++++
 6 files changed, 36 insertions(+), 3 deletions(-)

New commits:
commit 6c4ffb482120c7385254587e1f3ca7c375897ec0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    xf86-video-ati - fix build

commit 99e4716a324024e2bec7be3faed3cf448cca7c4c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    qt6base - tweak depends

diff --git a/qt6/qt6base/DEPENDS b/qt6/qt6base/DEPENDS
index b9392d3..8bf25fb 100755
--- a/qt6/qt6base/DEPENDS
+++ b/qt6/qt6base/DEPENDS
@@ -50,7 +50,7 @@ optional_depends  glib2  '' '' 'glib support'
 optional_depends  gtk+3  -DFEATURE_gtk3={ON,OFF} 'gtk3 support'
 
 #database plugins
-optional_depends firebird3  -DFEATURE_sql_ibase={ON,OFF} 'Firebird database 
support'  &&
+optional_depends FIREBIRD  -DFEATURE_sql_ibase={ON,OFF} 'Firebird database 
support'  &&
 
 optional_depends MYSQL      -DFEATURE_sql_mysql={ON,OFF}  'MySql database 
support'     &&
 
diff --git a/qt6/qt6base/HISTORY b/qt6/qt6base/HISTORY
index 940fbfc..8119ce3 100644
--- a/qt6/qt6base/HISTORY
+++ b/qt6/qt6base/HISTORY
@@ -1,3 +1,6 @@
+2021-07-23 Treeve Jelbert <treeve AT sourcemage.org>
+       * DEPENDS: use FIREBIRD
+
 2021-07-03 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 6.1.2
 
diff --git a/xorg-driver/xf86-video-ati/DEPENDS 
b/xorg-driver/xf86-video-ati/DEPENDS
index c993fd6..6435bfc 100755
--- a/xorg-driver/xf86-video-ati/DEPENDS
+++ b/xorg-driver/xf86-video-ati/DEPENDS
@@ -2,7 +2,7 @@ depends meson &&
 depends ninja-build-system &&
 depends xorgproto &&
 depends -sub "RADEON" libdrm &&
-depends XSERVER      &&
+depends xserver      &&
 depends libpciaccess &&
 depends libxcb &&
 depends -sub DRI MESA
diff --git a/xorg-driver/xf86-video-ati/DETAILS 
b/xorg-driver/xf86-video-ati/DETAILS
index c212952..7a490fb 100755
--- a/xorg-driver/xf86-video-ati/DETAILS
+++ b/xorg-driver/xf86-video-ati/DETAILS
@@ -1,5 +1,5 @@
 . "$GRIMOIRE/FUNCTIONS"
-. "$GRIMOIRE/MESONFUNCTIONS"
+. "$GRIMOIRE/MESON_FUNCTIONS"
            SPELL=xf86-video-ati
 if [[ $XF86_VIDEO_ATI_BRANCH == scm ]]; then
          VERSION=$(get_scm_version)
diff --git a/xorg-driver/xf86-video-ati/HISTORY 
b/xorg-driver/xf86-video-ati/HISTORY
index 59d1918..a0d8507 100644
--- a/xorg-driver/xf86-video-ati/HISTORY
+++ b/xorg-driver/xf86-video-ati/HISTORY
@@ -1,3 +1,8 @@
+2021-08-03 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: fix typo
+       * gcc-10.patch: added
+       * DEPENDS: xserver
+
 2019-10-15 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 19.1.0
 
diff --git a/xorg-driver/xf86-video-ati/PRE_BUILD 
b/xorg-driver/xf86-video-ati/PRE_BUILD
old mode 100644
new mode 100755
diff --git a/xorg-driver/xf86-video-ati/patches/gcc-10.patch 
b/xorg-driver/xf86-video-ati/patches/gcc-10.patch
new file mode 100644
index 0000000..64f3dd6
--- /dev/null
+++ b/xorg-driver/xf86-video-ati/patches/gcc-10.patch
@@ -0,0 +1,25 @@
+commit f223035f4ffcff2a9296d1e907a5193f8e8845a3
+Author: Adam Jackson <ajax AT redhat.com>
+Date:   Tue Feb 4 16:38:06 2020 -0500
+
+    Fix link failure with gcc 10
+    
+    Without the 'extern' this looks like a definition not just a
+    declaration, in every file that includes the header. gcc 10 is stricter
+    about this kind of multiple definition.
+    
+    Reviewed-by: Michel Dänzer <mdaenzer AT redhat.com>
+
+diff --git a/src/drmmode_display.h b/src/drmmode_display.h
+index 96eaef0a..8cd8a0a6 100644
+--- a/src/drmmode_display.h
++++ b/src/drmmode_display.h
+@@ -262,7 +262,7 @@ Bool drmmode_wait_vblank(xf86CrtcPtr crtc, 
drmVBlankSeqType type,
+                        uint64_t *ust, uint32_t *result_seq);
+ 
+ 
+-miPointerSpriteFuncRec drmmode_sprite_funcs;
++extern miPointerSpriteFuncRec drmmode_sprite_funcs;
+ 
+ 
+ #endif