Bug#771660: unblock: rygel/0.24.2-1
Control: tags -1 - moreinfo
Hello Ivo De Decker!
On Sat, Dec 06, 2014 at 06:25:33PM +0100, Ivo De Decker wrote:
[...]
> Please go ahead and upload the package. Once that's done, remove the moreinfo
> tag and provide a filtered diff (with an explanation of what was filtered and
> why).
Thanks. Uploaded. Please unblock.
Filtered debdiff, excluding all generated files, generated by:
debdiff /var/cache/pbuilder/result/rygel_0.24.[12]-1.dsc | filterdiff -i '*.vala' -i '*/NEWS'
--- rygel-0.24.1/NEWS 2014-10-13 21:11:08.000000000 +0200
+++ rygel-0.24.2/NEWS 2014-11-10 20:33:25.000000000 +0100
@@ -1,3 +1,18 @@
+0.24.2
+======
+
+A maintenance release of Rygel!
+
+Server:
+ - Fix sidecar album art extraction.
+
+Media-Export:
+ - Work-around an issue with GStreamer bindings that caused truncated embedded
+ album art.
+
+All contributors to this release:
+ - Jens Georg <mail@jensge.org>
+
0.24.1
======
--- rygel-0.24.1/src/librygel-server/rygel-media-art-store.vala 2014-10-12 13:23:28.000000000 +0200
+++ rygel-0.24.2/src/librygel-server/rygel-media-art-store.vala 2014-11-10 20:23:18.000000000 +0100
@@ -113,8 +113,22 @@
}
try {
- media_art_process.buffer (MediaArt.Type.ALBUM, MediaArt.ProcessFlags.NONE, file,
- data, item.mime_type, item.artist, item.album);
+ if (data != null) {
+ string? mime = null;
+ this.media_art_process.buffer (MediaArt.Type.ALBUM,
+ MediaArt.ProcessFlags.NONE,
+ file,
+ data,
+ mime,
+ item.artist,
+ item.album);
+ } else {
+ this.media_art_process.file (MediaArt.Type.ALBUM,
+ MediaArt.ProcessFlags.NONE,
+ file,
+ item.artist,
+ item.album);
+ }
} catch (Error error) {
warning ("%s", error.message);
}
--- rygel-0.24.1/src/plugins/media-export/rygel-media-export-item-factory.vala 2014-10-12 13:23:29.000000000 +0200
+++ rygel-0.24.2/src/plugins/media-export/rygel-media-export-item-factory.vala 2014-11-10 20:24:41.000000000 +0100
@@ -294,7 +294,12 @@
case Tag.ImageType.FRONT_COVER:
Gst.MapInfo map_info;
sample.get_buffer ().map (out map_info, Gst.MapFlags.READ);
- store.add (item, file, map_info.data);
+
+ // Work-around bgo#739915
+ weak uint8[] data = map_info.data;
+ data.length = (int) map_info.size;
+
+ store.add (item, file, data);
sample.get_buffer ().unmap (map_info);
break;
default:
Reply to: