update version info for v2.6.0 release

Merge pull request #16 from Jj0YzL5nvJ/up2024
CI/CD: Update to generic scripts, independent schedule, etc
2025-04-02 10:42:12 -04:00 · 2024-07-14 18:24:06 -07:00 · 2024-05-26 19:53:57 -07:00 · 2024-05-24 11:13:42 -06:00 · 2023-06-11 12:19:57 -07:00 · 2023-05-21 23:30:45 -06:00
8 changed files with 285 additions and 38 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -0,0 +1,120 @@
+name: Arachnoid
+
+on:
+  push:
+    paths-ignore:
+      - '.{gitattributes,gitignore,travis.yml}'
+      - '*.md,appveyor.yml,README'
+  pull_request:
+    paths-ignore:
+      - '.{gitattributes,gitignore,travis.yml}'
+      - '*.md,appveyor.yml,README'
+  workflow_dispatch:
+
+jobs:
+
+  Linux:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - cc: GCC
+            arch: x64
+          - cc: GCC
+            arch: x86
+          - cc: Clang
+            arch: x64
+          - cc: Clang
+            arch: x86
+    name: Linux / ${{ matrix.cc }} / ${{ matrix.arch }}
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Get build dependencies and arrange the environment
+        run: |
+          git clone --depth 1 https://github.com/mupen64plus/mupen64plus-core.git ../mupen64plus-core
+          export C_CLANG_SUFFIX="-15" C_GCC_SUFFIX="-12"
+          export BUILD_DEPS="libgl1-mesa-dev"
+          ./../mupen64plus-core/.github/workflows/scripts/ci_install_ubuntu_deps.sh ${{ matrix.arch }} ${{ matrix.cc }}
+      - name: Build and related stuff, backup binaries
+        run: |
+          export C_CLANG_SUFFIX="-15" C_GCC_SUFFIX="-12"
+          ./../mupen64plus-core/.github/workflows/scripts/ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }} makepkg
+      - name: Upload artifact
+        if: matrix.cc == 'GCC'
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.PKG_NAME }}
+          path: pkg/*.tar.gz
+
+  MSYS2:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - cc: GCC
+            arch: x64
+            cross: x86_64
+            env: MINGW64
+          - cc: GCC
+            arch: x86
+            cross: i686
+            env: MINGW32
+    name: Windows / MSYS2 ${{ matrix.cc }} / ${{ matrix.arch }}
+    runs-on: windows-2022
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: ${{ matrix.env }}
+          update: true
+          install: >-
+            git
+            libtool
+            make
+            mingw-w64-${{ matrix.cross }}-gcc
+            mingw-w64-${{ matrix.cross }}-toolchain
+            mingw-w64-${{ matrix.cross }}-ntldd
+      - name: Build and related stuff, backup binaries
+        run: |
+          git clone --depth 1 https://github.com/mupen64plus/mupen64plus-core.git ../mupen64plus-core
+          ./../mupen64plus-core/.github/workflows/scripts/ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }}
+      - name: Backup dependencies, etc...
+        run: |
+          ./../mupen64plus-core/.github/workflows/scripts/ci_backup_mingw_deps.sh ${{ matrix.env }}
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.PKG_NAME }}
+          path: pkg/*
+
+  Nightly-build:
+    runs-on: ubuntu-latest
+    if: github.ref_name == 'master'
+    needs: [Linux, MSYS2]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: binaries
+      - name: Get some tools
+        run: |
+          git clone --depth 1 https://github.com/mupen64plus/mupen64plus-core.git ../mupen64plus-core
+          sudo apt-get update
+          sudo apt-get -y install hashdeep
+      - name: Creating new artifacts and update nightly-build
+        run: |
+          ./../mupen64plus-core/.github/workflows/scripts/ci_nightly_artifacts.sh
+      - name: Nightly-build
+        uses: ncipollo/release-action@v1
+        with:
+          prerelease: true
+          allowUpdates: true
+          removeArtifacts: true
+          replacesArtifacts: false
+          tag: nightly-build
+          artifacts: pkg/*
--- a/.github/workflows/schedule.yml
+++ b/.github/workflows/schedule.yml
@ -0,0 +1,115 @@
+name: Arachnoid - Scheduled
+
+on:
+  schedule:
+    - cron: '15 14 21 * *'
+
+jobs:
+
+  Linux:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - cc: GCC
+            arch: x64
+          - cc: GCC
+            arch: x86
+          - cc: Clang
+            arch: x64
+          - cc: Clang
+            arch: x86
+    name: Linux / ${{ matrix.cc }} / ${{ matrix.arch }}
+    runs-on: ubuntu-22.04
+    if: github.repository == 'mupen64plus/mupen64plus-video-arachnoid'
+    steps:
+      - uses: actions/checkout@v4
+      - name: Get build dependencies and arrange the environment
+        run: |
+          git clone --depth 1 https://github.com/mupen64plus/mupen64plus-core.git ../mupen64plus-core
+          export C_CLANG_SUFFIX="-15" C_GCC_SUFFIX="-12"
+          export BUILD_DEPS="libgl1-mesa-dev"
+          ./../mupen64plus-core/.github/workflows/scripts/ci_install_ubuntu_deps.sh ${{ matrix.arch }} ${{ matrix.cc }}
+      - name: Build and related stuff, backup binaries
+        run: |
+          export C_CLANG_SUFFIX="-15" C_GCC_SUFFIX="-12"
+          ./../mupen64plus-core/.github/workflows/scripts/ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }} makepkg
+      - name: Upload artifact
+        if: matrix.cc == 'GCC'
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.PKG_NAME }}
+          path: pkg/*.tar.gz
+
+  MSYS2:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - cc: GCC
+            arch: x64
+            cross: x86_64
+            env: MINGW64
+          - cc: GCC
+            arch: x86
+            cross: i686
+            env: MINGW32
+    name: Windows / MSYS2 ${{ matrix.cc }} / ${{ matrix.arch }}
+    runs-on: windows-2022
+    if: github.repository == 'mupen64plus/mupen64plus-video-arachnoid'
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: ${{ matrix.env }}
+          update: true
+          install: >-
+            git
+            libtool
+            make
+            mingw-w64-${{ matrix.cross }}-gcc
+            mingw-w64-${{ matrix.cross }}-toolchain
+            mingw-w64-${{ matrix.cross }}-ntldd
+      - name: Build and related stuff, backup binaries
+        run: |
+          git clone --depth 1 https://github.com/mupen64plus/mupen64plus-core.git ../mupen64plus-core
+          ./../mupen64plus-core/.github/workflows/scripts/ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }}
+      - name: Backup dependencies, etc...
+        run: |
+          ./../mupen64plus-core/.github/workflows/scripts/ci_backup_mingw_deps.sh ${{ matrix.env }}
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.PKG_NAME }}
+          path: pkg/*
+
+  Nightly-build:
+    runs-on: ubuntu-latest
+    if: github.ref_name == 'master'
+    needs: [Linux, MSYS2]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: binaries
+      - name: Get some tools
+        run: |
+          git clone --depth 1 https://github.com/mupen64plus/mupen64plus-core.git ../mupen64plus-core
+          sudo apt-get update
+          sudo apt-get -y install hashdeep
+      - name: Creating new artifacts and update nightly-build
+        run: |
+          ./../mupen64plus-core/.github/workflows/scripts/ci_nightly_artifacts.sh
+      - name: Nightly-build
+        uses: ncipollo/release-action@v1
+        with:
+          prerelease: true
+          allowUpdates: true
+          removeArtifacts: true
+          replacesArtifacts: false
+          tag: nightly-build
+          artifacts: pkg/*
--- a/.travis.yml
+++ b/.travis.yml
@ -1,5 +1,5 @@
 sudo: required
-dist: trusty
+dist: xenial
 language: cpp
 compiler:
  - gcc
@ -21,14 +21,11 @@ matrix:
    - env:
      - MXE_CPU=i686
      - PATH="/usr/lib/mxe/usr/bin/:$PATH"
-      addons:
-        apt:
-          sources:
-          - sourceline: 'deb http://pkg.mxe.cc/repos/apt/debian jessie main'
-            key_url: 'http://pkg.mxe.cc/repos/apt/conf/mxeapt.gpg'
-          packages:
-          - mxe-i686-w64-mingw32.shared-gcc
      before_install:
+      - curl -sSL "https://mirror.mxe.cc/repos/apt/client-conf/mxeapt.gpg" | sudo -E apt-key add -
+      - echo "deb https://mirror.mxe.cc/repos/apt xenial main" | sudo tee -a /etc/apt/sources.list
+      - sudo apt-get update -qq
+      - sudo apt-get -y --allow-unauthenticated install mxe-i686-w64-mingw32.shared-gcc
      - git clone --depth=1 --branch=master git://github.com/mupen64plus/mupen64plus-core.git deps/mupen64plus-core
      script:
      - make UNAME=MINGW CROSS_COMPILE="${MXE_CPU}-w64-mingw32.shared-" CC="${MXE_CPU}-w64-mingw32.shared-gcc" CXX="${MXE_CPU}-w64-mingw32.shared-g++" HOST_CPU="${MXE_CPU}" -C projects/unix APIDIR="$(pwd)/deps/mupen64plus-core/src/api/"  V=1  clean && 
@ -37,15 +34,12 @@ matrix:
    - env:
      - MXE_CPU=x86_64
      - PATH="/usr/lib/mxe/usr/bin/:$PATH"
-      addons:
-        apt:
-          sources:
-          - sourceline: 'deb http://pkg.mxe.cc/repos/apt/debian jessie main'
-            key_url: 'http://pkg.mxe.cc/repos/apt/conf/mxeapt.gpg'
-          packages:
-          - mxe-x86-64-w64-mingw32.shared-gcc
      before_install:
-       - git clone --depth=1 --branch=master git://github.com/mupen64plus/mupen64plus-core.git deps/mupen64plus-core
+      - curl -sSL "https://mirror.mxe.cc/repos/apt/client-conf/mxeapt.gpg" | sudo -E apt-key add -
+      - echo "deb https://mirror.mxe.cc/repos/apt xenial main" | sudo tee -a /etc/apt/sources.list
+      - sudo apt-get update -qq
+      - sudo apt-get -y --allow-unauthenticated install mxe-x86-64-w64-mingw32.shared-gcc
+      - git clone --depth=1 --branch=master git://github.com/mupen64plus/mupen64plus-core.git deps/mupen64plus-core
      script:
      - make UNAME=MINGW CROSS_COMPILE="${MXE_CPU}-w64-mingw32.shared-" CC="${MXE_CPU}-w64-mingw32.shared-gcc" CXX="${MXE_CPU}-w64-mingw32.shared-g++" HOST_CPU="${MXE_CPU}" -C projects/unix APIDIR="$(pwd)/deps/mupen64plus-core/src/api/"  V=1  clean && 
        make UNAME=MINGW CROSS_COMPILE="${MXE_CPU}-w64-mingw32.shared-" CC="${MXE_CPU}-w64-mingw32.shared-gcc" CXX="${MXE_CPU}-w64-mingw32.shared-g++" HOST_CPU="${MXE_CPU}" -C projects/unix APIDIR="$(pwd)/deps/mupen64plus-core/src/api/"  V=1 -j$(nproc) all
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
@ -20,8 +20,9 @@
 # * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 # Makefile for mupen64plus-video-arachnoid

-# detect operation system
+# detect operating system
 UNAME ?= $(shell uname -s)
+OS := NONE
 ifeq ("$(UNAME)","Linux")
  OS = LINUX
  SO_EXTENSION = so
@ -70,11 +71,13 @@ endif

 # detect system architecture
 HOST_CPU ?= $(shell uname -m)
+CPU := NONE
 NO_ASM ?= 1
 ifneq ("$(filter x86_64 amd64,$(HOST_CPU))","")
  CPU := X86
  ifeq ("$(BITS)", "32")
    ARCH_DETECTED := 64BITS_32
+    PIC ?= 0
  else
    ARCH_DETECTED := 64BITS
    PIC ?= 1
@ -83,6 +86,7 @@ endif
 ifneq ("$(filter pentium i%86,$(HOST_CPU))","")
  CPU := X86
  ARCH_DETECTED := 32BITS
+  PIC ?= 0
 endif
 ifneq ("$(filter ppc macppc socppc powerpc,$(HOST_CPU))","")
  CPU := PPC
@ -106,6 +110,12 @@ ifneq ("$(filter arm%,$(HOST_CPU))","")
    $(warning Architecture "$(HOST_CPU)" not officially supported.')
  endif
 endif
+ifeq ("$(CPU)","NONE")
+  $(error CPU type "$(HOST_CPU)" not supported.  Please file bug report at 'https://github.com/mupen64plus/mupen64plus-core/issues')
+endif
+
+SRCDIR = ../../src
+OBJDIR = _obj$(POSTFIX)

 # base CFLAGS, LDLIBS, and LDFLAGS
 OPTFLAGS ?= -O3 -flto
@ -209,25 +219,33 @@ else
  endif
 endif

-# set special flags per-system
-ifeq ($(OS), LINUX)
-  # only export api symbols
-  LDFLAGS += -Wl,-version-script,$(SRCDIR)/video_api_export.ver
-endif
-ifneq ($(OS), FREEBSD)
-  ifeq ($(CPU), X86)
-    # tweak flags for 32-bit build on 64-bit system
-    ifeq ($(ARCH_DETECTED), 64BITS_32)
+# tweak flags for 32-bit build on 64-bit system
+ifeq ($(ARCH_DETECTED), 64BITS_32)
+  ifeq ($(OS), FREEBSD)
+    $(error Do not use the BITS=32 option with FreeBSD, use -m32 and -m elf_i386)
+  endif
+  ifneq ($(OS), OSX)
+    ifeq ($(OS), MINGW)
+      LDFLAGS += -Wl,-m,i386pe
+    else
      CFLAGS += -m32
      LDFLAGS += -Wl,-m,elf_i386
    endif
  endif
-else
-  ifeq ($(ARCH_DETECTED), 64BITS_32)
-    $(error Do not use the BITS=32 option with FreeBSD, use -m32 and -m elf_i386)
+endif
+
+ifeq ($(ARCH_DETECTED), 64BITS)
+  ifeq ($(OS), MINGW)
+    LDFLAGS += -Wl,-m,i386pep
  endif
 endif

+# set special flags per-system
+ifeq ($(OS), LINUX)
+  # only export api symbols
+  LDFLAGS += -Wl,-version-script,$(SRCDIR)/video_api_export.ver
+endif
+
 # reduced compile output when running make without V=1
 ifneq ($(findstring $(MAKEFLAGS),s),s)
 ifndef V
@ -259,9 +277,6 @@ endif
 ifeq ($(PREFIX),)
  PREFIX := /usr/local
 endif
-ifeq ($(SHAREDIR),)
-  SHAREDIR := $(PREFIX)/share/mupen64plus
-endif
 ifeq ($(LIBDIR),)
  LIBDIR := $(PREFIX)/lib
 endif
@ -269,10 +284,6 @@ ifeq ($(PLUGINDIR),)
  PLUGINDIR := $(LIBDIR)/mupen64plus
 endif

-
-SRCDIR = ../../src
-OBJDIR = _obj$(POSTFIX)
-
 # list of source files to compile
 SOURCE = \
 	$(SRCDIR)/main.cpp \
--- a/src/ExtensionChecker.h
+++ b/src/ExtensionChecker.h
@ -19,7 +19,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 *****************************************************************************/

-#ifndef EXTENSION_CHECKER_H
+#ifndef EXTENSION_CHECKER_H_
 #define EXTENSION_CHECKER_H_

 bool isExtensionSupported( const char *extension );
--- a/src/OpenGLManager.cpp
+++ b/src/OpenGLManager.cpp
@ -58,6 +58,7 @@ bool OpenGLManager::initialize(bool fullscreen, int width, int height, int bitDe
    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
    glEnable(GL_DEPTH_TEST);
    glEnable(GL_CULL_FACE);
+    this->setViewport(0, 0, width, height);

    //Set render states
    setCullMode(false, true);
--- a/src/config/StringFunctions.cpp
+++ b/src/config/StringFunctions.cpp
@ -98,6 +98,12 @@ void trim(string& str, bool left, bool right, const string delims)
 //-----------------------------------------------------------------------------
 char* trim(char* str, bool left, bool right)
 {
+    // Empty string check
+    if (*str == '\0')
+    {
+        return str;
+    }
+
    //Trim from the left
    if(left)
    {
--- a/src/main.cpp
+++ b/src/main.cpp
@ -41,7 +41,7 @@

 //Definitions
 #define PLUGIN_NAME "Arachnoid Video Plugin"
-#define PLUGIN_VERSION           0x020000
+#define PLUGIN_VERSION           0x020600
 #define VIDEO_PLUGIN_API_VERSION 0x020200
 #define CONFIG_API_VERSION       0x020000
 #define VIDEXT_API_VERSION       0x030000
Author	SHA1	Message	Date
Richard Goedeken	5e9ea51064	update version info for v2.6.0 release	2024-07-14 18:24:06 -07:00
Richard Goedeken	beebe29996	Merge pull request #16 from Jj0YzL5nvJ/up2024 CI/CD: Update to generic scripts, independent schedule, etc	2024-05-26 19:53:57 -07:00
Jj0YzL5nvJ	99515bac6d	CI/CD: Update to generic scripts, independent schedule, etc	2024-05-24 11:13:42 -06:00
Richard Goedeken	8187d1135c	Merge pull request #15 from Jj0YzL5nvJ/up2023 CI/CD: Fixes Ubuntu i386 builds, among other changes	2023-06-11 12:19:57 -07:00
Jj0YzL5nvJ	b69ca81311	CI/CD: Fixes Ubuntu i386 builds, among other changes	2023-05-21 23:30:45 -06:00
Richard Goedeken	4f5f3ba69a	Merge pull request #14 from Jj0YzL5nvJ/ci-schedule CI/CD: Integrate scheduled builds and other...	2023-03-02 21:58:34 -08:00
Jj0YzL5nvJ	7865c767b5	CI/CD: Integrate scheduled builds and other necessary updates	2023-02-14 23:48:47 -06:00
Richard Goedeken	82ab630d29	Merge pull request #13 from Sinisig/viewport-fix Set viewport when initializing window	2022-08-16 17:45:10 -07:00
Sinisig	4e6356c74a	Set viewport when initializing window	2022-08-15 22:13:42 -04:00
Richard Goedeken	52b2909ae6	Merge pull request #12 from Jj0YzL5nvJ/ci-update CI/CD: Update	2022-07-13 19:28:51 -07:00
Jj0YzL5nvJ	401bcb1047	CI/CD: Update	2022-07-10 18:51:06 -06:00
Richard Goedeken	244f13d3b9	Merge pull request #11 from Sinisig/crash-fix Fixed crash in StringFunctions::trim()	2022-06-09 20:09:35 -07:00
Sinisig	cdde810024	Fixed crash in StringFunctions::trim()	2022-06-09 22:42:52 -04:00
Richard Goedeken	05f76111c6	Merge pull request #10 from Jj0YzL5nvJ/ci-github CI/CD: Implement GitHub Actions and public nightly builds	2022-04-11 20:45:54 -07:00
Jj0YzL5nvJ	3f1b81dc5a	CI/CD: Implement GitHub Actions and public nightly builds	2021-12-05 08:58:33 -07:00
Richard Goedeken	578edd1530	Revert "Allow non-default compilers without resorting to symbolic links" This reverts commit `b0876423c8`, as it conflicts with GNU make which always defines default values for certain variables	2020-09-16 22:36:13 -07:00
Richard Goedeken	20ac6717d6	Merge pull request #9 from Jj0YzL5nvJ/alter_cc_cxx Allow non-default compilers without resorting to symbolic links	2020-08-30 18:55:01 -07:00
Jj0YzL5nvJ	b0876423c8	Allow non-default compilers without resorting to symbolic links	2020-08-30 13:57:34 -06:00
Richard Goedeken	5bde6b38b4	Merge pull request #8 from bentley/master Fix include guard.	2019-02-21 20:40:54 -08:00
Richard Goedeken	7109d57577	fix Travis CI test builds for MXE 32 and 64 bits	2019-02-21 20:39:57 -08:00
Anthony J. Bentley	87247554f0	Fix include guard.	2019-02-17 15:20:03 -07:00