diff options
| author |   Eric Hameleers <alien@slackware.com> | 2018-02-12 14:23:49 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-02-12 14:23:49 +0000 |
| commit | 13a52b2e06ed6081c099768be6335db8b74fd39f (patch) | |
| tree | 330888a1d99f70796c2cc7de1091c17247fdd46e /ffmpeg | |
| parent | c14cabe604c91188087c8193358367f3ad14ff50 (diff) | |
| download | asb-13a52b2e06ed6081c099768be6335db8b74fd39f.tar.gz asb-13a52b2e06ed6081c099768be6335db8b74fd39f.tar.xz | |
ffmpeg: enable x62410b (10-bit decoder) in libx264
Diffstat (limited to 'ffmpeg')
| -rwxr-xr-x | ffmpeg/build/ffmpeg.SlackBuild | 55 |
1 files changed, 27 insertions, 28 deletions
diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild index e8c0f7ab..438711f1 100755 --- a/ffmpeg/build/ffmpeg.SlackBuild +++ b/ffmpeg/build/ffmpeg.SlackBuild @@ -1074,32 +1074,31 @@ make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_x264.log make install DESTDIR=$FFMPEGDEPSDIR \ 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_x264.log -## To be enabled on next ffmpeg release: -#echo -e "**\n** x264 (10bit) ...\n**" -#echo -e "\n** 10-bit\n**" >> $OUTPUT/configure-${PRGNAM}_x264.log -#echo -e "\n** 10-bit\n**" >> $OUTPUT/make-${PRGNAM}_x264.log -# -## Now add a x62410b (10-bit decoder) to the depsdir: -#make clean -#CFLAGS="$SLKCFLAGS" \ -#CXXFLAGS="$SLKCFLAGS" \ -#LDFLAGS="$SLKLDFLAGS" \ -#./configure \ -# --prefix=/usr \ -# --libdir=/usr/lib${LIBDIRSUFFIX} \ -# --enable-static \ -# --disable-cli \ -# --bit-depth=10 \ -# $ARCHOPTS \ -# 2>&1 | tee -a $OUTPUT/configure-${PRGNAM}_x264.log -#sed -i -e 's/libx264/libx26410b/g' Makefile config.mak -#sed -i -e 's/x264/x26410b/g' x264.pc -#mv x264.pc x26410b.pc -#sed -i -e 's/x264.pc/x26410b.pc/g' Makefile -#make ${NUMJOBS} 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_x264.log -## Install x264 into a temp location so ffmpeg can pickup the library -#make install DESTDIR=$FFMPEGDEPSDIR \ -# 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_x264.log +echo -e "**\n** x264 (10bit) ...\n**" +echo -e "\n** 10-bit\n**" >> $OUTPUT/configure-${PRGNAM}_x264.log +echo -e "\n** 10-bit\n**" >> $OUTPUT/make-${PRGNAM}_x264.log + +# Now add a x62410b (10-bit decoder) to the depsdir: +make clean +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +LDFLAGS="$SLKLDFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --enable-static \ + --disable-cli \ + --bit-depth=10 \ + $ARCHOPTS \ + 2>&1 | tee -a $OUTPUT/configure-${PRGNAM}_x264.log +sed -i -e 's/libx264/libx26410b/g' Makefile config.mak +sed -i -e 's/x264/x26410b/g' x264.pc +mv x264.pc x26410b.pc +sed -i -e 's/x264.pc/x26410b.pc/g' Makefile +make ${NUMJOBS} 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_x264.log +# Install x264 into a temp location so ffmpeg can pickup the library +make install DESTDIR=$FFMPEGDEPSDIR \ + 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_x264.log # Add DOCS to the ffmpegdeps to have it added to ffmpeg package later: mkdir -p $FFMPEGDEPSDIR/doc/x264 @@ -1571,8 +1570,8 @@ cd $TMP/tmp-$PRGNAM/ffmpeg-${VERSION} # Fix compilation with newer libx264: # To actually use the new multi-bitdepth in libx264 we need a newer release # of ffmpeg, and then enable 10bit support in make_x264() -cat $SRCDIR/patches/x264_bitdepth.patch | patch -p1 --verbose \ - 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log +#cat $SRCDIR/patches/x264_bitdepth.patch | patch -p1 --verbose \ +# 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log if [ "$ARCH" = "x86_64" ]; then ARCHOPTS="--arch=x86_64 --enable-pic" |