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

Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/cinelerra/files: cinelerra-20140710-underlinking.patch cinelerra-20140710-validate_desktop_entry.patch cinelerra-20140710-ffmpeg-0.11.patch
Date: Thu, 10 Jul 2014 17:59:39
Message-Id: 20140710175935.A2DD82004E@flycatcher.gentoo.org
1 ssuominen 14/07/10 17:59:35
2
3 Added: cinelerra-20140710-underlinking.patch
4 cinelerra-20140710-validate_desktop_entry.patch
5 cinelerra-20140710-ffmpeg-0.11.patch
6 Log:
7 Create a new Cinelerra CV snapshot from git wrt #516850 by Michał Górny
8
9 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
10
11 Revision Changes Path
12 1.1 media-video/cinelerra/files/cinelerra-20140710-underlinking.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/cinelerra/files/cinelerra-20140710-underlinking.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/cinelerra/files/cinelerra-20140710-underlinking.patch?rev=1.1&content-type=text/plain
16
17 Index: cinelerra-20140710-underlinking.patch
18 ===================================================================
19 http://bugs.gentoo.org/367509
20
21 pluginserver.C is using dlsym, dlopen, dlclose and dlerror
22
23 --- cinelerra/Makefile.am
24 +++ cinelerra/Makefile.am
25 @@ -692,7 +692,8 @@
26 $(LIBDV_LIBS) \
27 -luuid \
28 $(MJPEG_LIBS) \
29 - -lstdc++
30 + -lstdc++ \
31 + -ldl
32
33 EXTRA_DIST = gen-feather-h
34
35
36
37
38 1.1 media-video/cinelerra/files/cinelerra-20140710-validate_desktop_entry.patch
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/cinelerra/files/cinelerra-20140710-validate_desktop_entry.patch?rev=1.1&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/cinelerra/files/cinelerra-20140710-validate_desktop_entry.patch?rev=1.1&content-type=text/plain
42
43 Index: cinelerra-20140710-validate_desktop_entry.patch
44 ===================================================================
45 --- image/cinelerra-cv.desktop
46 +++ image/cinelerra-cv.desktop
47 @@ -5,9 +5,8 @@
48 Name[fr]=Cinelerra-CV
49 Name[es]=Cinelerra-CV
50 Comment=Video Editor
51 -Categories=Application;AudioVideo;Multimedia;VideoEditing;
52 -Encoding=UTF-8
53 +Categories=AudioVideo;
54 Exec=cinelerra
55 -Icon=cinelerra-cv.xpm
56 +Icon=cinelerra-cv
57 Terminal=false
58 Type=Application
59
60
61
62 1.1 media-video/cinelerra/files/cinelerra-20140710-ffmpeg-0.11.patch
63
64 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/cinelerra/files/cinelerra-20140710-ffmpeg-0.11.patch?rev=1.1&view=markup
65 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/cinelerra/files/cinelerra-20140710-ffmpeg-0.11.patch?rev=1.1&content-type=text/plain
66
67 Index: cinelerra-20140710-ffmpeg-0.11.patch
68 ===================================================================
69 --- cinelerra/ffmpeg.C
70 +++ cinelerra/ffmpeg.C
71 @@ -23,7 +23,6 @@
72
73 int FFMPEG::init(char *codec_string) {
74
75 - avcodec_init();
76 avcodec_register_all();
77
78 CodecID id = codec_id(codec_string);
79 --- cinelerra/fileac3.C
80 +++ cinelerra/fileac3.C
81 @@ -84,7 +84,6 @@
82
83 if(wr)
84 {
85 - avcodec_init();
86 avcodec_register_all();
87 codec = avcodec_find_encoder(CODEC_ID_AC3);
88 if(!codec)
89 --- configure.ac
90 +++ configure.ac
91 @@ -497,7 +497,7 @@
92 AC_ARG_WITH([external-ffmpeg], AC_HELP_STRING([--with-external-ffmpeg], [use external ffmpeg library]))
93
94 if test "x$with_external_ffmpeg" = "xyes"; then
95 - PKG_CHECK_MODULES([FFMPEG_TEMP], [libavcodec libpostproc])
96 + PKG_CHECK_MODULES([FFMPEG_TEMP], [libavcodec libpostproc libavutil])
97 FFMPEG_FOLDER=""
98 FFMPEG_EXTERNALTEXT="External ffmpeg"
99
100 @@ -515,10 +515,10 @@
101 AC_MSG_RESULT($enable_ffmpeg_swscale)
102 if test x"$enable_ffmpeg_swscale" = xyes; then
103 dnl AC_DEFINE(HAVE_SWSCALER)
104 - PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libswscale])
105 + PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libswscale libavutil])
106 FFMPEG_CFLAGS="$FFMPEG_CFLAGS -I/usr/include/libavcodec -I/usr/include/libswscale -DHAVE_SWSCALER"
107 else
108 - PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc])
109 + PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libavutil])
110 fi
111 FFMPEG_EXTERNALTEXT="External ffmpeg"
112 else
113 --- quicktime/mpeg4.c
114 +++ quicktime/mpeg4.c
115 @@ -624,12 +624,12 @@
116 else
117 // ffmpeg section
118 {
119 + AVDictionary ** opts = NULL;
120 static char *video_rc_eq="tex^qComp";
121 codec->encode_initialized[current_field] = 1;
122 if(!ffmpeg_initialized)
123 {
124 ffmpeg_initialized = 1;
125 - avcodec_init();
126 avcodec_register_all();
127 }
128
129 @@ -673,8 +673,10 @@
130 context->b_quant_offset = 1.25;
131 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
132 context->error_resilience = FF_ER_CAREFUL;
133 -#else
134 +#elif LIBAVCODEC_VERSION_INT < ((54<<16)+(0<<8)+0)
135 context->error_recognition = FF_ER_CAREFUL;
136 +#else
137 + context->err_recognition |= AV_EF_CAREFUL;
138 #endif
139 context->error_concealment = 3;
140 context->frame_skip_cmp = FF_CMP_DCTMAX;
141 @@ -699,7 +701,7 @@
142 context->profile= FF_PROFILE_UNKNOWN;
143 context->rc_buffer_aggressivity = 1.0;
144 context->level= FF_LEVEL_UNKNOWN;
145 - context->flags |= CODEC_FLAG_H263P_UMV;
146 + av_dict_set(opts, "umv", "1", 0);
147 context->flags |= CODEC_FLAG_AC_PRED;
148
149 // All the forbidden settings can be extracted from libavcodec/mpegvideo.c of ffmpeg...
150 @@ -717,10 +719,8 @@
151 (codec->ffmpeg_id == CODEC_ID_MPEG4 ||
152 codec->ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
153 codec->ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
154 - codec->ffmpeg_id == CODEC_ID_H263P ||
155 - codec->ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT))
156 + codec->ffmpeg_id == CODEC_ID_H263P ))
157 {
158 - avcodec_thread_init(context, file->cpus);
159 context->thread_count = file->cpus;
160 }
161
162 @@ -740,7 +740,7 @@
163 * codec->fix_bitrate,
164 * codec->quantizer);
165 */
166 - avcodec_open(context, codec->encoder[current_field]);
167 + avcodec_open2(context, codec->encoder[current_field], opts);
168
169 avcodec_get_frame_defaults(&codec->picture[current_field]);
170
171 --- quicktime/qtffmpeg.c
172 +++ quicktime/qtffmpeg.c
173 @@ -54,7 +54,6 @@
174 if(!ffmpeg_initialized)
175 {
176 ffmpeg_initialized = 1;
177 - avcodec_init();
178 avcodec_register_all();
179 }
180
181 @@ -90,10 +89,8 @@
182 (ffmpeg_id == CODEC_ID_MPEG4 ||
183 ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
184 ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
185 - ffmpeg_id == CODEC_ID_H263P ||
186 - ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT))
187 + ffmpeg_id == CODEC_ID_H263P ))
188 {
189 - avcodec_thread_init(context, cpus);
190 context->thread_count = cpus;
191 }
192 if(avcodec_open(context,
193 --- quicktime/wma.c
194 +++ quicktime/wma.c
195 @@ -67,7 +67,6 @@
196 if(!ffmpeg_initialized)
197 {
198 ffmpeg_initialized = 1;
199 - avcodec_init();
200 avcodec_register_all();
201 }
Report Message
Find on MARC Find on Google Groups