Merge pull request #126 from rhubert/xproto-dev

jkloetzke · web-flow · commit 77884e34e0ee · 2025-11-19T10:19:43.000+01:00
make xorgproto a dev package
diff --git a/recipes/devel/makedepend.yaml b/recipes/devel/makedepend.yaml
@@ -4,7 +4,7 @@ metaEnvironment:
     PKG_VERSION: "1.0.5"
 
 depends:
-    - graphics::xorg::proto::xorgproto
+    - graphics::xorg::proto::xorgproto-dev
 
 checkoutSCM:
     scm: url
diff --git a/recipes/graphics/xorg/proto/xorgproto.yaml b/recipes/graphics/xorg/proto/xorgproto.yaml
@@ -1,4 +1,4 @@
-inherit: [autotools]
+inherit: [meson]
 
 metaEnvironment:
     PKG_VERSION: "2024.1"
@@ -10,7 +10,9 @@ checkoutSCM:
     stripComponents: 1
 
 buildScript: |
-    autotoolsBuild $1
+    mesonBuild $1
 
-packageScript: |
-    autotoolsPackageDev
+multiPackage:
+    dev:
+        packageScript: |
+            mesonPackageDev
diff --git a/recipes/graphics/xorg/setxkbmap.yaml b/recipes/graphics/xorg/setxkbmap.yaml
@@ -6,8 +6,6 @@ metaEnvironment:
     PKG_LICENSE_FILE: "COPYING"
 
 depends:
-    - graphics::xorg::proto::xorgproto
-
     - libs::xorg::libX11-dev
     - libs::xorg::libXrandr-dev
     - libs::xorg::libxkbfile-dev
diff --git a/recipes/graphics/xorg/utils/util-macros.yaml b/recipes/graphics/xorg/utils/util-macros.yaml
@@ -13,5 +13,7 @@ checkoutSCM:
 buildScript: |
     autotoolsBuild $1
 
-packageScript: |
-    autotoolsPackageDev $1 "usr/share/***"
+multiPackage:
+    dev:
+        packageScript: |
+            autotoolsPackageDev $1 "usr/share/***"
diff --git a/recipes/graphics/xorg/xauth.yaml b/recipes/graphics/xorg/xauth.yaml
@@ -6,8 +6,6 @@ metaEnvironment:
     PKG_DESCRIPTION: "X.Org authorization settings program"
 
 depends:
-    - graphics::xorg::proto::xorgproto
-
     - libs::xorg::xtrans-dev
     - libs::xorg::libX11-dev
     - libs::xorg::libXext-dev
diff --git a/recipes/graphics/xorg/xf86-input-evdev.yaml b/recipes/graphics/xorg/xf86-input-evdev.yaml
@@ -7,8 +7,6 @@ metaEnvironment:
     PKG_LICENSE_FILE: "COPYING"
 
 depends:
-    - graphics::xorg::proto::xorgproto
-
     - graphics::xorg::xserver-dev
     - libs::mtdev-dev
     - libs::libevdev-dev
diff --git a/recipes/graphics/xorg/xf86-video-fbdev.yaml b/recipes/graphics/xorg/xf86-video-fbdev.yaml
@@ -7,8 +7,6 @@ metaEnvironment:
 
 depends:
     - graphics::xorg::xserver-dev
-    - graphics::xorg::proto::xorgproto
-    - graphics::xorg::utils::util-macros
 
 checkoutSCM:
     scm: url
diff --git a/recipes/graphics/xorg/xinit.yaml b/recipes/graphics/xorg/xinit.yaml
@@ -6,8 +6,6 @@ metaEnvironment:
     PKG_LICENSE: "MIT-open-group, X11-distribute-modifications-variant"
 
 depends:
-    - graphics::xorg::proto::xorgproto
-
     - libs::xorg::libX11-dev
     - use: []
       depends:
diff --git a/recipes/graphics/xorg/xkbcomp.yaml b/recipes/graphics/xorg/xkbcomp.yaml
@@ -6,7 +6,6 @@ metaEnvironment:
     PKG_LICENSE_FILE: "COPYING"
 
 depends:
-    - graphics::xorg::proto::xorgproto
     - libs::xorg::libX11-dev
     - libs::xorg::libxkbfile-dev
     - use: []
diff --git a/recipes/graphics/xorg/xrdb.yaml b/recipes/graphics/xorg/xrdb.yaml
@@ -7,8 +7,6 @@ metaEnvironment:
     LICENCE_FILE: "COPYING"
 
 depends:
-    - graphics::xorg::proto::xorgproto
-
     - core::util-linux-dev
     - libs::xcb::libxcb-dev
     - libs::xorg::libICE-dev
diff --git a/recipes/graphics/xorg/xserver.yaml b/recipes/graphics/xorg/xserver.yaml
@@ -12,9 +12,6 @@ checkoutSCM:
     stripComponents: 1
 
 depends:
-    - graphics::xorg::proto::xorgproto
-    - graphics::xorg::utils::util-macros
-
     - graphics::xorg::xkbcomp-dev
     - graphics::fonts::font-util-dev
     - libs::libepoxy-dev
diff --git a/recipes/graphics/xorg/xset.yaml b/recipes/graphics/xorg/xset.yaml
@@ -6,8 +6,6 @@ metaEnvironment:
     PKG_LICENSE_FILE: "COPYING"
 
 depends:
-    - graphics::xorg::proto::xorgproto
-
     - libs::xorg::libX11-dev
     - libs::xorg::libXmu-dev
     - use: []
diff --git a/recipes/graphics/xorg/xsetroot.yaml b/recipes/graphics/xorg/xsetroot.yaml
@@ -6,7 +6,6 @@ metaEnvironment:
     PKG_LICENSE_FILE: "COPYING"
 
 depends:
-    - graphics::xorg::proto::xorgproto
     - graphics::xorg::xbitmaps
 
     - libs::xorg::libX11-dev
diff --git a/recipes/graphics/xorg/xterm.yaml b/recipes/graphics/xorg/xterm.yaml
@@ -6,8 +6,6 @@ metaEnvironment:
     PKG_DESCRIPTION: "X terminal emulator"
 
 depends:
-    - graphics::xorg::proto::xorgproto
-
     - libs::freetype-dev
     - libs::ncurses-dev
     - libs::xorg::libX11-dev
diff --git a/recipes/libs/libepoxy.yaml b/recipes/libs/libepoxy.yaml
@@ -6,7 +6,6 @@ metaEnvironment:
     PKG_DESCRIPTION: "library for handling OpenGL function pointer management"
 
 depends:
-    - graphics::xorg::proto::xorgproto
     - libs::xorg::libX11-dev
     - libs::mesa3d-dev
     - use: []
diff --git a/recipes/libs/mesa3d.yaml b/recipes/libs/mesa3d.yaml
@@ -117,7 +117,6 @@ multiPackage:
 
             - if: "$(eq,$MESA3D_PLATFORM,x11)"
               depends:
-                  - graphics::xorg::proto::xorgproto
                   - libs::xcb::libxcb-dev
                   - libs::xorg::libX11-dev
                   - libs::xorg::libXdamage-dev
diff --git a/recipes/libs/xcb/libxcb.yaml b/recipes/libs/xcb/libxcb.yaml
@@ -6,8 +6,8 @@ metaEnvironment:
 
 depends:
     - graphics::xcb::xcb-proto
-    - graphics::xorg::proto::xorgproto
-    - graphics::xorg::utils::util-macros
+    - graphics::xorg::proto::xorgproto-dev
+    - graphics::xorg::utils::util-macros-dev
 
     - libs::xcb::pthread-stubs-dev
     - libs::xorg::libXau-dev
diff --git a/recipes/libs/xcb/util-image.yaml b/recipes/libs/xcb/util-image.yaml
@@ -6,9 +6,7 @@ metaEnvironment:
     PKG_DESCRIPTION: "XCB port of Xlibs XImage and XShmImage"
 
 depends:
-    - graphics::xorg::utils::util-macros
-    - graphics::xorg::proto::xorgproto
-
+    - graphics::xorg::utils::util-macros-dev
     - libs::xcb::libxcb-dev
     - libs::xcb::util-dev
     - use: []
diff --git a/recipes/libs/xcb/util-keysyms.yaml b/recipes/libs/xcb/util-keysyms.yaml
@@ -6,9 +6,6 @@ metaEnvironment:
     PKG_DESCRIPTION: "Utility libraries for XC Binding - Standard X key constants and conversion to/from keycodes"
 
 depends:
-    - graphics::xorg::utils::util-macros
-    - graphics::xorg::proto::xorgproto
-
     - libs::xcb::libxcb-dev
     - use: []
       depends:
diff --git a/recipes/libs/xcb/util-renderutil.yaml b/recipes/libs/xcb/util-renderutil.yaml
@@ -6,8 +6,7 @@ metaEnvironment:
     PKG_LICENSE: "HPND-sell-variant, X11-distribute-modifications-variant"
 
 depends:
-    - graphics::xorg::utils::util-macros
-    - graphics::xorg::proto::xorgproto
+    - graphics::xorg::utils::util-macros-dev
     - libs::xcb::libxcb-dev
     - use: []
       depends:
diff --git a/recipes/libs/xcb/util-wm.yaml b/recipes/libs/xcb/util-wm.yaml
@@ -6,9 +6,7 @@ metaEnvironment:
     PKG_DESCRIPTION: "Utility libraries for XC Binding - client and window-manager helpers for ICCCM"
 
 depends:
-    - graphics::xorg::utils::util-macros
-    - graphics::xorg::proto::xorgproto
-
+    - graphics::xorg::utils::util-macros-dev
     - libs::xcb::libxcb-dev
     - libs::xcb::util-dev
     - use: []
diff --git a/recipes/libs/xcb/util.yaml b/recipes/libs/xcb/util.yaml
@@ -6,8 +6,7 @@ metaEnvironment:
     PKG_DESCRIPTION: "XCB util modules"
 
 depends:
-    - graphics::xorg::utils::util-macros
-    - graphics::xorg::proto::xorgproto
+    - graphics::xorg::utils::util-macros-dev
     - libs::xcb::libxcb-dev
     - use: []
       depends:
diff --git a/recipes/libs/xorg/libICE.yaml b/recipes/libs/xorg/libICE.yaml
@@ -5,8 +5,8 @@ metaEnvironment:
     PKG_VERSION: "1.1.2"
 
 depends:
-    - graphics::xorg::proto::xorgproto
-    - graphics::xorg::utils::util-macros
+    - graphics::xorg::proto::xorgproto-dev
+    - graphics::xorg::utils::util-macros-dev
     - libs::xorg::xtrans-dev
     - use: []
       depends:
diff --git a/recipes/libs/xorg/libSM.yaml b/recipes/libs/xorg/libSM.yaml
@@ -5,9 +5,6 @@ metaEnvironment:
     PKG_VERSION: "1.2.6"
 
 depends:
-    - graphics::xorg::proto::xorgproto
-    - graphics::xorg::utils::util-macros
-
     - libs::xorg::libICE-dev
     - use: []
       depends:
diff --git a/recipes/libs/xorg/libX11.yaml b/recipes/libs/xorg/libX11.yaml
@@ -10,8 +10,8 @@ depends:
       tools:
           target-toolchain: host-compat-toolchain
 
-    - graphics::xorg::proto::xorgproto
-    - graphics::xorg::utils::util-macros
+    - graphics::xorg::proto::xorgproto-dev
+    - graphics::xorg::utils::util-macros-dev
 
     - libs::xorg::xtrans-dev
     - libs::xcb::libxcb-dev
@@ -29,7 +29,7 @@ checkoutSCM:
 buildTools: [host-toolchain, libxslt-tools]
 buildScript: |
     autotoolsBuild $1 --disable-xf86bigfont \
-       --with-keysymdefdir=${BOB_DEP_PATHS['graphics::xorg::proto::xorgproto']}/usr/include/X11 \
+       --with-keysymdefdir=${BOB_DEP_PATHS['graphics::xorg::proto::xorgproto-dev']}/usr/include/X11 \
        --disable-malloc0returnsnull
 
 multiPackage:
diff --git a/recipes/libs/xorg/libXau.yaml b/recipes/libs/xorg/libXau.yaml
@@ -5,7 +5,7 @@ metaEnvironment:
     PKG_VERSION: "1.0.12"
 
 depends:
-    - graphics::xorg::proto::xorgproto
+    - graphics::xorg::proto::xorgproto-dev
 
 checkoutSCM:
     scm: url
@@ -18,6 +18,7 @@ buildScript: |
 
 multiPackage:
     dev:
+        provideDeps: ['*-dev']
         packageScript: autotoolsPackageDev
     tgt:
         packageScript: autotoolsPackageTgt
diff --git a/recipes/libs/xorg/libXaw.yaml b/recipes/libs/xorg/libXaw.yaml
@@ -6,9 +6,6 @@ metaEnvironment:
     PKG_DESCRIPTION: "X11 Athena Widgets Library"
 
 depends:
-    - graphics::xorg::proto::xorgproto
-    - graphics::xorg::utils::util-macros
-
     - libs::xorg::libXt-dev
     - libs::xorg::libXmu-dev
     - libs::xorg::libXpm-dev
diff --git a/recipes/libs/xorg/libXcomposite.yaml b/recipes/libs/xorg/libXcomposite.yaml
@@ -4,9 +4,6 @@ metaEnvironment:
     PKG_VERSION: "0.4.6"
 
 depends:
-    - graphics::xorg::proto::xorgproto
-    - graphics::xorg::utils::util-macros
-
     - libs::xorg::libXfixes-dev
     - libs::xorg::libX11-dev
     - use: []
diff --git a/recipes/libs/xorg/libXcursor.yaml b/recipes/libs/xorg/libXcursor.yaml
@@ -4,9 +4,6 @@ metaEnvironment:
     PKG_VERSION: "1.2.3"
 
 depends:
-    - graphics::xorg::proto::xorgproto
-    - graphics::xorg::utils::util-macros
-
     - libs::xorg::libXfixes-dev
     - libs::xorg::libXrender-dev
     - use: []
diff --git a/recipes/libs/xorg/libXdamage.yaml b/recipes/libs/xorg/libXdamage.yaml
@@ -8,7 +8,6 @@ metaEnvironment:
                 Copyright © 2007 Eric Anholt"
 
 depends:
-    - graphics::xorg::proto::xorgproto
     - libs::xorg::libXfixes-dev
     - use: []
       depends:
diff --git a/recipes/libs/xorg/libXdmcp.yaml b/recipes/libs/xorg/libXdmcp.yaml
@@ -11,13 +11,14 @@ checkoutSCM:
     stripComponents: 1
 
 depends:
-    - graphics::xorg::proto::xorgproto
+    - graphics::xorg::proto::xorgproto-dev
 
 buildScript: |
     autotoolsBuild $1
 
 multiPackage:
     dev:
+        provideDeps: ['*-dev']
         packageScript: autotoolsPackageDev
     tgt:
         packageScript: autotoolsPackageTgt
diff --git a/recipes/libs/xorg/libXext.yaml b/recipes/libs/xorg/libXext.yaml
@@ -5,7 +5,6 @@ metaEnvironment:
     PKG_VERSION: "1.3.6"
 
 depends:
-    - graphics::xorg::proto::xorgproto
     - libs::xorg::libX11-dev
     - libs::xorg::libXau-dev
     - use: []
diff --git a/recipes/libs/xorg/libXfixes.yaml b/recipes/libs/xorg/libXfixes.yaml
@@ -5,7 +5,6 @@ metaEnvironment:
     PKG_VERSION: "6.0.1"
 
 depends:
-    - graphics::xorg::proto::xorgproto
     - libs::xorg::libX11-dev
     - use: []
       depends:
diff --git a/recipes/libs/xorg/libXfont2.yaml b/recipes/libs/xorg/libXfont2.yaml
@@ -6,9 +6,6 @@ metaEnvironment:
     PKG_DESCRIPTION: "X11 font rasterisation library"
 
 depends:
-    - graphics::xorg::proto::xorgproto
-    - graphics::xorg::utils::util-macros
-
     - libs::xorg::xtrans-dev
     - libs::xorg::libfontenc-dev
     - libs::freetype-dev
diff --git a/recipes/libs/xorg/libXft.yaml b/recipes/libs/xorg/libXft.yaml
@@ -6,7 +6,7 @@ metaEnvironment:
     PKG_DESCRIPTION: "FreeType-based font drawing library for X"
 
 depends:
-    - graphics::xorg::proto::xorgproto
+    - graphics::xorg::proto::xorgproto-dev
 
     - libs::freetype-dev
     - libs::fontconfig-dev
diff --git a/recipes/libs/xorg/libXi.yaml b/recipes/libs/xorg/libXi.yaml
@@ -6,9 +6,6 @@ metaEnvironment:
     PKG_DESCRIPTION: "X11 Input Extension Library"
 
 depends:
-    - graphics::xorg::proto::xorgproto
-    - graphics::xorg::utils::util-macros
-
     - libs::xorg::libX11-dev
     - libs::xorg::libXext-dev
     - libs::xorg::libXfixes-dev
diff --git a/recipes/libs/xorg/libXinerama.yaml b/recipes/libs/xorg/libXinerama.yaml
@@ -4,9 +4,6 @@ metaEnvironment:
     PKG_VERSION: "1.1.5"
 
 depends:
-    - graphics::xorg::proto::xorgproto
-    - graphics::xorg::utils::util-macros
-
     - libs::xorg::libX11-dev
     - libs::xorg::libXext-dev
     - use: []
diff --git a/recipes/libs/xorg/libXmu.yaml b/recipes/libs/xorg/libXmu.yaml
@@ -7,9 +7,6 @@ metaEnvironment:
     PKG_LICENSE_FILE: "COPYING"
 
 depends:
-    - graphics::xorg::proto::xorgproto
-    - graphics::xorg::utils::util-macros
-
     - libs::xorg::libX11-dev
     - libs::xorg::libXext-dev
     - libs::xorg::libXt-dev
diff --git a/recipes/libs/xorg/libXpm.yaml b/recipes/libs/xorg/libXpm.yaml
diff --git a/recipes/libs/xorg/libXrandr.yaml b/recipes/libs/xorg/libXrandr.yaml
diff --git a/recipes/libs/xorg/libXrender.yaml b/recipes/libs/xorg/libXrender.yaml
diff --git a/recipes/libs/xorg/libXshmfence.yaml b/recipes/libs/xorg/libXshmfence.yaml
diff --git a/recipes/libs/xorg/libXt.yaml b/recipes/libs/xorg/libXt.yaml
diff --git a/recipes/libs/xorg/libXv.yaml b/recipes/libs/xorg/libXv.yaml
diff --git a/recipes/libs/xorg/libXxf86vm.yaml b/recipes/libs/xorg/libXxf86vm.yaml
diff --git a/recipes/libs/xorg/libfontenc.yaml b/recipes/libs/xorg/libfontenc.yaml
diff --git a/recipes/libs/xorg/libpciaccess.yaml b/recipes/libs/xorg/libpciaccess.yaml
diff --git a/recipes/libs/xorg/libxkbfile.yaml b/recipes/libs/xorg/libxkbfile.yaml
diff --git a/tests/buildall/recipes/all.yaml b/tests/buildall/recipes/all.yaml
