summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-07-04 13:08:50 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-07-04 13:08:50 +0000
commitc37c0e41ee0879afea638fff9020921df2e88f50 (patch)
treecc620fd71ee6197c0e14823fcd2966c3d9d17f1a
parentMerging upstream version 1.2.0. (diff)
downloadlibheif-c37c0e41ee0879afea638fff9020921df2e88f50.zip
libheif-c37c0e41ee0879afea638fff9020921df2e88f50.tar.xz
Merging debian version 1.2.0-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog13
-rw-r--r--debian/control15
-rw-r--r--debian/copyright2
-rw-r--r--debian/heif-thumbnailer.install3
-rw-r--r--debian/libheif-examples.install4
-rw-r--r--debian/libheif1.symbols4
-rw-r--r--debian/patches/001-fix-uninitialized-variables.patch51
-rw-r--r--debian/patches/series1
8 files changed, 39 insertions, 54 deletions
diff --git a/debian/changelog b/debian/changelog
index 3df6469..f403a2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libheif (1.2.0-1) unstable; urgency=medium
+
+ [ Ondřej Nový ]
+ * d/copyright: Use https protocol in Format field
+
+ [ Joachim Bauch ]
+ * Imported Upstream version 1.2.0
+ * Remove patch now in upstream.
+ * Update symbols for new upstream version.
+ * Add new package "heif-thumbnailer".
+
+ -- Joachim Bauch <bauch@struktur.de> Mon, 28 May 2018 16:12:56 +0200
+
libheif (1.1.0-2~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 0715ac2..4500a96 100644
--- a/debian/control
+++ b/debian/control
@@ -62,3 +62,18 @@ Description: ISO/IEC 23008-12:2017 HEIF file format decoder - examples
ratios currently possible.
.
Sample applications using libheif are provided by this package.
+
+Package: heif-thumbnailer
+Section: graphics
+Architecture: any
+Depends:
+ libheif1 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: ISO/IEC 23008-12:2017 HEIF file format decoder - thumbnailer
+ libheif is an ISO/IEC 23008-12:2017 HEIF file format decoder. HEIF is a new
+ image file format employing HEVC (h.265) image coding for the best compression
+ ratios currently possible.
+ .
+ A thumbnailer for HEIF images that can be used by Nautilus is provided by this
+ package.
diff --git a/debian/copyright b/debian/copyright
index cd17eb1..9305ff9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: libheif
Upstream-Contact: struktur AG <opensource@struktur.de>
Source: https://github.com/strukturag/libheif
diff --git a/debian/heif-thumbnailer.install b/debian/heif-thumbnailer.install
new file mode 100644
index 0000000..6403224
--- /dev/null
+++ b/debian/heif-thumbnailer.install
@@ -0,0 +1,3 @@
+usr/bin/heif-thumbnailer
+usr/share/mime/packages/*
+usr/share/thumbnailers/*
diff --git a/debian/libheif-examples.install b/debian/libheif-examples.install
index 1df36c6..b3d69b7 100644
--- a/debian/libheif-examples.install
+++ b/debian/libheif-examples.install
@@ -1 +1,3 @@
-usr/bin/*
+usr/bin/heif-convert
+usr/bin/heif-enc
+usr/bin/heif-info
diff --git a/debian/libheif1.symbols b/debian/libheif1.symbols
index 2ab5d40..d08d3b3 100644
--- a/debian/libheif1.symbols
+++ b/debian/libheif1.symbols
@@ -37,6 +37,8 @@ libheif.so.1 libheif1 #MINVER#
heif_encoder_list_parameters@Base 1.1.0
heif_encoder_parameter_get_name@Base 1.1.0
heif_encoder_parameter_get_type@Base 1.1.0
+ heif_encoder_parameter_get_valid_integer_range@Base 1.2.0
+ heif_encoder_parameter_get_valid_string_values@Base 1.2.0
heif_encoder_parameter_integer_valid_range@Base 1.1.0
heif_encoder_parameter_string_valid_values@Base 1.1.0
heif_encoder_release@Base 1.1.0
@@ -68,6 +70,7 @@ libheif.so.1 libheif1 #MINVER#
heif_image_handle_get_list_of_metadata_block_IDs@Base 1.0.0
heif_image_handle_get_list_of_thumbnail_IDs@Base 1.0.0
heif_image_handle_get_metadata@Base 1.0.0
+ heif_image_handle_get_metadata_content_type@Base 1.2.0
heif_image_handle_get_metadata_size@Base 1.0.0
heif_image_handle_get_metadata_type@Base 1.0.0
heif_image_handle_get_number_of_depth_images@Base 1.0.0
@@ -79,6 +82,7 @@ libheif.so.1 libheif1 #MINVER#
heif_image_handle_has_depth_image@Base 1.0.0
heif_image_handle_is_primary_image@Base 1.0.0
heif_image_handle_release@Base 1.0.0
+ heif_image_has_channel@Base 1.2.0
heif_image_release@Base 1.0.0
heif_image_scale_image@Base 1.0.0
heif_register_decoder@Base 1.0.0
diff --git a/debian/patches/001-fix-uninitialized-variables.patch b/debian/patches/001-fix-uninitialized-variables.patch
deleted file mode 100644
index a02e5c8..0000000
--- a/debian/patches/001-fix-uninitialized-variables.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 019593b556d254a47c4d3e80a10e0a5755b01138 Mon Sep 17 00:00:00 2001
-From: Dirk Farin <farin@struktur.de>
-Date: Thu, 19 Apr 2018 08:48:44 +0200
-Subject: [PATCH] fix uninitialized variable compiler warning and remove debug
- output
-
----
- src/heif_context.cc | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/src/heif_context.cc b/src/heif_context.cc
-index 13a1807..20c155d 100644
---- a/src/heif_context.cc
-+++ b/src/heif_context.cc
-@@ -1302,7 +1302,7 @@ void HeifContext::Image::set_preencoded_hevc_image(const std::vector<uint8_t>& d
- bool first=true;
- bool eof=false;
-
-- int prev_start_code_start;
-+ int prev_start_code_start = -1; // init to an invalid value, will always be overwritten before use
- int start_code_start;
- int ptr = 0;
-
-@@ -1335,9 +1335,7 @@ void HeifContext::Image::set_preencoded_hevc_image(const std::vector<uint8_t>& d
- //printf("-> state= %d\n",state);
-
- if (ptr == (int)data.size()) {
-- printf("to end of file\n");
- start_code_start = (int)data.size();
-- printf("end of file pos: %04x\n",(uint32_t)start_code_start);
- dump_nal = true;
- eof = true;
- }
-@@ -1350,16 +1348,11 @@ void HeifContext::Image::set_preencoded_hevc_image(const std::vector<uint8_t>& d
- std::vector<uint8_t> nal_data;
- size_t length = start_code_start - (prev_start_code_start+3);
-
-- printf("found start code at position: %08x (prev: %08x)\n",
-- (uint32_t)start_code_start,
-- (uint32_t)prev_start_code_start);
--
- nal_data.resize(length);
-
-+ assert(prev_start_code_start>=0);
- memcpy(nal_data.data(), data.data() + prev_start_code_start+3, length);
-
-- printf("read nal %02x with length %08x\n",nal_data[0], (uint32_t)length);
--
- int nal_type = (nal_data[0]>>1);
-
- switch (nal_type) {
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index bfba9ad..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-001-fix-uninitialized-variables.patch