From d07f2323fe6581414ee517ab2e738b372f65508d Mon Sep 17 00:00:00 2001
From: Philippe Normand <philn@igalia.com>
Date: Mon, 28 Feb 2022 10:58:41 +0000
Subject: [PATCH] validate: Fix padding and constants

Without this the Rust -sys validate crate tests don't pass.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1810>
---
 .../validate/gst/validate/gst-validate-scenario.h           | 2 +-
 .../gst-devtools/validate/gst/validate/media-descriptor.h   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/subprojects/gst-devtools/validate/gst/validate/gst-validate-scenario.h b/subprojects/gst-devtools/validate/gst/validate/gst-validate-scenario.h
index dc8a7e1a4e..c63e2a77e6 100644
--- a/subprojects/gst-devtools/validate/gst/validate/gst-validate-scenario.h
+++ b/subprojects/gst-devtools/validate/gst/validate/gst-validate-scenario.h
@@ -265,7 +265,7 @@ struct _GstValidateActionType
   GstValidateActionTypePrivate* priv;
 
   /*< private >*/
-  gpointer _gst_reserved[GST_PADDING_LARGE - sizeof (GstRank) - 2];
+  gpointer _gst_reserved[GST_PADDING_LARGE];
 };
 
 #ifndef __GI_SCANNER__
diff --git a/subprojects/gst-devtools/validate/gst/validate/media-descriptor.h b/subprojects/gst-devtools/validate/gst/validate/media-descriptor.h
index 65b3a57ac1..e7521e9edd 100644
--- a/subprojects/gst-devtools/validate/gst/validate/media-descriptor.h
+++ b/subprojects/gst-devtools/validate/gst/validate/media-descriptor.h
@@ -29,8 +29,10 @@
 
 G_BEGIN_DECLS
 
-#define GST_VALIDATE_UNKNOWN_UINT64 (G_MAXUINT64 - 2)
-#define GST_VALIDATE_UNKNOWN_BOOL (G_MAXUINT32 - 2)
+#define GST_VALIDATE_UNKNOWN_UINT64 -1
+
+#define GST_VALIDATE_UNKNOWN_BOOL -1
+
 typedef struct
 {
   /* Children */
-- 
2.34.1