4 files changed, 69 insertions, 55 deletions
diff --git a/ports/libyuv/CONTROL b/ports/libyuv/CONTROL
index 2b0189798..bd998bd95 100644
--- a/ports/libyuv/CONTROL
+++ b/ports/libyuv/CONTROL
@@ -1,4 +1,6 @@
 Source: libyuv
-Version: fec9121-2
+Version: fec9121
+Port-Version: 3
+Homepage: https://chromium.googlesource.com/libyuv/libyuv
 Build-Depends: libjpeg-turbo
 Description: libyuv is an open source project that includes YUV scaling and conversion functionality.
diff --git a/ports/libyuv/fix-build-type.patch b/ports/libyuv/fix-build-type.patch
index cb3ffdec8..179a7f7ea 100644
--- a/ports/libyuv/fix-build-type.patch
+++ b/ports/libyuv/fix-build-type.patch
@@ -1,53 +1,62 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 097434b..8f8864f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,21 +28,25 @@ LIST ( SORT			ly_unittest_sources )
- INCLUDE_DIRECTORIES( BEFORE ${ly_inc_dir} )
- 
- # this creates the static library (.a)
-+if (NOT BUILD_SHARED_LIBS)
- ADD_LIBRARY				( ${ly_lib_static} STATIC ${ly_source_files} )
- SET_TARGET_PROPERTIES( ${ly_lib_static} PROPERTIES PUBLIC_HEADER include/libyuv.h )
--
-+else()
- # this creates the shared library (.so)
- ADD_LIBRARY				( ${ly_lib_shared} SHARED ${ly_source_files} )
- SET_TARGET_PROPERTIES	( ${ly_lib_shared} PROPERTIES OUTPUT_NAME "${ly_lib_name}" )
- SET_TARGET_PROPERTIES	( ${ly_lib_shared} PROPERTIES PREFIX "lib" )
--
-+endif()
- # this creates the conversion tool
- ADD_EXECUTABLE			( yuvconvert ${ly_base_dir}/util/yuvconvert.cc )
--TARGET_LINK_LIBRARIES	( yuvconvert ${ly_lib_static} )
--
-+if (BUILD_SHARED_LIBS)
-+    TARGET_LINK_LIBRARIES	( yuvconvert ${ly_lib_shared} )
-+else()
-+    TARGET_LINK_LIBRARIES	( yuvconvert ${ly_lib_static} )
-+endif()
- 
- INCLUDE ( FindJPEG )
--if (JPEG_FOUND)
-+if (JPEG_FOUND AND BUILD_SHARED_LIBS)
-   include_directories( ${JPEG_INCLUDE_DIR} )
-   target_link_libraries( ${ly_lib_shared} PUBLIC ${JPEG_LIBRARY} )
-   target_link_libraries( yuvconvert ${JPEG_LIBRARY} )
-@@ -88,11 +92,13 @@ endif()
- 
- 
- # install the conversion tool, .so, .a, and all the header files
--INSTALL ( TARGETS yuvconvert DESTINATION bin )
-+INSTALL ( TARGETS yuvconvert DESTINATION tools )
- INSTALL ( FILES ${ly_include_files} DESTINATION include/libyuv )
--INSTALL ( TARGETS ${ly_lib_static} EXPORT libyuv-targets DESTINATION lib INCLUDES DESTINATION include PUBLIC_HEADER DESTINATION include )
--INSTALL ( TARGETS ${ly_lib_shared} EXPORT libyuv-targets LIBRARY DESTINATION lib RUNTIME DESTINATION bin )
--
-+if (NOT BUILD_SHARED_LIBS)
-+    INSTALL ( TARGETS ${ly_lib_static} EXPORT libyuv-targets DESTINATION lib INCLUDES DESTINATION include PUBLIC_HEADER DESTINATION include )
-+else()
-+    INSTALL ( TARGETS ${ly_lib_shared} EXPORT libyuv-targets LIBRARY DESTINATION lib RUNTIME DESTINATION bin )
-+endif()
- INSTALL( EXPORT libyuv-targets DESTINATION share/cmake/libyuv/ EXPORT_LINK_INTERFACE_LIBRARIES )
- 
- # create the .deb and .rpm packages using cpack
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 50442cd..fdc82f2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,24 +28,32 @@ LIST ( SORT			ly_unittest_sources )
+ INCLUDE_DIRECTORIES( BEFORE ${ly_inc_dir} )
+ 
+ # this creates the static library (.a)
++if (NOT BUILD_SHARED_LIBS)
+ ADD_LIBRARY				( ${ly_lib_static} STATIC ${ly_source_files} )
+ SET_TARGET_PROPERTIES( ${ly_lib_static} PROPERTIES PUBLIC_HEADER include/libyuv.h )
+-
++else()
+ # this creates the shared library (.so)
+ ADD_LIBRARY				( ${ly_lib_shared} SHARED ${ly_source_files} )
+ SET_TARGET_PROPERTIES	( ${ly_lib_shared} PROPERTIES OUTPUT_NAME "${ly_lib_name}" )
+ SET_TARGET_PROPERTIES	( ${ly_lib_shared} PROPERTIES PREFIX "lib" )
+-
++endif()
+ # this creates the conversion tool
+ ADD_EXECUTABLE			( yuvconvert ${ly_base_dir}/util/yuvconvert.cc )
+-TARGET_LINK_LIBRARIES	( yuvconvert ${ly_lib_static} )
+-
++if (BUILD_SHARED_LIBS)
++    TARGET_LINK_LIBRARIES   ( yuvconvert ${ly_lib_shared} )
++else()
++    TARGET_LINK_LIBRARIES   ( yuvconvert ${ly_lib_static} )
++endif()
+ 
+ INCLUDE ( FindJPEG )
+ if (JPEG_FOUND)
+-  include_directories( ${JPEG_INCLUDE_DIR} )
+-  target_link_libraries( ${ly_lib_shared} PUBLIC ${JPEG_LIBRARY} )
+-  target_link_libraries( yuvconvert ${JPEG_LIBRARY} )
++  include_directories( ${JPEG_INCLUDE_DIR})
++  if( BUILD_SHARED_LIBS)
++    target_link_libraries(${ly_lib_shared} PUBLIC ${JPEG_LIBRARY})
++  else()
++    target_link_libraries(${ly_lib_static} PUBLIC ${JPEG_LIBRARY})
++  endif()
++  target_link_libraries(yuvconvert ${JPEG_LIBRARY})
+   add_definitions( -DHAVE_JPEG )
+ endif()
+ 
+@@ -88,11 +96,13 @@ endif()
+ 
+ 
+ # install the conversion tool, .so, .a, and all the header files
+-INSTALL ( TARGETS yuvconvert DESTINATION bin )
++INSTALL ( TARGETS yuvconvert DESTINATION tools )
+ INSTALL ( FILES ${ly_include_files} DESTINATION include/libyuv )
+-INSTALL ( TARGETS ${ly_lib_static} EXPORT libyuv-targets DESTINATION lib INCLUDES DESTINATION include PUBLIC_HEADER DESTINATION include )
+-INSTALL ( TARGETS ${ly_lib_shared} EXPORT libyuv-targets LIBRARY DESTINATION lib RUNTIME DESTINATION bin )
+-
++if (NOT BUILD_SHARED_LIBS)
++    INSTALL ( TARGETS ${ly_lib_static} EXPORT libyuv-targets DESTINATION lib INCLUDES DESTINATION include PUBLIC_HEADER DESTINATION include )
++else()
++    INSTALL ( TARGETS ${ly_lib_shared} EXPORT libyuv-targets LIBRARY DESTINATION lib RUNTIME DESTINATION bin )
++endif()
+ INSTALL( EXPORT libyuv-targets DESTINATION share/cmake/libyuv/ EXPORT_LINK_INTERFACE_LIBRARIES )
+ 
+ # create the .deb and .rpm packages using cpack
diff --git a/ports/libyuv/libyuv-config.cmake b/ports/libyuv/libyuv-config.cmake
index 357a95f99..7031eddca 100644
--- a/ports/libyuv/libyuv-config.cmake
+++ b/ports/libyuv/libyuv-config.cmake
@@ -1,5 +1,5 @@
 include(CMakeFindDependencyMacro)
-find_dependency(JPEG REQUIRED)
+find_dependency(JPEG)
 
 set(libyuv_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../include")
 include("${CMAKE_CURRENT_LIST_DIR}/libyuv-targets.cmake")
diff --git a/ports/libyuv/portfile.cmake b/ports/libyuv/portfile.cmake
index ad856f9de..590f72b95 100644
--- a/ports/libyuv/portfile.cmake
+++ b/ports/libyuv/portfile.cmake
@@ -25,5 +25,8 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/libyuv)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
+vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/libyuv/convert.h "#ifdef HAVE_JPEG" "#if 1")
+vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/libyuv/convert_argb.h "#ifdef HAVE_JPEG" "#if 1")
+
 configure_file(${CMAKE_CURRENT_LIST_DIR}/libyuv-config.cmake  ${CURRENT_PACKAGES_DIR}/share/libyuv COPYONLY)
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)