3 files changed, 22 insertions, 22 deletions

diff --git a/meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch b/meta-oe/recipes-graphics/tigervnc/files/0001-do-not-build-tests-sub-directory.patch
index 5a42e67d06..0d58d2502d 100644
--- a/meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch
+++ b/meta-oe/recipes-graphics/tigervnc/files/0001-do-not-build-tests-sub-directory.patch
@@ -1,4 +1,4 @@
-From 076d0e12a7be6cd2108e4ca0dcde1cb658918fa5 Mon Sep 17 00:00:00 2001
+From e117ccc2b4ebb116ab63a3aa6097104964ee223b Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 19 Apr 2021 23:02:45 -0700
 Subject: [PATCH] do not build tests sub directory
@@ -12,19 +12,19 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
  1 file changed, 3 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7bf99441..bda80598 100644
+index 468f4b54..c47c9c0e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -304,9 +304,6 @@ if(BUILD_VIEWER)
+@@ -351,9 +351,6 @@ if(BUILD_VIEWER)
    add_subdirectory(media)
  endif()
  
 -add_subdirectory(tests)
 -
 -
- add_subdirectory(release)
- 
- # uninstall
+ if(BUILD_VIEWER)
+   add_subdirectory(release)
+ endif()
 -- 
-2.30.2
+2.25.1
 
diff --git a/meta-oe/recipes-graphics/tigervnc/files/0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch b/meta-oe/recipes-graphics/tigervnc/files/0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch
index cfb84ac141..101adaa82f 100644
--- a/meta-oe/recipes-graphics/tigervnc/files/0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch
+++ b/meta-oe/recipes-graphics/tigervnc/files/0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch
@@ -1,7 +1,7 @@
-From 6369a5be2af2ed1fa443f40f48deaf318d22713e Mon Sep 17 00:00:00 2001
+From 4c7658b43f903599608c1fea4fbd7e37dc117119 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Thu, 20 Jul 2017 05:06:00 -0400
-Subject: [PATCH 3/4] add missing dynamic library to FLTK_LIBRARIES
+Subject: [PATCH] add missing dynamic library to FLTK_LIBRARIES
 
 Upstream-Status: Pending
 
@@ -11,18 +11,18 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fb72a00..5732dc8 100644
+index 80c2762c..eb581600 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -246,6 +246,8 @@ if(UNIX AND NOT APPLE)
-   endif()
+@@ -315,6 +315,8 @@ if(BUILD_VIEWER)
+   set(CMAKE_REQUIRED_LIBRARIES)
  endif()
  
 +set(FLTK_LIBRARIES ${FLTK_LIBRARIES} -lm -ldl -lpng -ljpeg)
 +
  # Check for GNUTLS library
- option(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication" ON)
+ trioption(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication")
  if(ENABLE_GNUTLS)
 -- 
-2.7.4
+2.25.1
 
diff --git a/meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch b/meta-oe/recipes-graphics/tigervnc/files/0003-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch
index 5f14665b8d..c292df4a52 100644
--- a/meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch
+++ b/meta-oe/recipes-graphics/tigervnc/files/0003-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch
@@ -1,4 +1,4 @@
-From 7f8acd59bb2e54f9be25a98dd71534700a9e355a Mon Sep 17 00:00:00 2001
+From 36bf37cb638cd87d7f8eb96afaf69c2d95177614 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 19 Apr 2021 23:14:28 -0700
 Subject: [PATCH] tigervnc: add fPIC option to COMPILE_FLAGS
@@ -18,35 +18,35 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
  3 files changed, 3 insertions(+)
 
 diff --git a/common/network/CMakeLists.txt b/common/network/CMakeLists.txt
-index d00ca452..e84e0290 100644
+index f08eaa31..85c05951 100644
 --- a/common/network/CMakeLists.txt
 +++ b/common/network/CMakeLists.txt
-@@ -16,4 +16,5 @@ endif()
+@@ -15,4 +15,5 @@ endif()
  
  if(UNIX)
    libtool_create_control_file(network)
 +  set_target_properties(network PROPERTIES COMPILE_FLAGS -fPIC)
  endif()
 diff --git a/common/rdr/CMakeLists.txt b/common/rdr/CMakeLists.txt
-index 989ba2f4..20f6489d 100644
+index 30c2403a..94e1ff98 100644
 --- a/common/rdr/CMakeLists.txt
 +++ b/common/rdr/CMakeLists.txt
-@@ -27,4 +27,5 @@ target_link_libraries(rdr ${RDR_LIBRARIES})
+@@ -35,4 +35,5 @@ endif()
  
  if(UNIX)
    libtool_create_control_file(rdr)
 +  set_target_properties(rdr PROPERTIES COMPILE_FLAGS -fPIC)
  endif()
 diff --git a/common/rfb/CMakeLists.txt b/common/rfb/CMakeLists.txt
-index fc5a37bf..7f5ce131 100644
+index 360434a9..28566e90 100644
 --- a/common/rfb/CMakeLists.txt
 +++ b/common/rfb/CMakeLists.txt
-@@ -99,4 +99,5 @@ target_link_libraries(rfb ${RFB_LIBRARIES})
+@@ -116,4 +116,5 @@ endif()
  
  if(UNIX)
    libtool_create_control_file(rfb)
 +  set_target_properties(rfb PROPERTIES COMPILE_FLAGS -fPIC)
  endif()
 -- 
-2.30.2
+2.25.1