Merge branch 'master' of https://github.com/xoreos/xoreos-tools into …

…xoreos-master # Conflicts: # src/xoreostex2tga.cpp
xoreos · Nov 27, 2023 · 4d4f875 · 4d4f875
2 parents 8472f11 + 36f2884
commit 4d4f875
Show file tree

Hide file tree

Showing 76 changed files with 12,013 additions and 17,928 deletions.
diff --git a/.github/workflows/linux_autotools_clang.yml b/.github/workflows/linux_autotools_clang.yml
@@ -5,10 +5,10 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Install dependencies
       id: install_dependencies

diff --git a/.github/workflows/linux_autotools_gcc.yml b/.github/workflows/linux_autotools_gcc.yml
@@ -5,10 +5,10 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Install dependencies
       id: install_dependencies

diff --git a/.github/workflows/linux_cmake_clang.yml b/.github/workflows/linux_cmake_clang.yml
@@ -5,10 +5,10 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Install dependencies
       id: install_dependencies

diff --git a/.github/workflows/linux_cmake_gcc.yml b/.github/workflows/linux_cmake_gcc.yml
@@ -5,10 +5,10 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Install dependencies
       id: install_dependencies

diff --git a/.github/workflows/macos_autotools_clang.yml b/.github/workflows/macos_autotools_clang.yml
@@ -5,10 +5,10 @@ on:
 
 jobs:
   build:
-    runs-on: macos-10.15
+    runs-on: macos-12
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Install dependencies
       id: install_dependencies

diff --git a/.github/workflows/macos_cmake_clang.yml b/.github/workflows/macos_cmake_clang.yml
@@ -5,10 +5,10 @@ on:
 
 jobs:
   build:
-    runs-on: macos-10.15
+    runs-on: macos-12
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Install dependencies
       id: install_dependencies

diff --git a/.github/workflows/vcpkg.json b/.github/workflows/vcpkg.json
@@ -13,6 +13,7 @@
     "boost-smart-ptr",
     "boost-system",
     "boost-utility",
-    "boost-uuid"
+    "boost-uuid",
+    "boost-variant"
   ]
 }
diff --git a/.github/workflows/windows_cmake_msvc.yml b/.github/workflows/windows_cmake_msvc.yml
@@ -5,15 +5,15 @@ on:
 
 jobs:
   build:
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     env:
       VCPKG_ROOT: ${{ github.workspace }}/vcpkg
       VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/vcpkg/bincache
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: lukka/get-cmake@v3.21.2
+    - uses: actions/checkout@v4
+    - uses: lukka/get-cmake@v3.27.6
 
     - name: Prepare vcpkg
       id: prepare_vcpkg
@@ -24,10 +24,10 @@ jobs:
         cp -v "${GITHUB_WORKSPACE}"/.github/workflows/CMakePresets.json "${GITHUB_WORKSPACE}"/
 
     - name: Restore artifacts and set up vcpkg
-      uses: lukka/run-vcpkg@v10.1
+      uses: lukka/run-vcpkg@v11
       id: run_vcpkg
       with:
-        vcpkgGitCommitId: af2287382b1991dbdcb7e5112d236f3323b9dd7a
+        vcpkgGitCommitId: accd79817981f1ce00c6a4164aecf2b2ac699823
         vcpkgJsonGlob: vcpkg.json
 
     - name: Run CMake, with vcpkg stage, generate, build and test

diff --git a/AUTHORS b/AUTHORS
@@ -1,5 +1,5 @@
 xoreos-tools - Tools to help with xoreos development
-Copyright (c) 2012-2022 by the following:
+Copyright (c) 2012-2023 by the following:
 
 Sven Hesse (DrMcCoy) <drmccoy@drmccoy.de>
 Matthew Hoops (clone2727) <clone2727@gmail.com>
@@ -60,9 +60,9 @@ boost.m4
 UTF-8 CPP
 *********
    xoreos-tools uses the lightweight header-only UTF-8 CPP library
-   (<http://utfcpp.sourceforge.net/>) for handling UTF-8 encoded strings.
+   (<https://github.com/nemtrif/utfcpp>) for handling UTF-8 encoded strings.
    UTF-8 CPP is licensed under the Boost Software License. See
-   external/utf8cpp/utf8.h or <https://www.boost.org/users/license.html>
+   external/utf8cpp/LICENSE or <https://www.boost.org/users/license.html>
    for details.
 
 ScummVM code

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -263,6 +263,10 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 # find the required libraries
 set(XOREOSTOOLS_LIBRARIES "")
 
+find_package(Iconv REQUIRED)
+include_directories(${Iconv_INCLUDE_DIRS})
+list(APPEND XOREOSTOOLS_LIBRARIES ${Iconv_LIBRARIES})
+
 find_package(ZLIB REQUIRED)
 include_directories(${ZLIB_INCLUDE_DIRS})
 list(APPEND XOREOSTOOLS_LIBRARIES ${ZLIB_LIBRARIES})
@@ -281,10 +285,6 @@ find_package(LibXml2 REQUIRED)
 include_directories(${LIBXML2_INCLUDE_DIR})
 list(APPEND XOREOSTOOLS_LIBRARIES ${LIBXML2_LIBRARIES})
 
-find_package(Iconv REQUIRED)
-include_directories(${ICONV_INCLUDE_DIRS})
-list(APPEND XOREOSTOOLS_LIBRARIES ${ICONV_LIBRARIES})
-
 if(ICONV_SECOND_ARGUMENT_IS_CONST)
   add_definitions(-DICONV_CONST=const)
 else(ICONV_SECOND_ARGUMENT_IS_CONST)

diff --git a/Makefile.am b/Makefile.am
@@ -23,8 +23,6 @@
 
 # Use the m4 directory for extra m4 autoconf scripts.
 ACLOCAL_AMFLAGS = -I m4 --install
-# Build objects in the same directory as their source files.
-AUTOMAKE_OPTIONS = subdir-objects
 
 # Empty element to make the source lists easier editable.
 EMPTY =

diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake
diff --git a/configure.ac b/configure.ac
@@ -167,7 +167,10 @@ if test "x$with_std" = "xyes"; then
 	esac;
 fi
 
+BOOST_STD="$STD"
+
 AC_SUBST(STD)
+AC_SUBST(BOOST_STD)
 
 dnl Link-time optimization
 AC_ARG_WITH([lto], [AS_HELP_STRING([--with-lto], [Compile with link-time optimization @<:@default=no@:>@])], [], [with_lto=no])

diff --git a/dists/debian/copyright b/dists/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: xoreos-tools
 Source: https://xoreos.org/
 
 Files: *
-Copyright: 2010-2022 The xoreos Team
+Copyright: 2010-2023 The xoreos Team
 License: GPL-3.0-or-later
 Comment:
  See list of copyright holders and upstream authors in

diff --git a/external/utf8cpp/LICENSE b/external/utf8cpp/LICENSE
@@ -0,0 +1,23 @@
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/external/utf8cpp/README.xoreos b/external/utf8cpp/README.xoreos
@@ -1,5 +1,5 @@
-This is the source of UTF8-CPP (<http://utfcpp.sourceforge.net/>),
-version 2.3.4. The following changes have been applied:
+This is the source of UTF8-CPP (<https://github.com/nemtrif/utfcpp>),
+version 3.2.1. The following changes have been applied:
 
 Changes:
 ========

diff --git a/external/utf8cpp/rules.mk b/external/utf8cpp/rules.mk
@@ -17,16 +17,18 @@
 # You should have received a copy of the GNU General Public License
 # along with xoreos-tools. If not, see <http://www.gnu.org/licenses/>.
 
-# UTF8-CPP (<http://utfcpp.sourceforge.net/>).
+# UTF8-CPP (<https://github.com/nemtrif/utfcpp>).
 
 noinst_HEADERS += \
     external/utf8cpp/utf8.h \
     external/utf8cpp/utf8/checked.h \
     external/utf8cpp/utf8/core.h \
+    external/utf8cpp/utf8/cpp11.h \
+    external/utf8cpp/utf8/cpp17.h \
     external/utf8cpp/utf8/unchecked.h \
     $(EMPTY)
 
 EXTRA_DIST += \
+    external/utf8cpp/LICENSE \
     external/utf8cpp/README.xoreos \
-    external/utf8cpp/utf8cpp.patch \
     $(EMPTY)
diff --git a/external/utf8cpp/utf8.h b/external/utf8cpp/utf8.h
@@ -28,7 +28,7 @@ DEALINGS IN THE SOFTWARE.
 #ifndef UTF8_FOR_CPP_2675DCD0_9480_4c0c_B92A_CC14C027B731
 #define UTF8_FOR_CPP_2675DCD0_9480_4c0c_B92A_CC14C027B731
 
-#include "external/utf8cpp/utf8/checked.h"
-#include "external/utf8cpp/utf8/unchecked.h"
+#include "utf8/checked.h"
+#include "utf8/unchecked.h"
 
 #endif // header guard