make both libpng and libjpeg optional

3 files changed, 47 insertions, 7 deletions

diff --git a/main.c b/main.c
index 8718978..c279805 100644
--- a/main.c
+++ b/main.c
@@ -20,10 +20,15 @@
 #define LOG_MODULE "wbg"
 #define LOG_ENABLE_DBG 1
 #include "log.h"
-#include "png-wbg.h"
-#include "jpg.h"
 #include "shm.h"
 
+#if defined(WBG_HAVE_PNG)
+ #include "png-wbg.h"
+#endif
+#if defined(WBG_HAVE_JPG)
+ #include "jpg.h"
+#endif
+
 /* Top-level globals */
 static struct wl_display *display;
 static struct wl_registry *registry;
@@ -312,9 +317,16 @@ main(int argc, const char *const *argv)
     }
 
     const char *image_path = argv[1];
-    image = jpg_load(image_path);
+    image = NULL;
+
+#if defined(WBG_HAVE_JPG)
+    if (image == NULL)
+        image = jpg_load(image_path);
+#endif
+#if defined(WBG_HAVE_PNG)
     if (image == NULL)
         image = png_load(image_path);
+#endif
     if (image == NULL) {
         LOG_ERR("%s: failed to load", image_path);
         return EXIT_FAILURE;
diff --git a/meson.build b/meson.build
index 9980dea..2d8b5c9 100644
--- a/meson.build
+++ b/meson.build
@@ -47,8 +47,19 @@ if cc.has_argument('-fmacro-prefix-map=/foo=')
 endif
 
 pixman = dependency('pixman-1')
-png = dependency('libpng')
-jpg = dependency('libjpeg')
+png = dependency('libpng', required: get_option('png'))
+jpg = dependency('libjpeg', required: get_option('jpeg'))
+
+if not png.found() and not jpg.found()
+  error('you must enable at least one image format')
+endif
+
+if png.found()
+  add_project_arguments('-DWBG_HAVE_PNG=1', language: 'c')
+endif
+if jpg.found()
+  add_project_arguments('-DWBG_HAVE_JPG=1', language:'c')
+endif
 
 wayland_protocols = dependency('wayland-protocols')
 wayland_client = dependency('wayland-client')
@@ -87,14 +98,29 @@ version = custom_target(
   output: 'version.h',
   command: [generate_version_sh, meson.project_version(), '@SOURCE_DIR@', '@OUTPUT@'])
 
+image_format_sources = []
+if png.found()
+  image_format_sources += ['png.c', 'png-wbg.h']
+endif
+if jpg.found()
+  image_format_sources += ['jpg.c', 'jpg.h']
+endif
+
 executable(
     'wbg',
     'main.c',
     'log.c', 'log.h',
-    'png.c', 'png-wbg.h',
-    'jpg.c', 'jpg.h',
     'shm.c', 'shm.h',
     'stride.h',
+    image_format_sources,
     wl_proto_src + wl_proto_headers, version,
     dependencies: [pixman, png, jpg, wayland_client, tllist],
     install: true)
+
+summary(
+  {
+    'PNG support': png.found(),
+    'JPEG support': jpg.found(),
+  },
+  bool_yn: true
+)
diff --git a/meson_options.txt b/meson_options.txt
new file mode 100644
index 0000000..6818e93
--- /dev/null
+++ b/meson_options.txt
@@ -0,0 +1,2 @@
+option('png', type: 'feature')
+option('jpeg', type: 'feature')