[SCM] libgroove/ubuntu: add patch for new changes

[andrewrk-guest at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 3b0eb5b708d906e797adb1ce503f5549754c6c4c
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Wed Mar 12 11:38:47 2014 -0700

    add patch for new changes

diff --git a/debian/patches/ppa-test-new-changes.patch b/debian/patches/ppa-test-new-changes.patch
new file mode 100644
index 0000000..3fee1e0
--- /dev/null
+++ b/debian/patches/ppa-test-new-changes.patch
@@ -0,0 +1,86 @@
+Description: testing new changes in Ubuntu PPA
+ .
+ libgroove (3.0.6+dfsg-1ubuntu2) saucy; urgency=low
+ .
+Author: Andrew Kelley <superjoe30 at gmail.com>
+Origin: upstream, https://github.com/andrewrk/libgroove/commit/c22d8d3bb2952beda9c3991978eaf1a5dfe37cad
+
+--- libgroove-3.0.6+dfsg.orig/README.md
++++ libgroove-3.0.6+dfsg/README.md
+@@ -57,6 +57,7 @@ so that you can still compile if they ca
+    sudo apt-get update
+    sudo apt-get install libgroove-dev libgrooveplayer-dev libgrooveloudness-dev
+    ```
++ * [Debian experimental](http://serverfault.com/questions/22414)
+ 
+ ### From Source
+ 
+--- libgroove-3.0.6+dfsg.orig/grooveloudness/loudness.c
++++ libgroove-3.0.6+dfsg/grooveloudness/loudness.c
+@@ -61,9 +61,9 @@ static int emit_track_info(struct Groove
+ 
+     ebur128_state *cur_track_state = d->all_track_states[d->cur_track_index];
+     ebur128_loudness_global(cur_track_state, &info->loudness);
+-    ebur128_sample_peak(cur_track_state, 0, &info->peak);
++    ebur128_true_peak(cur_track_state, 0, &info->peak);
+     double out;
+-    ebur128_sample_peak(cur_track_state, 1, &out);
++    ebur128_true_peak(cur_track_state, 1, &out);
+     if (out > info->peak) info->peak = out;
+     if (info->peak > d->album_peak) d->album_peak = info->peak;
+ 
+@@ -165,7 +165,7 @@ static void *detect_thread(void *arg) {
+                 }
+             }
+             d->all_track_states[d->cur_track_index] = ebur128_init(2, 44100,
+-                    EBUR128_MODE_SAMPLE_PEAK|EBUR128_MODE_I);
++                    EBUR128_MODE_TRUE_PEAK|EBUR128_MODE_I);
+             if (!d->all_track_states[d->cur_track_index]) {
+                 av_log(NULL, AV_LOG_ERROR, "unable to allocate EBU R128 track context\n");
+             }
+--- libgroove-3.0.6+dfsg.orig/groove/file.c
++++ libgroove-3.0.6+dfsg/groove/file.c
+@@ -94,10 +94,7 @@ struct GrooveFile *groove_file_open(char
+     }
+ 
+     // copy the audio stream metadata to the context metadata
+-    AVDictionaryEntry *tag = NULL;
+-    while((tag = av_dict_get(f->audio_st->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) {
+-        av_dict_set(&f->ic->metadata, tag->key, tag->value, AV_DICT_IGNORE_SUFFIX);
+-    }
++    av_dict_copy(&f->ic->metadata, f->audio_st->metadata, 0);
+ 
+     return file;
+ }
+@@ -159,7 +156,9 @@ struct GrooveTag *groove_file_metadata_g
+ {
+     struct GrooveFilePrivate *f = (struct GrooveFilePrivate *) file;
+     const AVDictionaryEntry *e = (const AVDictionaryEntry *) prev;
+-    return (struct GrooveTag *) av_dict_get(f->ic->metadata, key, e, flags|AV_DICT_IGNORE_SUFFIX);
++    if (key && key[0] == 0)
++        flags |= AV_DICT_IGNORE_SUFFIX;
++    return (struct GrooveTag *) av_dict_get(f->ic->metadata, key, e, flags);
+ }
+ 
+ int groove_file_metadata_set(struct GrooveFile *file, const char *key,
+@@ -167,7 +166,7 @@ int groove_file_metadata_set(struct Groo
+ {
+     file->dirty = 1;
+     struct GrooveFilePrivate *f = (struct GrooveFilePrivate *) file;
+-    return av_dict_set(&f->ic->metadata, key, value, flags|AV_DICT_IGNORE_SUFFIX);
++    return av_dict_set(&f->ic->metadata, key, value, flags);
+ }
+ 
+ const char *groove_tag_key(struct GrooveTag *tag) {
+@@ -333,10 +332,7 @@ int groove_file_save(struct GrooveFile *
+     }
+ 
+     // set metadata
+-    AVDictionaryEntry *tag = NULL;
+-    while((tag = av_dict_get(f->ic->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) {
+-        av_dict_set(&f->oc->metadata, tag->key, tag->value, AV_DICT_IGNORE_SUFFIX);
+-    }
++    av_dict_copy(&f->oc->metadata, f->ic->metadata, 0);
+ 
+     if (avformat_write_header(f->oc, NULL) < 0) {
+         cleanup_save(file);
diff --git a/debian/patches/series b/debian/patches/series
index 998c072..9fa1b1c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-cmake-build-warnings.patch
+ppa-test-new-changes.patch

-- 
libgroove packaging