From 3921a94f28e7a59a5f61fdc2d4924e2ac3bcd56d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 8 Dec 2019 00:50:03 +0000 Subject: [PATCH] test: fix up HAVE_X11 / HAVE_X defines Only HAVE_X was defined, while both HAVE_X11 and HAVE_X were used. --- meson.build | 2 +- tests/examples/seek/jsseek.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index ff7f1ca..789b73c 100644 --- a/meson.build +++ b/meson.build @@ -278,7 +278,7 @@ else gtk_quartz_dep = dependency('', required : false) endif -core_conf.set('HAVE_X', x11_dep.found()) +core_conf.set('HAVE_X11', x11_dep.found()) core_conf.set('HAVE_GIO_UNIX_2_0', giounix_dep.found()) if gio_dep.type_name() == 'pkgconfig' diff --git a/tests/examples/seek/jsseek.c b/tests/examples/seek/jsseek.c index 855fd33..76e8780 100644 --- a/tests/examples/seek/jsseek.c +++ b/tests/examples/seek/jsseek.c @@ -42,7 +42,7 @@ #include #include -#ifdef HAVE_X +#ifdef HAVE_X11 #include #endif #include @@ -2416,7 +2416,7 @@ msg_clock_lost (GstBus * bus, GstMessage * message, GstPipeline * data) gst_element_set_state (pipeline, GST_STATE_PLAYING); } -#ifdef HAVE_X +#ifdef HAVE_X11 static gulong embed_xid = 0; @@ -2475,7 +2475,7 @@ realize_cb (GtkWidget * widget, gpointer data) if (!gdk_window_ensure_native (window)) g_error ("Couldn't create native window needed for GstVideoOverlay!"); -#ifdef HAVE_X +#ifdef HAVE_X11 embed_xid = GDK_WINDOW_XID (window); g_print ("Window realize: video window XID = %lu\n", embed_xid); #endif @@ -2509,7 +2509,7 @@ connect_bus_signals (GstElement * pipeline) { GstBus *bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline)); -#ifdef HAVE_X +#ifdef HAVE_X11 /* handle prepare-window-handle element message synchronously */ gst_bus_set_sync_handler (bus, (GstBusSyncHandler) bus_sync_handler, pipeline, NULL); @@ -2998,7 +2998,7 @@ main (int argc, char **argv) * asks for the XID of the window to render onto */ gtk_widget_realize (window); -#ifdef HAVE_X +#ifdef HAVE_X11 /* we should have the XID now */ g_assert (embed_xid != 0); #endif -- 2.7.4