diff options
| author |   Eric Hameleers <alien@slackware.com> | 2021-03-29 20:10:12 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2021-03-29 20:10:12 +0000 |
| commit | 9becf5f8db97a2ddd55b9b290faac03e0702572b (patch) | |
| tree | 0f667a3aecf2b33d8ce12dcdd08b2e510fe17a11 /ffmpeg | |
| parent | 848131c9dd871fdd51f4a28b35e3cc414aa3d733 (diff) | |
| download | asb-9becf5f8db97a2ddd55b9b290faac03e0702572b.tar.gz asb-9becf5f8db97a2ddd55b9b290faac03e0702572b.tar.xz | |
ffmpeg: fix compilation issue with libgme
Diffstat (limited to 'ffmpeg')
| -rwxr-xr-x | ffmpeg/build/ffmpeg.SlackBuild | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild index 1ca9f5c5..45b7fdec 100755 --- a/ffmpeg/build/ffmpeg.SlackBuild +++ b/ffmpeg/build/ffmpeg.SlackBuild @@ -1630,6 +1630,9 @@ make_gme() echo -e "**\n** gme ...\n**" cd $TMP/tmp-$PRGNAM/game-music-emu-${GME} +# Fix 64bit installation path for the static libary: +sed -i gme/CMakeLists.txt -e 's#DESTINATION lib #DESTINATION lib${LIB_SUFFIX} #' + mkdir build-gme cd build-gme cmake .. \ @@ -1641,7 +1644,8 @@ cd build-gme -DCMAKE_INSTALL_PREFIX=$FFMPEGDEPSDIR/usr \ -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DENABLE_SHARED=OFF \ + -DBUILD_SHARED_LIBS=OFF \ + -DENABLE_UBSAN=OFF \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}_gme.log make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_gme.log # Install gme into a temp location so ffmpeg can pickup the library @@ -1701,7 +1705,7 @@ TMPDIR="$TMP" \ CFLAGS="-I$FFMPEGDEPSDIR/usr/include $SLKCFLAGS" \ CPPFLAGS="-I$FFMPEGDEPSDIR/usr/include -I$FFMPEGDEPSDIR/usr/include/SDL" \ CXXFLAGS="-I$FFMPEGDEPSDIR/usr/include -I$FFMPEGDEPSDIR/usr/include/SDL $SLKCFLAGS" \ -LDFLAGS="-L$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS -lpthread -lpng -lusb-1.0 -lXext" \ +LDFLAGS="-L$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS -lm -lpthread -lpng -lusb-1.0 -lXext" \ PKG_CONFIG_PATH="$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \ PATH="$FFMPEGDEPSDIR/usr/bin:$PATH" \ ./configure \ |