summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Riemann <friemann@gnome.org>2022-08-10 20:34:14 +0000
committerFelix Riemann <friemann@gnome.org>2022-08-10 20:34:14 +0000
commit047bce9983fc0d5f0dbfdc6ab7f4fab86d6f0221 (patch)
treeddb11a82e36210c8dd2a3b8fc899fb9144c3ede2
parent8fd0b3c73c09a77fccf5e63a2d7e83d06122c21e (diff)
parentc897796aede1d4d708828ddc85993c62bf020c68 (diff)
downloadeog-047bce9983fc0d5f0dbfdc6ab7f4fab86d6f0221.tar.gz
Merge branch 'friemann/flatpak-webp' into 'master'
flatpak: Add webp pixbuf loader to the build Closes #250 See merge request GNOME/eog!139
-rw-r--r--org.gnome.Eog.json27
1 files changed, 25 insertions, 2 deletions
diff --git a/org.gnome.Eog.json b/org.gnome.Eog.json
index fe68c1dd..001a32bb 100644
--- a/org.gnome.Eog.json
+++ b/org.gnome.Eog.json
@@ -17,7 +17,8 @@
"--filesystem=xdg-run/dconf",
"--filesystem=~/.config/dconf:ro",
"--talk-name=ca.desrt.dconf",
- "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
+ "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+ "--env=GDK_PIXBUF_MODULE_FILE=/app/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
],
"cleanup" : [
"/include",
@@ -67,7 +68,7 @@
"buildsystem" : "meson",
"config-opts" : [
"-Ddemos=false"
- ],
+ ],
"cleanup" : [
"/bin/*"
],
@@ -93,6 +94,28 @@
]
},
{
+ "name" : "webp-pixbuf-loader",
+ "buildsystem" : "meson",
+ "config-opts" : [
+ "-Dgdk_pixbuf_moduledir=/app/lib/gdk-pixbuf-2.0/2.10.0/loaders/"
+ ],
+ "sources" : [
+ {
+ "type" : "git",
+ "url" : "https://github.com/aruiz/webp-pixbuf-loader.git",
+ "tag" : "0.0.6"
+ }
+ ]
+ },
+ {
+ "name" : "update-pixbuf-loaders",
+ "buildsystem" : "simple",
+ "build-commands" : [
+ "GDK_PIXBUF_MODULEDIR=/app/lib/gdk-pixbuf-2.0/2.10.0/loaders/ gdk-pixbuf-query-loaders > /app/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache",
+ "gdk-pixbuf-query-loaders >> /app/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+ ]
+ },
+ {
"name" : "eog",
"buildsystem" : "meson",
"builddir" : true,