Changes of Revision 2
| [-] | Changed | ffmpeg.spec |
|
x 1 2 # norootforbuild3 4 -%define name ffmpeg5 -%define version 0.56 -%define release 157 %define major 08 %define lib libffmpeg9 %define libname %{lib}%{major}10 11 %define majoravformat 5212 %define libavformat libavformat13 %define libnameavformat %{libavformat}%{majoravformat}14 -%define majoravutil 4915 +%define majoravutil 5016 %define libavutil libavutil17 %define libnameavutil %{libavutil}%{majoravutil}18 %define majorpostproc 5119 20 %define majorswscale 021 %define libswscale libswscale22 %define libnameswscale %{libswscale}%{majorswscale}23 +%define lastrelease 0.524 +%define svnsnapshot 2296525 26 -Name: %{name}27 -Version: %{version}28 -Release: %{release}29 +Name: ffmpeg30 +Version: %{lastrelease}.%{svnsnapshot}svn31 +Release: 332 License: LGPL v2 or later and some code GPL v2 or later33 Group: Productivity/Multimedia/Video/Editors and Convertors34 Summary: Hyper fast MPEG1/MPEG4/H263/RV and AC3/MPEG audio encoder35 Summary(de): Hyperschneller MPEG1/MPEG4/H263/RV Und AC3/MPEG Audio-Encoder36 URL: http://ffmpeg.mplayerhq.hu37 -38 -Source0: ffmpeg-0.5.tar.bz239 -40 +Source0: ffmpeg-%{version}.tar.bz241 Patch0: ffmpeg_configure.diff42 +Patch1: ffmpeg_fix_return.diff43 BuildRoot: %{_tmppath}/%{name}-buildroot44 -Prefix: %{_prefix}45 Requires: %{libnameavcodec} = %{version}-%{release}46 Requires: %{libnameavdevice} = %{version}-%{release}47 Requires: %{libnameavformat} = %{version}-%{release}48 Requires: %{libnameavutil} = %{version}-%{release}49 Requires: %{libnameswscale} = %{version}-%{release}50 -%if 0%{?suse_version} >= 93051 BuildRequires: libdca-devel52 BuildRequires: libdca053 -%endif54 BuildRequires: yasm >= 0.7.155 -%if 0%{?suse_version} >= 1010 || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora_version}56 BuildRequires: libgsm57 BuildRequires: libgsm-devel58 -%endif59 BuildRequires: imlib2-devel60 BuildRequires: libmp3lame-devel61 BuildRequires: libogg-devel62 BuildRequires: libvorbis-devel63 -BuildRequires: libtheora-devel >= 1.0.final64 +BuildRequires: libtheora-devel >= 1.165 BuildRequires: ncurses-devel66 BuildRequires: libjack-devel67 BuildRequires: alsa-devel68 BuildRequires: freetype2-devel69 BuildRequires: SDL-devel70 BuildRequires: slang-devel71 -%if 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora_version}72 -BuildRequires: xorg-x11-proto-devel xorg-x11-xtrans-devel73 -%endif74 -%if 0%{?suse_version} >= 92075 BuildRequires: xorg-x11-devel76 -%endif77 -%if 0%{?suse_version} > 0 && 0%{?suse_version} < 92078 -BuildRequires: XFree86-devel79 -%endif80 BuildRequires: zlib-devel81 BuildRequires: libfaad2 >= 2.782 BuildRequires: libfaad-devel >= 2.783 BuildRequires: libfaac-devel >= 1.2884 -BuildRequires: libx264-devel85 +BuildRequires: libx264-devel >= 0.0svn2010012286 BuildRequires: libxvidcore-devel87 BuildRequires: libmp4v2-devel88 BuildRequires: texinfo89 -BuildRequires: libamrnb-devel90 -BuildRequires: libamrwb-devel91 +BuildRequires: libopencore-amr-devel92 #BuildRequires: liba52-devel93 BuildRequires: libdc139494 BuildRequires: libdc1394-devel95 96 #%if 0%{?suse_version} >= 110097 #BuildRequires: libnut-devel98 #%endif99 -%if 0%{?suse_version} > 1020100 BuildRequires: libdc1394_control12-devel101 -%endif102 #BuildRequires: G.729-devel103 -BuildRequires: nvidia-vdpau-devel104 -105 -%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}106 -BuildRequires: texi2html107 -%endif108 +#BuildRequires: libopenjpeg-devel109 +BuildRequires: libvdpau-devel110 111 %description112 ffmpeg is a hyper fast realtime audio/video encoder, a streaming server113 114 115 %package -n %{libname}116 Group: System/Libraries117 -Summary: metapackage for ffmpeg shared libraries118 +Summary: Metapackage for ffmpeg shared libraries119 Summary(de): Metapaket für die ffmpeg Bibliotheken120 Requires: %{libnameavcodec} = %{version}-%{release}121 Requires: %{libnameavdevice} = %{version}-%{release}122 123 Requires: %{libnameswscale} = %{version}-%{release}124 125 %description -n %{libname}126 -metapackage for ffmpeg shared libraries127 +Metapackage for ffmpeg shared libraries.128 +For compatibility reasons only.129 130 %description -n %{libname} -l de131 -Metapaket für die ffmpeg Bibliotheken132 +Metapaket für die ffmpeg Bibliotheken.133 +Das Paket existiert nur noch aus Kompatibilitätsgründen.134 135 %package -n %{libnameavcodec}136 Group: System/Libraries137 -Summary: ffmpeg %{libavcodec}138 +Summary: Ffmpeg %{libavcodec}139 Provides: %{libavcodec} = %{version}-%{release}140 141 %description -n %{libnameavcodec}142 143 144 %package -n %{libnameavdevice}145 Group: System/Libraries146 -Summary: ffmpeg %{libavdevice}147 +Summary: Ffmpeg %{libavdevice}148 Provides: %{libavdevice} = %{version}-%{release}149 150 %description -n %{libnameavdevice}151 152 153 %package -n %{libnameavformat}154 Group: System/Libraries155 -Summary: ffmpeg %{libavformat}156 +Summary: Ffmpeg %{libavformat}157 Provides: %{libavformat} = %{version}-%{release}158 159 %description -n %{libnameavformat}160 161 162 %package -n %{libnameavutil}163 Group: System/Libraries164 -Summary: ffmpeg %{libavutil}165 +Summary: Ffmpeg %{libavutil}166 Provides: %{libavutil} = %{version}-%{release}167 168 %description -n %{libnameavutil}169 170 171 %package -n %{libnamepostproc}172 Group: System/Libraries173 -Summary: ffmpeg %{libpostproc}174 +Summary: Ffmpeg %{libpostproc}175 Provides: %{libpostproc} = %{version}-%{release}176 177 %description -n %{libnamepostproc}178 179 180 %package -n %{libnameswscale}181 Group: System/Libraries182 -Summary: ffmpeg %{libswscale}183 +Summary: Ffmpeg %{libswscale}184 Provides: %{libswscale} = %{version}-%{release}185 186 %description -n %{libnameswscale}187 188 Requires: libmp3lame-devel189 Requires: libogg-devel190 Requires: libvorbis-devel191 -Requires: libtheora-devel >= 1.0.final192 +Requires: libtheora-devel >= 1.1193 Requires: alsa-devel194 Requires: slang-devel195 Requires: zlib-devel196 197 Requires: libfaac-devel198 Requires: libxvidcore-devel199 Requires: libmp4v2-devel200 -Requires: libx264-devel201 |
||
| [+] | Changed | ffmpeg_configure.diff ^ |
| @@ -1,8 +1,8 @@ ---- configure.orig 2009-02-22 01:18:34.000000000 +0100 -+++ configure 2009-02-22 01:30:09.000000000 +0100 -@@ -1894,11 +1894,11 @@ - # --- - # check availability of some header files +--- configure.orig 2010-01-28 06:54:50.000000000 +0100 ++++ configure 2010-01-28 19:54:29.742794343 +0100 +@@ -2423,11 +2423,11 @@ + + fi -if check_func dlopen; then - ldl= @@ -14,52 +14,18 @@ -fi +#fi - check_func fork - check_func gethrtime -@@ -2137,19 +2137,20 @@ - check_ldflags '-Wl,-rpath-link,\$(BUILD_ROOT)/libpostproc -Wl,-rpath-link,\$(BUILD_ROOT)/libswscale -Wl,-rpath-link,\$(BUILD_ROOT)/libavfilter -Wl,-rpath-link,\$(BUILD_ROOT)/libavdevice -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil' - check_ldflags -Wl,-Bsymbolic - --if enabled small; then -- check_cflags -Os # not all compilers support -Os -- optimizations="small" --elif enabled optimizations; then -- if enabled xlc; then -- add_cflags -O5 -- add_ldflags -O5 -- elif enabled ccc; then -- add_cflags -fast -- else -- add_cflags -O3 -- fi --fi -+#if enabled small; then -+# check_cflags -Os # not all compilers support -Os -+# optimizations="small" -+#elif enabled optimizations; then -+# if enabled xlc; then -+# add_cflags -O5 -+# add_ldflags -O5 -+# elif enabled ccc; then -+# add_cflags -fast -+# else -+# add_cflags -O3 -+# fi -+#fi -+add_cflags '${CFLAGS}' - check_cflags -fno-math-errno - check_cflags -fno-signed-zeros - -@@ -2545,7 +2546,7 @@ + # Solaris has nanosleep in -lrt, OpenSolaris no longer needs that + check_func nanosleep || { check_func nanosleep -lrt && add_extralibs -lrt; } +@@ -3039,7 +3039,7 @@ Conflicts: - Libs: -L\${libdir} -l${shortname} $(disabled shared && echo $libs) + Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs) Libs.private: $(enabled shared && echo $libs) -Cflags: -I\${includedir} +Cflags: -I/usr/include -I/usr/include/$name EOF cat <<EOF > $name/$name-uninstalled.pc prefix= -@@ -2559,7 +2560,7 @@ +@@ -3053,7 +3053,7 @@ Requires: $requires Conflicts: Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs | ||
| [+] | Added | ffmpeg_fix_return.diff ^ |
| @@ -0,0 +1,17 @@ +diff -ur ffmpeg.orig/libswscale/x86/yuv2rgb_template.c ffmpeg/libswscale/x86/yuv2rgb_template.c +--- ffmpeg.orig/libswscale/x86/yuv2rgb_template.c 2010-01-15 19:54:58.000000000 +0100 ++++ ffmpeg/libswscale/x86/yuv2rgb_template.c 2010-03-23 21:35:31.506502288 +0100 +@@ -525,6 +525,7 @@ + YUV2RGB_ENDLOOP(4) + YUV2RGB_OPERANDS_ALPHA + #endif ++ return 0; + } + + static inline int RENAME(yuv420_bgr32)(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, +@@ -561,4 +562,5 @@ + YUV2RGB_ENDLOOP(4) + YUV2RGB_OPERANDS_ALPHA + #endif ++ return 0; + } | ||
| Deleted | ffmpeg-0.5-0.pm.3.src.rpm ^ | |
| Added | ffmpeg-0.5.22965svn.tar.bz2 ^ | |
| Deleted | ffmpeg-0.5.tar.bz2 ^ | |