- fix building with gcc 10+

- add missing link Xv lib
- rel 4

diff --git a/gcc10.patch b/gcc10.patch
new file mode 100644 (file)
index 0000000..aa7c0d6
--- /dev/null
+++ b/gcc10.patch
@@ -0,0 +1,35 @@
+--- xf86-video-openchrome-0.6.0/src/via_driver.h~      2017-02-26 07:28:58.000000000 +0100
++++ xf86-video-openchrome-0.6.0/src/via_driver.h       2021-11-03 17:41:06.129560526 +0100
+@@ -394,8 +394,8 @@
+ 
+ 
+ /* In via_display.c. */
+-const xf86CrtcFuncsRec iga1_crtc_funcs;
+-const xf86CrtcFuncsRec iga2_crtc_funcs;
++extern const xf86CrtcFuncsRec iga1_crtc_funcs;
++extern const xf86CrtcFuncsRec iga2_crtc_funcs;
+ 
+ /* In via_exa.c. */
+ Bool viaInitExa(ScreenPtr pScreen);
+--- xf86-video-openchrome-0.6.0/src/via_vt1632.h~      2017-01-06 04:33:01.000000000 +0100
++++ xf86-video-openchrome-0.6.0/src/via_vt1632.h       2021-11-03 17:51:51.857543491 +0100
+@@ -44,7 +44,7 @@
+ } viaVT1632Rec, *viaVT1632RecPtr;
+ 
+ 
+-const xf86OutputFuncsRec via_vt1632_funcs;
++extern const xf86OutputFuncsRec via_vt1632_funcs;
+ 
+ Bool viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus);
+ 
+--- xf86-video-openchrome-0.6.0/src/via_sii164.h~      2017-02-27 00:53:37.000000000 +0100
++++ xf86-video-openchrome-0.6.0/src/via_sii164.h       2021-11-03 17:52:51.717208389 +0100
+@@ -47,7 +47,7 @@
+ } viaSiI164Rec, *viaSiI164RecPtr;
+ 
+ 
+-const xf86OutputFuncsRec via_sii164_funcs;
++extern const xf86OutputFuncsRec via_sii164_funcs;
+ 
+ Bool viaSiI164Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus);
+ 

diff --git a/link.patch b/link.patch
new file mode 100644 (file)
index 0000000..543e708
--- /dev/null
+++ b/link.patch
@@ -0,0 +1,16 @@
+--- xf86-video-openchrome-0.6.0/src/xvmc/Makefile.am~  2016-08-29 05:17:42.000000000 +0200
++++ xf86-video-openchrome-0.6.0/src/xvmc/Makefile.am   2021-11-03 17:54:01.503466137 +0100
+@@ -26,11 +26,11 @@
+ 
+ libchromeXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XVMC_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/src/xvmc -DTRUE=1 -DFALSE=0
+ libchromeXvMC_la_LDFLAGS = -version-number 1:0:0
+-libchromeXvMC_la_LIBADD = @DRI_LIBS@ @XVMC_LIBS@
++libchromeXvMC_la_LIBADD = @DRI_LIBS@ @XVMC_LIBS@ -lXv
+ 
+ libchromeXvMCPro_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XVMC_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/src/xvmc -DTRUE=1 -DFALSE=0
+ libchromeXvMCPro_la_LDFLAGS = -version-number 1:0:0
+-libchromeXvMCPro_la_LIBADD = @DRI_LIBS@ @XVMC_LIBS@
++libchromeXvMCPro_la_LIBADD = @DRI_LIBS@ @XVMC_LIBS@ -lXv
+ else
+ EXTRA_DIST = \
+       driDrawable.c \

diff --git a/xorg-driver-video-openchrome.spec b/xorg-driver-video-openchrome.spec
index 59c698a50ab4267de505e7e1497482a590bf55a4..f80842b6284cd60c7274d26af577bb9f8dba51a4 100644 (file)
--- a/xorg-driver-video-openchrome.spec
+++ b/xorg-driver-video-openchrome.spec
@@ -2,11 +2,13 @@ Summary:      X.org video driver for VIA Unichrome graphics chipsets
 Summary(pl.UTF-8):     Sterownik obrazu X.org dla układów zintegrowanych VIA Unichrome
 Name:          xorg-driver-video-openchrome
 Version:       0.6.0
-Release:       3
+Release:       4
 License:       MIT
 Group:         X11/Applications
 Source0:       http://xorg.freedesktop.org/releases/individual/driver/xf86-video-openchrome-%{version}.tar.bz2
 # Source0-md5: c87f164739729b00f7e1a9934420c22d
+Patch0:                gcc10.patch
+Patch1:                link.patch
 URL:           http://www.openchrome.org/
 BuildRequires: Mesa-libGL-devel
 BuildRequires: autoconf >= 2.57
@@ -77,6 +79,8 @@ Obsługuje układy VIA:
 
 %prep
 %setup -q -n xf86-video-openchrome-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}