From 294ed90b99526f32a964a4ed322058098eb7f747 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Tue, 25 Mar 2014 12:40:17 +0100 Subject: [PATCH] Makefile.defs: specify other ffmpeg 2.2 vs ffmpeg1 preferences --- Makefile.defs | 12 ++++++++---- makedist.inc.sh | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index f890ed6..2ee4403 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -147,8 +147,10 @@ libavutil.so.52[][64bit] = libavutil-ffmpeg libavutil.so.52[LIBAVUTIL_52][64bit] = libavutil-ffmpeg libswscale.so.2[][64bit] = libswscale-ffmpeg libswscale.so.2[LIBSWSCALE_2][64bit] = libswscale-ffmpeg -libpostproc.so.51[][64bit] = libpostproc-ffmpeg -libpostproc.so.51[LIBPOSTPROC_51][64bit] = libpostproc-ffmpeg +libpostproc.so.52[][64bit] = libpostproc-ffmpeg +libpostproc.so.52[LIBPOSTPROC_52][64bit] = libpostproc-ffmpeg +libswresample.so.0[][64bit] = libswresample-ffmpeg +libswresample.so.0[][LIBSWRESAMPLE_0] = libswresample-ffmpeg else libGL.so.1 = libGL-Mesa-dri libGLU.so.1 = libGL-Mesa-dri @@ -182,8 +184,10 @@ libavutil.so.52 = libavutil-ffmpeg libavutil.so.52[LIBAVUTIL_52] = libavutil-ffmpeg libswscale.so.2 = libswscale-ffmpeg libswscale.so.2[LIBSWSCALE_2] = libswscale-ffmpeg -libpostproc.so.51 = libpostproc-ffmpeg -libpostproc.so.51[LIBPOSTPROC_51] = libpostproc-ffmpeg +libpostproc.so.52 = libpostproc-ffmpeg +libpostproc.so.52[LIBPOSTPROC_52] = libpostproc-ffmpeg +libswresample.so.0 = libswresample-ffmpeg +libswresample.so.0[LIBSWRESAMPLE_0] = libswresample-ffmpeg endif /usr/bin/python = python python[abi] = python diff --git a/makedist.inc.sh b/makedist.inc.sh index cde39f0..52c517c 100644 --- a/makedist.inc.sh +++ b/makedist.inc.sh @@ -14,6 +14,7 @@ initialize_root_dir create_rpm_database create_devices +echo "Installing preparation packages..." install_rpms "filesystem gzip texinfo ldconfig bash libreadline glibc libncurses initscripts setup coreutils chkconfig libattr libstdc++6" "--nodeps --noorder --noscripts" [ "$LANGUAGE" ] && {