diff options
author | David Spencer <baildon.research@googlemail.com> | 2015-05-30 07:11:36 +0100 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-01-17 09:40:16 +0700 |
commit | 644591cddb37c8b93642ce6f74f8b96e7d692d30 (patch) | |
tree | a7ca31b9cec134c5ee6fc37e114ec1db7865ed25 /multimedia/ffmpeg2theora | |
parent | 4904ba8459bedc9cd1dcf657195268e17ad681d6 (diff) |
multimedia/ffmpeg2theora: Patched to fix building with -current.
Signed-off-by: David Spencer <baildon.research@googlemail.com>
Diffstat (limited to 'multimedia/ffmpeg2theora')
-rw-r--r-- | multimedia/ffmpeg2theora/ffmpeg2theora.SlackBuild | 3 | ||||
-rw-r--r-- | multimedia/ffmpeg2theora/link-libm.patch | 16 |
2 files changed, 19 insertions, 0 deletions
diff --git a/multimedia/ffmpeg2theora/ffmpeg2theora.SlackBuild b/multimedia/ffmpeg2theora/ffmpeg2theora.SlackBuild index aae5c080f85e6..f2efde2012ea5 100644 --- a/multimedia/ffmpeg2theora/ffmpeg2theora.SlackBuild +++ b/multimedia/ffmpeg2theora/ffmpeg2theora.SlackBuild @@ -73,6 +73,9 @@ for diff in $CWD/patches/*.diff; do echo $diff patch -p1 < $diff done +# Fix underlinking on -current +# thanks to Debian https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=768674 +patch -p1 < $CWD/link-libm.patch scons install APPEND_CCFLAGS="$SLKCFLAGS" prefix=/usr destdir=$PKG diff --git a/multimedia/ffmpeg2theora/link-libm.patch b/multimedia/ffmpeg2theora/link-libm.patch new file mode 100644 index 0000000000000..326889be08a29 --- /dev/null +++ b/multimedia/ffmpeg2theora/link-libm.patch @@ -0,0 +1,16 @@ +Description: Link libm for ceil +Author: Sebastian Ramacher <sramacher@debian.org> +Last-Update: 2014-11-09 +Bug-Debian: https://bugs.debian.org/768674 + +--- ffmpeg2theora-0.29.0~git+20140316.orig/SConstruct ++++ ffmpeg2theora-0.29.0~git+20140316/SConstruct +@@ -221,6 +221,8 @@ if not env.GetOption('clean'): + env.Append(LIBS=['m']) + elif env['static']: + env.Append(LIBS=['m', 'dl']) ++ else: ++ env.Append(LIBS=['m']) + + + env = conf.Finish() |