xpra icon
Bug tracker and wiki

This bug tracker and wiki are being discontinued
please use https://github.com/Xpra-org/xpra instead.


Ticket #678: libyuv-nojpeg.patch

File libyuv-nojpeg.patch, 1.0 KB (added by Antoine Martin, 4 years ago)

don't link jpeg with libyuv

  • CMakeLists.txt

    diff --git a/CMakeLists.txt b/CMakeLists.txt
    index e5e2c69..c7e64f7 100644
    a b add_library(${ly_lib_name} STATIC ${ly_source_files}) 
    104104add_executable(convert ${ly_base_dir}/util/convert.cc)
    105105target_link_libraries(convert ${ly_lib_name})
    106106
    107 include(FindJPEG)
    108 if (JPEG_FOUND)
    109   include_directories(${JPEG_INCLUDE_DIR})
    110   target_link_libraries(convert ${JPEG_LIBRARY})
    111   add_definitions(-DHAVE_JPEG)
    112 endif()
     107#include(FindJPEG)
     108#if (JPEG_FOUND)
     109#  include_directories(${JPEG_INCLUDE_DIR})
     110#  target_link_libraries(convert ${JPEG_LIBRARY})
     111#  add_definitions(-DHAVE_JPEG)
     112#endif()
    113113
    114114if(TEST)
    115115  find_library(GTEST_LIBRARY gtest)
  • source/mjpeg_decoder.cc

    diff --git a/source/mjpeg_decoder.cc b/source/mjpeg_decoder.cc
    index 1612292..3b6b93b 100644
    a b  
    2525#endif
    2626
    2727#endif
    28 struct FILE;  // For jpeglib.h.
     28//struct FILE;  // For jpeglib.h.
    2929
    3030// C++ build requires extern C for jpeg internals.
    3131#ifdef __cplusplus