[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#771660: marked as done (unblock: rygel/0.24.2-1 (pre-approval))

Your message dated Sat, 6 Dec 2014 20:12:48 +0100
with message-id <20141206191247.GA22319@ugent.be>
and subject line Re: Bug#771660: unblock: rygel/0.24.2-1
has caused the Debian Bug report #771660,
regarding unblock: rygel/0.24.2-1 (pre-approval)
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
771660: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771660
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock


Hello Release-Team!

I'd like to update rygel to 0.24.2. This release has
two bugfixes.

https://git.gnome.org/browse/rygel/commit/?h=rygel-0-24&id=e34b0a8af3355512b31af3456da1a79c4d8c69d4
https://git.gnome.org/browse/rygel/commit/?h=rygel-0-24&id=b307ee367b4e388e1b197bcb0d7d82cd0de4f697
https://git.gnome.org/browse/rygel/commit/?h=rygel-0-24&id=82c43b7c5608d79ed815b9d1f3c4f49598bcedcd

The full upstream vcs diff is attached. (This will also result in generated
files being updated, which I assume release-team doesn't want to look at.)

If approving, please eventually unblock package rygel

unblock rygel/0.24.2-1

-- System Information:
Debian Release: jessie/sid
  APT prefers testing-updates
  APT policy: (500, 'testing-updates'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_DK.UTF-8, LC_CTYPE=en_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash


diff --git a/NEWS b/NEWS
index e5ec374..18661c8 100644
--- a/NEWS
+++ b/NEWS
@@ -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
 ======
 
diff --git a/src/librygel-server/rygel-media-art-store.vala b/src/librygel-server/rygel-media-art-store.vala
index 5d939f1..6b5281b 100644
--- a/src/librygel-server/rygel-media-art-store.vala
+++ b/src/librygel-server/rygel-media-art-store.vala
@@ -113,8 +113,22 @@ public class Rygel.MediaArtStore : GLib.Object {
         }
 
         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);
         }
diff --git a/src/plugins/media-export/rygel-media-export-item-factory.vala b/src/plugins/media-export/rygel-media-export-item-factory.vala
index ae71f40..cbd0f35 100644
--- a/src/plugins/media-export/rygel-media-export-item-factory.vala
+++ b/src/plugins/media-export/rygel-media-export-item-factory.vala
@@ -294,7 +294,12 @@ namespace Rygel.MediaExport.ItemFactory {
             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:

--- End Message ---
--- Begin Message --- 
Hi,

On Sat, Dec 06, 2014 at 07:20:05PM +0100, Andreas Henriksson wrote:
> Thanks. Uploaded. Please unblock.

Unblocked.

Cheers,

Ivo

--- End Message ---
Reply to: