From eb7e0b1ba93b9835c7adb65327c59599af99d07a Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Sun, 10 Jan 2016 22:44:01 -0300 Subject: reicast-git: update pkg --- pcr/reicast-git/PKGBUILD | 67 +++++++++++---------- pcr/reicast-git/ta-hash-logs.patch | 120 ------------------------------------- 2 files changed, 37 insertions(+), 150 deletions(-) delete mode 100644 pcr/reicast-git/ta-hash-logs.patch (limited to 'pcr/reicast-git') diff --git a/pcr/reicast-git/PKGBUILD b/pcr/reicast-git/PKGBUILD index 5ed2c9fb9..20edf1fcb 100644 --- a/pcr/reicast-git/PKGBUILD +++ b/pcr/reicast-git/PKGBUILD @@ -2,21 +2,19 @@ # Maintainer: André Silva # Maintainer: Márcio Silva -# error: in fault_handler -> ../../core/linux/common.cpp : 99 -# read: error-mem.txt - -pkgname=reicast-git -pkgver=r1665.915d6b2 +_pkgname=reicast +pkgname=${_pkgname}-git +pkgver=r1688.0e4949e pkgrel=1 pkgdesc="A multiplatform Sega Dreamcast emulator" arch=('i686' 'x86_64' 'armv7h') -url="http://reicast.com/" +url="http://${_pkgname}.com/" license=('GPL2') -provides=('reicast') -conflicts=('reicast') +provides=("${_pkgname}") +conflicts=("${_pkgname}") makedepends=('git') depends=('libgl' 'alsa-plugins' 'libpulse' 'python-evdev' ) -source=(reicast::"git+https://github.com/reicast/reicast-emulator.git" +source=(${_pkgname}-${pkgver}::"git+https://github.com/${_pkgname}/${_pkgname}-emulator.git" 'enable_multiplayer_support.patch' 'fix-dyna-constprop.patch' 'futuristic-memops.patch' @@ -27,8 +25,7 @@ source=(reicast::"git+https://github.com/reicast/reicast-emulator.git" 'multiplayer-unstable.patch' 'refactor-rend-stuff.patch' 'sdl-opengl.patch' - 'sh-block-graphs.patch' - 'ta-hash-logs.patch') + 'sh-block-graphs.patch') sha256sums=('SKIP' '12bfc58e12b3ee79b0c82159cdc70c76a4b6804f5c6986853156602bb0e6beb0' 'c14287cf2b2289b9de28cedeee06fcb89ca40da50e34607780dce55d7d8e5fd6' @@ -40,16 +37,15 @@ sha256sums=('SKIP' '7c0e2a158d7d37ddbf99a40d11a0a889e55c1e85f9c17a2602e5a2bc809ff4ac' 'aead8326ac6815b555be03030ffbdc8f6ced625c980e77eca89e570591c5eb34' 'cf386ebaeafce046a1fc971a5b140bb6a1245840ad2c2a341541327ed6f5606c' - '94694d1b615facb39b5ee92ed90c6cefc77fab23fb97f2fcc82e0aa6e1cb14c5' - 'ead1e44b82c5a58beca6550a7620fc426b7729f0b7e2ebe27583397fac2a574d') + '94694d1b615facb39b5ee92ed90c6cefc77fab23fb97f2fcc82e0aa6e1cb14c5') pkgver() { - cd reicast + cd "${srcdir}/${_pkgname}-${pkgver}" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } -prepare () { - cd reicast +prepare() { + cd "${srcdir}/${_pkgname}-${pkgver}" # Remove nonfree fp.h header # rm -v core/deps/libpng/fp.h @@ -60,13 +56,12 @@ prepare () { # Add extra patches patch -Np1 -i "$srcdir"/fix-dyna-constprop.patch patch -Np1 -i "$srcdir"/futuristic-memops.patch - patch -Np1 -i "$srcdir"/generalize-mappings.patch +# patch -Np1 -i "$srcdir"/generalize-mappings.patch # patch -Np1 -i "$srcdir"/loop-tracing.patch # failed build on i686 patch -Np1 -i "$srcdir"/loungekatt_rm-nonfree-fp.patch patch -Np1 -i "$srcdir"/refactor-rend-stuff.patch patch -Np1 -i "$srcdir"/sdl-opengl.patch patch -Np1 -i "$srcdir"/sh-block-graphs.patch - patch -Np1 -i "$srcdir"/ta-hash-logs.patch # Add Multiplayer support (unstable) # core/linux-dist/main.cpp @@ -137,37 +132,49 @@ prepare () { sed -i 's|//DrawModVols|DrawModVols|' core/rend/gles/gldraw.cpp # Fix Xbox Input Axis - # sed -i 's|DC_AXIS_LT, 0, 0, DC_AXIS_RT|0, 0, DC_AXIS_RT, DC_AXIS_LT|' core/linux-dist/joystick.cpp - sed -i 's|DC_AXIS_LT, 0, 0, DC_AXIS_RT|0, 0, DC_AXIS_RT, DC_AXIS_LT|' core/sdl/sdl.cpp # with generalize-mappings.patch + sed -i 's|DC_AXIS_LT, 0, 0, DC_AXIS_RT|0, 0, DC_AXIS_RT, DC_AXIS_LT|' core/linux-dist/joystick.cpp + sed -i 's|DC_AXIS_LT, 0, 0, DC_AXIS_RT|0, 0, DC_AXIS_RT, DC_AXIS_LT|' core/sdl/sdl.cpp # Enable Pulseaudio sed -i 's|#USE_PULSEAUDIO|USE_PULSEAUDIO|' shell/linux/Makefile } -build () { +build() { mkdir -vm 0755 "$srcdir"/pkgbuild-dir if [ $CARCH == x86_64 ]; then - make -C reicast/shell/linux platform=x64 PREFIX=/usr DESTDIR="$srcdir"/pkgbuild-dir install + make -C ${_pkgname}-${pkgver}/shell/linux platform=x64 PREFIX=/usr DESTDIR="$srcdir"/pkgbuild-dir install # Error in platform=lincpp: # ../../core/linux-dist/evdev.cpp:287:65: required from here # /usr/include/c++/5.2.0/tuple:1172:70: error: use of deleted function 'EvdevControllerMapping::EvdevControllerMapping()' # second(std::forward<_Args2>(std::get<_Indexes2>(__tuple2))...) # mkdir -vm 0755 "$srcdir"/pkgbuild-cpp-dir - # make -C reicast/shell/linux platform=lincpp PREFIX=/usr DESTDIR="$srcdir"/pkgbuild-cpp-dir install + # make -C ${_pkgname}-${pkgver}/shell/linux platform=lincpp PREFIX=/usr DESTDIR="$srcdir"/pkgbuild-cpp-dir install elif [ $CARCH == i686 ]; then - make -C reicast/shell/linux platform=x86 PREFIX=/usr DESTDIR="$srcdir"/pkgbuild-dir install + make -C ${_pkgname}-${pkgver}/shell/linux platform=x86 PREFIX=/usr DESTDIR="$srcdir"/pkgbuild-dir install + elif [ $CARCH == armv7h ]; then + make -C ${_pkgname}-${pkgver}/shell/linux platform=armv7h PREFIX=/usr DESTDIR="$srcdir"/pkgbuild-dir install + # mkdir -vm 0755 "$srcdir"/pkgbuild-{rpi2,beagle,pandora,odroid{c1,xu3,xu,x2,x,u2}}-dir + # make -C ${_pkgname}-${pkgver}/shell/linux platform=rpi2 PREFIX=/usr DESTDIR="$srcdir"/pkgbuild-rpi2-dir install + # make -C ${_pkgname}-${pkgver}/shell/linux platform=beagle PREFIX=/usr DESTDIR="$srcdir"/pkgbuild-beagle-dir install + # make -C ${_pkgname}-${pkgver}/shell/linux platform=pandora PREFIX=/usr DESTDIR="$srcdir"/pkgbuild-pandora-dir install + # make -C ${_pkgname}-${pkgver}/shell/linux platform=odroidc1 PREFIX=/usr DESTDIR="$srcdir"/pkgbuild-odroidc1-dir install + # make -C ${_pkgname}-${pkgver}/shell/linux platform=odroidxu3 PREFIX=/usr DESTDIR="$srcdir"/pkgbuild-odroidxu3-dir install + # make -C ${_pkgname}-${pkgver}/shell/linux platform=odroidxu PREFIX=/usr DESTDIR="$srcdir"/pkgbuild-odroidxu-dir install + # make -C ${_pkgname}-${pkgver}/shell/linux platform=odroidx2 PREFIX=/usr DESTDIR="$srcdir"/pkgbuild-odroidx2-dir install + # make -C ${_pkgname}-${pkgver}/shell/linux platform=odroidx PREFIX=/usr DESTDIR="$srcdir"/pkgbuild-odroidx-dir install + # make -C ${_pkgname}-${pkgver}/shell/linux platform=odroidu2 PREFIX=/usr DESTDIR="$srcdir"/pkgbuild-odroidu2-dir install fi } -package () { +package() { cp -va "$srcdir"/pkgbuild-dir/* "$pkgdir" if [ -d "$srcdir"/pkgbuild-cpp-dir ]; then - cp -va "$srcdir"/pkgbuild-cpp-dir/usr/bin/reicast "$pkgdir"/usr/bin/reicast-c++ - cp -va "$srcdir"/pkgbuild-cpp-dir/usr/share/applications/reicast.desktop "$pkgdir"/usr/share/applications/reicast-c++.desktop - cp -va "$srcdir"/pkgbuild-cpp-dir/usr/share/man/man1/reicast "$pkgdir"/usr/share/man/man1/reicast-c++ + cp -va "$srcdir"/pkgbuild-cpp-dir/usr/bin/${_pkgname} "$pkgdir"/usr/bin/${_pkgname}-c++ + cp -va "$srcdir"/pkgbuild-cpp-dir/usr/share/applications/${_pkgname}.desktop "$pkgdir"/usr/share/applications/${_pkgname}-c++.desktop + cp -va "$srcdir"/pkgbuild-cpp-dir/usr/share/man/man1/${_pkgname} "$pkgdir"/usr/share/man/man1/${_pkgname}-c++ sed -i '\|Name| s|reicast|reicast-c++| \|Exec| s|reicast|reicast-c++| - ' "$pkgdir"/usr/share/applications/reicast-c++.desktop + ' "$pkgdir"/usr/share/applications/${_pkgname}-c++.desktop fi - install -Dm 644 reicast/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + install -Dm 644 ${_pkgname}-${pkgver}/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } diff --git a/pcr/reicast-git/ta-hash-logs.patch b/pcr/reicast-git/ta-hash-logs.patch deleted file mode 100644 index 1d120852f..000000000 --- a/pcr/reicast-git/ta-hash-logs.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -Nur a/core/hw/pvr/Renderer_if.cpp b/core/hw/pvr/Renderer_if.cpp ---- a/core/hw/pvr/Renderer_if.cpp 2015-10-06 21:43:53.028336301 -0300 -+++ b/core/hw/pvr/Renderer_if.cpp 2015-10-06 21:49:25.016725724 -0300 -@@ -5,10 +5,16 @@ - - #include "deps/zlib/zlib.h" - -+#include "deps/crypto/md5.h" -+ - #if FEAT_HAS_NIXPROF - #include "profiler/profiler.h" - #endif - -+#define FRAME_MD5 0x1 -+FILE* fLogFrames; -+FILE* fCheckFrames; -+ - /* - - rendv3 ideas -@@ -291,6 +297,48 @@ - - if (ctx) - { -+ if (fLogFrames || fCheckFrames) { -+ MD5Context md5; -+ u8 digest[16]; -+ -+ MD5Init(&md5); -+ MD5Update(&md5, ctx->tad.thd_root, ctx->tad.End() - ctx->tad.thd_root); -+ MD5Final(digest, &md5); -+ -+ if (fLogFrames) { -+ fputc(FRAME_MD5, fLogFrames); -+ fwrite(digest, 1, 16, fLogFrames); -+ fflush(fLogFrames); -+ } -+ -+ if (fCheckFrames) { -+ u8 v; -+ u8 digest2[16]; -+ int ch = fgetc(fCheckFrames); -+ -+ if (ch == EOF) { -+ printf("Testing: TA Hash log matches, exiting\n"); -+ exit(1); -+ } -+ -+ verify(ch == FRAME_MD5); -+ -+ fread(digest2, 1, 16, fCheckFrames); -+ -+ verify(memcmp(digest, digest2, 16) == 0); -+ -+ -+ } -+ -+ /* -+ u8* dig = digest; -+ printf("FRAME: %02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X\n", -+ digest[0], digest[1], digest[2], digest[3], digest[4], digest[5], digest[6], digest[7], -+ digest[8], digest[9], digest[10], digest[11], digest[12], digest[13], digest[14], digest[15] -+ ); -+ */ -+ } -+ - if (!ctx->rend.Overrun) - { - //printf("REP: %.2f ms\n",render_end_pending_cycles/200000.0); -@@ -366,6 +414,13 @@ - - bool rend_init() - { -+ if (fLogFrames = fopen(settings.pvr.HashLogFile.c_str(), "wb")) { -+ printf("Saving frame hashes to: '%s'\n", settings.pvr.HashLogFile.c_str()); -+ } -+ -+ if (fCheckFrames = fopen(settings.pvr.HashCheckFile.c_str(), "rb")) { -+ printf("Comparing frame hashes against: '%s'\n", settings.pvr.HashCheckFile.c_str()); -+ } - - #ifdef NO_REND - renderer = rend_norend(); -@@ -435,6 +490,11 @@ - - void rend_term() - { -+ if (fCheckFrames) -+ fclose(fCheckFrames); -+ -+ if (fLogFrames) -+ fclose(fLogFrames); - } - - void rend_vblank() -diff -Nur a/core/nullDC.cpp b/core/nullDC.cpp ---- a/core/nullDC.cpp 2015-10-06 21:43:53.043336408 -0300 -+++ b/core/nullDC.cpp 2015-10-06 21:49:25.017725731 -0300 -@@ -260,6 +260,8 @@ - #endif - - settings.bios.UseReios = cfgLoadInt("config", "bios.UseReios", 0); -+ settings.pvr.HashLogFile = cfgLoadStr("testing", "ta.HashLogFile", ""); -+ settings.pvr.HashCheckFile = cfgLoadStr("testing", "ta.HashCheckFile", ""); - - #if (HOST_OS != OS_LINUX || defined(_ANDROID) || defined(TARGET_PANDORA)) - settings.aica.BufferSize=2048; -diff -Nur a/core/types.h b/core/types.h ---- a/core/types.h 2015-10-06 21:43:53.048336444 -0300 -+++ b/core/types.h 2015-10-06 21:49:25.017725731 -0300 -@@ -696,6 +696,9 @@ - - u32 MaxThreads; - u32 SynchronousRendering; -+ -+ string HashLogFile; -+ string HashCheckFile; - } pvr; - - struct { -- cgit v1.2.3