Changes of Revision 54
| [-] | Changed | ffmpeg.spec |
|
x 1 2 # norootforbuild3 4 %define name ffmpeg5 -%define version 0.4.9svn6 -%define release 200809087 +%define version 0.4.9.16240svn8 +%define release 20081219.pm.20219 %define major 010 %define lib libffmpeg11 %define libname %{lib}%{major}12 -%define majoravcodec 5113 +%define majoravcodec 5214 %define libavcodec libavcodec15 %define libnameavcodec %{libavcodec}%{majoravcodec}16 %define majoravdevice 5217 18 Summary(de): Hyperschneller MPEG1/MPEG4/H263/RV Und AC3/MPEG Audio-Encoder19 URL: http://ffmpeg.sourceforge.net20 21 -Source0: ffmpeg-svn.tar.bz222 +Source0: ffmpeg-0.4.9.16240svn.tar.bz223 24 Patch0: ffmpeg_configure.diff25 -#Patch1: ffmpeg_fix_wmadecoding.diff26 BuildRoot: %{_tmppath}/%{name}-buildroot27 Prefix: %{_prefix}28 Requires: %{libnameavcodec} = %{version}-%{release}29 30 Requires: %{libnameavformat} = %{version}-%{release}31 Requires: %{libnameavutil} = %{version}-%{release}32 Requires: %{libnameswscale} = %{version}-%{release}33 -Requires: imlib234 -Requires: libmp3lame035 -Requires: libogg36 -Requires: libvorbis37 -Requires: libtheora38 -Requires: ncurses39 -Requires: alsa40 -Requires: freetype241 -Requires: SDL42 -Requires: slang43 -%if 0%{?suse_version} >= 92044 -Requires: xorg-x11-libs45 -%endif46 -%if 0%{?suse_version} > 0 && 0%{?suse_version} < 92047 -Requires: XFree86-libs48 -%endif49 -Requires: zlib50 -Requires: libfaad2_0 >= 2.651 -Requires: libfaac0 >= 1.2652 -Requires: libamrnb353 -Requires: libamrwb354 %if 0%{?suse_version} >= 93055 BuildRequires: libdca-devel56 BuildRequires: libdca057 -Requires: libdca058 %endif59 BuildRequires: yasm >= 0.7.160 %if 0%{?suse_version} >= 1010 || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora_version}61 62 BuildRequires: libmp3lame-devel63 BuildRequires: libogg-devel64 BuildRequires: libvorbis-devel65 -BuildRequires: libtheora-devel66 +BuildRequires: libtheora-devel >= 1.0.final67 BuildRequires: ncurses-devel68 -BuildRequires: libjack0 >= 0.109.269 -BuildRequires: libjack-devel >= 0.109.270 +BuildRequires: libjack-devel71 BuildRequires: alsa-devel72 BuildRequires: freetype2-devel73 BuildRequires: SDL-devel74 BuildRequires: slang-devel75 -%if 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora_version} 76 -BuildRequires: xorg-x11-proto-devel xorg-x11-xtrans-devel77 -%endif78 %if 0%{?suse_version} >= 92079 BuildRequires: xorg-x11-devel80 -%endif81 -%if 0%{?suse_version} > 0 && 0%{?suse_version} < 92082 +%else83 BuildRequires: XFree86-devel84 %endif85 BuildRequires: zlib-devel86 -BuildRequires: libfaad2_0 >= 2.687 -BuildRequires: libfaad2-devel >= 2.688 +BuildRequires: libfaad0 >= 2.689 +BuildRequires: libfaad-devel >= 2.690 BuildRequires: libfaac-devel >= 1.2691 BuildRequires: libx264-devel92 -BuildRequires: xvid-devel93 +BuildRequires: libxvidcore-devel94 BuildRequires: libmp4v2-devel95 BuildRequires: texinfo96 BuildRequires: libamrnb-devel97 BuildRequires: libamrwb-devel98 -BuildRequires: liba52dec-devel99 +#BuildRequires: liba52-devel100 BuildRequires: libdc1394101 BuildRequires: libdc1394-devel102 -#BuildRequires: libschroedinger-devel103 -%if 0%{?suse_version} >= 1100104 -BuildRequires: libnut-devel105 -%endif106 +%if 0%{?suse_version} >= 1030107 +BuildRequires: libschroedinger-devel >= 1.0.5108 +BuildRequires: liboil-devel >= 0.3.15109 +BuildRequires: libdirac-devel >= 1.0.0110 +%endif111 +#%if 0%{?suse_version} >= 1100112 +#BuildRequires: libnut-devel113 +#%endif114 %if 0%{?suse_version} > 1020115 BuildRequires: libdc1394_control12-devel116 %endif117 #BuildRequires: G.729-devel118 119 -%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}120 -BuildRequires: texi2html121 -%endif122 -123 %description124 ffmpeg is a hyper fast realtime audio/video encoder, a streaming server125 and a generic audio and video file converter.126 127 Requires: libmp3lame-devel128 Requires: libogg-devel129 Requires: libvorbis-devel130 -Requires: libtheora-devel131 +Requires: libtheora-devel >= 1.0.final132 Requires: alsa-devel133 Requires: slang-devel134 Requires: zlib-devel135 -Requires: libfaad2-devel136 +Requires: libfaad-devel137 Requires: libfaac-devel138 -Requires: xvid-devel139 +Requires: libxvidcore-devel140 Requires: libmp4v2-devel141 Requires: libx264-devel142 Requires: libamrnb-devel143 Requires: libamrwb-devel144 -Requires: liba52dec-devel145 -Requires: libjack0 >= 0.109.2146 -Requires: libjack-devel >= 0.109.2147 +#Requires: liba52-devel148 +Requires: libjack-devel149 %if 0%{?suse_version} > 930150 Requires: libdca-devel151 %endif152 153 %endif154 Requires: libdc1394155 Requires: libdc1394-devel156 -#Requires: libschroedinger-devel157 -%if 0%{?suse_version} >= 1100158 -Requires: libnut-devel159 -%endif160 +%if 0%{?suse_version} >= 1030161 +Requires: libschroedinger-devel >= 1.0.5162 +Requires: liboil-devel >= 0.3.15163 +Requires: libdirac-devel >= 1.0.0164 +%endif165 +#%if 0%{?suse_version} >= 1100166 +#Requires: libnut-devel167 +#%endif168 %if 0%{?suse_version} > 1020169 Requires: libdc1394_control12-devel170 %endif171 172 %prep173 %setup -q -n %{name}174 %patch0175 -##%patch1176 -%if 0%{?suse_version}177 +178 %suse_update_libdir configure179 -%endif180 #don't call ldconfig on install181 #perl -pi -e 's/ldconfig \|\| true//' libavcodec/Makefile182 183 184 %endif185 186 CFLAGS="$RPM_OPT_FLAGS $archflags"187 -%if 0%{?suse_version} >= 1010 || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora_version}188 +%if 0%{?suse_version} >= 1010189 CFLAGS="${CFLAGS} -I%{_includedir}/gsm"190 %endif191 export archflags192 193 %endif194 --libdir=%{_libdir} --enable-shared --enable-libmp3lame \195 --enable-libvorbis --enable-libtheora --enable-libfaad \196 - --enable-libfaac --enable-libxvid --enable-liba52 --enable-swscale \197 + --enable-libfaac --enable-libxvid --enable-swscale \198 --enable-postproc --enable-gpl --enable-vhook --enable-x11grab \199 -%if 0%{?suse_version} >= 1100200 - --enable-libnut \201 |
||
| [+] | Deleted | ffmpeg_fix_wmadecoding.diff ^ |
| @@ -1,83 +0,0 @@ ---- libavcodec/wmadec.c.orig 2008-08-12 21:38:07.000000000 +0200 -+++ libavcodec/wmadec.c 2008-08-15 16:56:01.000000000 +0200 -@@ -403,13 +403,13 @@ - v |= a; - } - -- bsize = s->frame_len_bits - s->block_len_bits; -- - /* if no channel coded, no need to go further */ - /* XXX: fix potential framing problems */ - if (!v) - goto next; - -+ bsize = s->frame_len_bits - s->block_len_bits; -+ - /* read total gain and extract corresponding number of bits for - coef escape coding */ - total_gain = 1; -@@ -681,28 +681,27 @@ - } - } - --next: - for(ch = 0; ch < s->nb_channels; ch++) { -- int n4, index, n; - -- n = s->block_len; -- n4 = s->block_len / 2; - if(s->channel_coded[ch]){ -+ int n4, index, n; -+ n = s->block_len; -+ n4 = s->block_len / 2; - ff_imdct_calc(&s->mdct_ctx[bsize], s->output, s->coefs[ch]); -- }else -- memset(s->output, 0, sizeof(s->output)); - -- /* multiply by the window and add in the frame */ -- index = (s->frame_len / 2) + s->block_pos - n4; -- wma_window(s, &s->frame_out[ch][index]); -- -- /* specific fast case for ms-stereo : add to second -- channel if it is not coded */ -- if (s->ms_stereo && !s->channel_coded[1]) { -- wma_window(s, &s->frame_out[1][index]); -+ /* multiply by the window and add in the frame */ -+ index = (s->frame_len / 2) + s->block_pos - n4; -+ wma_window(s, &s->frame_out[ch][index]); -+ -+ /* specific fast case for ms-stereo : add to second -+ channel if it is not coded */ -+ if (s->ms_stereo && !s->channel_coded[1]) { -+ wma_window(s, &s->frame_out[1][index]); -+ } - } - } - -+next: - /* update block number */ - s->block_num++; - s->block_pos += s->block_len; -@@ -784,11 +783,6 @@ - skip_bits(&s->gb, 4); /* super frame index */ - nb_frames = get_bits(&s->gb, 4) - 1; - -- if((nb_frames+1) * s->nb_channels * s->frame_len * sizeof(int16_t) > *data_size){ -- av_log(s->avctx, AV_LOG_ERROR, "Insufficient output space\n"); -- goto fail; -- } -- - bit_offset = get_bits(&s->gb, s->byte_offset_bits + 3); - - if (s->last_superframe_len > 0) { -@@ -844,10 +838,6 @@ - s->last_superframe_len = len; - memcpy(s->last_superframe, buf + pos, len); - } else { -- if(s->nb_channels * s->frame_len * sizeof(int16_t) > *data_size){ -- av_log(s->avctx, AV_LOG_ERROR, "Insufficient output space\n"); -- goto fail; -- } - /* single frame decode */ - if (wma_decode_frame(s, samples) < 0) - goto fail; | ||
| Added | ffmpeg-0.4.9.16240svn.tar.bz2 ^ | |
| Deleted | ffmpeg-svn.tar.bz2 ^ | |