Changes - j0ke.net Open Build Service

Changes of Revision 8

[-] [+]	Deleted	ffmpeg.changes
@@ -1,5 +0,0 @@ -------------------------------------------------------------------- -Sat Mar 12 21:18:22 UTC 2011 - cs@linux-administrator.com - -- re-import -
[-] [+]	Changed	ffmpeg.spec ^
@@ -1,47 +1,49 @@ +# norootforbuild + %define lib libffmpeg -%define majoravcodec 52 +%define majoravcodec 53 %define libavcodec libavcodec %define libnameavcodec %{libavcodec}%{majoravcodec} -%define majoravdevice 52 +%define majoravdevice 53 %define libavdevice libavdevice %define libnameavdevice %{libavdevice}%{majoravdevice} -%define majoravformat 52 +%define majoravformat 53 %define libavformat libavformat %define libnameavformat %{libavformat}%{majoravformat} -%define majoravutil 50 +%define majoravutil 51 %define libavutil libavutil %define libnameavutil %{libavutil}%{majoravutil} -%define majoravfilter 1 +%define majoravfilter 2 %define libavfilter libavfilter %define libnameavfilter %{libavfilter}%{majoravfilter} %define majorpostproc 51 %define libpostproc libpostproc %define libnamepostproc %{libpostproc}%{majorpostproc} -%define majorswscale 0 +%define majorswscale 2 %define libswscale libswscale %define libnameswscale %{libswscale}%{majorswscale} -%define lastrelease 0.6 -%define svnsnapshot 201103092102 +%define lastrelease 0.8 +#define svnsnapshot 201106212300 %bcond_without avfilter %bcond_without libvpx %bcond_with libfaac -%bcond_without libopenjpeg +%bcond_with libopenjpeg Name: ffmpeg -Version: %{lastrelease}.%{svnsnapshot}git -Release: 10 +Version: %{lastrelease} +Release: 2 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 +URL: http://www.ffmpeg.org Source0: ffmpeg-%{version}.tar.bz2 -Source1: ffmpeg-rpmlintrc -Patch0: ffmpeg_configure.diff -Patch1: ffmpeg_fix_return.diff +Source1: ffmpeg.rpmlintrc BuildRoot: %{_tmppath}/%{name}-buildroot +Provides: libav = %{version}-%{release} +Obsoletes: libav < %{version}-%{release} BuildRequires: yasm BuildRequires: libgsm BuildRequires: libgsm-devel @@ -67,13 +69,13 @@ BuildRequires: libopencore-amr-devel BuildRequires: libdc1394 BuildRequires: libdc1394-devel -BuildRequires: libspeex-devel -%if %suse_version >= 1030 +BuildRequires: speex-devel BuildRequires: schroedinger-devel BuildRequires: liboil-devel >= 0.3.15 -BuildRequires: libdirac-devel >= 1.0.0 -%endif -%if %suse_version <= 1130 +BuildRequires: dirac-devel >= 1.0.0 +BuildRequires: librtmp-devel +BuildRequires: libva-devel +%if 0%{?suse_version} <= 1130 BuildRequires: libdc1394_control12-devel %endif %if %{with libopenjpeg} @@ -113,9 +115,10 @@ Group: System/Libraries Summary: FFmpeg %{libavcodec} Provides: %{libavcodec} = %{version}-%{release} +Provides: libffmpeg = %{version}-%{release} +Obsoletes: libffmpeg < %{version}-%{release} Provides: libffmpeg0 = %{version}-%{release} Obsoletes: libffmpeg0 < %{version}-%{release} -Obsoletes: libavcore0 Requires: %{libnameavutil} = %{version}-%{release} %description -n %{libnameavcodec} @@ -213,6 +216,12 @@ 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 +Obsoletes: ffmpeg-devel < %{version} +Provides: ffmpeg-devel = %{version} +Provides: libffmpeg0-devel = %{version}-%{release} +Obsoletes: libffmpeg0-devel < %{version}-%{release} +Obsoletes: libav-devel < %{version} +Provides: libav-devel = %{version} Requires: %{libnameavcodec} = %{version}-%{release} Requires: %{libnameavdevice} = %{version}-%{release} Requires: %{libnameavformat} = %{version}-%{release} @@ -236,16 +245,16 @@ Requires: libx264-devel Requires: libopencore-amr-devel Requires: libjack-devel -Requires: libspeex-devel +Requires: speex-devel Requires: libgsm-devel Requires: libdc1394 Requires: libdc1394-devel -%if %suse_version >= 1030 -Requires: libschroedinger-devel +Requires: schroedinger-devel Requires: liboil-devel >= 0.3.15 -Requires: libdirac-devel >= 1.0.0 -%endif -%if %suse_version <= 1130 +Requires: dirac-devel >= 1.0.0 +Requires: librtmp-devel +Requires: libva-devel +%if 0%{?suse_version} <= 1130 Requires: libdc1394_control12-devel %endif %if %{with libopenjpeg} @@ -270,8 +279,6 @@ %endif Provides: libpostproc.so %endif -Obsoletes: ffmpeg-devel < %{version} -Provides: ffmpeg-devel = %{version} %description -n %{lib}-devel ffmpeg is a hyper fast realtime audio/video encoder, a streaming server @@ -296,14 +303,18 @@ %prep -%setup -q -n %{name} -%patch0 -%patch1 -p1 -sed -i -e "s/UNKNOWN/SVN-r%{svnsnapshot}/g" version.sh +%setup -q -n %{name}-%{version} +#gitsnapshot=$(echo %{version} \| sed "s;.git;;g") +#gitdate=$(echo $gitsnapshot \| sed "s;\..;;g") +#gittime="$(echo $gitsnapshot \| sed "s;.\.;;g" \| cut -b 1-2):$(echo $gitsnapshot \| sed "s;.\.;;g" \| cut -b 3-4):00" +#sed -i -e "s/UNKNOWN/GIT-$gitsnapshot/g" version.sh +#sed -i -e "s/UNKNOWN/GIT-%{svnsnapshot}/g" version.sh %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) +#sed -i "s/__DATE__/\"$gitdate\"/" cmdutils.c +#sed -i "s/__TIME__/\"$gittime\"/" cmdutils.c 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') @@ -330,7 +341,7 @@ export CPPFLAGS ./configure --shlibdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} \ - --libdir=%{_libdir} --enable-shared --enable-libmp3lame \ + --libdir=%{_libdir} --enable-shared --disable-static --enable-libmp3lame \ --enable-libvorbis --enable-libtheora --enable-libspeex \ %if %{with libfaac} --enable-libfaac --enable-nonfree \ @@ -340,11 +351,8 @@ %endif --enable-libxvid --enable-postproc --enable-gpl \ --enable-x11grab --extra-cflags="${CFLAGS}" \ - --enable-debug --disable-stripping \ -%if %suse_version >= 1030 + --enable-debug --disable-stripping --enable-libgsm \ --enable-libschroedinger --enable-libdirac \ -%endif - --enable-libgsm \ %ifarch ppc --disable-altivec \ %endif @@ -359,7 +367,7 @@ %endif %endif --enable-version3 --enable-libopencore-amrnb --enable-libopencore-amrwb \ - --enable-libx264 --enable-libdc1394 --enable-pthreads + --enable-libx264 --enable-libdc1394 --enable-pthreads --enable-librtmp %{__make} %{?jobs:-j%{jobs}} V=1 %install @@ -368,11 +376,13 @@ %{__mkdir_p} %{buildroot}%{_includedir}/postproc %{__install} -d %{buildroot}%{_libdir}/libavcodec -%{__rm} -rf doc/.svn x 1 @@ -1,47 +1,49 @@ 2 +# norootforbuild 3 + 4 %define lib libffmpeg 5 -%define majoravcodec 52 6 +%define majoravcodec 53 7 %define libavcodec libavcodec 8 %define libnameavcodec %{libavcodec}%{majoravcodec} 9 -%define majoravdevice 52 10 +%define majoravdevice 53 11 %define libavdevice libavdevice 12 %define libnameavdevice %{libavdevice}%{majoravdevice} 13 -%define majoravformat 52 14 +%define majoravformat 53 15 %define libavformat libavformat 16 %define libnameavformat %{libavformat}%{majoravformat} 17 -%define majoravutil 50 18 +%define majoravutil 51 19 %define libavutil libavutil 20 %define libnameavutil %{libavutil}%{majoravutil} 21 -%define majoravfilter 1 22 +%define majoravfilter 2 23 %define libavfilter libavfilter 24 %define libnameavfilter %{libavfilter}%{majoravfilter} 25 %define majorpostproc 51 26 %define libpostproc libpostproc 27 %define libnamepostproc %{libpostproc}%{majorpostproc} 28 -%define majorswscale 0 29 +%define majorswscale 2 30 %define libswscale libswscale 31 %define libnameswscale %{libswscale}%{majorswscale} 32 -%define lastrelease 0.6 33 -%define svnsnapshot 201103092102 34 +%define lastrelease 0.8 35 +#define svnsnapshot 201106212300 36 37 %bcond_without avfilter 38 %bcond_without libvpx 39 %bcond_with libfaac 40 -%bcond_without libopenjpeg 41 +%bcond_with libopenjpeg 42 43 44 Name: ffmpeg 45 -Version: %{lastrelease}.%{svnsnapshot}git 46 -Release: 10 47 +Version: %{lastrelease} 48 +Release: 2 49 License: LGPL v2 or later and some code GPL v2 or later 50 Group: Productivity/Multimedia/Video/Editors and Convertors 51 Summary: Hyper fast MPEG1/MPEG4/H263/RV and AC3/MPEG audio encoder 52 Summary(de): Hyperschneller MPEG1/MPEG4/H263/RV Und AC3/MPEG Audio-Encoder 53 -URL: http://ffmpeg.mplayerhq.hu 54 +URL: http://www.ffmpeg.org 55 Source0: ffmpeg-%{version}.tar.bz2 56 -Source1: ffmpeg-rpmlintrc 57 -Patch0: ffmpeg_configure.diff 58 -Patch1: ffmpeg_fix_return.diff 59 +Source1: ffmpeg.rpmlintrc 60 BuildRoot: %{_tmppath}/%{name}-buildroot 61 +Provides: libav = %{version}-%{release} 62 +Obsoletes: libav < %{version}-%{release} 63 BuildRequires: yasm 64 BuildRequires: libgsm 65 BuildRequires: libgsm-devel 66 @@ -67,13 +69,13 @@ 67 BuildRequires: libopencore-amr-devel 68 BuildRequires: libdc1394 69 BuildRequires: libdc1394-devel 70 -BuildRequires: libspeex-devel 71 -%if %suse_version >= 1030 72 +BuildRequires: speex-devel 73 BuildRequires: schroedinger-devel 74 BuildRequires: liboil-devel >= 0.3.15 75 -BuildRequires: libdirac-devel >= 1.0.0 76 -%endif 77 -%if %suse_version <= 1130 78 +BuildRequires: dirac-devel >= 1.0.0 79 +BuildRequires: librtmp-devel 80 +BuildRequires: libva-devel 81 +%if 0%{?suse_version} <= 1130 82 BuildRequires: libdc1394_control12-devel 83 %endif 84 %if %{with libopenjpeg} 85 @@ -113,9 +115,10 @@ 86 Group: System/Libraries 87 Summary: FFmpeg %{libavcodec} 88 Provides: %{libavcodec} = %{version}-%{release} 89 +Provides: libffmpeg = %{version}-%{release} 90 +Obsoletes: libffmpeg < %{version}-%{release} 91 Provides: libffmpeg0 = %{version}-%{release} 92 Obsoletes: libffmpeg0 < %{version}-%{release} 93 -Obsoletes: libavcore0 94 Requires: %{libnameavutil} = %{version}-%{release} 95 96 %description -n %{libnameavcodec} 97 @@ -213,6 +216,12 @@ 98 Group: Development/Libraries/C and C++ 99 Summary: Header files and static library for the ffmpeg library 100 Summary(de): Header Dateien und statische Bibliotheken für die ffmpeg Bibliothek 101 +Obsoletes: ffmpeg-devel < %{version} 102 +Provides: ffmpeg-devel = %{version} 103 +Provides: libffmpeg0-devel = %{version}-%{release} 104 +Obsoletes: libffmpeg0-devel < %{version}-%{release} 105 +Obsoletes: libav-devel < %{version} 106 +Provides: libav-devel = %{version} 107 Requires: %{libnameavcodec} = %{version}-%{release} 108 Requires: %{libnameavdevice} = %{version}-%{release} 109 Requires: %{libnameavformat} = %{version}-%{release} 110 @@ -236,16 +245,16 @@ 111 Requires: libx264-devel 112 Requires: libopencore-amr-devel 113 Requires: libjack-devel 114 -Requires: libspeex-devel 115 +Requires: speex-devel 116 Requires: libgsm-devel 117 Requires: libdc1394 118 Requires: libdc1394-devel 119 -%if %suse_version >= 1030 120 -Requires: libschroedinger-devel 121 +Requires: schroedinger-devel 122 Requires: liboil-devel >= 0.3.15 123 -Requires: libdirac-devel >= 1.0.0 124 -%endif 125 -%if %suse_version <= 1130 126 +Requires: dirac-devel >= 1.0.0 127 +Requires: librtmp-devel 128 +Requires: libva-devel 129 +%if 0%{?suse_version} <= 1130 130 Requires: libdc1394_control12-devel 131 %endif 132 %if %{with libopenjpeg} 133 @@ -270,8 +279,6 @@ 134 %endif 135 Provides: libpostproc.so 136 %endif 137 -Obsoletes: ffmpeg-devel < %{version} 138 -Provides: ffmpeg-devel = %{version} 139 140 %description -n %{lib}-devel 141 ffmpeg is a hyper fast realtime audio/video encoder, a streaming server 142 @@ -296,14 +303,18 @@ 143 144 145 %prep 146 -%setup -q -n %{name} 147 -%patch0 148 -%patch1 -p1 149 -sed -i -e "s/UNKNOWN/SVN-r%{svnsnapshot}/g" version.sh 150 +%setup -q -n %{name}-%{version} 151 +#gitsnapshot=$(echo %{version} \| sed "s;.git;;g") 152 +#gitdate=$(echo $gitsnapshot \| sed "s;\..;;g") 153 +#gittime="$(echo $gitsnapshot \| sed "s;.\.;;g" \| cut -b 1-2):$(echo $gitsnapshot \| sed "s;.\.;;g" \| cut -b 3-4):00" 154 +#sed -i -e "s/UNKNOWN/GIT-$gitsnapshot/g" version.sh 155 +#sed -i -e "s/UNKNOWN/GIT-%{svnsnapshot}/g" version.sh 156 %suse_update_libdir configure 157 #don't call ldconfig on install 158 #perl -pi -e 's/ldconfig \\|\\| true//' libavcodec/Makefile 159 #remove date references so builds are reproducible (build-compare) 160 +#sed -i "s/__DATE__/\"$gitdate\"/" cmdutils.c 161 +#sed -i "s/__TIME__/\"$gittime\"/" cmdutils.c 162 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') 163 sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" cmdutils.c 164 FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S') 165 @@ -330,7 +341,7 @@ 166 export CPPFLAGS 167 168 ./configure --shlibdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} \ 169 - --libdir=%{_libdir} --enable-shared --enable-libmp3lame \ 170 + --libdir=%{_libdir} --enable-shared --disable-static --enable-libmp3lame \ 171 --enable-libvorbis --enable-libtheora --enable-libspeex \ 172 %if %{with libfaac} 173 --enable-libfaac --enable-nonfree \ 174 @@ -340,11 +351,8 @@ 175 %endif 176 --enable-libxvid --enable-postproc --enable-gpl \ 177 --enable-x11grab --extra-cflags="${CFLAGS}" \ 178 - --enable-debug --disable-stripping \ 179 -%if %suse_version >= 1030 180 + --enable-debug --disable-stripping --enable-libgsm \ 181 --enable-libschroedinger --enable-libdirac \ 182 -%endif 183 - --enable-libgsm \ 184 %ifarch ppc 185 --disable-altivec \ 186 %endif 187 @@ -359,7 +367,7 @@ 188 %endif 189 %endif 190 --enable-version3 --enable-libopencore-amrnb --enable-libopencore-amrwb \ 191 - --enable-libx264 --enable-libdc1394 --enable-pthreads 192 + --enable-libx264 --enable-libdc1394 --enable-pthreads --enable-librtmp 193 %{__make} %{?jobs:-j%{jobs}} V=1 194 195 %install 196 @@ -368,11 +376,13 @@ 197 198 %{__mkdir_p} %{buildroot}%{_includedir}/postproc 199 %{__install} -d %{buildroot}%{_libdir}/libavcodec 200 -%{__rm} -rf doc/.svn 201
[-] [+]	Deleted	ffmpeg_configure.diff ^
@@ -1,36 +0,0 @@ ---- 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 - --if check_func dlopen; then -- ldl= --elif check_func dlopen -ldl; then -+#if check_func dlopen; then -+# ldl= -+#elif check_func dlopen -ldl; then - ldl=-ldl --fi -+#fi - - 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) --Cflags: -I\${includedir} -+Cflags: -I/usr/include -I/usr/include/$name - EOF - cat <<EOF > $name/$name-uninstalled.pc - prefix= -@@ -3384,7 +3384,7 @@ - Requires: $requires - Conflicts: - Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs --Cflags: -I\${includedir} -+Cflags: -I/usr/include -I/usr/include/$name - EOF - } -
[-] [+]	Deleted	ffmpeg_fix_return.diff ^
@@ -1,17 +0,0 @@ -diff -ur ffmpeg.orig/libswscale/x86/yuv2rgb_template.c ffmpeg/libswscale/x86/yuv2rgb_template.c ---- 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 - #endif -+ return 0; - } - - static inline int RENAME(yuv420_bgr32)(SwsContext c, const uint8_t src[], -@@ -450,4 +451,5 @@ - YUV2RGB_OPERANDS_ALPHA - YUV2RGB_ENDFUNC - #endif -+ return 0; - }
	Changed	ffmpeg-0.8.tar.bz2 ^
[-] [+]	Deleted	ffmpeg-rpmlintrc ^
@@ -1,2 +0,0 @@ -addFilter("shlib-fixed-dependency") -addFilter("shlib-with-non-pic-code")
[-] [+]	Added	ffmpeg.rpmlintrc ^
@@ -0,0 +1,4 @@ +# This line is mandatory to access the configuration functions +from Config import * + +addFilter("shlib-fixed-dependency")