Accepting request 956998 from home:iznogood:factory

My original intent was to fix build with gcc 12 - but it grew somewhat during that process.
We still get 4 years of bugfixes, so I think overall this is the way to go.
Feel free to reject, and only use the gcc 12 buildfix patch

- Update to version 13.3.0+12:
  * vmwgfx:
    - Change header inclusion order to avoid xorg headers catching
      stdbool.h
    - Unify style in scanout_update and present functions
    - Limit the number of cliprects in a drm present_readback
      command v3
    - Limit the number of cliprects in a drm present command v3
    - Limit the number of cliprects in a drm dirtyfb command v3
    - Don't exceed the device command size limit v3
    - Fix invalid memory accesses in CloseScreen
    - Use libdrm to obtain the drm device node name v2
    - Fix a memory leak
    - Fix XVideo memory leaks
  * saa: Make sure damage destruction happens at the correct
    location
  * Remove obsolete B16 & B32 tags in struct definitions
- Switch to git checkout via source service.
- Add u_Fix-build-gcc-12.patch: Still needs a patch to build with
  gcc 12.
- Modernize spec, add libtool BuildRequires and bootstrap build.

OBS-URL: https://build.opensuse.org/request/show/956998
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xf86-video-vmware?expand=0&rev=39
This commit is contained in:
Stefan Dirsch 2022-02-23 12:00:57 +00:00 committed by Git OBS Bridge
parent 20b191e595
commit 1b7e417b62
8 changed files with 81 additions and 14 deletions

18
_service Normal file
View File

@ -0,0 +1,18 @@
<?xml version="1.0"?>
<services>
<service name="obs_scm" mode="manual">
<param name="url">https://gitlab.freedesktop.org/xorg/driver/xf86-video-vmware.git</param>
<param name="scm">git</param>
<param name="revision">50ab008c</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">xf86-video-vmware-(.*)</param>
<param name="changesgenerate">enable</param>
</service>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service mode="manual" name="set_version" />
</services>

4
_servicedata Normal file
View File

@ -0,0 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://gitlab.freedesktop.org/xorg/driver/xf86-video-vmware.git</param>
<param name="changesrevision">50ab008cb965dc9e47e0a84a1950e2485bbd3c44</param></service></servicedata>

12
u_Fix-build-gcc-12.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Nur xf86-video-vmware/vmwgfx/vmwgfx_tex_video.c patched-xf86-video-vmware/vmwgfx/vmwgfx_tex_video.c
--- xf86-video-vmware/vmwgfx/vmwgfx_tex_video.c 2022-02-23 10:26:07.678383367 +0100
+++ patched-xf86-video-vmware/vmwgfx/vmwgfx_tex_video.c 2022-02-23 11:03:54.104420733 +0100
@@ -237,7 +237,7 @@
for (i=0; i<3; ++i) {
for (j=0; j<2; ++j) {
- if (priv->yuv[i]) {
+ if (priv->yuv[j][i]) {
xa_surface_destroy(priv->yuv[j][i]);
priv->yuv[j][i] = NULL;
}

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:41dced8a6932ef9f99d233da491ecc0522cc777505d09e65bc9d69af4f615b57
size 793612

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:47971924659e51666a757269ad941a059ef5afe7a47b5101c174a6022ac4066c
size 473527

View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Wed Feb 23 09:26:07 UTC 2022 - bjorn.lie@gmail.com
- Update to version 13.3.0+12:
* vmwgfx:
- Change header inclusion order to avoid xorg headers catching
stdbool.h
- Unify style in scanout_update and present functions
- Limit the number of cliprects in a drm present_readback
command v3
- Limit the number of cliprects in a drm present command v3
- Limit the number of cliprects in a drm dirtyfb command v3
- Don't exceed the device command size limit v3
- Fix invalid memory accesses in CloseScreen
- Use libdrm to obtain the drm device node name v2
- Fix a memory leak
- Fix XVideo memory leaks
* saa: Make sure damage destruction happens at the correct
location
* Remove obsolete B16 & B32 tags in struct definitions
- Switch to git checkout via source service.
- Add u_Fix-build-gcc-12.patch: Still needs a patch to build with
gcc 12.
- Modernize spec, add libtool BuildRequires and bootstrap build.
-------------------------------------------------------------------
Sat May 19 15:15:28 UTC 2018 - sndirsch@suse.com

View File

@ -0,0 +1,4 @@
name: xf86-video-vmware
version: 13.3.0+12
mtime: 1638305298
commit: 50ab008cb965dc9e47e0a84a1950e2485bbd3c44

View File

@ -1,7 +1,7 @@
#
# spec file for package xf86-video-vmware
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,21 +12,25 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: xf86-video-vmware
Version: 13.3.0
Version: 13.3.0+12
Release: 0
Summary: VMware SVGA video driver for the Xorg X server
License: MIT
Group: System/X11/Servers/XF86_4
Url: http://xorg.freedesktop.org/
URL: http://xorg.freedesktop.org/
#http://xorg.freedesktop.org/releases/individual/driver/
Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
# Source url disabled, we are using a git checkout via source service
#Source0: http://xorg.freedesktop.org/releases/individual/driver/%%{name}-%%{version}.tar.bz2
Source0: %{name}-%{version}.tar.xz
Patch0: u_Fix-build-gcc-12.patch
ExclusiveArch: %ix86 x86_64
BuildRequires: pkg-config
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: pkgconfig(fontsproto)
BuildRequires: pkgconfig(pciaccess) >= 0.8.0
BuildRequires: pkgconfig(randrproto)
@ -41,26 +45,26 @@ BuildRequires: pkgconfig(xproto)
Supplements: modalias(xorg-x11-server:pci:v000015ADd*sv*sd*bc03sc*i*)
# This was part of the xorg-x11-driver-video package up to version 7.6
Conflicts: xorg-x11-driver-video <= 7.6
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%x11_abi_videodrv_req
%description
vmware is an Xorg driver for VMware virtual video cards.
%prep
%setup -q
%autosetup -p1
%build
NOCONFIGURE=1 ./autogen.sh
%configure
make %{?_smp_mflags}
%make_build
%install
%make_install
find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
%files
%defattr(-,root,root)
%doc ChangeLog COPYING README
%license COPYING
%doc README
%dir %{_libdir}/xorg/modules/drivers
%{_libdir}/xorg/modules/drivers/vmware_drv.so
%{_datadir}/man/man4/vmware.4%{?ext_man}