diff --git a/ports/tmx/CONTROL b/ports/tmx/CONTROL index 970b433dc878ed..1f933b6f5065d0 100644 --- a/ports/tmx/CONTROL +++ b/ports/tmx/CONTROL @@ -1,5 +1,4 @@ Source: tmx -Version: 1.0.0 -Port-Version: 2 +Version: 1.1.0 Description: A portable C library to load tiled maps in your games. Build-Depends: zlib, libxml2 diff --git a/ports/tmx/fix-build-error.patch b/ports/tmx/fix-build-error.patch deleted file mode 100644 index 654fb4dba1ca87..00000000000000 --- a/ports/tmx/fix-build-error.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b29edce..48d0553 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -66,8 +66,9 @@ write_basic_package_version_file("tmxConfigVersion.cmake" COMPATIBILITY SameMajo - # Build - #-----------# - --list(APPEND targets tmx) -+set(targets tmx) - -+if (NOT BUILD_SHARED_LIBS) - add_library(tmx STATIC ${SOURCES}) - set_target_properties(tmx PROPERTIES VERSION ${BUILD_VERSION}) - -@@ -75,8 +76,8 @@ set_property(TARGET tmx - APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES - $) - --if(BUILD_SHARED_LIBS) -- list(APPEND targets tmx_shared) -+else() -+ set(targets tmx_shared) - - add_library(tmx_shared SHARED ${SOURCES}) - target_link_libraries(tmx_shared PRIVATE ${libs}) diff --git a/ports/tmx/portfile.cmake b/ports/tmx/portfile.cmake index c2231f4948277c..4a3801b8a0f798 100644 --- a/ports/tmx/portfile.cmake +++ b/ports/tmx/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO baylej/tmx - REF tmx_1.0.0 + REF tmx_1.1.0 HEAD_REF master - SHA512 d045c45efd03f91a81dae471cb9ddc80d222b3ac52e13b729deeaf3e07d0a03b8e0956b30336ef410c72ddbbf33bea6811da5454b88d44b1db75683ef2a9383a - PATCHES fix-build-error.patch + SHA512 4f57cea30cf01518812cb7279e4d09fd3524e02a29950c2a40aed07ed0f5bd44601517d8a6216a3ca878e1d6bfa15651e92b9e8024e0325baae1dadc7a79acd1 ) vcpkg_configure_cmake( @@ -25,4 +24,4 @@ file(REMOVE_RECURSE ) # Handle copyright -configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/tmx/copyright COPYONLY) +configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)