diff --git a/info.yml b/info.yml index 6a9a3da..e1bad6f 100644 --- a/info.yml +++ b/info.yml @@ -1,7 +1,7 @@ name: glycin description: Load, edit, and create images as well as read metadata -version: 2.1.1 -revision: 2 +version: 2.1.5 +revision: 1 url: https://gnome.pages.gitlab.gnome.org/glycin/ license: MPL2 OR LGPL2.1-or-later maintainers: @@ -19,6 +19,8 @@ depends: - libjxl - librsvg - libseccomp +optional_depends: + - libheif:For .avif, .heic and .heif support make_depends: - clang - gobject-introspection @@ -27,6 +29,7 @@ make_depends: - meson - rustc - vala +check_depends: - dav1d - ffmpeg - rav1e @@ -35,7 +38,7 @@ downloads: - url: https://download.gnome.org/sources/glycin/${BPM_PKG_VERSION%.*}/glycin-${BPM_PKG_VERSION}.tar.xz extract_to: ${BPM_SOURCE} extract_strip_components: 1 - checksum: 8e8e92e312b14d2c5f3a047bdc5305adcb9931ef0150cf74bf526a3741e6fb32 + checksum: 6c09757ee906330a60b6705753aa56bca007ad219b95e6e3537510d41bc341c8 split_packages: - name: glycin optional_depends: diff --git a/recipe.sh b/recipe.sh index 9e53003..a12dd73 100644 --- a/recipe.sh +++ b/recipe.sh @@ -2,6 +2,13 @@ # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT +# The prepare function is executed in the root of the temp directory +# This function is used for putting downloaded files to the correct location or applying patches +prepare() { + cd "$BPM_SOURCE" + patch -Np1 -i "$BPM_WORKDIR"/update-dds-mimetype.diff +} + # The build function is executed in the source directory # This function is used to compile the source code build() { diff --git a/source-files/update-dds-mimetype.diff b/source-files/update-dds-mimetype.diff new file mode 100644 index 0000000..6cd38d2 --- /dev/null +++ b/source-files/update-dds-mimetype.diff @@ -0,0 +1,36 @@ +diff --git a/glycin-loaders/glycin-image-rs/glycin-image-rs.conf b/glycin-loaders/glycin-image-rs/glycin-image-rs.conf +index 7e744ea..40ee246 100644 +--- a/glycin-loaders/glycin-image-rs/glycin-image-rs.conf ++++ b/glycin-loaders/glycin-image-rs/glycin-image-rs.conf +@@ -51,7 +51,7 @@ Exec = @EXEC@ + Exec = @EXEC@ + Creator = true + +-[loader:image/x-dds] ++[loader:image/vnd.ms-dds] + Exec = @EXEC@ + + [loader:image/bmp] +diff --git a/glycin-loaders/glycin-image-rs/glycin-image-rs.thumbnailer.in b/glycin-loaders/glycin-image-rs/glycin-image-rs.thumbnailer.in +index 53576c9..51de157 100644 +--- a/glycin-loaders/glycin-image-rs/glycin-image-rs.thumbnailer.in ++++ b/glycin-loaders/glycin-image-rs/glycin-image-rs.thumbnailer.in +@@ -1,4 +1,4 @@ + [Thumbnailer Entry] + TryExec=@BINDIR@/glycin-thumbnailer + Exec=@BINDIR@/glycin-thumbnailer --input %u --output %o --size %s +-MimeType=image/jpeg;image/png;image/apng;image/gif;image/webp;image/tiff;image/x-tga;image/vnd-ms.dds;image/x-dds;image/bmp;image/vnd.microsoft.icon;image/x-exr;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-portable-anymap;image/x-qoi;image/qoi; ++MimeType=image/jpeg;image/png;image/apng;image/gif;image/webp;image/tiff;image/x-tga;image/vnd-ms.dds;image/vnd.ms-dds;image/bmp;image/vnd.microsoft.icon;image/x-exr;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-portable-anymap;image/x-qoi;image/qoi; +diff --git a/glycin-loaders/glycin-image-rs/src/main.rs b/glycin-loaders/glycin-image-rs/src/main.rs +index 43e82eb..953a0ee 100644 +--- a/glycin-loaders/glycin-image-rs/src/main.rs ++++ b/glycin-loaders/glycin-image-rs/src/main.rs +@@ -289,7 +289,7 @@ impl ImageRsFormat { + )) + .format_name("BMP") + .default_bit_depth(8), +- "image/x-dds" => Self::new(ImageRsDecoder::Dds( ++ "image/vnd.ms-dds" => Self::new(ImageRsDecoder::Dds( + codecs::dds::DdsDecoder::new(data).expected_error()?, + )) + .format_name("DDS")