summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-12-13 12:07:40 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-28 23:25:41 +0000
commit6b2bccd6995ddfad9f85b566a9a0f97d8381758c (patch)
treeab44bc61f7325e7e818c916ed6df4655ddbe76bc
parent7785c41d0b95d084bec716166393d2a3323692dd (diff)
downloadpoky-6b2bccd6995ddfad9f85b566a9a0f97d8381758c.tar.gz
xorgproto: merge .inc
This inc file isn't used anymore since the X.org protocol packages merged into xorgproto. (From OE-Core rev: 438f21ae14499e1f61d6e0c020153448d6ffa84c) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-proto/xorg-proto-common.inc26
-rw-r--r--meta/recipes-graphics/xorg-proto/xorgproto/legacy.patch97
-rw-r--r--meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb16
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 @@
1SUMMARY = "X protocol headers: ${XORG_PN}"
2HOMEPAGE = "http://www.x.org"
3BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg"
4
5SECTION = "x11/libs"
6LICENSE = "MIT-X"
7
8XORG_PN = "${BPN}"
9
10SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-${PV}.tar.bz2"
11
12S = "${WORKDIR}/${XORG_PN}-${PV}"
13
14DEPENDS = "util-macros"
15
16inherit autotools pkgconfig
17EXTRA_OECONF = "--without-fop"
18
19UNKNOWN_CONFIGURE_WHITELIST += "--without-fop --without-xmlto --with-xmlto"
20
21PACKAGECONFIG ??= ""
22PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
23
24# ${PN} is empty so we need to tweak -dev and -dbg package dependencies
25RDEPENDS_${PN}-dev = ""
26RRECOMMENDS_${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 @@
1These headers should be legacy to ensure autotools/meson intall the same files.
2
3Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/proto/xorgproto/merge_requests/12]
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6diff --git a/include/X11/extensions/meson.build b/include/X11/extensions/meson.build
7index 1d85cf8..d1ac281 100644
8--- a/include/X11/extensions/meson.build
9+++ b/include/X11/extensions/meson.build
10@@ -65,8 +65,6 @@ install_headers(
11 'xf86dga.h',
12 'xf86dgaproto.h',
13 'xf86dgastr.h',
14- 'xf86misc.h',
15- 'xf86mscstr.h',
16 'xf86vm.h',
17 'xf86vmproto.h',
18 'xf86vmstr.h',
19@@ -85,13 +83,6 @@ install_headers(
20 'xtestext1const.h',
21 'xtestext1proto.h',
22 'xtestproto.h',
23- 'xtrapbits.h',
24- 'xtrapddmi.h',
25- 'xtrapdi.h',
26- 'xtrapemacros.h',
27- 'xtraplib.h',
28- 'xtraplibp.h',
29- 'xtrapproto.h',
30 'Xv.h',
31 'XvMC.h',
32 'XvMCproto.h',
33@@ -113,7 +104,16 @@ if get_option('legacy') == true
34 'windowswmstr.h',
35 'xcalibrateproto.h',
36 'xcalibratewire.h',
37+ 'xtrapbits.h',
38+ 'xtrapddmi.h',
39+ 'xtrapdi.h',
40+ 'xtrapemacros.h',
41+ 'xtraplib.h',
42+ 'xtraplibp.h',
43+ 'xtrapproto.h',
44 'Xeviestr.h',
45+ 'xf86misc.h',
46+ 'xf86mscstr.h',
47 'xf86rush.h',
48 'xf86rushstr.h',
49 'XKBgeom.h',
50diff --git a/include/X11/meson.build b/include/X11/meson.build
51index 1c33c64..a4b022e 100644
52--- a/include/X11/meson.build
53+++ b/include/X11/meson.build
54@@ -59,4 +59,6 @@ install_headers(
55 subdir('dri')
56 subdir('extensions')
57 subdir('fonts')
58-subdir('PM')
59+if get_option('legacy') == true
60+ subdir('PM')
61+endif
62diff --git a/meson.build b/meson.build
63index cfbaa2c..68e622a 100644
64--- a/meson.build
65+++ b/meson.build
66@@ -42,18 +42,15 @@ pcs = [
67 ['renderproto', '0.11.1'],
68 ['resourceproto', '1.2.0'],
69 ['scrnsaverproto', '1.2.2'],
70- ['trapproto', '3.4.3'],
71 ['videoproto', '2.3.3'],
72 ['xcmiscproto', '1.2.2'],
73 ['xextproto', '7.3.0'],
74 ['xf86bigfontproto', '1.2.0'],
75 ['xf86dgaproto', '2.1'],
76 ['xf86driproto', '2.1.1'],
77- ['xf86miscproto', '0.9.3'],
78 ['xf86vidmodeproto', '2.3.1'],
79 ['xineramaproto', '1.2.1'],
80 ['xproto', '7.0.32'],
81- ['xproxymngproto', '1.0.3'],
82 ]
83
84 foreach pc : pcs
85@@ -78,9 +75,12 @@ if get_option('legacy') == true
86 ['fontcacheproto', '0.1.3'],
87 ['lg3dproto', '5.0'],
88 ['printproto', '1.0.5'],
89+ ['trapproto', '3.4.3'],
90 ['windowswmproto', '1.0.4'],
91 ['xcalibrateproto', '0.1.0'],
92+ ['xf86miscproto', '0.9.3'],
93 ['xf86rushproto', '1.2.2'],
94+ ['xproxymngproto', '1.0.3'],
95 ]
96 foreach pc : legacy_pcs
97 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 @@
1require xorg-proto-common.inc
2 1
3SUMMARY = "X Window System unified protocol definitions" 2SUMMARY = "X Window System unified protocol definitions"
4
5DESCRIPTION = "This package provides the headers and specification documents defining \ 3DESCRIPTION = "This package provides the headers and specification documents defining \
6the core protocol and (many) extensions for the X Window System" 4the core protocol and (many) extensions for the X Window System"
5HOMEPAGE = "http://www.x.org"
6BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg"
7 7
8SECTION = "x11/libs"
8LICENSE = "MIT-style" 9LICENSE = "MIT-style"
9LIC_FILES_CHKSUM = "file://COPYING-x11proto;md5=b9e051107d5628966739a0b2e9b32676" 10LIC_FILES_CHKSUM = "file://COPYING-x11proto;md5=b9e051107d5628966739a0b2e9b32676"
10 11
12SRC_URI = "${XORG_MIRROR}/individual/proto/${BP}.tar.bz2 \
13 file://legacy.patch"
11SRC_URI[md5sum] = "a02dcaff48b4141b949ac99dfc344d86" 14SRC_URI[md5sum] = "a02dcaff48b4141b949ac99dfc344d86"
12SRC_URI[sha256sum] = "46ecd0156c561d41e8aa87ce79340910cdf38373b759e737fcbba5df508e7b8e" 15SRC_URI[sha256sum] = "46ecd0156c561d41e8aa87ce79340910cdf38373b759e737fcbba5df508e7b8e"
13 16
17inherit meson
18
19PACKAGECONFIG ??= ""
20PACKAGECONFIG[legacy] = "-Dlegacy=true,-Dlegacy=false"
21
22# ${PN} is empty so we need to tweak -dev and -dbg package dependencies
23RDEPENDS_${PN}-dev = ""
24RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
25
14BBCLASSEXTEND = "native nativesdk" 26BBCLASSEXTEND = "native nativesdk"