summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
-rw-r--r--openglide_path.patch12
3 files changed, 4 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 463043cef63e..18c725f9ac21 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -4,7 +4,7 @@ pkgbase = dosbox-ece
pkgrel = 1
url = https://dosboxece.yesterplay.net/
arch = any
- license = ???
+ license = GPLv2
makedepends = autoconf
makedepends = automake
makedepends = gcc
@@ -21,11 +21,9 @@ pkgbase = dosbox-ece
source = https://dosboxdl.yesterplay.net/DOSBox ECE r4338 (Linux source).7z
source = dosbox-ece.png
source = dosbox-ece.desktop
- source = openglide_path.patch
md5sums = 0ddd53cf2d5e2cccc52c9c22e4384a6c
md5sums = 19fbd9958c0a412000d5fe7362774df1
md5sums = 7ab512ca7e6bdb3616e197271ffae928
- md5sums = c9e92ddc87b1a5ff43c0ff35ef5ca461
pkgname = dosbox-ece
diff --git a/PKGBUILD b/PKGBUILD
index aba06388f6f3..9042e61f3f62 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="DOS/x86 emulator focusing on ease of use. Based on DOSBox"
arch=('any')
url="https://dosboxece.yesterplay.net/"
-license=('???')
+license=('GPLv2')
depends=('sdl2' 'sdl2_net' 'opusfile' 'alsa-lib' 'munt' 'openglide-git')
optdepends=('libpng' 'ncurses')
makedepends=('autoconf' 'automake' 'gcc')
@@ -16,19 +16,13 @@ source=(
"https://dosboxdl.yesterplay.net/DOSBox ECE r${_pkgver} (Linux source).7z"
"dosbox-ece.png"
"dosbox-ece.desktop"
- 'openglide_path.patch'
)
md5sums=('0ddd53cf2d5e2cccc52c9c22e4384a6c'
'19fbd9958c0a412000d5fe7362774df1'
- '7ab512ca7e6bdb3616e197271ffae928'
- 'c9e92ddc87b1a5ff43c0ff35ef5ca461')
-
-prepare() {
- patch -p1 <../openglide_path.patch
-}
+ '7ab512ca7e6bdb3616e197271ffae928')
build() {
- FLAGS="-O3 -DNDEBUG -pipe"
+ FLAGS="-O3 -DNDEBUG -pipe -I/usr/include/openglide"
./autogen.sh
./configure CFLAGS="$FLAGS" CXXFLAGS="$FLAGS" --prefix=/usr
make -j "$(nproc)"
diff --git a/openglide_path.patch b/openglide_path.patch
deleted file mode 100644
index efff995dc595..000000000000
--- a/openglide_path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru3 src_org/include/glide.h src/include/glide.h
---- src_org/include/glide.h 2020-04-28 22:04:55.000000000 +0200
-+++ src/include/glide.h 2020-05-05 18:23:24.006296996 +0200
-@@ -61,7 +61,7 @@
- #define FX_CALL
- #endif
-
--#include <sdk2_glide.h>
-+#include <openglide/sdk2_glide.h>
- #include "glidedef.h"
-
- // Careful with structures containing pointers