diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-11-02 21:04:36 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-11-08 23:39:33 +0530 |
| commit | 90e1943450850d85003411f47d8b4ea17e08d41d (patch) | |
| tree | 394dd47d5d2422f68776f50ad50758ba970f0949 /recipes/libjpeg-turbo.recipe | |
| parent | 3c494023980e0d06e4615e840e1acbe1d425b59f (diff) | |
build-tools: Replace yasm with nasm
nasm is much more maintained than yasm now, and projects specifically
require nasm, and newer versions too.
Also, don't pass `--enable-win32threads` to x264 on Windows. It
generates a warning since the option is actually
`--disable-win32threads`, and the default is already what we want.
Diffstat (limited to 'recipes/libjpeg-turbo.recipe')
| -rw-r--r-- | recipes/libjpeg-turbo.recipe | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/recipes/libjpeg-turbo.recipe b/recipes/libjpeg-turbo.recipe index 92b4628a..c790335a 100644 --- a/recipes/libjpeg-turbo.recipe +++ b/recipes/libjpeg-turbo.recipe @@ -12,15 +12,8 @@ class Recipe(recipe.Recipe): configure_tpl = "%(config-sh)s --prefix=%(prefix)s "\ "--libdir=%(libdir)s" configure_options = " --with-jpeg8" - autoreconf = True patches = [] files_libs = ['libjpeg','libturbojpeg'] files_devel = ['include/jpeglib.h', 'include/jerror.h', 'include/jconfig.h', 'include/jmorecfg.h','include/turbojpeg.h', 'lib/pkgconfig/libjpeg.pc'] - - def prepare(self): - if self.config.target_platform in [Platform.DARWIN, Platform.IOS]: - # avoid using xcode's nasm (doesn't support nasm-like arguments) - # instead use cerbero's yasm - self.set_env('NASM', 'yasm') |