aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhoebe <925731795@qq.com>2019-10-29 08:45:46 +0800
committerdan-shaw <51385773+dan-shaw@users.noreply.github.com>2019-10-28 17:45:46 -0700
commit8d08f53d4b0b35ebe842823b5b23a372f52e7a32 (patch)
tree8dbd173f4821461d790eed9b8042716ec467a295
parentaf55822ea1d8b1cc8ff7daf4d4b0850405f12e89 (diff)
downloadvcpkg-8d08f53d4b0b35ebe842823b5b23a372f52e7a32.tar.gz
vcpkg-8d08f53d4b0b35ebe842823b5b23a372f52e7a32.zip
[jxrlib] Update port (#8525)
-rw-r--r--ports/jxrlib/CONTROL2
-rw-r--r--ports/jxrlib/LICENSE23
-rw-r--r--ports/jxrlib/portfile.cmake10
3 files changed, 6 insertions, 29 deletions
diff --git a/ports/jxrlib/CONTROL b/ports/jxrlib/CONTROL
index ec07669f1..ac2559064 100644
--- a/ports/jxrlib/CONTROL
+++ b/ports/jxrlib/CONTROL
@@ -1,4 +1,4 @@
Source: jxrlib
-Version: 1.1-9
+Version: 2019.10.9
Homepage: https://github.com/4creators/jxrlib
Description: Open source implementation of the jpegxr image format standard.
diff --git a/ports/jxrlib/LICENSE b/ports/jxrlib/LICENSE
deleted file mode 100644
index 2b6f03f6c..000000000
--- a/ports/jxrlib/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright © Microsoft Corp.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- • Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- • Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file
diff --git a/ports/jxrlib/portfile.cmake b/ports/jxrlib/portfile.cmake
index 8f65aaf74..bf131d431 100644
--- a/ports/jxrlib/portfile.cmake
+++ b/ports/jxrlib/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO 4creators/jxrlib
- REF e922fa50cdf9a58f40cad07553bcaa2883d3c5bf
- SHA512 15ed099e5f80571ebd86e115ed1c2dd18be4d6faa8b5f19212ea89582ec37e0ffa0629d80470fcb49f1c605996ea6ce76fd0dd95d9edee458ba290dff4d21537
+ REF f7521879862b9085318e814c6157490dd9dbbdb4
+ SHA512 f5617cbe73b6b905cc6bba181e6a3efedd59584f7a8c90e0f34db580cfdad4239a2ab753df4e221f26a5c0db51475b021052e3b9e3ab3673573573b1d57f3fdb
HEAD_REF master
)
@@ -29,8 +29,8 @@ vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright
-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
#install FindJXR.cmake file
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindJXR.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxr)
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxr)
+file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/FindJXR.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxr)
+file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxr)