Commit 294ed90b99526f32a964a4ed322058098eb7f747
1 parent
cefc8f6149
Exists in
master
Makefile.defs: specify other ffmpeg 2.2 vs ffmpeg1 preferences
Showing 2 changed files with 9 additions and 4 deletions Side-by-side Diff
Makefile.defs
... | ... | @@ -147,8 +147,10 @@ |
147 | 147 | libavutil.so.52[LIBAVUTIL_52][64bit] = libavutil-ffmpeg |
148 | 148 | libswscale.so.2[][64bit] = libswscale-ffmpeg |
149 | 149 | libswscale.so.2[LIBSWSCALE_2][64bit] = libswscale-ffmpeg |
150 | -libpostproc.so.51[][64bit] = libpostproc-ffmpeg | |
151 | -libpostproc.so.51[LIBPOSTPROC_51][64bit] = libpostproc-ffmpeg | |
150 | +libpostproc.so.52[][64bit] = libpostproc-ffmpeg | |
151 | +libpostproc.so.52[LIBPOSTPROC_52][64bit] = libpostproc-ffmpeg | |
152 | +libswresample.so.0[][64bit] = libswresample-ffmpeg | |
153 | +libswresample.so.0[][LIBSWRESAMPLE_0] = libswresample-ffmpeg | |
152 | 154 | else |
153 | 155 | libGL.so.1 = libGL-Mesa-dri |
154 | 156 | libGLU.so.1 = libGL-Mesa-dri |
... | ... | @@ -182,8 +184,10 @@ |
182 | 184 | libavutil.so.52[LIBAVUTIL_52] = libavutil-ffmpeg |
183 | 185 | libswscale.so.2 = libswscale-ffmpeg |
184 | 186 | libswscale.so.2[LIBSWSCALE_2] = libswscale-ffmpeg |
185 | -libpostproc.so.51 = libpostproc-ffmpeg | |
186 | -libpostproc.so.51[LIBPOSTPROC_51] = libpostproc-ffmpeg | |
187 | +libpostproc.so.52 = libpostproc-ffmpeg | |
188 | +libpostproc.so.52[LIBPOSTPROC_52] = libpostproc-ffmpeg | |
189 | +libswresample.so.0 = libswresample-ffmpeg | |
190 | +libswresample.so.0[LIBSWRESAMPLE_0] = libswresample-ffmpeg | |
187 | 191 | endif |
188 | 192 | /usr/bin/python = python |
189 | 193 | python[abi] = python |
makedist.inc.sh
... | ... | @@ -14,6 +14,7 @@ |
14 | 14 | create_rpm_database |
15 | 15 | create_devices |
16 | 16 | |
17 | +echo "Installing preparation packages..." | |
17 | 18 | install_rpms "filesystem gzip texinfo ldconfig bash libreadline glibc libncurses initscripts setup coreutils chkconfig libattr libstdc++6" "--nodeps --noorder --noscripts" |
18 | 19 | |
19 | 20 | [ "$LANGUAGE" ] && { |