openmamba/makedist-openmamba-milestone3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile.defs: specify other ffmpeg 2.2 vs ffmpeg1 preferences

Browse Source
This commit is contained in:
Silvan Calarco 2014-03-25 12:40:17 +01:00
parent cefc8f6149
commit 294ed90b99
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.defs
View File

@ -147,8 +147,10 @@ libavutil.so.52[][64bit] = libavutil-ffmpeg
libavutil.so.52[LIBAVUTIL_52][64bit] = libavutil-ffmpeg libavutil.so.52[LIBAVUTIL_52][64bit] = libavutil-ffmpeg
libswscale.so.2[][64bit] = libswscale-ffmpeg libswscale.so.2[][64bit] = libswscale-ffmpeg
libswscale.so.2[LIBSWSCALE_2][64bit] = libswscale-ffmpeg libswscale.so.2[LIBSWSCALE_2][64bit] = libswscale-ffmpeg
libpostproc.so.51[][64bit] = libpostproc-ffmpeg libpostproc.so.52[][64bit] = libpostproc-ffmpeg
libpostproc.so.51[LIBPOSTPROC_51][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 else
libGL.so.1 = libGL-Mesa-dri libGL.so.1 = libGL-Mesa-dri
libGLU.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 libavutil.so.52[LIBAVUTIL_52] = libavutil-ffmpeg
libswscale.so.2 = libswscale-ffmpeg libswscale.so.2 = libswscale-ffmpeg
libswscale.so.2[LIBSWSCALE_2] = libswscale-ffmpeg libswscale.so.2[LIBSWSCALE_2] = libswscale-ffmpeg
libpostproc.so.51 = libpostproc-ffmpeg libpostproc.so.52 = libpostproc-ffmpeg
libpostproc.so.51[LIBPOSTPROC_51] = libpostproc-ffmpeg libpostproc.so.52[LIBPOSTPROC_52] = libpostproc-ffmpeg
libswresample.so.0 = libswresample-ffmpeg
libswresample.so.0[LIBSWRESAMPLE_0] = libswresample-ffmpeg
endif endif
/usr/bin/python = python /usr/bin/python = python
python[abi] = python python[abi] = python

1
makedist.inc.sh
View File

@ -14,6 +14,7 @@ initialize_root_dir
create_rpm_database create_rpm_database
create_devices 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" install_rpms "filesystem gzip texinfo ldconfig bash libreadline glibc libncurses initscripts setup coreutils chkconfig libattr libstdc++6" "--nodeps --noorder --noscripts"
[ "$LANGUAGE" ] && { [ "$LANGUAGE" ] && {