Merge pull request #5 from xemu-project/master

MM

.github/workflows/build.yml

@@ -67,7 +67,7 @@ jobs:
           build_param:
           artifact_name: xemu-win-release
     env:
-      DOCKER_IMAGE_NAME: ghcr.io/xemu-project/xemu-win64-toolchain:sha-d0d3e7b
+      DOCKER_IMAGE_NAME: ghcr.io/xemu-project/xemu-win64-toolchain:sha-8152913
 
     steps:
     - name: Download source package
@@ -168,15 +168,8 @@ jobs:
       run: |
         mkdir src
         tar -C src -xf src.tar.gz
-    - name: Clone Debian packaging
-      uses: actions/checkout@v4
-      with:
-        ref: deb
-        path: debian-tmp
-    - name: Integrate Debian packaging
+    - name: Create debian changelog
       run: |
-        mv debian-tmp/debian src
-        rm -rf debian-tmp
         pushd src
         echo -e "\
         xemu (1:$(cat XEMU_VERSION)-0) unstable; urgency=medium\n\
@@ -239,7 +232,7 @@ jobs:
 
   macOS:
     name: Build for macOS (${{ matrix.arch }}, ${{ matrix.configuration }})
-    runs-on: macOS-11
+    runs-on: macOS-14
     needs: Init
     strategy:
       matrix:
@@ -271,6 +264,9 @@ jobs:
         name: src.tar.gz
     - name: Extract source package
       run: tar xf src.tar.gz
+    - uses: actions/[email protected]
+      with:
+        python-version: '3.12'
     - name: Install dependencies
       run: |
         export HOMEBREW_NO_AUTO_UPDATE=1
@@ -279,9 +275,8 @@ jobs:
           ccache \
           coreutils \
           dylibbundler \
-          pkg-config \
           ninja
-        python3 -m pip install pyyaml requests
+        pip install pyyaml requests
     - name: Initialize compiler, library cache
       id: cache
       uses: actions/cache@v4
@@ -311,7 +306,7 @@ jobs:
 
   macOSUniversal:
     name: Build macOS Universal Bundle (${{ matrix.configuration }})
-    runs-on: macOS-11
+    runs-on: macOS-14
     needs: [macOS]
     strategy:
       matrix:
@@ -418,15 +413,8 @@ jobs:
       run: |
         mkdir src
         tar -C src -xf src.tar.gz
-    - name: Clone Debian packaging
-      uses: actions/checkout@v4
-      with:
-        ref: deb
-        path: debian-tmp
     - name: Integrate Debian packaging
       run: |
-        mv debian-tmp/debian src
-        rm -rf debian-tmp
         pushd src
         echo -e "\
         xemu (1:$(cat XEMU_VERSION)-0) unstable; urgency=medium\n\

build.sh

@@ -199,9 +199,9 @@ case "$platform" in # Adjust compilation options based on platform
     Darwin)
         echo "Compiling for MacOS for $target_arch..."
         if [ "$target_arch" == "arm64" ]; then
-            macos_min_ver=11.3
+            macos_min_ver=12.7.5
         elif [ "$target_arch" == "x86_64" ]; then
-            macos_min_ver=10.13
+            macos_min_ver=12.7.5
         else
             echo "Unsupported arch $target_arch"
             exit 1

debian/build_deb.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+# Run from xemu root
+set -e
+set -x
+
+BUILD_DIR=/tmp/xemu-deb-build
+XEMU_VERSION_TAG=0.0.0
+PKG_NAME=xemu_${XEMU_VERSION_TAG}
+
+# Remove previous build artifacts, create build dir
+rm -rf $BUILD_DIR
+mkdir -p $BUILD_DIR
+
+# Create source tarball
+tar -czf $BUILD_DIR/${PKG_NAME}.orig.tar.gz --transform "s#^#${PKG_NAME}/#" .
+pushd $BUILD_DIR
+
+# Build .deb
+tar xf ${PKG_NAME}.orig.tar.gz
+cd ${PKG_NAME}
+
+# Create a changelog with current version
+echo -e "xemu (1:${XEMU_VERSION_TAG}-0) unstable; urgency=medium\n" > debian/changelog
+echo -e "  Built from $(git describe --match 'xemu-v*')\n" >> debian/changelog
+echo " -- Matt Borgerson <[email protected]>  $(date -R)" >> debian/changelog
+
+# Place specific repo version in control file
+echo -e " .\n This package was built from $(git describe --match 'xemu-v*') on $(date -R)\n" >> debian/control
+
+debuild --preserve-env -us -uc

debian/changelog

@@ -0,0 +1,5 @@
+xemu (1:0.5.2-18-g12b58544b1-0) unstable; urgency=medium
+
+  Built from 0.5.2-18-g12b58544b1
+
+ -- Matt Borgerson <[email protected]>  Tue, 25 May 2021 01:43:41 +0000

debian/compat

@@ -0,0 +1 @@
+11

debian/control

@@ -0,0 +1,33 @@
+Source: xemu
+Section: games
+Priority: optional
+Maintainer: Matt Borgerson <[email protected]>
+Build-Depends: debhelper (>= 11),
+ git,
+ python3:any,
+ python3-yaml,
+ ninja-build,
+ libgtk-3-dev,
+ libepoxy-dev,
+ libpixman-1-dev,
+ libsdl2-dev,
+ libsamplerate0-dev,
+ zlib1g-dev,
+ libssl-dev,
+ libpcap-dev,
+ libslirp-dev,
+Standards-Version: 3.9.8
+Homepage: https://xemu.app
+XS-Debian-Vcs-Browser: https://github.com/mborgerson/xemu
+XS-Debian-Vcs-Git: https://github.com/mborgerson/xemu.git
+Vcs-Browser: https://github.com/mborgerson/xemu
+Vcs-Git: https://github.com/mborgerson/xemu.git
+
+Package: xemu
+Architecture: amd64 arm arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el riscv64 s390x sparc sparc64 x32
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Provides: xemu
+Description: Original Xbox emulator
+ An open-source, cross-platform application that emulates the hardware of the
+ original Xbox game console.