Bug 829627 – x11-drivers/xf86-video-vmware-13.3.0-r3 fails to compile with xorg-server-21.1.2-r2: /usr/include/xorg/xf86Opt.h:44:10: error: two or more data types in declaration specifiers

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description Remus-Gabriel Chelu 2021-12-19 12:44:28 UTC]

Created attachment 759764 [details]
Created emerge-info.txt

x11-drivers/xf86-video-vmware-13.3.0-r3 fails to compile with xorg-server-21.1.2-r2:

In file included from /usr/include/xf86drmMode.h:45,
                 from vmwgfx_driver.h: 41,
                 from vmwgfx_ctrl.c: 45:
/usr/include/xorg/xf86Opt.h:44:10: error: two or more data types in declaration specifiers
   44 | Bool bool;
      | ^ ~~~
In file included from /usr/include/xorg/xf86str.h:43,
                 from /usr/include/xorg/xf86.h:44,
                 from vmwgfx_driver.h: 43,
                 from vmwgfx_ctrl.c: 45:
/usr/include/xorg/xf86Opt.h:44:14: warning: declaration does not declare anything
   44 | Bool bool;
      | ^
make [2]: *** [Makefile: 550: libvmwgfx_la-vmwgfx_ctrl.lo] Error 1
In file included from /usr/include/xf86drmMode.h:45,
                 from vmwgfx_driver.h: 41,
                 from vmwgfx_layout.c: 32:
/usr/include/xorg/xf86Opt.h:44:10: error: two or more data types in declaration specifiers
   44 | Bool bool;
      | ^ ~~~
In file included from /usr/include/xorg/xf86str.h:43,
                 from /usr/include/xorg/xf86.h:44,
                 from vmwgfx_driver.h: 43,
                 from vmwgfx_layout.c: 32:
/usr/include/xorg/xf86Opt.h:44:14: warning: declaration does not declare anything
   44 | Bool bool;
      | ^
make [2]: *** [Makefile: 578: libvmwgfx_la-vmwgfx_layout.lo] Error 1
In file included from /usr/include/xf86drmMode.h:45,
                 from vmwgfx_driver.h: 41,
                 from vmwgfx_dri3.c: 35:
/usr/include/xorg/xf86Opt.h:44:10: error: two or more data types in declaration specifiers
   44 | Bool bool;
      | ^ ~~~
In file included from /usr/include/xorg/xf86str.h:43,
                 from /usr/include/xorg/xf86.h:44,
                 from vmwgfx_driver.h: 43,
                 from vmwgfx_dri3.c: 35:
/usr/include/xorg/xf86Opt.h:44:14: warning: declaration does not declare anything
   44 | Bool bool;
      | ^
make [2]: *** [Makefile: 585: libvmwgfx_la-vmwgfx_dri3.lo] Error 1

[Comment 1 Sam James 2021-12-19 12:46:08 UTC]

https://gitlab.freedesktop.org/xorg/driver/xf86-video-vmware/-/commit/50ab008cb965dc9e47e0a84a1950e2485bbd3c44 might help?

Please include the full build.log.

[Comment 2 Remus-Gabriel Chelu 2021-12-19 14:24:06 UTC]

Created attachment 759769 [details]
Created x11-drivers:xf86-video-vmware-13.3.0:20211219-111050.log

[Comment 3 Remus-Gabriel Chelu 2021-12-19 14:24:57 UTC]

(In reply to Sam James from comment #1)
> https://gitlab.freedesktop.org/xorg/driver/xf86-video-vmware/-/commit/
> 50ab008cb965dc9e47e0a84a1950e2485bbd3c44 might help?
> 
> Please include the full build.log.

It works; I have been able to compile without problems.
I have made the patch: change-header-inclusion-order-avoid-xorg-headers-catching-stdbool.h.patch
Using it in the ebuild; xf86-video-vmware-13.3.0-r1.ebuild:
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI = 7

XORG_DRI = always
inherit xorg-3

DESCRIPTION = "VMware SVGA video driver"

KEYWORDS = "amd64 x86"
IUSE = "kernel_linux"

RDEPEND = "
kernel_linux? (
x11-libs / libdrm [libkms, video_cards_vmware]
media-libs / table [xa]
) "
DEPEND = "$ {RDEPEND}"

src_prepare () {
# patch from Fedora: Build compatibility with xserver 1.20 (fbGetRotatedPixmap went away with
# 24bpp support, just treat it as NULL and we'll do the right thing.)
eapply "$ {FILESDIR}" / 0001-saa-Build-compatibility-with-xserver-1.20.patch
# patch from upstream team
eapply "$ {FILESDIR}" / change-header-inclusion-order-avoid-xorg-headers-catching-stdbool.h.patch

# prepare with autoreconf
autoreconf -v --install || die
eapply_user
}

src_configure () {

econf \
--enable-vmwarectrl-client \
--disable-static
}

[Comment 4 Remus-Gabriel Chelu 2021-12-19 14:27:25 UTC]

Created attachment 759770 [details, diff]
Created change-header-inclusion-order-avoid-xorg-headers-catching-stdbool.h.patch

[Comment 5 Remus-Gabriel Chelu 2021-12-19 14:30:40 UTC]

(In reply to Sam James from comment #1)
> https://gitlab.freedesktop.org/xorg/driver/xf86-video-vmware/-/commit/
> 50ab008cb965dc9e47e0a84a1950e2485bbd3c44 might help?
> 
> Please include the full build.log.

Thanks, Sam James!
Have a nice day!

[Comment 6 Remus-Gabriel Chelu 2021-12-19 17:34:04 UTC]

(In reply to Sam James from comment #1)
> https://gitlab.freedesktop.org/xorg/driver/xf86-video-vmware/-/commit/
> 50ab008cb965dc9e47e0a84a1950e2485bbd3c44 might help?
> 
> Please include the full build.log.

I just checked the build of x11-drivers/xf86-video-vmware-13.3.0 with the ebuild of „x11-drivers/xf86-video-vmware-13.3.0::gentoo” and the patch „/etc/portage/patches/x11-drivers/xf86-video-vmware-13.3.0/change-header-inclusion-order-avoid-xorg-headers-catching-stdbool.h.patch ”and works perfectly, too.

[Comment 7 Sam James 2021-12-19 21:23:11 UTC]

(In reply to Remus-Gabriel Chelu from comment #5)
> (In reply to Sam James from comment #1)
> > https://gitlab.freedesktop.org/xorg/driver/xf86-video-vmware/-/commit/
> > 50ab008cb965dc9e47e0a84a1950e2485bbd3c44 might help?
> > 
> > Please include the full build.log.
> 
> Thanks, Sam James!
> Have a nice day!

You too, thanks for the quick feedback!

[Comment 8 Larry the Git Cow 2021-12-19 21:30:22 UTC]

The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd3fc7a8f0191de5f3a7ff225c4ff386d217cd46

commit bd3fc7a8f0191de5f3a7ff225c4ff386d217cd46
Author:     Sam James <[e-mail]>
AuthorDate: 2021-12-19 21:23:31 +0000
Commit:     Sam James <[e-mail]>
CommitDate: 2021-12-19 21:30:12 +0000

    x11-drivers/xf86-video-vmware: fix build with newer xorg-server
    
    Closes: https://bugs.gentoo.org/829627
    Signed-off-by: Sam James <[e-mail]>

 ...ideo-vmware-13.3.0-fix-include-order-bool.patch | 51 ++++++++++++++++++++++
 .../xf86-video-vmware-13.3.0.ebuild                |  4 ++
 2 files changed, 55 insertions(+)