[pull] master from uniconproject:master

.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         cfg:
-        -  { os: windows-latest,  name: 'Windows 64-bit', pkg: 'Windows_64-bit',  opt: '--enable-werror' }
+        -  { os: windows-latest,  name: 'Windows 64-bit', pkg: 'Windows_64-bit',  opt: '--disable-iconc --enable-werror' }
         #-  { os: windows-latest,  name: 'Windows 32-bit', opt: '--build=i686-w64-mingw32 --host=i686-w64-mingw32' }
 
     defaults:
@@ -79,7 +79,8 @@ jobs:
     strategy:
       matrix:
         cfg:
-        -  { os: macos-13, name: 'macOS', opt: '--enable-werror CC=clang CXX=clang++' }
+        -  { os: macos-13, name: 'macOS x86', opt: '--enable-werror CC=clang CXX=clang++' }
+        -  { os: macos-latest, name: 'macOS arm', opt: 'CC=clang CXX=clang++' }
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -125,7 +126,7 @@ jobs:
         case "${{ matrix.cfg.os }}" in
            ubuntu*|debian*)
               apt-get update -q -y
-              DEBIAN_FRONTEND="noninteractive" apt-get install -q -y build-essential make autotools-dev libc6 libgcc1 libgl1-mesa-glx
+              DEBIAN_FRONTEND="noninteractive" apt-get install -q -y build-essential make autotools-dev libc6 libgcc1 libgl1-mesa-dev
               DEBIAN_FRONTEND="noninteractive" apt-get install -q -y libssl-dev libx11-dev libjpeg-dev libpng-dev libglu1-mesa-dev libxft-dev
               DEBIAN_FRONTEND="noninteractive" apt-get install -q -y libopenal-dev libalut-dev libogg-dev libvorbis-dev unixodbc-dev libfreetype6-dev
               ;;
@@ -173,15 +174,21 @@ jobs:
     strategy:
       matrix:
         platform:
-         -  { arch: aarch64 }
-         -  { arch: armv7 }
+         -  { arch: aarch64 } # emulated
+         -  { arch: armv7 }   # emulated
+         -  { arch: riscv64 } # emulated
          -  { arch: x86 }
     steps:
+    - name: Install extra dependencies
+      shell: 'sh'
+      run: |
+        sudo apt update && sudo apt install -y binfmt-support
+
     - name: alpine
       uses: jirutka/setup-alpine@v1
       with:
         arch:  ${{ matrix.platform.arch }}
-        branch: v3.19
+        branch: v3.20
         packages: >
           build-base
           diffutils
@@ -225,13 +232,15 @@ jobs:
         -  { os: ubuntu-latest, name: 'Heap Test',      opt: '--enable-debugheap  --enable-verifyheap --enable-werror' }
         -  { os: ubuntu-latest, name: 'Thin Build',     opt: '--enable-thin --enable-werror' }
         -  { os: ubuntu-latest, name: 'Dev Mode',       opt: '--enable-devmode' }
+        -  { os: ubuntu-24.04-arm, name: 'Ubuntu ARM',  opt: '--enable-werror' }
     steps:
     - name: Checkout
       uses: actions/checkout@v4
 
     - name: Install dependencies
       run: |
         sudo apt-get update -q -y
+        sudo apt install -y binfmt-support
         if [[ "${{ matrix.cfg.name }}" = "Ubuntu 32-bit" ]]
         then
         # Install tools to cross compile 32-bit
@@ -270,6 +279,51 @@ jobs:
         cat unicon-config.log
         cat unicon-features.log
 
+  FreeBSD:
+   runs-on: ubuntu-latest
+   name: FreeBSD
+
+   steps:
+   - uses: actions/checkout@v4
+   - name: Start FreeBSD VM
+     id: vm
+     uses: vmactions/freebsd-vm@v1
+     with:
+      usesh: true # default shell is csh, switch to sh
+      prepare: |
+        pkg install -y -f autoconf gmake lang/gcc git
+
+   - name: Configure
+     shell: freebsd {0}
+     run: |
+      cd $GITHUB_WORKSPACE
+      git config --global --add safe.directory $GITHUB_WORKSPACE
+      ./configure
+
+   - name: Make
+     shell: freebsd {0}
+     run: cd $GITHUB_WORKSPACE && gmake
+
+   - name: HtmlDoc
+     shell: freebsd {0}
+     run: cd $GITHUB_WORKSPACE && gmake htmldoc
+
+   - name: Test
+     shell: freebsd {0}
+     run: cd $GITHUB_WORKSPACE && gmake Test
+
+   - name: TestReport
+     shell: freebsd {0}
+     run: cd $GITHUB_WORKSPACE && gmake -C tests Report
+
+   - name: Summary
+     shell: freebsd {0}
+     run: |
+      cd $GITHUB_WORKSPACE
+      cat unicon-config.log
+      cat unicon-features.log
+
+
   DebianPkg:
     runs-on: ${{ matrix.cfg.os }}
     name: ${{ matrix.cfg.name }}

.github/workflows/packages.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         cfg:
-        -  { os: windows-latest,  name: 'Windows_64-bit',  opt: '' }
+        -  { os: windows-latest,  name: 'Windows_64-bit',  opt: '--disable-iconc' }
         #-  { os: windows-latest,  name: 'Windows_32-bit', opt: '--build=i686-w64-mingw32 --host=i686-w64-mingw32' }
 
     defaults:

README.md

@@ -83,7 +83,7 @@ Most of these libraries are listed below for common Linux distibutions.
 
 Debian/Ubuntu:
 ```
-apt install libgl1-mesa-glx libssl-dev libx11-dev libjpeg-dev libpng-dev libglu1-mesa-dev
+apt install libgl1-mesa-dev libssl-dev libx11-dev libjpeg-dev libpng-dev libglu1-mesa-dev
             libxft-dev libopenal-dev libalut-dev libogg-dev libvorbis-dev unixodbc-dev
 	    libfreetype6-dev
 ```
@@ -97,7 +97,7 @@ dnf install libjpeg-turbo-devel libpng-devel libX11-devel mesa-libGL-devel mesa-
 Go into the Unicon directory and run:
 ```
 ./configure
-make
+make -j
 ```
 After that you can add `unicon/bin` to the $PATH environment variable or install Unicon instead:
 ```
@@ -115,6 +115,19 @@ explicitly set the compiler as follows:
 If you want access to the graphics facilities of Unicon, you also need to download
 and install the XQuartz package from https://www.xquartz.org/.
 
+### *BSD
+
+installl build dependencies. Make sure to use GNU `gmake` when building.
+```
+pkg install -y -f autoconf gmake lang/gcc git
+```
+
+Configure, make, and optionally install unicon:
+```
+./configure
+gmake -j
+gmake install
+```
 
 ### Windows
 There are two possibilities depending on the choice of the C runtime library.  You can choose