Changes - j0ke.net Open Build Service

Changes of Revision 5

[-] [+]	Changed	ffmpeg.spec
@@ -1,9 +1,4 @@ -# norootforbuild - %define lib libffmpeg -%define majoravcore 0 -%define libavcore libavcore -%define libnameavcore %{libavcore}%{majoravcore} %define majoravcodec 52 %define libavcodec libavcodec %define libnameavcodec %{libavcodec}%{majoravcodec} @@ -26,24 +21,23 @@ %define libswscale libswscale %define libnameswscale %{libswscale}%{majorswscale} %define lastrelease 0.6 -%define svnsnapshot 25702 +%define svnsnapshot 201103092102 %bcond_without avfilter %bcond_without libvpx %bcond_with libfaac -%bcond_with libopenjpeg +%bcond_without libopenjpeg Name: ffmpeg -Version: %{lastrelease}.%{svnsnapshot}svn -Release: 9 -License: LGPL v2 or later and some code GPL v3 or later +Version: %{lastrelease}.%{svnsnapshot}git +Release: 10 +License: LGPL v2 or later and some code GPL v2 or later Group: Productivity/Multimedia/Video/Editors and Convertors Summary: Hyper fast MPEG1/MPEG4/H263/RV and AC3/MPEG audio encoder Summary(de): Hyperschneller MPEG1/MPEG4/H263/RV Und AC3/MPEG Audio-Encoder URL: http://ffmpeg.mplayerhq.hu -Source0: ffmpeg-0.6.25702svn.tar.bz2 -Source1: ffmpeg-rpmlintrc +Source0: ffmpeg-%{version}.tar.bz2 Patch0: ffmpeg_configure.diff Patch1: ffmpeg_fix_return.diff BuildRoot: %{_tmppath}/%{name}-buildroot @@ -74,16 +68,13 @@ BuildRequires: libdc1394-devel BuildRequires: libspeex-devel %if %suse_version >= 1030 -BuildRequires: libschroedinger-devel +BuildRequires: schroedinger-devel BuildRequires: liboil-devel >= 0.3.15 BuildRequires: libdirac-devel >= 1.0.0 %endif -%if 0%{?suse_version} < 1130 +%if %suse_version <= 1130 BuildRequires: libdc1394_control12-devel -%else -BuildRequires: libdc1394-devel %endif - %if %{with libopenjpeg} BuildRequires: libopenjpeg-devel %endif @@ -93,11 +84,9 @@ BuildRequires: libvpx-devel %endif %endif -Requires: %{libnameavcore} = %{version}-%{release} Requires: %{libnameavcodec} = %{version}-%{release} Requires: %{libnameavdevice} = %{version}-%{release} Requires: %{libnameavformat} = %{version}-%{release} -Requires: %{libnameavfilter} = %{version}-%{release} Requires: %{libnameavutil} = %{version}-%{release} Requires: %{libnamepostproc} = %{version}-%{release} Requires: %{libnameswscale} = %{version}-%{release} @@ -119,26 +108,13 @@ Sound wird in einen MPEG audio layer 2 oder AC3 Stream geschrieben. -%package -n %{libnameavcore} -Group: System/Libraries -Summary: FFmpeg %{libavcore} -Provides: %{libavcore} = %{version}-%{release} -Requires: %{libnameavutil} = %{version}-%{release} - -%description -n %{libnameavcore} -ffmpeg %{libavcore} shared library - -%description -n %{libnameavcore} -l de -ffmpeg %{libavcore} Bibliothek - - %package -n %{libnameavcodec} Group: System/Libraries Summary: FFmpeg %{libavcodec} Provides: %{libavcodec} = %{version}-%{release} Provides: libffmpeg0 = %{version}-%{release} Obsoletes: libffmpeg0 < %{version}-%{release} -Requires: %{libnameavcore} = %{version}-%{release} +Obsoletes: libavcore0 Requires: %{libnameavutil} = %{version}-%{release} %description -n %{libnameavcodec} @@ -152,7 +128,6 @@ Group: System/Libraries Summary: FFmpeg %{libavdevice} Provides: %{libavdevice} = %{version}-%{release} -Requires: %{libnameavcore} = %{version}-%{release} Requires: %{libnameavcodec} = %{version}-%{release} Requires: %{libnameavformat} = %{version}-%{release} Requires: %{libnameavutil} = %{version}-%{release} @@ -169,7 +144,6 @@ Summary: FFmpeg %{libavformat} Provides: %{libavformat} = %{version}-%{release} Requires: %{libnameavcodec} = %{version}-%{release} -Requires: %{libnameavcore} = %{version}-%{release} Requires: %{libnameavutil} = %{version}-%{release} %description -n %{libnameavformat} @@ -197,7 +171,6 @@ Summary: FFmpeg %{libavutil} Provides: %{libavfilter} = %{version}-%{release} Requires: %{libnameavcodec} = %{version}-%{release} -Requires: %{libnameavcore} = %{version}-%{release} Requires: %{libnameavutil} = %{version}-%{release} Requires: %{libnameswscale} = %{version}-%{release} @@ -239,7 +212,6 @@ Group: Development/Libraries/C and C++ Summary: Header files and static library for the ffmpeg library Summary(de): Header Dateien und statische Bibliotheken für die ffmpeg Bibliothek -Requires: %{libnameavcore} = %{version}-%{release} Requires: %{libnameavcodec} = %{version}-%{release} Requires: %{libnameavdevice} = %{version}-%{release} Requires: %{libnameavformat} = %{version}-%{release} @@ -272,7 +244,7 @@ Requires: liboil-devel >= 0.3.15 Requires: libdirac-devel >= 1.0.0 %endif -%if %suse_version > 1020 && %suse_version < 1140 +%if %suse_version <= 1130 Requires: libdc1394_control12-devel %endif %if %{with libopenjpeg} @@ -321,8 +293,6 @@ Installieren Sie libffmpeg-devel wenn Sie Anwendungen mit ffmpeg Support compilieren wollen. -%debug_package - %prep %setup -q -n %{name} @@ -332,8 +302,14 @@ %suse_update_libdir configure #don't call ldconfig on install #perl -pi -e 's/ldconfig \\|\\| true//' libavcodec/Makefile +#remove date references so builds are reproducible (build-compare) +FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') +sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" cmdutils.c +FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S') +sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" cmdutils.c %build +export SUSE_ASNEEDED=0 archflags="" %ifarch x86_64 amd64 ia32e archflags=" -fPIC" @@ -343,10 +319,13 @@ sed -i -e "s/-fPIC -DPIC//g" libpostproc/Makefile %endif -CFLAGS="$RPM_OPT_FLAGS $archflags -I%{_includedir}/gsm" +CFLAGS="${RPM_OPT_FLAGS} ${archflags} -I%{_includedir}/gsm" +%if %{with libopenjpeg} +CFLAGS="${CFLAGS} -I%{_includedir}/openjpeg" +%endif export archflags export CFLAGS -CPPFLAGS="$CFLAGS" +CPPFLAGS="${CFLAGS}" export CPPFLAGS ./configure --shlibdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} \ @@ -359,7 +338,7 @@ --enable-libopenjpeg \ %endif --enable-libxvid --enable-postproc --enable-gpl \ - --enable-x11grab --extra-cflags="$CFLAGS" \ + --enable-x11grab --extra-cflags="${CFLAGS}" \ --enable-debug --disable-stripping \ %if %suse_version >= 1030 --enable-libschroedinger --enable-libdirac \ @@ -397,9 +376,6 @@ %clean [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} -%post -n %{libnameavcore} -p /sbin/ldconfig -%postun -n %{libnameavcore} -p /sbin/ldconfig - %post -n %{libnameavcodec} -p /sbin/ldconfig %postun -n %{libnameavcodec} -p /sbin/ldconfig x 1 @@ -1,9 +1,4 @@ 2 -# norootforbuild 3 - 4 %define lib libffmpeg 5 -%define majoravcore 0 6 -%define libavcore libavcore 7 -%define libnameavcore %{libavcore}%{majoravcore} 8 %define majoravcodec 52 9 %define libavcodec libavcodec 10 %define libnameavcodec %{libavcodec}%{majoravcodec} 11 @@ -26,24 +21,23 @@ 12 %define libswscale libswscale 13 %define libnameswscale %{libswscale}%{majorswscale} 14 %define lastrelease 0.6 15 -%define svnsnapshot 25702 16 +%define svnsnapshot 201103092102 17 18 %bcond_without avfilter 19 %bcond_without libvpx 20 %bcond_with libfaac 21 -%bcond_with libopenjpeg 22 +%bcond_without libopenjpeg 23 24 25 Name: ffmpeg 26 -Version: %{lastrelease}.%{svnsnapshot}svn 27 -Release: 9 28 -License: LGPL v2 or later and some code GPL v3 or later 29 +Version: %{lastrelease}.%{svnsnapshot}git 30 +Release: 10 31 +License: LGPL v2 or later and some code GPL v2 or later 32 Group: Productivity/Multimedia/Video/Editors and Convertors 33 Summary: Hyper fast MPEG1/MPEG4/H263/RV and AC3/MPEG audio encoder 34 Summary(de): Hyperschneller MPEG1/MPEG4/H263/RV Und AC3/MPEG Audio-Encoder 35 URL: http://ffmpeg.mplayerhq.hu 36 -Source0: ffmpeg-0.6.25702svn.tar.bz2 37 -Source1: ffmpeg-rpmlintrc 38 +Source0: ffmpeg-%{version}.tar.bz2 39 Patch0: ffmpeg_configure.diff 40 Patch1: ffmpeg_fix_return.diff 41 BuildRoot: %{_tmppath}/%{name}-buildroot 42 @@ -74,16 +68,13 @@ 43 BuildRequires: libdc1394-devel 44 BuildRequires: libspeex-devel 45 %if %suse_version >= 1030 46 -BuildRequires: libschroedinger-devel 47 +BuildRequires: schroedinger-devel 48 BuildRequires: liboil-devel >= 0.3.15 49 BuildRequires: libdirac-devel >= 1.0.0 50 %endif 51 -%if 0%{?suse_version} < 1130 52 +%if %suse_version <= 1130 53 BuildRequires: libdc1394_control12-devel 54 -%else 55 -BuildRequires: libdc1394-devel 56 %endif 57 - 58 %if %{with libopenjpeg} 59 BuildRequires: libopenjpeg-devel 60 %endif 61 @@ -93,11 +84,9 @@ 62 BuildRequires: libvpx-devel 63 %endif 64 %endif 65 -Requires: %{libnameavcore} = %{version}-%{release} 66 Requires: %{libnameavcodec} = %{version}-%{release} 67 Requires: %{libnameavdevice} = %{version}-%{release} 68 Requires: %{libnameavformat} = %{version}-%{release} 69 -Requires: %{libnameavfilter} = %{version}-%{release} 70 Requires: %{libnameavutil} = %{version}-%{release} 71 Requires: %{libnamepostproc} = %{version}-%{release} 72 Requires: %{libnameswscale} = %{version}-%{release} 73 @@ -119,26 +108,13 @@ 74 Sound wird in einen MPEG audio layer 2 oder AC3 Stream geschrieben. 75 76 77 -%package -n %{libnameavcore} 78 -Group: System/Libraries 79 -Summary: FFmpeg %{libavcore} 80 -Provides: %{libavcore} = %{version}-%{release} 81 -Requires: %{libnameavutil} = %{version}-%{release} 82 - 83 -%description -n %{libnameavcore} 84 -ffmpeg %{libavcore} shared library 85 - 86 -%description -n %{libnameavcore} -l de 87 -ffmpeg %{libavcore} Bibliothek 88 - 89 - 90 %package -n %{libnameavcodec} 91 Group: System/Libraries 92 Summary: FFmpeg %{libavcodec} 93 Provides: %{libavcodec} = %{version}-%{release} 94 Provides: libffmpeg0 = %{version}-%{release} 95 Obsoletes: libffmpeg0 < %{version}-%{release} 96 -Requires: %{libnameavcore} = %{version}-%{release} 97 +Obsoletes: libavcore0 98 Requires: %{libnameavutil} = %{version}-%{release} 99 100 %description -n %{libnameavcodec} 101 @@ -152,7 +128,6 @@ 102 Group: System/Libraries 103 Summary: FFmpeg %{libavdevice} 104 Provides: %{libavdevice} = %{version}-%{release} 105 -Requires: %{libnameavcore} = %{version}-%{release} 106 Requires: %{libnameavcodec} = %{version}-%{release} 107 Requires: %{libnameavformat} = %{version}-%{release} 108 Requires: %{libnameavutil} = %{version}-%{release} 109 @@ -169,7 +144,6 @@ 110 Summary: FFmpeg %{libavformat} 111 Provides: %{libavformat} = %{version}-%{release} 112 Requires: %{libnameavcodec} = %{version}-%{release} 113 -Requires: %{libnameavcore} = %{version}-%{release} 114 Requires: %{libnameavutil} = %{version}-%{release} 115 116 %description -n %{libnameavformat} 117 @@ -197,7 +171,6 @@ 118 Summary: FFmpeg %{libavutil} 119 Provides: %{libavfilter} = %{version}-%{release} 120 Requires: %{libnameavcodec} = %{version}-%{release} 121 -Requires: %{libnameavcore} = %{version}-%{release} 122 Requires: %{libnameavutil} = %{version}-%{release} 123 Requires: %{libnameswscale} = %{version}-%{release} 124 125 @@ -239,7 +212,6 @@ 126 Group: Development/Libraries/C and C++ 127 Summary: Header files and static library for the ffmpeg library 128 Summary(de): Header Dateien und statische Bibliotheken für die ffmpeg Bibliothek 129 -Requires: %{libnameavcore} = %{version}-%{release} 130 Requires: %{libnameavcodec} = %{version}-%{release} 131 Requires: %{libnameavdevice} = %{version}-%{release} 132 Requires: %{libnameavformat} = %{version}-%{release} 133 @@ -272,7 +244,7 @@ 134 Requires: liboil-devel >= 0.3.15 135 Requires: libdirac-devel >= 1.0.0 136 %endif 137 -%if %suse_version > 1020 && %suse_version < 1140 138 +%if %suse_version <= 1130 139 Requires: libdc1394_control12-devel 140 %endif 141 %if %{with libopenjpeg} 142 @@ -321,8 +293,6 @@ 143 Installieren Sie libffmpeg-devel wenn Sie Anwendungen mit ffmpeg Support 144 compilieren wollen. 145 146 -%debug_package 147 - 148 149 %prep 150 %setup -q -n %{name} 151 @@ -332,8 +302,14 @@ 152 %suse_update_libdir configure 153 #don't call ldconfig on install 154 #perl -pi -e 's/ldconfig \\|\\| true//' libavcodec/Makefile 155 +#remove date references so builds are reproducible (build-compare) 156 +FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') 157 +sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" cmdutils.c 158 +FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S') 159 +sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" cmdutils.c 160 161 %build 162 +export SUSE_ASNEEDED=0 163 archflags="" 164 %ifarch x86_64 amd64 ia32e 165 archflags=" -fPIC" 166 @@ -343,10 +319,13 @@ 167 sed -i -e "s/-fPIC -DPIC//g" libpostproc/Makefile 168 %endif 169 170 -CFLAGS="$RPM_OPT_FLAGS $archflags -I%{_includedir}/gsm" 171 +CFLAGS="${RPM_OPT_FLAGS} ${archflags} -I%{_includedir}/gsm" 172 +%if %{with libopenjpeg} 173 +CFLAGS="${CFLAGS} -I%{_includedir}/openjpeg" 174 +%endif 175 export archflags 176 export CFLAGS 177 -CPPFLAGS="$CFLAGS" 178 +CPPFLAGS="${CFLAGS}" 179 export CPPFLAGS 180 181 ./configure --shlibdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} \ 182 @@ -359,7 +338,7 @@ 183 --enable-libopenjpeg \ 184 %endif 185 --enable-libxvid --enable-postproc --enable-gpl \ 186 - --enable-x11grab --extra-cflags="$CFLAGS" \ 187 + --enable-x11grab --extra-cflags="${CFLAGS}" \ 188 --enable-debug --disable-stripping \ 189 %if %suse_version >= 1030 190 --enable-libschroedinger --enable-libdirac \ 191 @@ -397,9 +376,6 @@ 192 %clean 193 [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} 194 195 -%post -n %{libnameavcore} -p /sbin/ldconfig 196 -%postun -n %{libnameavcore} -p /sbin/ldconfig 197 - 198 %post -n %{libnameavcodec} -p /sbin/ldconfig 199 %postun -n %{libnameavcodec} -p /sbin/ldconfig 200 201
[-] [+]	Changed	ffmpeg_configure.diff ^
@@ -1,6 +1,6 @@ ---- configure.orig 2010-09-28 23:31:55.000000000 +0200 -+++ configure 2010-10-03 17:37:20.605547484 +0200 -@@ -2640,11 +2640,11 @@ +--- configure.orig 2011-02-28 20:16:15.000000000 +0100 ++++ configure 2011-03-09 20:58:42.286516569 +0100 +@@ -2693,11 +2693,11 @@ $nogas "GNU assembler not found, install gas-preprocessor" fi @@ -14,9 +14,9 @@ -fi +#fi - # Solaris has nanosleep in -lrt, OpenSolaris no longer needs that - check_func nanosleep \|\| { check_func nanosleep -lrt && add_extralibs -lrt; } -@@ -3309,7 +3309,7 @@ + if enabled network; then + check_type "sys/types.h sys/socket.h" socklen_t +@@ -3370,7 +3370,7 @@ Conflicts: Libs: -L\${libdir} -l${shortname} $(enabled shared \|\| echo $libs) Libs.private: $(enabled shared && echo $libs) @@ -25,7 +25,7 @@ EOF cat <<EOF > $name/$name-uninstalled.pc prefix= -@@ -3323,7 +3323,7 @@ +@@ -3384,7 +3384,7 @@ Requires: $requires Conflicts: Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
[-] [+]	Changed	ffmpeg_fix_return.diff ^
@@ -1,6 +1,6 @@ diff -ur ffmpeg.orig/libswscale/x86/yuv2rgb_template.c ffmpeg/libswscale/x86/yuv2rgb_template.c ---- ffmpeg.orig/libswscale/x86/yuv2rgb_template.c 2010-05-30 18:50:31.000000000 +0200 -+++ ffmpeg/libswscale/x86/yuv2rgb_template.c 2010-10-03 14:02:16.226730841 +0200 +--- ffmpeg.orig/libswscale/x86/yuv2rgb_template.c 2011-01-23 22:13:55.000000000 +0100 ++++ ffmpeg/libswscale/x86/yuv2rgb_template.c 2011-03-09 20:56:00.394764911 +0100 @@ -407,6 +407,7 @@ YUV2RGB_OPERANDS_ALPHA YUV2RGB_ENDFUNC
	Added	ffmpeg-0.6.201103092102git.tar.bz2 ^
	Deleted	ffmpeg-0.6.25702svn.tar.bz2 ^
[-] [+]	Deleted	ffmpeg-rpmlintrc ^
@@ -1 +0,0 @@ -addFilter("shlib-fixed-dependency")