Merge lp:~vanvugt/ubuntu/oneiric/mediatomb/fix-770964-784431 into lp:ubuntu/oneiric/mediatomb

Proposed by Daniel van Vugt on 2011-05-25
Status: Merged
Merged at revision: 18
Proposed branch: lp:~vanvugt/ubuntu/oneiric/mediatomb/fix-770964-784431
Merge into: lp:ubuntu/oneiric/mediatomb
Diff against target: 93 lines (+76/-0)
3 files modified
debian/patches/libav_0.7_support.patch (+64/-0)
debian/patches/mediatomb-0.12.1-gcc46.patch (+10/-0)
debian/patches/series (+2/-0)
To merge this branch: bzr merge lp:~vanvugt/ubuntu/oneiric/mediatomb/fix-770964-784431
Reviewer Review Type Date Requested Status
Luke Yelavich Approve on 2011-06-03
Ubuntu branches 2011-05-25 Pending
Review via email: mp+62261@code.launchpad.net

Description of the Change

Fix all problems causing mediatomb builds to fail on oneiric:
* Fix gcc-4.6 build failures (missing header) (LP: #770964)
* Fix libav-0.7 build failures (mediatomb using deprecated API) (LP: #784431).

To post a comment you must log in.
Luke Yelavich (themuso) wrote :

Thanks for your work. The change from this branch, along with your other branch all build fine here, so I am going to go ahead and upload your work.

Thanks again.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/patches/libav_0.7_support.patch'
2--- debian/patches/libav_0.7_support.patch 1970-01-01 00:00:00 +0000
3+++ debian/patches/libav_0.7_support.patch 2011-05-25 09:27:27 +0000
4@@ -0,0 +1,64 @@
5+=== modified file 'src/metadata/ffmpeg_handler.cc'
6+--- old/src/metadata/ffmpeg_handler.cc 2010-08-25 17:07:03 +0000
7++++ new/src/metadata/ffmpeg_handler.cc 2011-05-19 04:33:32 +0000
8+@@ -89,6 +89,33 @@
9+
10+ Ref<StringConverter> sc = StringConverter::m2i();
11+
12++ /* Tabs are 4 characters here */
13++ typedef struct {const char *avname; metadata_fields_t field;} mapping_t;
14++ static const mapping_t mapping[] =
15++ {
16++ {"title", M_TITLE},
17++ {"artist", M_ARTIST},
18++ {"album", M_ALBUM},
19++ {"date", M_DATE},
20++ {"genre", M_GENRE},
21++ {"comment", M_DESCRIPTION},
22++ {"track", M_TRACKNUMBER},
23++ {NULL, M_MAX},
24++ };
25++
26++ if (!pFormatCtx->metadata)
27++ return;
28++ for (const mapping_t *m = mapping; m->avname != NULL; m++)
29++ {
30++ AVMetadataTag *tag = NULL;
31++ tag = av_metadata_get(pFormatCtx->metadata, m->avname, NULL, 0);
32++ if (tag && tag->value && tag->value[0])
33++ {
34++ log_debug("Added metadata %s: %s\n", m->avname, tag->value);
35++ item->setMetadata(MT_KEYS[m->field].upnp, sc->convert(tag->value));
36++ }
37++ }
38++ /* Old algorithm (doesn't work with libav >= 0.7)
39+ if (strlen(pFormatCtx->title) > 0)
40+ {
41+ log_debug("Added metadata title: %s\n", pFormatCtx->title);
42+@@ -131,6 +158,7 @@
43+ item->setMetadata(MT_KEYS[M_TRACKNUMBER].upnp,
44+ sc->convert(String::from(pFormatCtx->track)));
45+ }
46++ */
47+ }
48+
49+ // ffmpeg library calls
50+@@ -178,7 +206,7 @@
51+ for(i=0; i<pFormatCtx->nb_streams; i++)
52+ {
53+ AVStream *st = pFormatCtx->streams[i];
54+- if((st != NULL) && (videoset == false) && (st->codec->codec_type == CODEC_TYPE_VIDEO))
55++ if((st != NULL) && (videoset == false) && (st->codec->codec_type == AVMEDIA_TYPE_VIDEO))
56+ {
57+ if (st->codec->codec_tag > 0)
58+ {
59+@@ -209,7 +237,7 @@
60+ *y = st->codec->height;
61+ }
62+ }
63+- if(st->codec->codec_type == CODEC_TYPE_AUDIO)
64++ if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
65+ {
66+ // Increase number of audiochannels
67+ audioch++;
68+
69
70=== added file 'debian/patches/mediatomb-0.12.1-gcc46.patch'
71--- debian/patches/mediatomb-0.12.1-gcc46.patch 1970-01-01 00:00:00 +0000
72+++ debian/patches/mediatomb-0.12.1-gcc46.patch 2011-05-25 09:27:27 +0000
73@@ -0,0 +1,10 @@
74+--- a/src/zmm/object.h
75++++ b/src/zmm/object.h
76+@@ -33,6 +33,7 @@
77+ #define __ZMM_OBJECT_H__
78+
79+ #include <new> // for size_t
80++#include <cstddef>
81+ #include "atomic.h"
82+
83+ namespace zmm
84
85=== modified file 'debian/patches/series'
86--- debian/patches/series 2010-08-25 17:07:03 +0000
87+++ debian/patches/series 2011-05-25 09:27:27 +0000
88@@ -1,3 +1,5 @@
89 debug-mode-fix.patch
90 config_xml_comment.patch
91 const_char_conversion.patch
92+mediatomb-0.12.1-gcc46.patch
93+libav_0.7_support.patch

Subscribers

People subscribed via source and target branches