diff options
| author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2015-09-16 13:17:54 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-09-22 16:15:05 -0300 |
| commit | f3f5876239ae98af61562c09425373b9a2fdfb57 (patch) | |
| tree | db49712f3cd40e05983bc9599c9305ede5b7a0be /pcr/reicast-git | |
| parent | 764522271778b59ebc16c7bc3087ffe5e17a432b (diff) | |
pcr/reicast-git: rebuild pkgbuild and add multilib pkg
Diffstat (limited to 'pcr/reicast-git')
| -rw-r--r-- | pcr/reicast-git/PKGBUILD | 15 | ||||
| -rw-r--r-- | pcr/reicast-git/wait_if_two_frames_already_in_flight.patch | 51 |
2 files changed, 5 insertions, 61 deletions
diff --git a/pcr/reicast-git/PKGBUILD b/pcr/reicast-git/PKGBUILD index 758f0cf0a..3dd13fb68 100644 --- a/pcr/reicast-git/PKGBUILD +++ b/pcr/reicast-git/PKGBUILD @@ -4,18 +4,15 @@ pkgname=reicast-git pkgver=r1651.56f8ffa -pkgrel=1 +pkgrel=2 pkgdesc="A multiplatform Sega Dreamcast emulator" arch=('i686' 'x86_64') url="http://reicast.com/" license=('GPL2') provides=('reicast') conflicts=('reicast') -conflicts_x86_64+=('reicast-multilib' 'reicast-multilib-git') -replaces_x86_64=('reicast-multilib' 'reicast-multilib-git') makedepends=('git') depends=('libgl' 'alsa-plugins' 'libpulse' 'python-evdev' ) -optdepends=('xboxdrv: Userspace gamepad driver for Xbox and Xbox360 gamepads') source=(reicast::"git+https://github.com/reicast/reicast-emulator.git" 'enable_multiplayer_support.patch') sha256sums=('SKIP' @@ -46,13 +43,11 @@ prepare () { } build () { - make -C reicast/shell/linux + mkdir -vm 0755 "$srcdir"/pkgbuild-dir + make -C reicast/shell/linux PREFIX=/usr DESTDIR="$srcdir"/pkgbuild-dir install } package () { - cd reicast - - make -C shell/linux PREFIX=/usr DESTDIR=$pkgdir install - - install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + cp -va "$srcdir"/pkgbuild-dir/* "$pkgdir" + install -Dm 644 reicast/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } diff --git a/pcr/reicast-git/wait_if_two_frames_already_in_flight.patch b/pcr/reicast-git/wait_if_two_frames_already_in_flight.patch deleted file mode 100644 index 6b29b3d61..000000000 --- a/pcr/reicast-git/wait_if_two_frames_already_in_flight.patch +++ /dev/null @@ -1,51 +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-08-27 12:17:34.719561251 -0300 -+++ b/core/hw/pvr/Renderer_if.cpp 2015-08-27 12:21:45.917501578 -0300 -@@ -187,6 +187,7 @@ - - bool rend_frame(TA_context* ctx, bool draw_osd) { - bool proc = renderer->Process(ctx); -+ FinishRender(_pvrrc); - #if !defined(TARGET_NO_THREADS) - re.Set(); - #endif -@@ -213,7 +214,7 @@ - bool do_swp = rend_frame(_pvrrc, true); - - //clear up & free data .. -- FinishRender(_pvrrc); -+ tactx_Recycle(_pvrrc); - _pvrrc=0; - - return do_swp; -@@ -267,6 +268,7 @@ - #endif - - bool pend_rend = false; -+extern TA_context* rqueue; - - void rend_resize(int width, int height) { - renderer->Resize(width, height); -@@ -275,6 +277,10 @@ - - void rend_start_render() - { -+ if (rqueue) { -+ rend_end_render(); -+ } -+ - pend_rend = false; - bool is_rtt=(FB_W_SOF1& 0x1000000)!=0; - TA_context* ctx = tactx_Pop(CORE_CURRENT_CTX); -diff -Nur a/core/hw/pvr/ta_ctx.cpp b/core/hw/pvr/ta_ctx.cpp ---- a/core/hw/pvr/ta_ctx.cpp 2015-08-27 12:17:34.720561259 -0300 -+++ b/core/hw/pvr/ta_ctx.cpp 2015-08-27 12:23:24.614248467 -0300 -@@ -153,8 +153,6 @@ - mtx_rqueue.Lock(); - rqueue = 0; - mtx_rqueue.Unlock(); -- -- tactx_Recycle(ctx); - frame_finished.Set(); - } - |