[soci] Fix feature mysql (#16296)

* [soci] Fix feature mysql

* update version record

6 files changed, 61 insertions, 28 deletions

diff --git a/ports/soci/CONTROL b/ports/soci/CONTROL
deleted file mode 100644
index 0a6a291bb..000000000
--- a/ports/soci/CONTROL
+++ /dev/null
@@ -1,24 +0,0 @@
-Source: soci
-Version: 4.0.1
-Port-Version: 1
-Homepage: https://github.com/SOCI/soci
-Description: SOCI database access library
-
-Feature: boost
-Build-Depends: boost-date-time, boost-fusion, boost-optional, boost-preprocessor, boost-tuple
-Description: Integration with Boost
-
-Feature: sqlite3
-Build-Depends: sqlite3
-Description: Build sqlite3 backend
-
-Feature: postgresql
-Build-Depends: libpq
-Description: Build postgresql backend
-
-Feature: odbc
-Description: Build odbc backend
-
-Feature: mysql
-Build-Depends: libmysql
-Description: Build mysql backend
diff --git a/ports/soci/fix-dependency-libmysql.patch b/ports/soci/fix-dependency-libmysql.patch
new file mode 100644
index 000000000..b4d945d7e
--- /dev/null
+++ b/ports/soci/fix-dependency-libmysql.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake
+index 1233568..6110c36 100644
+--- a/cmake/modules/FindMySQL.cmake
++++ b/cmake/modules/FindMySQL.cmake
+@@ -13,6 +13,8 @@
+ #
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++find_package(libmysql REQUIRED)
++return()
+ 
+ include(CheckCXXSourceCompiles)
+ 
diff --git a/ports/soci/portfile.cmake b/ports/soci/portfile.cmake
index fcf9204a9..b989b6f7c 100644
--- a/ports/soci/portfile.cmake
+++ b/ports/soci/portfile.cmake
@@ -4,6 +4,7 @@ vcpkg_from_github(
     REF 334cc55d9fa7b42d7214a8533a246d637bc92899 #version 4.0.1 commit on 2020.10.19
     SHA512 b300b13f68347d78252812e09efffb1735072cf5019940da53366a5cdee997f4b8b03a584a87a95ba764b0a78640ad6eb4966b53f9156280cb452465607afbc7
     HEAD_REF master
+    PATCHES fix-dependency-libmysql.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SOCI_DYNAMIC)
@@ -40,7 +41,6 @@ vcpkg_configure_cmake(
         -DSOCI_STATIC=${SOCI_STATIC}
         -DSOCI_SHARED=${SOCI_DYNAMIC}
         ${_COMPONENT_FLAGS}
-
         ${MYSQL_OPT}
         -DWITH_ORACLE=OFF
         -DWITH_FIREBIRD=OFF
@@ -48,6 +48,7 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
+vcpkg_copy_pdbs()
 vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
 # Correct the config file name
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/SOCI.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/SOCI-config.cmake)
@@ -56,5 +57,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
-vcpkg_copy_pdbs()
diff --git a/ports/soci/vcpkg.json b/ports/soci/vcpkg.json
new file mode 100644
index 000000000..5014f3f0f
--- /dev/null
+++ b/ports/soci/vcpkg.json
@@ -0,0 +1,40 @@
+{
+  "name": "soci",
+  "version-string": "4.0.1",
+  "port-version": 2,
+  "description": "SOCI database access library",
+  "homepage": "https://github.com/SOCI/soci",
+  "features": {
+    "boost": {
+      "description": "Integration with Boost",
+      "dependencies": [
+        "boost-date-time",
+        "boost-fusion",
+        "boost-optional",
+        "boost-preprocessor",
+        "boost-tuple"
+      ]
+    },
+    "mysql": {
+      "description": "Build mysql backend",
+      "dependencies": [
+        "libmysql"
+      ]
+    },
+    "odbc": {
+      "description": "Build odbc backend"
+    },
+    "postgresql": {
+      "description": "Build postgresql backend",
+      "dependencies": [
+        "libpq"
+      ]
+    },
+    "sqlite3": {
+      "description": "Build sqlite3 backend",
+      "dependencies": [
+        "sqlite3"
+      ]
+    }
+  }
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 91e71465b..6a2259ff5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5450,7 +5450,7 @@
     },
     "soci": {
       "baseline": "4.0.1",
-      "port-version": 1
+      "port-version": 2
     },
     "socket-io-client": {
       "baseline": "1.6.1-1",
diff --git a/versions/s-/soci.json b/versions/s-/soci.json
index c5e60bc53..c3dbe5478 100644
--- a/versions/s-/soci.json
+++ b/versions/s-/soci.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "8127c6d88c6b673066ea41b061dd79d600c442d4",
+      "version-string": "4.0.1",
+      "port-version": 2
+    },
+    {
       "git-tree": "b3715b7475ac7a9dd45c1d46c0f72b7c84f67c09",
       "version-string": "4.0.1",
       "port-version": 1