Remove traces of dlib and menpo

conda/beat-devel/meta.yaml

@@ -2,7 +2,7 @@
 {% set nopin = ['ca-certificates', 'certifi', 'openssl', 'libstdcxx-ng', 'libgcc-ng', 'libcxx', 'libcxxabi'] %}
 package:
   name: beat-devel
-  version: 2019.04.16
+  version: 2019.04.17
 
 build:
   # the build number must be zero all the time.
@@ -15,7 +15,7 @@ build:
 requirements:
   host:
     - python {{ python }}
-    - bob-devel 2019.04.16
+    - bob-devel 2019.04.17
     - docker-py 3.6.0
     - flask 1.0.2
     - flask-cors 3.0.7

conda/bob-devel/meta.yaml

@@ -2,7 +2,7 @@
 {% set nopin = ['ca-certificates', 'certifi', 'openssl', 'libstdcxx-ng', 'libgcc-ng', 'libcxx', 'libcxxabi'] %}
 package:
   name: bob-devel
-  version: 2019.04.16
+  version: 2019.04.17
 # please update the version of beat-devel and update bob-devel's version there
 # as well in the same merge request.
 
@@ -28,7 +28,6 @@ requirements:
     - click-plugins 1.0.4
     - cmake 3.14.0
     - coverage 4.5.3
-    - cyvlfeat 0.4.6
     - docopt 0.6.2
     - ffmpeg 4.0
     - freetype 2.9.1

conda/cyvlfeat/bld.bat

-"%PYTHON%" setup.py install --single-version-externally-managed --record=%TEMP%record.txt
-
-if errorlevel 1 exit 1

conda/cyvlfeat/build.sh

-#!/bin/sh
-
-if [ "$(uname)" == "Linux" ]; then
-  CFLAGS="${CFLAGS} -I${CONDA_PREFIX}/include" LDFLAGS="-L${CONDA_PREFIX}/lib -lvl -Wl,-rpath=${CONDA_PREFIX}/lib "
-else
-  CFLAGS="${CFLAGS} -I${CONDA_PREFIX}/include" LDFLAGS="-L${CONDA_PREFIX}/lib -lvl "
-fi
-
-"$PYTHON" setup.py install --single-version-externally-managed --record=record.txt
-
-if [ "$(uname -s)" == "Darwin" ]; then
-  # For some reason Cython refuses to generate @rpath/vlfeat.dylib - so
-  # we manually do it here
-  find $SP_DIR/cyvlfeat -name "*.so" -print0 | while read -d $'\0' file
-  do
-    install_name_tool -change @loader_path/libvl.dylib @rpath/libvl.dylib $file
-  done
-fi

conda/cyvlfeat/meta.yaml

-{% set name = "cyvlfeat" %}
-{% set version = "0.4.6" %}
-{% set sha256 = "5bc5de3c2e40240b8cb6ff06d744fe92911635d7b61c3a034ba93f6297df4732" %}
-
-package:
-  name: {{ name }}
-  version: {{ version }}
-
-source:
-  fn: {{ name }}-v{{ version }}.tar.gz
-  url: https://github.com/menpo/cyvlfeat/archive/v{{ version }}.tar.gz
-  sha256: {{ sha256 }}
-
-build:
-  number: 4
-
-requirements:
-  build:
-    - {{ compiler('c') }}
-    - {{ compiler('cxx') }}
-
-  host:
-    - python
-    - setuptools {{ setuptools }}
-    - cython {{ cython }}
-    - numpy {{ numpy }}
-    - vlfeat {{ vlfeat }}
-    # - msinttypes r26  # [win]
-
-  run:
-    - python
-    - {{ pin_compatible('numpy') }}
-
-test:
-  requires:
-    - nose
-    - coverage
-
-  imports:
-    - cyvlfeat.sift.sift
-    - cyvlfeat.sift.dsift
-    - cyvlfeat.fisher.fisher
-    - cyvlfeat.hog.hog
-    - cyvlfeat.kmeans.kmeans
-    - cyvlfeat.generic.generic
-
-  commands:
-    - nosetests {{ name }} -v --cover-package={{ name }}
-    - conda inspect linkages -p $PREFIX {{ name }}  # [not win]
-    - conda inspect objects -p $PREFIX {{ name }}  # [osx]
-
-about:
-  home: https://github.com/menpo/cyvlfeat/
-  summary: A thin Cython wrapper around select areas of vlfeat
-  license: BSD
-
-extra:
-  recipe-maintainers:
-    - anjos

conda/dlib/FACE_LICENSE

-The images face.jpg/face.png are used under the Creative Commons 2.0 License, 
-which can be found here:
-
-https://creativecommons.org/licenses/by/2.0/
-
-The image was found on Flickr under the following URL:
-
-https://flic.kr/p/x1TgvF
-
-and was provided by user Jane Kostenko (layma1999): 
-
-https://www.flickr.com/photos/133533365@N06/
-
-The "medium" version of the image was downloaded on 21/07/2016 and was modified
-only via reencoding to png.
-
-The intended use of this image is for testing purposes only.

conda/dlib/bld.bat

-@echo ON
-
-mkdir build
-cd build
-
-rem The Python lib has no period in the version string, so we remove it here.
-set PY_VER_NO_DOT=%PY_VER:.=%
-rem Required as the png locator does some processing that chokes on \
-set "PNG_LIBRARY=%LIBRARY_LIB%\libpng16.lib"
-set "PNG_LIBRARY=%PNG_LIBRARY:\=/%"
-
-rem There is a bug whereby linking to jpeg causes a link crash, so we allow
-rem dlib to build it
-cmake ..\tools\python -LAH -G"NMake Makefiles"              ^
--DCMAKE_BUILD_TYPE="Release"                                ^
--DCMAKE_PREFIX_PATH="%LIBRARY_PREFIX%"                      ^
--DBoost_USE_STATIC_LIBS=0                                   ^
--DBoost_USE_STATIC_RUNTIME=0                                ^
--DBOOST_ROOT="%LIBRARY_PREFIX%"                             ^
--DBOOST_INCLUDEDIR="%LIBRARY_INC%"                          ^
--DBOOST_LIBRARYDIR="%LIBRARY_LIB%"                          ^
--DPYTHON3=%PY3K%                                            ^
--DPYTHON_LIBRARY="%PREFIX%\libs\python%PY_VER_NO_DOT%.lib"  ^
--DPYTHON_INCLUDE_DIR="%PREFIX%\include"                     ^
--DDLIB_LINK_WITH_SQLITE3=0                                  ^
--DDLIB_PNG_SUPPORT=1                                        ^
--DPNG_INCLUDE_DIR="%LIBRARY_INC%"                           ^
--DPNG_PNG_INCLUDE_DIR="%LIBRARY_INC%"                       ^
--DPNG_LIBRARY="%PNG_LIBRARY%"                               ^
--DZLIB_INCLUDE_DIRS="%LIBRARY_INC%"                         ^
--DZLIB_LIBRARIES="%LIBRARY_BIN%\zlib.dll"                   ^
--DDLIB_JPEG_SUPPORT=1                                       ^
--DDLIB_USE_BLAS=0                                           ^
--DDLIB_USE_LAPACK=0                                         ^
--DUSE_SSE2_INSTRUCTIONS=1                                   ^
--DUSE_SSE4_INSTRUCTIONS=0                                   ^
--DUSE_AVX_INSTRUCTIONS=0                                    ^
--DDLIB_USE_CUDA=0                                           ^
--DDLIB_GIF_SUPPORT=0
-if errorlevel 1 exit 1
-
-cmake --build . --target INSTALL --config Release
-if errorlevel 1 exit 1
-
-rem Copy the dlib library to site packages
-move "..\python_examples\dlib.pyd" "%SP_DIR%\dlib.pyd"
-if errorlevel 1 exit 1

conda/dlib/build.sh

-#!/bin/bash
-
-set +x
-
-rm -fr build
-mkdir -p build
-cd build
-
-if [ $PY3K -eq 1 ]; then
-  export PY_STR="${PY_VER}m"
-else
-  export PY_STR="${PY_VER}"
-fi
-
-# Make the probably sensible assumption that a 64-bit
-# machine supports SSE4 instructions - if this becomes
-# a problem we should turn this off.
-if [ $ARCH -eq 64 ]; then
-  USE_SSE4=1
-else
-  USE_SSE4=0
-fi
-
-PYTHON_LIBRARY_PATH="$PREFIX/lib/libpython$PY_STR$SHLIB_EXT"
-
-cmake -LAH ../tools/python                              \
-  -DCMAKE_PREFIX_PATH="$PREFIX"                         \
-  -DCMAKE_BUILD_TYPE="Release"                          \
-  -DBoost_USE_STATIC_LIBS=0                             \
-  -DBoost_USE_STATIC_RUNTIME=0                          \
-  -DBOOST_ROOT="$PREFIX"                                \
-  -DBOOST_INCLUDEDIR="$PREFIX/include"                  \
-  -DBOOST_LIBRARYDIR="$PREFIX/lib"                      \
-  -DPYTHON_LIBRARY="$PYTHON_LIBRARY_PATH"               \
-  -DPYTHON_INCLUDE_DIR="$PREFIX/include/python$PY_STR"  \
-  -DPYTHON3=$PY3K                                       \
-  -DDLIB_PNG_SUPPORT=1                                  \
-  -DPNG_INCLUDE_DIR="$PREFIX/include"                   \
-  -DPNG_PNG_INCLUDE_DIR="$PREFIX/include"               \
-  -DPNG_LIBRARY="$PREFIX/lib/libpng$SHLIB_EXT"          \
-  -DZLIB_INCLUDE_DIRS="$PREFIX/include"                 \
-  -DZLIB_LIBRARIES="$PREFIX/lib/libz$SHLIB_EXT"         \
-  -DDLIB_JPEG_SUPPORT=1                                 \
-  -DJPEG_INCLUDE_DIR="$PREFIX/include"                  \
-  -DJPEG_LIBRARY="$PREFIX/lib/libjpeg$SHLIB_EXT"        \
-  -DDLIB_LINK_WITH_SQLITE3=1                            \
-  -DDLIB_NO_GUI_SUPPORT=1                               \
-  -DUSE_SSE2_INSTRUCTIONS=1                             \
-  -DUSE_SSE4_INSTRUCTIONS=$USE_SSE4                     \
-  -DUSE_AVX_INSTRUCTIONS=0                              \
-  -DDLIB_USE_BLAS=1                                     \
-  -DDLIB_USE_LAPACK=1                                   \
-  -DDLIB_USE_CUDA=0                                     \
-  -DDLIB_GIF_SUPPORT=0
-
-make -j$CPU_COUNT
-# Non-standard installation - copy manually
-cp dlib.so $SP_DIR

conda/dlib/images.xml

-<?xml version='1.0' encoding='ISO-8859-1'?>
-<?xml-stylesheet type='text/xsl' href='image_metadata_stylesheet.xsl'?>
-<dataset>
-<name>Training faces</name>
-<comment>See the FACE_LICENSE file for more information.</comment>
-<images>
-  <image file='face.jpg'>
-    <box top='125' left='156' width='278' height='240'/>
-  </image>
-  <image file='face.png'>
-    <box top='125' left='156' width='278' height='240'/>
-  </image>
-</images>
-</dataset>

conda/dlib/lapack_sgetrf.patch

---- dlib/cmake_utils/cmake_find_blas.txt
-+++ dlib/cmake_utils/cmake_find_blas.txt
-@@ -156,15 +156,8 @@
-          set(blas_found 1)
-          message(STATUS "Found OpenBLAS library")
-          set(CMAKE_REQUIRED_LIBRARIES ${blas_libraries})
--         # If you compiled OpenBLAS with LAPACK in it then it should have the
--         # sgetrf_single function in it.  So if we find that function in
--         # OpenBLAS then just use OpenBLAS's LAPACK. 
--         CHECK_FUNCTION_EXISTS(sgetrf_single OPENBLAS_HAS_LAPACK)
--         if (OPENBLAS_HAS_LAPACK)
--            message(STATUS "Using OpenBLAS's built in LAPACK")
--            # set(lapack_libraries gfortran) 
--            set(lapack_found 1)
--         endif()
-+         message(STATUS "Using OpenBLAS's built in LAPACK")
-+         set(lapack_found 1)
-       endif()
-       mark_as_advanced( cblas_lib)
-    endif()
-

conda/dlib/meta.yaml

-{% set name = "dlib" %}
-{% set version = "19.7" %}
-
-package:
-  name: {{ name }}
-  version: {{ version }}
-
-source:
-  url: https://github.com/davisking/{{ name }}/archive/v{{ version }}.tar.gz
-  sha1: 6dfc0dfa1cd45baa39a9b03238b222cd59041194
-
-  patches:
-    - osx_jpeg.patch           # [osx]
-    - lapack_sgetrf.patch      # [unix]
-    - win_boost.patch          # [win]
-    - win_jpeg_png.patch       # [win]
-    - win_release_flags.patch  # [win]
-    - win_thread_fix.patch     # [win]
-
-build:
-  number: 1
-  skip: True  # [blas_impl == 'openblas' and win]
-  requires_features:
-    blas: {{ blas_impl }}
-
-requirements:
-  build:
-    - cmake
-    - {{ compiler('c') }}
-    - {{ compiler('cxx') }}
-    - pkg-config
-
-  host:
-    - python
-    - numpy {{ numpy }}
-    - py-boost {{ boost }}
-    - libpng {{ libpng }}
-    - mkl-devel {{ mkl }}  # [blas_impl == 'mkl']
-    - openblas-devel {{ openblas }}  # [blas_impl == 'openblas']
-    - nomkl  # [blas_impl == 'openblas']
-    - jpeg {{ jpeg }}  # [not win]
-    - sqlite {{ sqlite }}  # [not win]
-
-  run:
-    - python
-    - {{ pin_compatible('numpy') }}
-    - py-boost
-
-test:
-  files:
-    - face.jpg
-    - face.png
-    - images.xml
-
-  requires:
-    - tqdm
-    - pillow
-
-  imports:
-    - dlib
-
-  commands:
-    - conda inspect linkages -p $PREFIX {{ name }}  # [not win]
-    - conda inspect objects -p $PREFIX {{ name }}  # [osx]
-
-about:
-  home: http://dlib.net/
-  license: Boost 1.0
-  license_file: dlib/LICENSE.txt
-  summary: Modern C++ toolkit containing machine learning algorithms with Python bindings
-
-extra:
-  recipe-maintainers:
-    - tiago.pereira
-    - anjos
-    - amohammadi

conda/dlib/osx_jpeg.patch

---- dlib/CMakeLists.txt
-+++ dlib/CMakeLists.txt
-@@ -403,7 +403,7 @@
-             set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARY})
-             CHECK_FUNCTION_EXISTS(jpeg_read_header LIBJPEG_IS_GOOD)
-          endif()
--         if (JPEG_FOUND AND LIBJPEG_IS_GOOD AND NOT APPLE)
-+         if (JPEG_FOUND AND LIBJPEG_IS_GOOD)
-             include_directories(${JPEG_INCLUDE_DIR})
-             set (dlib_needed_libraries ${dlib_needed_libraries} ${JPEG_LIBRARY})
-          else()
-

conda/dlib/run_test.py

-import os
-import sys
-import bz2
-import unittest
-from functools import partial
-
-import dlib
-import numpy as np
-from PIL import Image
-from tqdm import tqdm
-
-
-SHAPE_PREDICTOR_FNAME = 'shape_predictor_68_face_landmarks.dat'
-SHAPE_PREDICTOR_BZ2_FNAME = SHAPE_PREDICTOR_FNAME + '.bz2'
-SHAPE_PREDICTOR_URL = 'http://dlib.net/files/{}'.format(SHAPE_PREDICTOR_BZ2_FNAME)
-
-
-def _download_file(url, out_path):
-    try:
-        from urllib import urlretrieve          # Python 2
-    except ImportError:
-        from urllib.request import urlretrieve  # Python 3
-
-    # Wrap tqdm instance with urlretrieve compatible function
-    # Abuse mutable [] argument to give function 'memory'
-    # First argument will be supplied using partial (an instance of tqdm)
-    def reporthook(t, b=1, bsize=1, tsize=None, last_b=[0]):
-        if tsize is not None:
-            t.total = tsize
-        t.update((b - last_b[0]) * bsize)
-        last_b[0] = b
-
-    with tqdm(unit='B', unit_scale=True, miniters=1, desc=out_path) as t:
-        urlretrieve(url, filename=out_path, reporthook=partial(reporthook, t))
-
-
-def _bz2_decompress_inplace(path, out_path):
-    with open(path, 'rb') as source, open(out_path, 'wb') as dest:
-        dest.write(bz2.decompress(source.read()))
-
-
-def _load_image_using_pillow(path):
-    return np.array(Image.open(path))
-
-
-class TestDlib(unittest.TestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        # Get paths to test data
-        test_dir_path = os.path.dirname(os.path.abspath(__file__))
-        cls.face_jpg_path = os.path.join(test_dir_path, 'face.jpg')
-        cls.face_png_path = os.path.join(test_dir_path, 'face.png')
-
-        # Download shape_predictor model
-        print('Downloading {} to ./{}'.format(SHAPE_PREDICTOR_URL, 
-                                              SHAPE_PREDICTOR_BZ2_FNAME))
-        _download_file(SHAPE_PREDICTOR_URL, SHAPE_PREDICTOR_BZ2_FNAME)
-        _bz2_decompress_inplace(SHAPE_PREDICTOR_BZ2_FNAME,
-                                SHAPE_PREDICTOR_FNAME)
-
-    def test_builtin_frontal_face_detection(self):
-        detector = dlib.get_frontal_face_detector()
-        image = _load_image_using_pillow(self.face_jpg_path)
-        results = detector(image)
-        self.assertEqual(len(results), 1)
-
-    def test_shape_predictor(self):
-        predictor = dlib.shape_predictor(SHAPE_PREDICTOR_FNAME)
-        image = _load_image_using_pillow(self.face_jpg_path)
-
-        # This is the output of the detector, hardcoded
-        detection = dlib.rectangle(left=125, top=56, right=434, bottom=365)
-        shape = predictor(image, detection)
-        self.assertEqual(len(shape.parts()), 68)
-        for p in shape.parts():
-            self.assertGreater(p.x, 0)
-            self.assertGreater(p.y, 0)
-
-    def test_train_xml_detector(self):
-        # This effectively tests that we can successfully load images
-        options = dlib.simple_object_detector_training_options()
-        options.add_left_right_image_flips = True
-        options.C = 1
-        options.num_threads = 1
-
-        dlib.train_simple_object_detector('images.xml', "test.svm", options)
-        self.assertTrue(os.path.exists('./test.svm'))
-
-if __name__ == '__main__':
-    unittest.main()

conda/dlib/win_boost.patch

---- dlib/cmake_utils/add_python_module
-+++ dlib/cmake_utils/add_python_module
-@@ -35,45 +35,15 @@
- list(APPEND CMAKE_PREFIX_PATH "${PYTHON_PATH}")
- 
- 
--# To avoid dll hell, always link everything statically when compiling in
--# visual studio.  This way, the resulting library won't depend on a bunch
--# of other dll files and can be safely copied to someone elese's computer
--# and expected to run.
--if (MSVC)
--    include(${CMAKE_CURRENT_LIST_DIR}/tell_visual_studio_to_use_static_runtime.cmake)
--    add_definitions(-DBOOST_PYTHON_STATIC_LIB)
--    SET(Boost_USE_STATIC_LIBS ON)
--    SET(Boost_USE_MULTITHREADED ON)
--    SET(Boost_USE_STATIC_RUNTIME ON)
--endif()
--
--set(Boost_NO_BOOST_CMAKE ON)
--
- if (NOT WIN32)
-     set(BOOST_LIBRARYDIR ${BOOST_LIBRARYDIR} $ENV{BOOST_LIBRARYDIR}  
-             /usr/lib/x86_64-linux-gnu/)
- else()
-     link_directories($ENV{BOOST_LIBRARYDIR})
- endif()
--if (PYTHON3)
--    # On some systems the boost python3 module is called python-py34 so check
--    # for that one first.  
--    FIND_PACKAGE(Boost 1.41.0  COMPONENTS python-py34 )
--    if (NOT Boost_FOUND)
--        FIND_PACKAGE(Boost 1.41.0 COMPONENTS python-py35)
--    endif()
--    if (NOT Boost_FOUND)
--        FIND_PACKAGE(Boost 1.41.0 COMPONENTS python3)
--    endif()
--    if (NOT Boost_FOUND)
--        FIND_PACKAGE(Boost 1.41.0 COMPONENTS python)
--    endif()
--    set(Python_ADDITIONAL_VERSIONS 3.5 3.6)
--    FIND_PACKAGE(PythonLibs 3.4)
--else()
--    FIND_PACKAGE(Boost 1.41.0 COMPONENTS python)
--    FIND_PACKAGE(PythonLibs 2.6)
--endif()
-+
-+FIND_PACKAGE(Boost 1.41.0 COMPONENTS python3)
-+FIND_PACKAGE(PythonLibs $ENV{PY_VER} REQUIRED)
- 
- if (CMAKE_COMPILER_IS_GNUCXX)
-     # Just setting CMAKE_POSITION_INDEPENDENT_CODE should be enough to set

conda/dlib/win_jpeg_png.patch

---- dlib/CMakeLists.txt
-+++ dlib/CMakeLists.txt
-@@ -339,66 +339,11 @@
- 
-       if (DLIB_PNG_SUPPORT)
-          # try to find libpng 
--         find_package(PNG QUIET)
--         # Make sure there isn't something wrong with the version of LIBPNG
--         # installed on this system.  
--         if (PNG_FOUND)
--            set(CMAKE_REQUIRED_LIBRARIES ${PNG_LIBRARIES})
--            CHECK_FUNCTION_EXISTS(png_create_read_struct LIBPNG_IS_GOOD)
--         endif()
--         if (PNG_FOUND AND LIBPNG_IS_GOOD)
-+         find_package(PNG REQUIRED)
-             include_directories(${PNG_INCLUDE_DIR})
-             set (dlib_needed_libraries ${dlib_needed_libraries} ${PNG_LIBRARIES})
-             set(REQUIRES_LIBS " libpng")
--         else()
--            # If we can't find libpng then statically compile it in.
--            include_directories(external/libpng external/zlib)
--            set(source_files ${source_files}
--               external/libpng/png.c
--               external/libpng/pngerror.c
--               external/libpng/pngget.c
--               external/libpng/pngmem.c
--               external/libpng/pngpread.c
--               external/libpng/pngread.c
--               external/libpng/pngrio.c
--               external/libpng/pngrtran.c
--               external/libpng/pngrutil.c
--               external/libpng/pngset.c
--               external/libpng/pngtrans.c
--               external/libpng/pngwio.c
--               external/libpng/pngwrite.c
--               external/libpng/pngwtran.c
--               external/libpng/pngwutil.c
--               external/zlib/adler32.c
--               external/zlib/compress.c
--               external/zlib/crc32.c
--               external/zlib/deflate.c
--               external/zlib/gzclose.c
--               external/zlib/gzlib.c
--               external/zlib/gzread.c
--               external/zlib/gzwrite.c
--               external/zlib/infback.c
--               external/zlib/inffast.c
--               external/zlib/inflate.c
--               external/zlib/inftrees.c
--               external/zlib/trees.c
--               external/zlib/uncompr.c
--               external/zlib/zutil.c
--               )
--
--            include(cmake_utils/check_if_neon_available.cmake)
--            if (ARM_NEON_IS_AVAILABLE)
--               message (STATUS "NEON instructions will be used for libpng.")
--               enable_language(ASM)
--               set(source_files ${source_files}
--                  external/libpng/arm/arm_init.c
--                  external/libpng/arm/filter_neon_intrinsics.c
--                  external/libpng/arm/filter_neon.S
--                  )
--               set_source_files_properties(external/libpng/arm/filter_neon.S PROPERTIES COMPILE_FLAGS "${CMAKE_ASM_FLAGS} ${CMAKE_CXX_FLAGS} -x assembler-with-cpp")
--            endif()
--            set(REQUIRES_LIBS "")
--         endif()
-+         
-          set(source_files ${source_files}
-             image_loader/png_loader.cpp
-             image_saver/save_png.cpp
-@@ -406,19 +351,6 @@
-       endif()
- 
-       if (DLIB_JPEG_SUPPORT)
--         # try to find libjpeg 
--         find_package(JPEG QUIET)
--         # Make sure there isn't something wrong with the version of libjpeg 
--         # installed on this system.  Also don't use the installed libjpeg
--         # if this is an APPLE system because apparently it's broken (as of 2015/01/01).
--         if (JPEG_FOUND)
--            set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARY})
--            CHECK_FUNCTION_EXISTS(jpeg_read_header LIBJPEG_IS_GOOD)
--         endif()
--         if (JPEG_FOUND AND LIBJPEG_IS_GOOD AND NOT APPLE)
--            include_directories(${JPEG_INCLUDE_DIR})
--            set (dlib_needed_libraries ${dlib_needed_libraries} ${JPEG_LIBRARY})
--         else()
-             # If we can't find libjpeg then statically compile it in.
-             add_definitions(-DDLIB_JPEG_STATIC)
-             set(source_files ${source_files}
-@@ -467,7 +399,6 @@
-                   external/libjpeg/jfdctflt.cpp
-                   external/libjpeg/jfdctfst.cpp
-                   )
--         endif()
-          set(source_files ${source_files}
-             image_loader/jpeg_loader.cpp
-             image_saver/save_jpeg.cpp