Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Ben de Groot (yngwin)" <yngwin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/mpeg4ip/files: mpeg4ip-1.5.0.1-avcodec_extern_c-2.patch mpeg4ip-1.5.0.1-ffmpeg-headers.patch
Date: Sat, 21 Jun 2008 21:24:42
Message-Id: E1KAAZY-00043J-Md@stork.gentoo.org
1 yngwin 08/06/21 21:24:36
2
3 Added: mpeg4ip-1.5.0.1-avcodec_extern_c-2.patch
4 mpeg4ip-1.5.0.1-ffmpeg-headers.patch
5 Log:
6 Add patches to make mpeg4ip compile with new ffmpeg headers location, thanks to Andrew Church in bug 218105.
7 (Portage version: 2.2_rc1/cvs/Linux 2.6.25-hh5 i686)
8
9 Revision Changes Path
10 1.1 media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-avcodec_extern_c-2.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-avcodec_extern_c-2.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-avcodec_extern_c-2.patch?rev=1.1&content-type=text/plain
14
15 Index: mpeg4ip-1.5.0.1-avcodec_extern_c-2.patch
16 ===================================================================
17 --- mpeg4ip-1.5.0.1/player/plugin/audio/ffmpeg/ffmpeg.h.unpatched 2008-06-21 14:21:58.000000000 +0900
18 +++ mpeg4ip-1.5.0.1/player/plugin/audio/ffmpeg/ffmpeg.h 2008-06-21 14:23:16.000000000 +0900
19 @@ -25,9 +25,13 @@
20 #define __MPEG4IP_FFMPEG_H__ 1
21 #include "codec_plugin.h"
22 #ifdef HAVE_FFMPEG_INSTALLED
23 +extern "C" {
24 #include <libavcodec/avcodec.h>
25 +}
26 #else
27 +extern "C" {
28 #include <avcodec.h>
29 +}
30 #endif
31
32 DECLARE_CONFIG(CONFIG_USE_FFMPEG_AUDIO);
33 --- mpeg4ip-1.5.0.1/player/plugin/video/ffmpeg/ffmpeg.h.unpatched 2008-06-21 14:21:58.000000000 +0900
34 +++ mpeg4ip-1.5.0.1/player/plugin/video/ffmpeg/ffmpeg.h 2008-06-21 14:23:26.000000000 +0900
35 @@ -25,9 +25,13 @@
36 #define __MPEG4IP_FFMPEG_H__ 1
37 #include "codec_plugin.h"
38 #ifdef HAVE_FFMPEG_INSTALLED
39 +extern "C" {
40 #include <libavcodec/avcodec.h>
41 +}
42 #else
43 +extern "C" {
44 #include <avcodec.h>
45 +}
46 #endif
47 #include <mp4av.h>
48
49 --- mpeg4ip-1.5.0.1/server/mp4live/audio_ffmpeg.h.unpatched 2007-11-24 09:07:06.000000000 +0100
50 +++ mpeg4ip-1.5.0.1/server/mp4live/audio_ffmpeg.h 2007-11-24 09:11:03.000000000 +0100
51 @@ -24,9 +24,13 @@
52
53 #include "audio_encoder.h"
54 #ifdef HAVE_FFMPEG_INSTALLED
55 +extern "C" {
56 #include <libavcodec/avcodec.h>
57 +}
58 #else
59 +extern "C" {
60 #include <avcodec.h>
61 +}
62 #endif
63 #include <sdp.h>
64
65 --- mpeg4ip-1.5.0.1/server/mp4live/video_ffmpeg.h.unpatched 2007-11-24 09:09:04.000000000 +0100
66 +++ mpeg4ip-1.5.0.1/server/mp4live/video_ffmpeg.h 2007-11-24 09:10:18.000000000 +0100
67 @@ -24,9 +24,13 @@
68
69 #include "video_encoder.h"
70 #ifdef HAVE_FFMPEG_INSTALLED
71 +extern "C" {
72 #include <libavcodec/avcodec.h>
73 +}
74 #else
75 +extern "C" {
76 #include <avcodec.h>
77 +}
78 #endif
79
80 class CFfmpegVideoEncoder : public CVideoEncoder {
81 --- mpeg4ip-1.5.0.1/server/mp4live/video_encoder_class.cpp.unpatched 2007-11-24 09:11:51.000000000 +0100
82 +++ mpeg4ip-1.5.0.1/server/mp4live/video_encoder_class.cpp 2007-11-24 09:12:17.000000000 +0100
83 @@ -26,9 +26,13 @@
84 #include "video_util_filter.h"
85 #ifdef HAVE_FFMPEG
86 #ifdef HAVE_FFMPEG_INSTALLED
87 +extern "C" {
88 #include <libavcodec/avcodec.h>
89 +}
90 #else
91 +extern "C" {
92 #include <avcodec.h>
93 +}
94 #endif
95 #endif
96
97
98
99
100 1.1 media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-ffmpeg-headers.patch
101
102 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-ffmpeg-headers.patch?rev=1.1&view=markup
103 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-ffmpeg-headers.patch?rev=1.1&content-type=text/plain
104
105 Index: mpeg4ip-1.5.0.1-ffmpeg-headers.patch
106 ===================================================================
107 diff -urN mpeg4ip-1.5.0.1-orig/configure.in mpeg4ip-1.5.0.1/configure.in
108 --- mpeg4ip-1.5.0.1-orig/configure.in 2006-06-09 04:15:16.000000000 +0900
109 +++ mpeg4ip-1.5.0.1/configure.in 2008-06-21 13:44:38.000000000 +0900
110 @@ -495,8 +495,8 @@
111 AC_DEFINE(HAVE_FFMPEG_INSTALLED, 1, [defined if ffmpeg is installed])
112 FFMPEG_INC=
113 FFMPEG_LIB="-lavcodec -lz $ffmpeg_add_libs"
114 - AC_CHECK_TYPES([AVRational], , , [#include <ffmpeg/avcodec.h>])
115 - AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include <ffmpeg/avcodec.h>])
116 + AC_CHECK_TYPES([AVRational], , , [#include <libavcodec/avcodec.h>])
117 + AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include <libavcodec/avcodec.h>])
118 AC_DEFINE(HAVE_FFMPEG, 1, [enable ffmpeg for mp4live])
119 fi
120 fi
121 diff -urN mpeg4ip-1.5.0.1-orig/player/plugin/audio/ffmpeg/ffmpeg.h mpeg4ip-1.5.0.1/player/plugin/audio/ffmpeg/ffmpeg.h
122 --- mpeg4ip-1.5.0.1-orig/player/plugin/audio/ffmpeg/ffmpeg.h 2004-10-12 06:26:46.000000000 +0900
123 +++ mpeg4ip-1.5.0.1/player/plugin/audio/ffmpeg/ffmpeg.h 2008-06-21 13:45:35.000000000 +0900
124 @@ -25,7 +25,7 @@
125 #define __MPEG4IP_FFMPEG_H__ 1
126 #include "codec_plugin.h"
127 #ifdef HAVE_FFMPEG_INSTALLED
128 -#include <ffmpeg/avcodec.h>
129 +#include <libavcodec/avcodec.h>
130 #else
131 #include <avcodec.h>
132 #endif
133 diff -urN mpeg4ip-1.5.0.1-orig/player/plugin/video/ffmpeg/ffmpeg.h mpeg4ip-1.5.0.1/player/plugin/video/ffmpeg/ffmpeg.h
134 --- mpeg4ip-1.5.0.1-orig/player/plugin/video/ffmpeg/ffmpeg.h 2005-04-06 03:04:46.000000000 +0900
135 +++ mpeg4ip-1.5.0.1/player/plugin/video/ffmpeg/ffmpeg.h 2008-06-21 13:47:48.000000000 +0900
136 @@ -25,7 +25,7 @@
137 #define __MPEG4IP_FFMPEG_H__ 1
138 #include "codec_plugin.h"
139 #ifdef HAVE_FFMPEG_INSTALLED
140 -#include <ffmpeg/avcodec.h>
141 +#include <libavcodec/avcodec.h>
142 #else
143 #include <avcodec.h>
144 #endif
145 diff -urN mpeg4ip-1.5.0.1-orig/server/mp4live/audio_ffmpeg.h mpeg4ip-1.5.0.1/server/mp4live/audio_ffmpeg.h
146 --- mpeg4ip-1.5.0.1-orig/server/mp4live/audio_ffmpeg.h 2005-09-15 08:15:42.000000000 +0900
147 +++ mpeg4ip-1.5.0.1/server/mp4live/audio_ffmpeg.h 2008-06-21 13:48:21.000000000 +0900
148 @@ -24,7 +24,7 @@
149
150 #include "audio_encoder.h"
151 #ifdef HAVE_FFMPEG_INSTALLED
152 -#include <ffmpeg/avcodec.h>
153 +#include <libavcodec/avcodec.h>
154 #else
155 #include <avcodec.h>
156 #endif
157 diff -urN mpeg4ip-1.5.0.1-orig/server/mp4live/video_encoder_class.cpp mpeg4ip-1.5.0.1/server/mp4live/video_encoder_class.cpp
158 --- mpeg4ip-1.5.0.1-orig/server/mp4live/video_encoder_class.cpp 2006-03-11 06:40:57.000000000 +0900
159 +++ mpeg4ip-1.5.0.1/server/mp4live/video_encoder_class.cpp 2008-06-21 13:48:31.000000000 +0900
160 @@ -26,7 +26,7 @@
161 #include "video_util_filter.h"
162 #ifdef HAVE_FFMPEG
163 #ifdef HAVE_FFMPEG_INSTALLED
164 -#include <ffmpeg/avcodec.h>
165 +#include <libavcodec/avcodec.h>
166 #else
167 #include <avcodec.h>
168 #endif
169 diff -urN mpeg4ip-1.5.0.1-orig/server/mp4live/video_ffmpeg.h mpeg4ip-1.5.0.1/server/mp4live/video_ffmpeg.h
170 --- mpeg4ip-1.5.0.1-orig/server/mp4live/video_ffmpeg.h 2005-09-09 02:40:36.000000000 +0900
171 +++ mpeg4ip-1.5.0.1/server/mp4live/video_ffmpeg.h 2008-06-21 13:48:13.000000000 +0900
172 @@ -24,7 +24,7 @@
173
174 #include "video_encoder.h"
175 #ifdef HAVE_FFMPEG_INSTALLED
176 -#include <ffmpeg/avcodec.h>
177 +#include <libavcodec/avcodec.h>
178 #else
179 #include <avcodec.h>
180 #endif
181
182
183
184 --
185 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups