Changes of Revision 58
| [-] | Changed | ffmpeg.spec |
|
x 1 2 # norootforbuild3 4 %define name ffmpeg5 -%define version 0.4.9.16240svn6 -%define release 20081219.pm.20217 +%define version 0.58 +%define release 159 %define major 010 %define lib libffmpeg11 %define libname %{lib}%{major}12 13 Group: Productivity/Multimedia/Video/Editors and Convertors14 Summary: Hyper fast MPEG1/MPEG4/H263/RV and AC3/MPEG audio encoder15 Summary(de): Hyperschneller MPEG1/MPEG4/H263/RV Und AC3/MPEG Audio-Encoder16 -URL: http://ffmpeg.sourceforge.net17 +URL: http://ffmpeg.mplayerhq.hu18 19 -Source0: ffmpeg-0.4.9.16240svn.tar.bz220 +Source0: ffmpeg-0.5.tar.bz221 22 Patch0: ffmpeg_configure.diff23 BuildRoot: %{_tmppath}/%{name}-buildroot24 25 Requires: %{libnameavformat} = %{version}-%{release}26 Requires: %{libnameavutil} = %{version}-%{release}27 Requires: %{libnameswscale} = %{version}-%{release}28 -%if 0%{?suse_version} >= 93029 +%if %suse_version >= 93030 BuildRequires: libdca-devel31 BuildRequires: libdca032 %endif33 BuildRequires: yasm >= 0.7.134 -%if 0%{?suse_version} >= 1010 || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora_version}35 +%if %suse_version >= 101036 BuildRequires: libgsm37 BuildRequires: libgsm-devel38 %endif39 40 BuildRequires: freetype2-devel41 BuildRequires: SDL-devel42 BuildRequires: slang-devel43 -%if 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora_version}44 -BuildRequires: xorg-x11-proto-devel xorg-x11-xtrans-devel45 -%endif46 -%if 0%{?suse_version} >= 92047 +%if %suse_version >= 92048 BuildRequires: xorg-x11-devel49 -%endif50 -%if 0%{?suse_version} > 0 && 0%{?suse_version} < 92051 +%else52 BuildRequires: XFree86-devel53 %endif54 BuildRequires: zlib-devel55 -BuildRequires: libfaad0 >= 2.656 -BuildRequires: libfaad-devel >= 2.657 -BuildRequires: libfaac-devel >= 1.2658 +BuildRequires: libfaad2 >= 2.759 +BuildRequires: libfaad-devel >= 2.760 +BuildRequires: libfaac-devel >= 1.2861 BuildRequires: libx264-devel62 BuildRequires: libxvidcore-devel63 BuildRequires: libmp4v2-devel64 65 #BuildRequires: liba52-devel66 BuildRequires: libdc139467 BuildRequires: libdc1394-devel68 -%if 0%{?suse_version} >= 103069 +BuildRequires: speex-devel70 +%if %suse_version >= 103071 BuildRequires: libschroedinger-devel >= 1.0.572 BuildRequires: liboil-devel >= 0.3.1573 BuildRequires: libdirac-devel >= 1.0.074 %endif75 -#%if 0%{?suse_version} >= 110076 +#%if %suse_version >= 110077 #BuildRequires: libnut-devel78 #%endif79 -%if 0%{?suse_version} > 102080 +%if %suse_version > 102081 BuildRequires: libdc1394_control12-devel82 %endif83 #BuildRequires: G.729-devel84 -85 -%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}86 -BuildRequires: texi2html87 -%endif88 -89 +BuildRequires: nvidia-vdpau-devel90 91 %description92 ffmpeg is a hyper fast realtime audio/video encoder, a streaming server93 94 95 %package -n %{libname}96 Group: System/Libraries97 -Summary: Metapackage for ffmpeg shared libraries98 +Summary: metapackage for ffmpeg shared libraries99 Summary(de): Metapaket für die ffmpeg Bibliotheken100 Requires: %{libnameavcodec} = %{version}-%{release}101 Requires: %{libnameavdevice} = %{version}-%{release}102 103 104 %package -n %{libnameavcodec}105 Group: System/Libraries106 -Summary: FFmpeg %{libavcodec}107 +Summary: ffmpeg %{libavcodec}108 Provides: %{libavcodec} = %{version}-%{release}109 110 %description -n %{libnameavcodec}111 112 113 %package -n %{libnameavdevice}114 Group: System/Libraries115 -Summary: FFmpeg %{libavdevice}116 +Summary: ffmpeg %{libavdevice}117 Provides: %{libavdevice} = %{version}-%{release}118 119 %description -n %{libnameavdevice}120 121 122 %package -n %{libnameavformat}123 Group: System/Libraries124 -Summary: FFmpeg %{libavformat}125 +Summary: ffmpeg %{libavformat}126 Provides: %{libavformat} = %{version}-%{release}127 128 %description -n %{libnameavformat}129 130 131 %package -n %{libnameavutil}132 Group: System/Libraries133 -Summary: FFmpeg %{libavutil}134 +Summary: ffmpeg %{libavutil}135 Provides: %{libavutil} = %{version}-%{release}136 137 %description -n %{libnameavutil}138 139 140 %package -n %{libnamepostproc}141 Group: System/Libraries142 -Summary: FFmpeg %{libpostproc}143 +Summary: ffmpeg %{libpostproc}144 Provides: %{libpostproc} = %{version}-%{release}145 146 %description -n %{libnamepostproc}147 148 149 %package -n %{libnameswscale}150 Group: System/Libraries151 -Summary: FFmpeg %{libswscale}152 +Summary: ffmpeg %{libswscale}153 Provides: %{libswscale} = %{version}-%{release}154 155 %description -n %{libnameswscale}156 157 Requires: libamrwb-devel158 #Requires: liba52-devel159 Requires: libjack-devel160 -%if 0%{?suse_version} > 930161 +Requires: speex-devel162 +%if %suse_version > 930163 Requires: libdca-devel164 %endif165 -%if 0%{?suse_version} >= 1010166 +%if %suse_version >= 1010167 Requires: libgsm-devel168 %endif169 Requires: libdc1394170 Requires: libdc1394-devel171 -%if 0%{?suse_version} >= 1030172 +%if %suse_version >= 1030173 Requires: libschroedinger-devel >= 1.0.5174 Requires: liboil-devel >= 0.3.15175 +Requires: libdirac0176 Requires: libdirac-devel >= 1.0.0177 %endif178 -#%if 0%{?suse_version} >= 1100179 +#%if %suse_version >= 1100180 #Requires: libnut-devel181 #%endif182 -%if 0%{?suse_version} > 1020183 +%if %suse_version > 1020184 Requires: libdc1394_control12-devel185 %endif186 +Requires: nvidia-vdpau-devel187 Provides: %{libname}-devel = %{version}-%{release}188 %ifarch x86_64 amd64 ia32e189 Provides: libavcodec.so()(64bit)190 191 %debug_package192 193 %prep194 -%setup -q -n %{name}195 +%setup -q -n %{name}-%{version}196 %patch0197 -%if 0%{?suse_version}198 +199 %suse_update_libdir configure200 -%endif201 |
||
| [+] | Changed | ffmpeg_configure.diff ^ |
| @@ -1,6 +1,6 @@ ---- configure.orig 2008-06-15 21:30:34.000000000 +0200 -+++ configure 2008-06-15 21:38:50.000000000 +0200 -@@ -1590,11 +1590,11 @@ +--- 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 @@ -16,30 +16,50 @@ check_func fork check_func gethrtime -@@ -1838,10 +1838,10 @@ - optimizations="small" - elif enabled optimizations; then - if $cc -v 2>&1 | grep -q xlc; then -- add_cflags "-O5" -+# add_cflags "-O5" - add_ldflags "-O5" +@@ -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" +- 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 -O3 ++# fi ++#fi ++add_cflags '${CFLAGS}' check_cflags -fno-math-errno -@@ -2206,7 +2206,7 @@ + check_cflags -fno-signed-zeros + +@@ -2545,7 +2546,7 @@ Conflicts: Libs: -L\${libdir} -l${shortname} $(disabled shared && echo $libs) Libs.private: $(enabled shared && echo $libs) -Cflags: -I\${includedir} +Cflags: -I/usr/include -I/usr/include/$name EOF - cat <<EOF > $name-uninstalled.pc + cat <<EOF > $name/$name-uninstalled.pc prefix= -@@ -2220,7 +2220,7 @@ +@@ -2559,7 +2560,7 @@ Requires: $requires Conflicts: Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs | ||
| Added | ffmpeg-0.5-0.pm.3.src.rpm ^ | |
| Changed | ffmpeg-0.5.tar.bz2 ^ | |