Skip to content

Commit 0e97127

Browse files
jcupittjcupitt
committed
revise for builder 1.4.4
1 parent 5dd5c5e commit 0e97127

File tree

2 files changed

+59
-169
lines changed

2 files changed

+59
-169
lines changed

‎README.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,17 @@ not allowed`, re-enable file transport with:
4949
git config --global protocol.file.allow always
5050
```
5151

52+
You need the latest `flatpak-builder` (the one in deb is not new enough),
53+
install with:
54+
55+
```
56+
flatpak install org.flatpak.Builder
57+
```
58+
5259
Build and try running it:
5360

5461
```shell
55-
flatpak-builder --force-clean --user --install build-dir org.libvips.nip4.json
62+
flatpak run org.flatpak.Builder --force-clean --user --install build-dir org.libvips.nip4.json
5663
flatpak run org.libvips.nip4 ~/pics/k2.jpg
5764
```
5865

‎org.libvips.nip4.json‎

Lines changed: 51 additions & 168 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,16 @@
1111
"--socket=wayland",
1212
"--talk-name=org.gtk.vfs.*",
1313
"--filesystem=xdg-run/gvfsd",
14-
"--filesystem=home",
15-
"--filesystem=/mnt",
16-
"--filesystem=/srv"
14+
"--filesystem=host"
1715
],
1816
"cleanup" : [
1917
"/include",
2018
"/lib/libheif",
21-
"/lib/x86_64-linux-gnu",
2219
"/lib/girepository-1.0",
2320
"/lib/pkgconfig",
2421
"/lib/cmake",
2522
"/lib/openjpeg-*",
23+
"/lib/*.a",
2624
"/man",
2725
"/share/aclocal",
2826
"/share/doc",
@@ -39,31 +37,13 @@
3937
"/share/COPYING",
4038
"/share/RELEASE.txt",
4139
"/share/cmake",
42-
"/bin/a*",
43-
"/bin/b*",
44-
"/bin/c*",
45-
"/bin/d*",
46-
"/bin/e*",
47-
"/bin/f*",
48-
"/bin/g*",
49-
"/bin/h*",
50-
"/bin/i*",
51-
"/bin/l*",
52-
"/bin/m*",
53-
"/bin/o*",
54-
"/bin/p*",
55-
"/bin/r*",
56-
"/bin/s*",
57-
"/bin/t*",
58-
"/bin/x*",
59-
"/bin/vips",
60-
"/bin/vipsheader",
40+
"/bin/smem",
41+
"/bin/fpack",
42+
"/bin/funpack",
43+
"/bin/speed",
6144
"/bin/vipsedit",
6245
"/bin/vipsprofile",
63-
"/bin/vipsthumbnail",
64-
"/bin/jxlinfo",
65-
"*.la",
66-
"*.a"
46+
"/bin/vipsthumbnail"
6747
],
6848
"modules" : [
6949

@@ -73,7 +53,6 @@
7353
"buildsystem" : "cmake-ninja",
7454
"build-options" : {
7555
"config-opts" : [
76-
"-DCMAKE_INSTALL_LIBDIR=lib",
7756
"-DBUILD_TESTING=OFF",
7857
"-DHWY_ENABLE_CONTRIB=OFF",
7958
"-DHWY_ENABLE_EXAMPLES=OFF",
@@ -94,75 +73,25 @@
9473
"name" : "libdeflate",
9574
"builddir" : true,
9675
"buildsystem" : "cmake-ninja",
97-
"build-options" : {
98-
"config-opts" : [
99-
"-DCMAKE_INSTALL_LIBDIR=lib"
100-
]
101-
},
10276
"sources" : [
10377
{
10478
"type" : "git",
10579
"url" : "https://github.com/ebiggers/libdeflate.git",
10680
"tag" : "v1.22",
10781
"commit" : "2335c047e91cac6fd04cb0fd2769380395149f15"
10882
}
109-
]
110-
},
111-
112-
{
113-
"name" : "libjxl",
114-
"builddir" : true,
115-
"buildsystem" : "cmake-ninja",
116-
"build-options" : {
117-
"config-opts" : [
118-
"-DCMAKE_INSTALL_LIBDIR=lib",
119-
"-DBUILD_TESTING=OFF",
120-
"-DJPEGXL_ENABLE_SKCMS=off",
121-
"-DJPEGXL_ENABLE_DOXYGEN=off",
122-
"-DJPEGXL_ENABLE_EXAMPLES=off",
123-
"-DJPEGXL_ENABLE_JNI=off",
124-
"-DJPEGXL_ENABLE_MANPAGES=off",
125-
"-DJPEGXL_ENABLE_OPENEXR=off",
126-
"-DJPEGXL_ENABLE_TOOLS=off"
127-
]
128-
},
129-
"sources" : [
130-
{
131-
"type" : "git",
132-
"url" : "https://github.com/libjxl/libjxl.git",
133-
"tag" : "v0.11.0",
134-
"commit" : "4df1e9eccdf86b8df4c0c7c08f529263906f9c4f"
135-
}
136-
]
137-
},
138-
139-
{
140-
"name" : "openjpeg",
141-
"builddir" : true,
142-
"buildsystem" : "cmake-ninja",
143-
"build-options" : {
144-
"config-opts" : [
145-
"-DCMAKE_INSTALL_LIBDIR=lib"
146-
]
147-
},
148-
"sources" : [
149-
{
150-
"type" : "git",
151-
"url" : "https://github.com/uclouvain/openjpeg.git",
152-
"tag" : "v2.5.2",
153-
"commit" : "39e8c50a2f9bdcf36810ee3d41bcbf1cc78968ae"
154-
}
155-
]
83+
],
84+
"cleanup" : [
85+
"/bin/libdeflate-gunzip",
86+
"/bin/libdeflate-gzip"
87+
]
15688
},
15789

15890
{
15991
"name" : "libimagequant",
16092
"builddir" : true,
16193
"buildsystem" : "cmake-ninja",
16294
"build-options" : {
163-
"config-opts" : [
164-
"-DCMAKE_INSTALL_LIBDIR=lib"
165-
],
16695
"arch" : {
16796
"aarch64" : {
16897
"config-opts" : [
@@ -185,11 +114,6 @@
185114
"name" : "libspng",
186115
"builddir" : true,
187116
"buildsystem" : "cmake-ninja",
188-
"build-options" : {
189-
"config-opts" : [
190-
"-DCMAKE_INSTALL_LIBDIR=lib"
191-
]
192-
},
193117
"sources" : [
194118
{
195119
"type" : "git",
@@ -200,34 +124,10 @@
200124
]
201125
},
202126

203-
{
204-
"name" : "libarchive",
205-
"builddir" : true,
206-
"buildsystem" : "cmake-ninja",
207-
"build-options" : {
208-
"config-opts" : [
209-
"-DCMAKE_INSTALL_LIBDIR=lib"
210-
]
211-
},
212-
"sources" : [
213-
{
214-
"type" : "git",
215-
"url" : "https://github.com/libarchive/libarchive.git",
216-
"tag" : "v3.7.7",
217-
"commit" : "b439d586f53911c84be5e380445a8a259e19114c"
218-
}
219-
]
220-
},
221-
222127
{
223128
"name" : "poppler-data",
224129
"builddir" : true,
225130
"buildsystem" : "cmake-ninja",
226-
"build-options" : {
227-
"config-opts" : [
228-
"-DCMAKE_INSTALL_LIBDIR=lib"
229-
]
230-
},
231131
"sources" : [
232132
{
233133
"type" : "archive",
@@ -243,7 +143,6 @@
243143
"builddir" : true,
244144
"buildsystem" : "cmake-ninja",
245145
"config-opts" : [
246-
"-DCMAKE_INSTALL_LIBDIR=lib",
247146
"-DBUILD_CPP_TESTS=OFF",
248147
"-DBUILD_GTK_TESTS=OFF",
249148
"-DBUILD_MANUAL_TESTS=OFF",
@@ -274,11 +173,6 @@
274173
"name" : "imath",
275174
"builddir" : true,
276175
"buildsystem" : "cmake-ninja",
277-
"build-options" : {
278-
"config-opts" : [
279-
"-DCMAKE_INSTALL_LIBDIR=lib"
280-
]
281-
},
282176
"sources" : [
283177
{
284178
"type" : "git",
@@ -293,19 +187,27 @@
293187
"name" : "openexr",
294188
"builddir" : true,
295189
"buildsystem" : "cmake-ninja",
296-
"build-options" : {
297-
"config-opts" : [
298-
"-DCMAKE_INSTALL_LIBDIR=lib"
299-
]
300-
},
301190
"sources" : [
302191
{
303192
"type" : "git",
304193
"url" : "https://github.com/AcademySoftwareFoundation/openexr.git",
305194
"tag" : "v3.3.1",
306195
"commit" : "f723c3940fff287c0a26b425b90a8e764823bfd4"
307196
}
308-
]
197+
],
198+
"cleanup" : [
199+
"/bin/exr2aces",
200+
"/bin/exrenvmap",
201+
"/bin/exrheader",
202+
"/bin/exrinfo",
203+
"/bin/exrmakepreview",
204+
"/bin/exrmaketiled",
205+
"/bin/exrmanifest",
206+
"/bin/exrmetrics",
207+
"/bin/exrmultipart",
208+
"/bin/exrmultiview",
209+
"/bin/exrstdattr"
210+
]
309211
},
310212

311213
{
@@ -329,7 +231,6 @@
329231
"buildsystem" : "meson",
330232
"config-opts" : [
331233
"--buildtype=release",
332-
"--libdir=lib",
333234
"-Dtests=false"
334235
],
335236
"sources" : [
@@ -339,15 +240,18 @@
339240
"tag" : "v1.1.0",
340241
"commit" : "60f291dea0fd464e34d693b1ad55c46f9f2ee69a"
341242
}
342-
]
243+
],
244+
"cleanup" : [
245+
"/bin/dcm-dump",
246+
"/bin/dcm-getframe"
247+
]
343248
},
344249

345250
{
346251
"name" : "openslide",
347252
"builddir" : true,
348253
"buildsystem" : "meson",
349254
"config-opts" : [
350-
"--libdir=lib",
351255
"--buildtype=release"
352256
],
353257
"sources" : [
@@ -356,7 +260,13 @@
356260
"url" : "https://github.com/openslide/openslide/releases/download/v4.0.0/openslide-4.0.0.tar.xz",
357261
"sha256" : "cc227c44316abb65fb28f1c967706eb7254f91dbfab31e9ae6a48db6cf4ae562"
358262
}
359-
]
263+
],
264+
"cleanup" : [
265+
"/bin/openslide-quickhash1sum",
266+
"/bin/openslide-show-properties",
267+
"/bin/openslide-write-png",
268+
"/bin/slidetool"
269+
]
360270
},
361271

362272
{
@@ -369,50 +279,19 @@
369279
"url" : "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-4.5.0.tar.gz",
370280
"sha256" : "e4854fc3365c1462e493aa586bfaa2f3d0bb8c20b75a524955db64c27427ce09"
371281
}
372-
]
373-
},
374-
375-
{
376-
"name" : "libde265",
377-
"builddir" : true,
378-
"buildsystem" : "cmake-ninja",
379-
"build-options" : {
380-
"config-opts" : [
381-
"-DCMAKE_INSTALL_LIBDIR=lib"
382-
]
383-
},
384-
"sources" : [
385-
{
386-
"type" : "archive",
387-
"url" : "https://github.com/strukturag/libde265/releases/download/v1.0.15/libde265-1.0.15.tar.gz",
388-
"sha256" : "00251986c29d34d3af7117ed05874950c875dd9292d016be29d3b3762666511d"
389-
}
390-
]
391-
},
392-
393-
{
394-
"name" : "libheif",
395-
"builddir" : true,
396-
"buildsystem" : "cmake-ninja",
397-
"build-options" : {
398-
"config-opts" : [
399-
"-DCMAKE_INSTALL_LIBDIR=lib"
400-
]
401-
},
402-
"sources" : [
403-
{
404-
"type" : "archive",
405-
"url" : "https://github.com/strukturag/libheif/releases/download/v1.18.2/libheif-1.18.2.tar.gz",
406-
"sha256" : "c4002a622bec9f519f29d84bfdc6024e33fd67953a5fb4dc2c2f11f67d5e45bf"
407-
}
408-
]
282+
],
283+
"cleanup" : [
284+
"/bin/imcopy",
285+
"/bin/cookbook",
286+
"/bin/fitscopy",
287+
"/bin/fitsverify"
288+
]
409289
},
410290

411291
{
412292
"name" : "cgif",
413293
"buildsystem" : "meson",
414294
"config-opts" : [
415-
"--libdir=lib",
416295
"--buildtype=release"
417296
],
418297
"builddir" : true,
@@ -431,7 +310,6 @@
431310
"builddir" : true,
432311
"buildsystem" : "meson",
433312
"config-opts" : [
434-
"--libdir=lib",
435313
"--buildtype=release",
436314
"-Ddeprecated=false",
437315
"-Dmodules=disabled"
@@ -455,7 +333,12 @@
455333
"url" : "https://ftp.snt.utwente.nl/pub/software/gnu/gsl/gsl-2.8.tar.gz",
456334
"sha256" : "6a99eeed15632c6354895b1dd542ed5a855c0f15d9ad1326c6fe2b2c9e423190"
457335
}
458-
]
336+
],
337+
"cleanup" : [
338+
"/bin/gsl-config",
339+
"/bin/gsl-histogram",
340+
"/bin/gsl-randist"
341+
]
459342
},
460343

461344
{

0 commit comments

Comments
 (0)