Gentoo Archives: gentoo-commits

From: "Joerg Bornkessel (hd_brummy)" <hd_brummy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-plugins/vdr-audiorecorder/files: vdr-audiorecorder-0.1.0_pre14_ffmpeg.diff vdr-audiorecorder-0.1.0_pre14_obsolete-i18n.diff
Date: Sun, 01 Jul 2012 11:33:25
Message-Id: 20120701113315.A15DD2004B@flycatcher.gentoo.org
1 hd_brummy 12/07/01 11:33:15
2
3 Added: vdr-audiorecorder-0.1.0_pre14_ffmpeg.diff
4 vdr-audiorecorder-0.1.0_pre14_obsolete-i18n.diff
5 Log:
6 fixed ffmpeg compile, bug 423671; vdr-plugin-2.eclass
7
8 (Portage version: 2.1.10.11/cvs/Linux i686)
9
10 Revision Changes Path
11 1.1 media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14_ffmpeg.diff
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14_ffmpeg.diff?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14_ffmpeg.diff?rev=1.1&content-type=text/plain
15
16 Index: vdr-audiorecorder-0.1.0_pre14_ffmpeg.diff
17 ===================================================================
18 https://bugs.gentoo.org/show_bug.cgi?id=423671
19 fixed compile newer ffmepg
20
21 signed-of-by: Joerg Bornkessel <hd_brummy@g.o> (2012/07/01)
22 diff -Naur audiorecorder-0.1.0-pre14.orig/convert.c audiorecorder-0.1.0-pre14/convert.c
23 --- audiorecorder-0.1.0-pre14.orig/convert.c 2012-07-01 11:38:56.000000000 +0200
24 +++ audiorecorder-0.1.0-pre14/convert.c 2012-07-01 11:41:12.000000000 +0200
25 @@ -111,9 +111,13 @@
26 avcodec_decode_audio(decoder_ctx, (short *)decoder_buf.data,
27 &decoder_buf.length, mpa_frame->data, mpa_frame->length);
28 #else
29 + AVPacket avpkt;
30 + av_init_packet(&avpkt);
31 + avpkt.data = mpa_frame->data;
32 + avpkt.size = mpa_frame->length;
33 decoder_buf.length = AVCODEC_MAX_AUDIO_FRAME_SIZE;
34 - avcodec_decode_audio2(decoder_ctx, (short *)decoder_buf.data,
35 - &decoder_buf.length, mpa_frame->data, mpa_frame->length);
36 + int len = avcodec_decode_audio3(decoder_ctx, (short *)decoder_buf.data,
37 + &decoder_buf.length, &avpkt);
38 #endif
39 }
40
41
42
43
44 1.1 media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14_obsolete-i18n.diff
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14_obsolete-i18n.diff?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14_obsolete-i18n.diff?rev=1.1&content-type=text/plain
48
49 Index: vdr-audiorecorder-0.1.0_pre14_obsolete-i18n.diff
50 ===================================================================
51 fixed for obsolet i18n handling, up from vdr-1.7.27
52 vdr-plugin-2.eclass will not help in this case
53
54 signed-of-by: Joerg Bornkessel <hd_brummy@g.o> (2012/07/01)
55
56 diff -Naur audiorecorder-0.1.0-pre14.orig/audiorecorder_i18n.h audiorecorder-0.1.0-pre14/audiorecorder_i18n.h
57 --- audiorecorder-0.1.0-pre14.orig/audiorecorder_i18n.h 2012-07-01 12:49:17.000000000 +0200
58 +++ audiorecorder-0.1.0-pre14/audiorecorder_i18n.h 2012-07-01 12:49:59.000000000 +0200
59 @@ -11,6 +11,6 @@
60
61 #include <vdr/i18n.h>
62
63 -extern const tI18nPhrase Phrases[];
64 +//extern const tI18nPhrase Phrases[];
65
66 #endif //__I18N__H
67 diff -Naur audiorecorder-0.1.0-pre14.orig/Makefile audiorecorder-0.1.0-pre14/Makefile
68 --- audiorecorder-0.1.0-pre14.orig/Makefile 2012-07-01 12:49:17.000000000 +0200
69 +++ audiorecorder-0.1.0-pre14/Makefile 2012-07-01 12:49:44.000000000 +0200
70 @@ -70,7 +70,7 @@
71
72 ### The object files (add further files here):
73
74 -OBJS = $(PLUGIN).o mainmenu.o browse.o browse-item.o column.o dispatcher.o audioreceiver.o postdata.o trackinfo.o postproc.o rds.o convert.o cache.o xml-cache.o xml-base.o setup.o mpa-frame.o audiorecorder_
75 +OBJS = $(PLUGIN).o mainmenu.o browse.o browse-item.o column.o dispatcher.o audioreceiver.o postdata.o trackinfo.o postproc.o rds.o convert.o cache.o xml-cache.o xml-base.o setup.o mpa-frame.o
76
77 ### Implicit rules: