Merge branch 'develop' of github.com:UiL-OTS-labs/psy-lib into develop

meson.build

@@ -93,6 +93,9 @@ psy_deps = [
     epoxy_dep,
     gstreamer_dep,
     gstreamer_app_dep,
+    cairo_dep,
+    pango_dep,
+    pangocairo_dep
 ]
 
 # add optional dependencies
@@ -144,6 +147,12 @@ endif
 #     psy_deps += kernel32_dep
 # endif
 
+# to query WMI for hardware stuff on windows
+wbemuuid_dep = cc.find_library('wbemuuid', static:true, required: false)
+if wbemuuid_dep.found()
+    psy_deps += wbemuuid_dep
+endif
+
 message('the depencies are: ')
 foreach dep : psy_deps
     message(' - ', dep.name())
@@ -156,6 +165,7 @@ psy_deps += winmm_dep
 psy_deps += kernel32_dep
 
 gnome = import('gnome')
+fs = import ('fs')
 
 subdir('psy')
 subdir('share')
@@ -181,5 +191,3 @@ endif
 if get_option('documentation')
     subdir('doc')
 endif
-
-

programs/meson.build

@@ -6,3 +6,8 @@ psy_enum_fonts = executable (
     dependencies : [psy_dep]
 )
 
+psy_enum_parallel = executable (
+    'psy-enum-parallel',
+    files('psy-enum-parallel.c'),
+    dependencies : [psy_dep]
+)

programs/psy-enum-parallel.c

@@ -0,0 +1,22 @@
+
+#include "hw/psy-parallel-port.h"
+#include <psylib.h>
+
+int
+main(void)
+{
+    gint                  n     = 0;
+    PsyParallelPortInfo **ports = NULL;
+
+    PsyParallelPort *port = psy_parallel_port_new();
+
+    psy_parallel_port_enumerate(port, &ports, &n);
+
+    for (int i = 0; i < n; i++) {
+        g_print("Port %d: %s\n",
+                psy_parallel_port_info_port_number(ports[i]),
+                psy_parallel_port_info_name(ports[i]));
+    }
+
+    psy_parallel_port_free(port);
+}

psy/hw/meson.build

@@ -13,3 +13,9 @@ if cdata.has('HAVE_LINUX_PARPORT_H') and cdata.has('HAVE_LINUX_PPDEV_H')
     libpsyfiles += files('psy-parport.c')
     libpsy_headers += files('psy-parport.h')
 endif
+
+
+if host_machine.system() in ['windows', 'cygwin']
+    libpsyfiles += files('psy-inpout-port.c')
+    libpsy_headers += files('psy-inpout-port.h')
+endif