Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xf86-video-mach64 for 
openSUSE:Factory checked in at 2021-11-12 15:59:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-mach64 (Old)
 and      /work/SRC/openSUSE:Factory/.xf86-video-mach64.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xf86-video-mach64"

Fri Nov 12 15:59:41 2021 rev:15 rq:931153 version:6.9.6

Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-video-mach64/xf86-video-mach64.changes      
2021-04-21 21:01:05.478361234 +0200
+++ 
/work/SRC/openSUSE:Factory/.xf86-video-mach64.new.1890/xf86-video-mach64.changes
    2021-11-12 16:00:25.950597358 +0100
@@ -1,0 +2,6 @@
+Fri Nov 12 14:02:46 UTC 2021 - Stefan Dirsch <[email protected]>
+
+- u_xorg-server-21.1.patch
+  * fixes build against xorg-server 21.1 
+
+-------------------------------------------------------------------

New:
----
  u_xorg-server-21.1.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xf86-video-mach64.spec ++++++
--- /var/tmp/diff_new_pack.OTmIgv/_old  2021-11-12 16:00:26.414597573 +0100
+++ /var/tmp/diff_new_pack.OTmIgv/_new  2021-11-12 16:00:26.418597575 +0100
@@ -24,6 +24,7 @@
 Group:          System/X11/Servers/XF86_4
 URL:            https://xorg.freedesktop.org/
 Source0:        
https://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
+Patch0:         u_xorg-server-21.1.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(fontsproto)
@@ -48,6 +49,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure

++++++ u_xorg-server-21.1.patch ++++++
diff -u -r xf86-video-mach64-6.9.6.orig/src/aticonfig.c 
xf86-video-mach64-6.9.6/src/aticonfig.c
--- xf86-video-mach64-6.9.6.orig/src/aticonfig.c        2021-11-12 
13:56:54.754042869 +0000
+++ xf86-video-mach64-6.9.6/src/aticonfig.c     2021-11-12 14:00:24.293979790 
+0000
@@ -311,42 +311,42 @@
 
     (void)memcpy(PublicOption, ATIPublicOptions, ATIPublicOptionSize);
 
-#   define ProbeSparse   PublicOption[ATI_OPTION_PROBE_SPARSE].value.bool
-#   define Accel         PublicOption[ATI_OPTION_ACCEL].value.bool
-#   define BIOSDisplay   PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.bool
-#   define Blend         PrivateOption[ATI_OPTION_BLEND].value.bool
-#   define CRTDisplay    PublicOption[ATI_OPTION_CRT_DISPLAY].value.bool
-#   define CRTScreen     PrivateOption[ATI_OPTION_CRT_SCREEN].value.bool
-#   define CSync         PublicOption[ATI_OPTION_CSYNC].value.bool
-#   define Devel         PrivateOption[ATI_OPTION_DEVEL].value.bool
-#   define HWCursor      PublicOption[ATI_OPTION_HWCURSOR].value.bool
+#   define ProbeSparse   PublicOption[ATI_OPTION_PROBE_SPARSE].value.boolean
+#   define Accel         PublicOption[ATI_OPTION_ACCEL].value.boolean
+#   define BIOSDisplay   PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.boolean
+#   define Blend         PrivateOption[ATI_OPTION_BLEND].value.boolean
+#   define CRTDisplay    PublicOption[ATI_OPTION_CRT_DISPLAY].value.boolean
+#   define CRTScreen     PrivateOption[ATI_OPTION_CRT_SCREEN].value.boolean
+#   define CSync         PublicOption[ATI_OPTION_CSYNC].value.boolean
+#   define Devel         PrivateOption[ATI_OPTION_DEVEL].value.boolean
+#   define HWCursor      PublicOption[ATI_OPTION_HWCURSOR].value.boolean
 
 #ifdef XF86DRI_DEVEL
 
-#   define IsPCI       PublicOption[ATI_OPTION_IS_PCI].value.bool
+#   define IsPCI       PublicOption[ATI_OPTION_IS_PCI].value.boolean
 #   define DMAMode     PublicOption[ATI_OPTION_DMA_MODE].value.str
 #   define AGPMode     PublicOption[ATI_OPTION_AGP_MODE].value.num
 #   define AGPSize     PublicOption[ATI_OPTION_AGP_SIZE].value.num
-#   define LocalTex    PublicOption[ATI_OPTION_LOCAL_TEXTURES].value.bool
+#   define LocalTex    PublicOption[ATI_OPTION_LOCAL_TEXTURES].value.boolean
 #   define BufferSize  PublicOption[ATI_OPTION_BUFFER_SIZE].value.num
 
 #endif /* XF86DRI_DEVEL */
 
 #ifdef TV_OUT
 
-#   define TvOut        PublicOption[ATI_OPTION_TV_OUT].value.bool
+#   define TvOut        PublicOption[ATI_OPTION_TV_OUT].value.boolean
 #   define TvStd        PublicOption[ATI_OPTION_TV_STD].value.str
 
 #endif /* TV_OUT */
 
-#   define CacheMMIO     PublicOption[ATI_OPTION_MMIO_CACHE].value.bool
-#   define TestCacheMMIO PublicOption[ATI_OPTION_TEST_MMIO_CACHE].value.bool
-#   define PanelDisplay  PublicOption[ATI_OPTION_PANEL_DISPLAY].value.bool
-#   define ShadowFB      PublicOption[ATI_OPTION_SHADOW_FB].value.bool
-#   define SWCursor      PublicOption[ATI_OPTION_SWCURSOR].value.bool
+#   define CacheMMIO     PublicOption[ATI_OPTION_MMIO_CACHE].value.boolean
+#   define TestCacheMMIO PublicOption[ATI_OPTION_TEST_MMIO_CACHE].value.boolean
+#   define PanelDisplay  PublicOption[ATI_OPTION_PANEL_DISPLAY].value.boolean
+#   define ShadowFB      PublicOption[ATI_OPTION_SHADOW_FB].value.boolean
+#   define SWCursor      PublicOption[ATI_OPTION_SWCURSOR].value.boolean
 #   define AccelMethod   PublicOption[ATI_OPTION_ACCELMETHOD].value.str
-#   define RenderAccel   PublicOption[ATI_OPTION_RENDER_ACCEL].value.bool
-#   define LCDSync       PrivateOption[ATI_OPTION_LCDSYNC].value.bool
+#   define RenderAccel   PublicOption[ATI_OPTION_RENDER_ACCEL].value.boolean
+#   define LCDSync       PrivateOption[ATI_OPTION_LCDSYNC].value.boolean
 
 #   define ReferenceClock \
         PublicOption[ATI_OPTION_REFERENCE_CLOCK].value.freq.freq

Reply via email to