Fixing build issues with libwebp in Flathub manifest.

Author: phase1geo

com.github.phase1geo.minder.flathub.yml

@@ -5,7 +5,7 @@ app-id: com.github.phase1geo.minder
 # we can use a convenient pre-made runtime and SDK. For this example, we'll be
 # using the runtime and SDK provided by elementary.
 runtime: org.gnome.Platform
-runtime-version: '46'
+runtime-version: '49'
 sdk: org.gnome.Sdk
 
 # This should match the exec line in your .desktop file and usually is the same
@@ -80,23 +80,6 @@ modules:
         url: https://github.com/elementary/granite/archive/refs/tags/7.6.0.tar.gz
         sha256: 4b4e4f7f86eb3f55116faec42ebd87e04c3e424d82715ecd967ed39540dca5ef
 
-          #  - name: libwebp
-          #    buildsystem: cmake-ninja
-          #    config-opts:
-          #      - -DBUILD_SHARED_LIBS=ON
-          #      - -DWEBP_BUILD_ANIM_UTILS=OFF
-          #      - -DWEBP_BUILD_CWEBP=OFF
-          #      - -DWEBP_BUILD_DWEBP=OFF
-          #      - -DWEBP_BUILD_GIF2WEBP=OFF
-          #      - -DWEBP_BUILD_IMG2WEBP=OFF
-          #      - -DWEBP_BUILD_VWEBP=OFF
-          #      - -DWEBP_BUILD_WEBPMUX=OFF
-          #      - -DWEBP_BUILD_EXTRAS=OFF
-          #    sources:
-          #      - type: archive
-          #        url: https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.3.2.tar.gz
-          #        sha256: 2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4
-
   - name: minder
     buildsystem: meson
     sources:

data/meson.build

@@ -6,7 +6,7 @@ install_data(
 i18n.merge_file(
     input: meson.project_name() + '.desktop.in',
     output: meson.project_name() + '.desktop',
-    po_dir: join_paths(meson.source_root(), 'po', 'extra'),
+    po_dir: join_paths(meson.project_source_root(), 'po', 'extra'),
     type: 'desktop',
     install: true,
     install_dir: join_paths(get_option('datadir'), 'applications')
@@ -15,7 +15,7 @@ i18n.merge_file(
 i18n.merge_file(
     input: meson.project_name() + '.appdata.xml.in',
     output: meson.project_name() + '.appdata.xml',
-    po_dir: join_paths(meson.source_root(), 'po', 'extra'),
+    po_dir: join_paths(meson.project_source_root(), 'po', 'extra'),
     install: true,
     install_dir: join_paths(get_option('datadir'), 'metainfo')
 )

meson.build

@@ -46,12 +46,14 @@ if libmarkdown.version().version_compare('>=3.0')
 endif
 
 add_project_arguments([
-        '--vapidir', join_paths(meson.current_source_dir(), 'vapi'),
+        '--vapidir=' + join_paths(meson.project_source_root(), 'vapi'),
         '--disable-warnings'
     ],
     language: 'vala',
 )
 
+add_project_arguments(['-w'], language: 'c')
+
 dependencies = [
     dependency('gobject-2.0'),
     dependency('glib-2.0'),
@@ -76,7 +78,8 @@ e = executable('com.github.phase1geo.minder',
     gresource,
     dependencies: dependencies,
     vala_args: [
-        meson.source_root() + markdown_vapi
+        join_paths(meson.project_source_root(), 'vapi', 'libmarkdown.vapi'),
+        join_paths(meson.project_source_root(), 'vapi', 'libwebp.vapi'),
     ],
     install : true
 )

po/extra/meson.build

@@ -1,7 +1,7 @@
 i18n.gettext('extra',
     args: [
-        '--directory=' + meson.source_root(),
+        '--directory=' + meson.project_source_root(),
         '--from-code=UTF-8'
     ],
     install: false
-)
+)

po/meson.build

@@ -1,6 +1,6 @@
 i18n.gettext(meson.project_name(),
     args: [
-        '--directory='+meson.source_root(), 
+        '--directory='+meson.project_source_root(), 
         '--from-code=UTF-8'
     ]
 )

src/exports/ExportWebP.vala

@@ -19,7 +19,6 @@
 * Authored by: Trevor Williams <[email protected]>
 */
 
-using WebP;
 using Cairo;
 using Gdk;
 using Gtk;
@@ -54,7 +53,7 @@ public class ExportWebP : Export {
     uint8* output_buffer = null;
     size_t buffer_size   = 0;
 
-    buffer_size = WebP.encode_lossless_rgba( pixbuf.get_pixels(), pixbuf.get_width(), pixbuf.get_height(), pixbuf.get_rowstride(), out output_buffer );
+    buffer_size = WebPEncodeLosslessRGBA( pixbuf.get_pixels(), pixbuf.get_width(), pixbuf.get_height(), pixbuf.get_rowstride(), out output_buffer );
 
     if( buffer_size == 0 ) {
       stdout.printf( "Failed to encode WebP image.\n" );
@@ -66,7 +65,7 @@ public class ExportWebP : Export {
       for( int i=0; i<buffer_size; i++ ) {
         obuf += output_buffer[i];
       }
-      WebP.free( output_buffer );
+      WebPFree( output_buffer );
       var file = File.new_for_path( fname );
       var output_stream = file.replace( null, false, FileCreateFlags.NONE, null );
       output_stream.write( obuf );

vapi/libwebp.vapi

@@ -1,16 +1,11 @@
 [CCode (cheader_filename = "webp/encode.h")]
-namespace WebP {
+public extern size_t WebPEncodeLosslessRGBA(
+  uint8* rgb,
+  int width,
+  int height,
+  int stride,
+  out uint8* output_buffer
+);
 
-  [CCode (cname = "WebPEncodeLosslessRGBA")]
-  public extern size_t encode_lossless_rgba(
-    uint8* rgb,
-    int width,
-    int height,
-    int stride,
-    out uint8* output_buffer
-  );
-
-  [CCode (cname = "WebPFree", cheader_filename = "webp/decode.h")]
-  public extern void free(void* ptr);
-
-}
+[CCode (cheader_filename = "webp/decode.h")]
+public extern void WebPFree(void* ptr);