diff options
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | 010-dosbox-add-openglide-support.patch (renamed from dosbox-openglide-svn.patch) | 12 | ||||
| -rw-r--r-- | PKGBUILD | 18 |
3 files changed, 16 insertions, 21 deletions
@@ -1,6 +1,6 @@ pkgbase = dosbox-openglide-svn pkgdesc = DOS emulator for running DOS games (with openglide 3D, svn version) - pkgver = 0.74.2.r4369 + pkgver = 0.74.3.r4473 pkgrel = 1 url = https://www.dosbox.com/ arch = x86_64 @@ -24,12 +24,11 @@ pkgbase = dosbox-openglide-svn source = https://raw.githubusercontent.com/voyageur/openglide/c300160d0a8292bc04e79dd59e6cc178aa648dec/platform/dosbox/glide2x.ovl source = dosbox.desktop source = dosbox.png - source = dosbox-openglide-svn.patch + source = 010-dosbox-add-openglide-support.patch sha256sums = SKIP sha256sums = ed391bb9fb0e7b5d33b92882356f02b05913361675712d93b4ef303d5b9f2ac9 sha256sums = 680c8543cb0329000a36c188bb95999c6fae159d3704a4496b54cfada360c7e5 sha256sums = 491c42d16fc5ef7ee2eca1b736f7801249d4ca8c0b236a001aec0d3e24504f3b - sha256sums = 0fdefd8522a42d5106c4be87016113af3dd63265f5c936696cd1099e07bff56e + sha256sums = 396f9cfbfe0880517bc93b97ff6d90e9878f72f3ff5695d45123fd9aa7555ea1 pkgname = dosbox-openglide-svn - diff --git a/dosbox-openglide-svn.patch b/010-dosbox-add-openglide-support.patch index 65b0fe3caf11..e0327483988c 100644 --- a/dosbox-openglide-svn.patch +++ b/010-dosbox-add-openglide-support.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -598,7 +598,7 @@ int main(int argc,char * argv[]) { +@@ -616,7 +616,7 @@ int main(int argc,char * argv[]) { dnl Some target detection and actions for them case "$host" in *-*-cygwin* | *-*-mingw32*) @@ -546,7 +546,7 @@ void MOUSE_Init(Section*); void SBLASTER_Init(Section*); void GUS_Init(Section*); -@@ -753,6 +754,17 @@ void DOSBOX_Init(void) { +@@ -749,6 +750,17 @@ void DOSBOX_Init(void) { Pmulti_remain->Set_help("see serial1"); @@ -574,7 +574,7 @@ #define MAPPERFILE "mapper-" VERSION ".map" //#define DISABLE_JOYSTICK -@@ -612,6 +613,10 @@ check_gotbpp: +@@ -620,6 +621,10 @@ check_gotbpp: void GFX_ResetScreen(void) { @@ -585,7 +585,7 @@ GFX_Stop(); if (sdl.draw.callback) (sdl.draw.callback)( GFX_CallBackReset ); -@@ -1227,6 +1232,9 @@ void GFX_SwitchFullScreen(void) { +@@ -1249,6 +1254,9 @@ void GFX_SwitchFullScreen(void) { sticky_keys(true); //restore sticky keys to default state in windowed mode. #endif } @@ -595,7 +595,7 @@ GFX_ResetScreen(); } -@@ -2117,7 +2125,7 @@ void GFX_Events() { +@@ -2184,7 +2192,7 @@ void GFX_Events() { throw(0); break; case SDL_VIDEOEXPOSE: @@ -604,7 +604,7 @@ break; #ifdef WIN32 case SDL_KEYDOWN: -@@ -2577,6 +2585,7 @@ int main(int argc, char* argv[]) { +@@ -2669,6 +2677,7 @@ int main(int argc, char* argv[]) { if (strcmp(sdl_drv_name,"windib")==0) LOG_MSG("SDL_Init: Starting up with SDL windib video driver.\n Try to update your video card and directx drivers!"); } #endif @@ -1,18 +1,14 @@ # Maintainer: Daniel Bermond <dbermond@archlinux.org> pkgname=dosbox-openglide-svn -pkgver=0.74.2.r4369 +pkgver=0.74.3.r4473 pkgrel=1 pkgdesc='DOS emulator for running DOS games (with openglide 3D, svn version)' arch=('x86_64') url='https://www.dosbox.com/' license=('GPL') -depends=( - # official repositories: - 'sdl_net' 'zlib' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs' 'glu' - # AUR: - 'openglide-git' -) +depends=('sdl_net' 'zlib' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs' 'glu' + 'openglide-git') makedepends=('subversion' 'mesa-libgl') provides=('dosbox' 'dosbox-openglide' 'dosbox-svn') conflicts=('dosbox') @@ -20,12 +16,12 @@ source=('dosbox'::'svn+https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk' 'https://raw.githubusercontent.com/voyageur/openglide/c300160d0a8292bc04e79dd59e6cc178aa648dec/platform/dosbox/glide2x.ovl' 'dosbox.desktop' 'dosbox.png' - 'dosbox-openglide-svn.patch') + '010-dosbox-add-openglide-support.patch') sha256sums=('SKIP' 'ed391bb9fb0e7b5d33b92882356f02b05913361675712d93b4ef303d5b9f2ac9' '680c8543cb0329000a36c188bb95999c6fae159d3704a4496b54cfada360c7e5' '491c42d16fc5ef7ee2eca1b736f7801249d4ca8c0b236a001aec0d3e24504f3b' - '0fdefd8522a42d5106c4be87016113af3dd63265f5c936696cd1099e07bff56e') + '396f9cfbfe0880517bc93b97ff6d90e9878f72f3ff5695d45123fd9aa7555ea1') prepare() { cd dosbox @@ -33,13 +29,13 @@ prepare() { # add openglide support svn revert -R . rm -f {include/{glide,glidedef}.h,src/hardware/glide.cpp} - patch -Np1 -i "${srcdir}/dosbox-openglide-svn.patch" + patch -Np1 -i "${srcdir}/010-dosbox-add-openglide-support.patch" ./autogen.sh } pkgver() { - printf '%s.r%s' "$(head -n1 dosbox/VERSION | sed 's/-/./g')" \ + printf '%s.r%s' "$(head -n1 dosbox/NEWS | sed 's/-/./g')" \ "$(svnversion dosbox | tr -d 'A-z')" } |