summaryrefslogtreecommitdiffstats
path: root/ffmpeg
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2014-11-16 00:07:59 +0000
committer Eric Hameleers <alien@slackware.com>2014-11-16 00:07:59 +0000
commit4f5b8c20a14b0f80e2bb49d97b46cacdaa29e569 (patch)
treeb555c9b51110c332bf31fede94f9eff4c34dfc27 /ffmpeg
parent3fdd879e3f3d1a7c070202638c7548240779df3d (diff)
downloadasb-4f5b8c20a14b0f80e2bb49d97b46cacdaa29e569.tar.gz
asb-4f5b8c20a14b0f80e2bb49d97b46cacdaa29e569.tar.xz
Fix static linking of libx265
Diffstat (limited to 'ffmpeg')
-rwxr-xr-xffmpeg/build/ffmpeg.SlackBuild2
1 files changed, 2 insertions, 0 deletions
diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild
index 11701a02..1fd26d67 100755
--- a/ffmpeg/build/ffmpeg.SlackBuild
+++ b/ffmpeg/build/ffmpeg.SlackBuild
@@ -776,6 +776,7 @@ cd build_x265
-DCMAKE_LDFLAGS:STRING="$SLKLDFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_INSTALL_DIR=lib${LIBDIRSUFFIX} \
+ -DENABLE_SHARED=OFF \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_x265.log
make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_x265.log
# Install x265 into a temp location so ffmpeg can pickup the library
@@ -1631,6 +1632,7 @@ PATH="$FFMPEGDEPSDIR/usr/bin:$PATH" \
$ARCHOPTS \
--extra-cflags="-I$FFMPEGDEPSDIR/usr/include -DRUNTIME_CPUDETECT" \
--extra-ldflags="-L$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX} -ldl -lssl -lcrypto -lz -lusb" \
+ --pkg-config-flags="--static" \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_ffmpeg.log
# Use ffmpeg's own implementation:
#--enable-librtmp \