[libideviceactivation/libimobiledevice]Upgrade version, modify build process.

4 files changed, 54 insertions, 38 deletions

diff --git a/ports/libideviceactivation/CMakeLists.txt b/ports/libideviceactivation/CMakeLists.txt
new file mode 100644
index 000000000..33e034791
--- /dev/null
+++ b/ports/libideviceactivation/CMakeLists.txt
@@ -0,0 +1,39 @@
+cmake_minimum_required(VERSION 3.0)
+project(libideviceactivation C)
+
+# find dependencies
+find_library(libplist plist REQUIRED)
+find_path(libimobiledevice_INCLUDES endianness.h)
+find_library(libimobiledevice libimobiledevice REQUIRED)
+find_package(LibXml2 REQUIRED)
+find_package(CURL REQUIRED)
+
+# ready to create library
+file(GLOB_RECURSE IDVCACTV_TOOLS_SRC common/*.c)
+
+file(GLOB_RECURSE IDVCACTV_PUBLIC_HDR include/*.h)
+file(GLOB_RECURSE IDVCACTV_SRC src/*.c)
+
+add_library(libideviceactivation ${IDVCACTV_TOOLS_SRC} ${IDVCACTV_SRC} ${IDVCACTV_PUBLIC_HDR})
+target_include_directories(libideviceactivation PRIVATE ${libimobiledevice_INCLUDES} ${LIBXML2_INCLUDE_DIR} ${CURL_INCLUDE_DIRS} include)
+target_compile_definitions(libideviceactivation PRIVATE -DHAVE_OPENSSL)
+target_link_libraries(libideviceactivation PRIVATE ${libplist} ${libimobiledevice} ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES})
+
+# install
+install(
+    TARGETS libideviceactivation
+    RUNTIME DESTINATION bin
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib
+)
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/libideviceactivation-1.0.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/libideviceactivation-1.0.pc
+    @ONLY
+)
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/libideviceactivation-1.0.pc
+    DESTINATION lib/libideviceactivation
+)
+
+install(FILES ${IDVCACTV_PUBLIC_HDR} DESTINATION include)
\ No newline at end of file
diff --git a/ports/libideviceactivation/CONTROL b/ports/libideviceactivation/CONTROL
index 8ff0a857e..9fc1ed98e 100644
--- a/ports/libideviceactivation/CONTROL
+++ b/ports/libideviceactivation/CONTROL
@@ -1,4 +1,4 @@
 Source: libideviceactivation

-Version: 1.2.68-1

+Version: 1.2.137
 Description: A library to handle the activation process of iOS devices

-Build-Depends: libimobiledevice, libxml2, curl
\ No newline at end of file
+Build-Depends: libimobiledevice, libxml2, curl, libplist
\ No newline at end of file
diff --git a/ports/libideviceactivation/libcurl_d.patch b/ports/libideviceactivation/libcurl_d.patch
deleted file mode 100644
index 69f1bf53b..000000000
--- a/ports/libideviceactivation/libcurl_d.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/libideviceactivation.vcxproj b/libideviceactivation.vcxproj
-index ba473f7a..47a20d15 100644
---- a/libideviceactivation.vcxproj	
-+++ b/libideviceactivation.vcxproj
-@@ -76,7 +76,7 @@
-       <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-     </ClCompile>
-     <Link>
--      <AdditionalDependencies>libcurl.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>libcurl-d.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-@@ -89,7 +89,7 @@
-       <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-     </ClCompile>
-     <Link>
--      <AdditionalDependencies>libcurl.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>libcurl-d.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/ports/libideviceactivation/portfile.cmake b/ports/libideviceactivation/portfile.cmake
index 7e4776c69..87eecc757 100644
--- a/ports/libideviceactivation/portfile.cmake
+++ b/ports/libideviceactivation/portfile.cmake
@@ -1,23 +1,22 @@
-include(vcpkg_common_functions)

-

-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)

-

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO libimobiledevice-win32/libideviceactivation

-    REF v1.2.68

-    SHA512 c2742bba2d90c21e853255c9ef1b9a63560c3e65541a0a3daaace9b0c48d236b7947008dbcd6e42622251015b686758ebc6b564e379d831cb4f52af812430140

+    REF de6008a6bd66a96bb11468b8b137704f0fef2c54 # v1.2.137
+    SHA512 cdf72702c465cb3e405db067fa96e2979b8c32e7798bcdb9e7286c4bc9392639cb0d31622c321453f635ef5212e645d300f3b420a847fb16fa05425c4882be95

     HEAD_REF msvc-master

-    PATCHES libcurl_d.patch

 )

 

-vcpkg_install_msbuild(

+configure_file(${CURRENT_PORT_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY)

+

+vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}

-    PROJECT_SUBPATH libideviceactivation.sln

-    INCLUDES_SUBPATH include

-    LICENSE_SUBPATH COPYING

-    USE_VCPKG_INTEGRATION

-    ALLOW_ROOT_INCLUDES

+    PREFER_NINJA

 )

 

-file(REMOVE ${CURRENT_PACKAGES_DIR}/include/Makefile.am)

+vcpkg_install_cmake()

+vcpkg_copy_pdbs()

+

+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

+

+# Handle copyright

+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)