3 files changed, 111 insertions, 28 deletions

diff --git a/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc b/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
deleted file mode 100644
index 7a417c9742..0000000000
--- a/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "X protocol headers: ${XORG_PN}"
-HOMEPAGE = "http://www.x.org"
-BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg"
-
-SECTION = "x11/libs"
-LICENSE = "MIT-X"
-
-XORG_PN = "${BPN}"
-
-SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-${PV}.tar.bz2"
-
-S = "${WORKDIR}/${XORG_PN}-${PV}"
-
-DEPENDS = "util-macros"
-
-inherit autotools pkgconfig
-EXTRA_OECONF = "--without-fop"
-
-UNKNOWN_CONFIGURE_WHITELIST += "--without-fop --without-xmlto --with-xmlto"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
-
-# ${PN} is empty so we need to tweak -dev and -dbg package dependencies
-RDEPENDS_${PN}-dev = ""
-RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
diff --git a/meta/recipes-graphics/xorg-proto/xorgproto/legacy.patch b/meta/recipes-graphics/xorg-proto/xorgproto/legacy.patch
new file mode 100644
index 0000000000..e25db04b9c
--- /dev/null
+++ b/meta/recipes-graphics/xorg-proto/xorgproto/legacy.patch
@@ -0,0 +1,97 @@
+These headers should be legacy to ensure autotools/meson intall the same files.
+
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/proto/xorgproto/merge_requests/12]
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+diff --git a/include/X11/extensions/meson.build b/include/X11/extensions/meson.build
+index 1d85cf8..d1ac281 100644
+--- a/include/X11/extensions/meson.build
++++ b/include/X11/extensions/meson.build
+@@ -65,8 +65,6 @@ install_headers(
+     'xf86dga.h',
+     'xf86dgaproto.h',
+     'xf86dgastr.h',
+-    'xf86misc.h',
+-    'xf86mscstr.h',
+     'xf86vm.h',
+     'xf86vmproto.h',
+     'xf86vmstr.h',
+@@ -85,13 +83,6 @@ install_headers(
+     'xtestext1const.h',
+     'xtestext1proto.h',
+     'xtestproto.h',
+-    'xtrapbits.h',
+-    'xtrapddmi.h',
+-    'xtrapdi.h',
+-    'xtrapemacros.h',
+-    'xtraplib.h',
+-    'xtraplibp.h',
+-    'xtrapproto.h',
+     'Xv.h',
+     'XvMC.h',
+     'XvMCproto.h',
+@@ -113,7 +104,16 @@ if get_option('legacy') == true
+         'windowswmstr.h',
+         'xcalibrateproto.h',
+         'xcalibratewire.h',
++        'xtrapbits.h',
++        'xtrapddmi.h',
++        'xtrapdi.h',
++        'xtrapemacros.h',
++        'xtraplib.h',
++        'xtraplibp.h',
++        'xtrapproto.h',
+         'Xeviestr.h',
++        'xf86misc.h',
++        'xf86mscstr.h',
+         'xf86rush.h',
+         'xf86rushstr.h',
+         'XKBgeom.h',
+diff --git a/include/X11/meson.build b/include/X11/meson.build
+index 1c33c64..a4b022e 100644
+--- a/include/X11/meson.build
++++ b/include/X11/meson.build
+@@ -59,4 +59,6 @@ install_headers(
+ subdir('dri')
+ subdir('extensions')
+ subdir('fonts')
+-subdir('PM')
++if get_option('legacy') == true
++    subdir('PM')
++endif
+diff --git a/meson.build b/meson.build
+index cfbaa2c..68e622a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -42,18 +42,15 @@ pcs = [
+         ['renderproto',         '0.11.1'],
+         ['resourceproto',       '1.2.0'],
+         ['scrnsaverproto',      '1.2.2'],
+-        ['trapproto',           '3.4.3'],
+         ['videoproto',          '2.3.3'],
+         ['xcmiscproto',         '1.2.2'],
+         ['xextproto',           '7.3.0'],
+         ['xf86bigfontproto',    '1.2.0'],
+         ['xf86dgaproto',        '2.1'],
+         ['xf86driproto',        '2.1.1'],
+-        ['xf86miscproto',       '0.9.3'],
+         ['xf86vidmodeproto',    '2.3.1'],
+         ['xineramaproto',       '1.2.1'],
+         ['xproto',              '7.0.32'],
+-        ['xproxymngproto',      '1.0.3'],
+ ]
+ 
+ foreach pc : pcs
+@@ -78,9 +75,12 @@ if get_option('legacy') == true
+         ['fontcacheproto', '0.1.3'],
+         ['lg3dproto', '5.0'],
+         ['printproto', '1.0.5'],
++        ['trapproto', '3.4.3'],
+         ['windowswmproto', '1.0.4'],
+         ['xcalibrateproto', '0.1.0'],
++        ['xf86miscproto', '0.9.3'],
+         ['xf86rushproto', '1.2.2'],
++        ['xproxymngproto', '1.0.3'],
+     ]
+     foreach pc : legacy_pcs
+         pkg.generate(
diff --git a/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb b/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb
index 8acbe895aa..fb3f3aed3d 100644
--- a/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb
+++ b/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb
@@ -1,14 +1,26 @@
-require xorg-proto-common.inc
 
 SUMMARY = "X Window System unified protocol definitions"
-
 DESCRIPTION = "This package provides the headers and specification documents defining \
 the core protocol and (many) extensions for the X Window System"
+HOMEPAGE = "http://www.x.org"
+BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg"
 
+SECTION = "x11/libs"
 LICENSE = "MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING-x11proto;md5=b9e051107d5628966739a0b2e9b32676"
 
+SRC_URI = "${XORG_MIRROR}/individual/proto/${BP}.tar.bz2 \
+           file://legacy.patch"
 SRC_URI[md5sum] = "a02dcaff48b4141b949ac99dfc344d86"
 SRC_URI[sha256sum] = "46ecd0156c561d41e8aa87ce79340910cdf38373b759e737fcbba5df508e7b8e"
 
+inherit meson
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[legacy] = "-Dlegacy=true,-Dlegacy=false"
+
+# ${PN} is empty so we need to tweak -dev and -dbg package dependencies
+RDEPENDS_${PN}-dev = ""
+RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
+
 BBCLASSEXTEND = "native nativesdk"