diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 52 | ||||
| -rw-r--r-- | sdl2_bug.patch | 25 |
3 files changed, 77 insertions, 14 deletions
@@ -1,23 +1,31 @@ pkgbase = sheepshaver-git pkgdesc = An Open Source PowerMac Emulator - pkgver = r2604.g143b0827 + pkgver = r2687.g720eb598 pkgrel = 2 url = http://sheepshaver.cebix.net arch = x86_64 license = GPL + makedepends = git depends = gtk2 depends = sdl depends = vde2 - provides = sheepshaver=r2604.g143b0827 - conflicts = sheepshaver + options = !lto source = git+https://github.com/cebix/macemu source = SheepShaver.sysctl source = SheepShaver.desktop source = SheepShaver.png + source = sdl2_bug.patch sha256sums = SKIP sha256sums = a4aa858b95d29906873693988d5db42d5a4da8aa94a72c79374f59fc488efd51 sha256sums = cb002e73e864a6ca271e0bbaa6df6eb89dc1df86856fc575c20bf79367458c39 sha256sums = b7f67b1f8424f3e0ffa1a5e57597f368c4c4f93ea1f871ec0a76700b7519b241 + sha256sums = ab944b2d074df35671ad534a1c768fdcf663d9d0f838d68b73007e3737b1a0c4 pkgname = sheepshaver-git + provides = sheepshaver=r2687.g720eb598 + conflicts = sheepshaver +pkgname = sheepnet-dkms-git + depends = dkms + provides = sheepnet-dkms=r2687.g720eb598 + conflicts = sheepnet-dkms @@ -1,45 +1,58 @@ -# Maintainer: Eric DeStefano <eric at ericdestefano dot com> +# Maintainer: Daniel Menelkir <dmenelkir at gmail dot com> +# Contributor: Eric DeStefano <eric at ericdestefano dot com> -pkgname=sheepshaver-git -pkgver=r2604.g143b0827 +pkgbase=sheepshaver-git +pkgname=(sheepshaver-git sheepnet-dkms-git) +pkgver=r2687.g720eb598 pkgrel=2 pkgdesc="An Open Source PowerMac Emulator" arch=('x86_64') url="http://sheepshaver.cebix.net" license=('GPL') depends=('gtk2' 'sdl' 'vde2') -provides=("sheepshaver=$pkgver") -conflicts=("sheepshaver") +options=(!lto) +makedepends=('git') source=('git+https://github.com/cebix/macemu' 'SheepShaver.sysctl' 'SheepShaver.desktop' - 'SheepShaver.png') + 'SheepShaver.png' + 'sdl2_bug.patch' + ) sha256sums=('SKIP' 'a4aa858b95d29906873693988d5db42d5a4da8aa94a72c79374f59fc488efd51' 'cb002e73e864a6ca271e0bbaa6df6eb89dc1df86856fc575c20bf79367458c39' - 'b7f67b1f8424f3e0ffa1a5e57597f368c4c4f93ea1f871ec0a76700b7519b241') + 'b7f67b1f8424f3e0ffa1a5e57597f368c4c4f93ea1f871ec0a76700b7519b241' + 'ab944b2d074df35671ad534a1c768fdcf663d9d0f838d68b73007e3737b1a0c4') pkgver() { cd macemu echo "r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)" } +prepare() { + cd macemu/ + # patch -p1 -i "$srcdir/sdl2_bug.patch" +} + build() { cd macemu/SheepShaver/src/Unix + export CXXFLAGS="$CXXFLAGS -DSTDC_HEADERS=1 -Werror=format-security" ./autogen.sh \ --prefix=/usr \ --enable-addressing=direct \ --enable-standalone-gui \ --enable-sdl-audio \ + --enable-addressing=real \ --enable-sdl-video \ - --enable-tuntap \ --with-bincue \ - --with-vdeplug \ - ; + ; make -j1 } -package() { +package_sheepshaver-git() { + provides=("sheepshaver=$pkgver") + conflicts=("sheepshaver") + install -Dm755 macemu/SheepShaver/src/Unix/SheepShaver "$pkgdir"/usr/bin/SheepShaver install -Dm755 macemu/SheepShaver/src/Unix/SheepShaverGUI "$pkgdir"/usr/bin/SheepShaverGUI @@ -51,4 +64,21 @@ package() { install -Dm644 SheepShaver.sysctl "$pkgdir"/etc/sysctl.d/90-SheepShaver.conf } +package_sheepnet-dkms-git() { + depends=('dkms') + provides=("sheepnet-dkms=$pkgver") + conflicts=("sheepnet-dkms") + + mkdir -p "$pkgdir"/usr/src + cp -rL macemu/SheepShaver/src/Unix/Linux/NetDriver "$pkgdir"/usr/src/sheepnet-$pkgver + + cat > "$pkgdir"/usr/src/sheepnet-$pkgver/dkms.conf <<-EOF + PACKAGE_NAME="sheepnet" + PACKAGE_VERSION="$pkgver" + AUTOINSTALL=yes + BUILT_MODULE_NAME="sheep_net" + DEST_MODULE_LOCATION="/kernel/net" +EOF +} + # vim: ts=2:sw=2:et: diff --git a/sdl2_bug.patch b/sdl2_bug.patch new file mode 100644 index 000000000000..5506e913e339 --- /dev/null +++ b/sdl2_bug.patch @@ -0,0 +1,25 @@ +From b7bf5f6422f60e863051d1cfa3f067cd028a0bf8 Mon Sep 17 00:00:00 2001 +From: Darren Blaber <dmbtech@gmail.com> +Date: Sat, 1 Aug 2020 17:54:23 -0400 +Subject: [PATCH] Fix configure.ac so sheepshaver builds with sdl2 changes + +ENABLE_SDL1 must be set after commit https://github.com/cebix/macemu/commit/a46759990d33d7d1e2c7bac01459747d6180eb76 or else +symbols in video_sdl.cpp(VideoExit(), VideoInit() etc) will not be available, when building sheepshaver with +--enable-sdl-video. Sheepshaver and BasiliskII share the same SDL code, +so this must be changed as well. +--- + SheepShaver/src/Unix/configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/SheepShaver/src/Unix/configure.ac b/SheepShaver/src/Unix/configure.ac +index 006fe872..cb3baa0a 100644 +--- a/SheepShaver/src/Unix/configure.ac ++++ b/SheepShaver/src/Unix/configure.ac +@@ -195,6 +195,7 @@ if [[ "x$WANT_SDL" = "xyes" ]]; then + fi + if [[ "x$ac_cv_framework_SDL" = "xno" ]]; then + AC_PATH_PROG(sdl_config, "sdl-config") ++ AC_DEFINE(ENABLE_SDL1, 1, [Define if using SDL1, sheepshaver only currenly supports 1.]) + if [[ -n "$sdl_config" ]]; then + sdl_cflags=`$sdl_config --cflags` + if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then |