Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/tagpy/files: tagpy-0.94.8-taglib-1.8_compat.patch
Date: Wed, 26 Dec 2012 11:48:11
Message-Id: 20121226114801.0E24720081@flycatcher.gentoo.org
1 polynomial-c 12/12/26 11:48:01
2
3 Added: tagpy-0.94.8-taglib-1.8_compat.patch
4 Log:
5 Fixed compilation with ~media-libs/taglib-1.8 (bug #440740)
6
7 (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
8
9 Revision Changes Path
10 1.1 dev-python/tagpy/files/tagpy-0.94.8-taglib-1.8_compat.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/tagpy/files/tagpy-0.94.8-taglib-1.8_compat.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/tagpy/files/tagpy-0.94.8-taglib-1.8_compat.patch?rev=1.1&content-type=text/plain
14
15 Index: tagpy-0.94.8-taglib-1.8_compat.patch
16 ===================================================================
17 https://github.com/inducer/tagpy/commit/d0759c0ec7d24ae8d1af395a1032521eb00b4d1f
18 https://github.com/inducer/tagpy/commit/813ec4f03bb4411c7ffd15dcb3974da04a3f109c
19
20 --- tagpy-0.94.8/src/wrapper/id3.cpp
21 +++ tagpy-0.94.8/src/wrapper/id3.cpp
22 @@ -79,6 +79,10 @@
23 MF_OL(setVolumeAdjustment, 1, 2);
24 MF_OL(setPeakVolume, 1, 2);
25
26 + #if (TAGPY_TAGLIB_HEX_VERSION >= 0x10800)
27 + MF_OL(render, 0, 1)
28 + #endif
29 +
30 // -------------------------------------------------------------
31 // MPEG
32 // -------------------------------------------------------------
33 @@ -212,7 +216,11 @@
34 .DEF_SIMPLE_METHOD(removeFrame)
35 .DEF_SIMPLE_METHOD(removeFrames)
36
37 - .DEF_SIMPLE_METHOD(render)
38 + #if (TAGPY_TAGLIB_HEX_VERSION >= 0x10800)
39 + .DEF_OVERLOADED_METHOD(render, ByteVector (cl::*)(int) const)
40 + #else
41 + .DEF_SIMPLE_METHOD(render)
42 + #endif
43 ;
44 }