xorgproto: Branch 'master' - 2 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Aug 24 15:02:22 UTC 2020
applewmproto.pc.in | 1
bigreqsproto.pc.in | 1
compositeproto.pc.in | 1
damageproto.pc.in | 1
dmxproto.pc.in | 1
dpmsproto.pc.in | 1
dri2proto.pc.in | 1
dri3proto.pc.in | 1
evieproto.pc.in | 1
fixesproto.pc.in | 1
fontcacheproto.pc.in | 1
fontsproto.pc.in | 1
glproto.pc.in | 1
inputproto.pc.in | 1
kbproto.pc.in | 1
lg3dproto.pc.in | 1
meson.build | 108 +++++++++++++++++++++++--------------------------
presentproto.pc.in | 1
printproto.pc.in | 1
randrproto.pc.in | 1
recordproto.pc.in | 1
renderproto.pc.in | 1
resourceproto.pc.in | 1
scrnsaverproto.pc.in | 1
trapproto.pc.in | 1
videoproto.pc.in | 1
windowswmproto.pc.in | 1
xcalibrateproto.pc.in | 1
xcmiscproto.pc.in | 1
xextproto.pc.in | 1
xf86bigfontproto.pc.in | 1
xf86dgaproto.pc.in | 1
xf86driproto.pc.in | 1
xf86miscproto.pc.in | 1
xf86rushproto.pc.in | 1
xf86vidmodeproto.pc.in | 1
xineramaproto.pc.in | 1
xproto.pc.in | 1
xproxymngproto.pc.in | 1
39 files changed, 52 insertions(+), 94 deletions(-)
New commits:
commit e4d9ffdd51b15b1c9441086f7a86bb50a9f7b555
Author: orbea <orbea at riseup.net>
Date: Mon Aug 17 09:30:57 2020 -0700
meson: Use configure_file for pc files.
Meson's pkg.generate() is not suitable for header only libraries
and using configure_file() allows for more fine tuned control.
This also makes the meson and autotools builds more in sync where
they both use the same .pc.in files.
v2: Drop exec_prefix.
diff --git a/meson.build b/meson.build
index 6254dce..8da8337 100644
--- a/meson.build
+++ b/meson.build
@@ -19,77 +19,73 @@
# SOFTWARE.
project('xorgproto', 'c', license : 'MIT', version : '2020.1')
-pkg = import('pkgconfig')
cc = meson.get_compiler('c')
sed = find_program('sed')
pcs = [
- ['applewmproto', '1.4.2'],
- ['bigreqsproto', '1.1.2'],
- ['compositeproto', '0.4.2'],
- ['damageproto', '1.2.1'],
- ['dmxproto', '2.3.1'],
- ['dpmsproto', '1.2'],
- ['dri2proto', '2.8'],
- ['dri3proto', '1.2'],
- ['fixesproto', '5.0'],
- ['fontsproto', '2.1.3'],
- ['glproto', '1.4.17'],
- ['inputproto', '2.3.2'],
- ['kbproto', '1.0.7'],
- ['presentproto', '1.2'],
- ['randrproto', '1.6.0'],
- ['recordproto', '1.14.2'],
- ['renderproto', '0.11.1'],
- ['resourceproto', '1.2.0'],
- ['scrnsaverproto', '1.2.2'],
- ['videoproto', '2.3.3'],
- ['xcmiscproto', '1.2.2'],
- ['xextproto', '7.3.0'],
- ['xf86bigfontproto', '1.2.0'],
- ['xf86dgaproto', '2.1'],
- ['xf86driproto', '2.1.1'],
- ['xf86vidmodeproto', '2.3.1'],
- ['xineramaproto', '1.2.1'],
- ['xproto', '7.0.32'],
+ 'applewmproto',
+ 'bigreqsproto',
+ 'compositeproto',
+ 'damageproto',
+ 'dmxproto',
+ 'dpmsproto',
+ 'dri2proto',
+ 'dri3proto',
+ 'fixesproto',
+ 'fontsproto',
+ 'glproto',
+ 'inputproto',
+ 'kbproto',
+ 'presentproto',
+ 'randrproto',
+ 'recordproto',
+ 'renderproto',
+ 'resourceproto',
+ 'scrnsaverproto',
+ 'videoproto',
+ 'xcmiscproto',
+ 'xextproto',
+ 'xf86bigfontproto',
+ 'xf86dgaproto',
+ 'xf86driproto',
+ 'xf86vidmodeproto',
+ 'xineramaproto',
+ 'xproto',
]
+pc_data = configuration_data()
+pc_data.set('prefix', get_option('prefix'))
+# meson does not allow installing the includedir outside of the prefix
+pc_data.set('includedir', '${prefix}/' + get_option('includedir'))
+
foreach pc : pcs
- if pc[0] == 'xf86driproto'
- subdir = 'X11/dri'
- else
- subdir = ''
- endif
- pkg.generate(
- name : pc[0],
- filebase : pc[0],
- description : pc[0] + ' headers',
- version : pc[1],
+ configure_file(
+ input : pc + '.pc.in',
+ output : pc + '.pc',
install_dir : get_option('datadir') + '/pkgconfig',
- subdirs : subdir,
+ configuration : pc_data,
)
endforeach
if get_option('legacy') == true
legacy_pcs = [
- ['evieproto', '1.1.1'],
- ['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'],
+ 'evieproto',
+ 'fontcacheproto',
+ 'lg3dproto',
+ 'printproto',
+ 'trapproto',
+ 'windowswmproto',
+ 'xcalibrateproto',
+ 'xf86miscproto',
+ 'xf86rushproto',
+ 'xproxymngproto',
]
foreach pc : legacy_pcs
- pkg.generate(
- name : pc[0],
- filebase : pc[0],
- description : pc[0] + ' headers',
- version : pc[1],
- install_dir : get_option('datadir') + '/pkgconfig'
+ configure_file(
+ input : pc + '.pc.in',
+ output : pc + '.pc',
+ install_dir : get_option('datadir') + '/pkgconfig',
+ configuration : pc_data,
)
endforeach
endif
commit daffc5b46234d6a18c3a2c3f5e0367cd3c586df6
Author: orbea <orbea at riseup.net>
Date: Mon Aug 24 07:40:49 2020 -0700
pkgconfig: Drop exec_prefix from the .pc.in files.
This is not used by xorg-devel which contains only headers.
diff --git a/applewmproto.pc.in b/applewmproto.pc.in
index 3227b21..cb12105 100644
--- a/applewmproto.pc.in
+++ b/applewmproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: AppleWMProto
diff --git a/bigreqsproto.pc.in b/bigreqsproto.pc.in
index e21bb59..3ba8e4b 100644
--- a/bigreqsproto.pc.in
+++ b/bigreqsproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: BigReqsProto
diff --git a/compositeproto.pc.in b/compositeproto.pc.in
index b0dada1..91f2422 100644
--- a/compositeproto.pc.in
+++ b/compositeproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: CompositeExt
diff --git a/damageproto.pc.in b/damageproto.pc.in
index bfd5244..7f5a99d 100644
--- a/damageproto.pc.in
+++ b/damageproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: DamageProto
diff --git a/dmxproto.pc.in b/dmxproto.pc.in
index d140e1c..b9ec7e7 100644
--- a/dmxproto.pc.in
+++ b/dmxproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: DMXProto
diff --git a/dpmsproto.pc.in b/dpmsproto.pc.in
index 930d208..c6c39db 100644
--- a/dpmsproto.pc.in
+++ b/dpmsproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: DPMSProto
diff --git a/dri2proto.pc.in b/dri2proto.pc.in
index fa9d24d..01dfa20 100644
--- a/dri2proto.pc.in
+++ b/dri2proto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: DRI2Proto
diff --git a/dri3proto.pc.in b/dri3proto.pc.in
index 20da358..209c2be 100644
--- a/dri3proto.pc.in
+++ b/dri3proto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: DRI3Proto
diff --git a/evieproto.pc.in b/evieproto.pc.in
index fd5442b..1a1ea13 100644
--- a/evieproto.pc.in
+++ b/evieproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: EvIEExt
diff --git a/fixesproto.pc.in b/fixesproto.pc.in
index c7fcb81..5274728 100644
--- a/fixesproto.pc.in
+++ b/fixesproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: FixesProto
diff --git a/fontcacheproto.pc.in b/fontcacheproto.pc.in
index 8ffffe9..034b2b9 100644
--- a/fontcacheproto.pc.in
+++ b/fontcacheproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: FontcacheProto
diff --git a/fontsproto.pc.in b/fontsproto.pc.in
index ebb61a4..5239b66 100644
--- a/fontsproto.pc.in
+++ b/fontsproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: FontsProto
diff --git a/glproto.pc.in b/glproto.pc.in
index e97bfc9..d7a742a 100644
--- a/glproto.pc.in
+++ b/glproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: GLProto
diff --git a/inputproto.pc.in b/inputproto.pc.in
index 270b95c..42964ea 100644
--- a/inputproto.pc.in
+++ b/inputproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: InputProto
diff --git a/kbproto.pc.in b/kbproto.pc.in
index 32a172d..c28138d 100644
--- a/kbproto.pc.in
+++ b/kbproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: KBProto
diff --git a/lg3dproto.pc.in b/lg3dproto.pc.in
index 43fba29..4abd729 100644
--- a/lg3dproto.pc.in
+++ b/lg3dproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: Lg3dProto
diff --git a/presentproto.pc.in b/presentproto.pc.in
index 55b84dc..489e438 100644
--- a/presentproto.pc.in
+++ b/presentproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: PresentProto
diff --git a/printproto.pc.in b/printproto.pc.in
index a2da66d..2e2ddeb 100644
--- a/printproto.pc.in
+++ b/printproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: PrintProto
diff --git a/randrproto.pc.in b/randrproto.pc.in
index 6d60cbb..d0403e1 100644
--- a/randrproto.pc.in
+++ b/randrproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: RandrProto
diff --git a/recordproto.pc.in b/recordproto.pc.in
index a87aa82..d01c3ba 100644
--- a/recordproto.pc.in
+++ b/recordproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: RecordProto
diff --git a/renderproto.pc.in b/renderproto.pc.in
index 34b15e0..b1d8eab 100644
--- a/renderproto.pc.in
+++ b/renderproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: RenderProto
diff --git a/resourceproto.pc.in b/resourceproto.pc.in
index f927cbb..f341ea7 100644
--- a/resourceproto.pc.in
+++ b/resourceproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: ResourceProto
diff --git a/scrnsaverproto.pc.in b/scrnsaverproto.pc.in
index fa7c97a..245590a 100644
--- a/scrnsaverproto.pc.in
+++ b/scrnsaverproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: ScrnSaverProto
diff --git a/trapproto.pc.in b/trapproto.pc.in
index 8a220b9..d7c0c4d 100644
--- a/trapproto.pc.in
+++ b/trapproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: TrapProto
diff --git a/videoproto.pc.in b/videoproto.pc.in
index 5c22f7a..35acb7d 100644
--- a/videoproto.pc.in
+++ b/videoproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: VideoProto
diff --git a/windowswmproto.pc.in b/windowswmproto.pc.in
index ec56e82..de14473 100644
--- a/windowswmproto.pc.in
+++ b/windowswmproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: WindowsWMProto
diff --git a/xcalibrateproto.pc.in b/xcalibrateproto.pc.in
index f1ea5de..7a0778c 100644
--- a/xcalibrateproto.pc.in
+++ b/xcalibrateproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: XCalibrate
diff --git a/xcmiscproto.pc.in b/xcmiscproto.pc.in
index b72bbc6..63e1532 100644
--- a/xcmiscproto.pc.in
+++ b/xcmiscproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: XCMiscProto
diff --git a/xextproto.pc.in b/xextproto.pc.in
index 9419c91..25a0d52 100644
--- a/xextproto.pc.in
+++ b/xextproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: XExtProto
diff --git a/xf86bigfontproto.pc.in b/xf86bigfontproto.pc.in
index 4a67be6..884e548 100644
--- a/xf86bigfontproto.pc.in
+++ b/xf86bigfontproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: XF86BigFontProto
diff --git a/xf86dgaproto.pc.in b/xf86dgaproto.pc.in
index e029cd4..2b0dc3f 100644
--- a/xf86dgaproto.pc.in
+++ b/xf86dgaproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: XF86DGAProto
diff --git a/xf86driproto.pc.in b/xf86driproto.pc.in
index c8faf14..c725bbc 100644
--- a/xf86driproto.pc.in
+++ b/xf86driproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: XF86DRIProto
diff --git a/xf86miscproto.pc.in b/xf86miscproto.pc.in
index 05d5d9e..10530b7 100644
--- a/xf86miscproto.pc.in
+++ b/xf86miscproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: XF86MiscProto
diff --git a/xf86rushproto.pc.in b/xf86rushproto.pc.in
index 1c7ff1b..099fd03 100644
--- a/xf86rushproto.pc.in
+++ b/xf86rushproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: XF86RushProto
diff --git a/xf86vidmodeproto.pc.in b/xf86vidmodeproto.pc.in
index ef062b3..0233304 100644
--- a/xf86vidmodeproto.pc.in
+++ b/xf86vidmodeproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: XF86VidModeProto
diff --git a/xineramaproto.pc.in b/xineramaproto.pc.in
index 9172f1e..a920a6f 100644
--- a/xineramaproto.pc.in
+++ b/xineramaproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: XineramaProto
diff --git a/xproto.pc.in b/xproto.pc.in
index 899316a..9274236 100644
--- a/xproto.pc.in
+++ b/xproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
includex11dir=@includedir@/X11
diff --git a/xproxymngproto.pc.in b/xproxymngproto.pc.in
index 1a81e28..b2f42bf 100644
--- a/xproxymngproto.pc.in
+++ b/xproxymngproto.pc.in
@@ -1,5 +1,4 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
includedir=@includedir@
Name: XProxyManagementProtocol
More information about the xorg-commit
mailing list