summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Bezies2021-03-06 12:29:05 +0100
committerFrederic Bezies2021-03-06 12:29:05 +0100
commitd2af50db16f081c4fbf2e28a9eb67a90cfe3debf (patch)
tree1d3faeb789a17feec9b596bd0e62b32db7aeb5db
parented5223fad0329c78a326e014139e341ecb6aaea8 (diff)
downloadaur-d2af50db16f081c4fbf2e28a9eb67a90cfe3debf.tar.gz
Forgot a conflicting package :(
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 76c814c69533..615956bdeb74 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = dosbox-x-sdl2
pkgdesc = x86 emulator with builtin DOS, with patches and more features
pkgver = 0.83.11
- pkgrel = 2
+ pkgrel = 3
url = http://dosbox-x.com
arch = i686
arch = x86_64
@@ -17,6 +17,7 @@ pkgbase = dosbox-x-sdl2
depends = physfs
conflicts = dosbox-x-git
conflicts = dosbox-x
+ conflicts = dosbox-x-sdl2-git
source = https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v0.83.11.tar.gz
source = dosbox-x.png
source = dosbox-x.desktop
diff --git a/PKGBUILD b/PKGBUILD
index fa0ece8ea807..05a681915b3e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=dosbox-x-sdl2
pkgver=0.83.11
-pkgrel=2
+pkgrel=3
pkgdesc="x86 emulator with builtin DOS, with patches and more features"
arch=(i686 x86_64 aarch64)
url="http://dosbox-x.com"
@@ -8,7 +8,7 @@ license=(GPL)
depends=(fluidsynth libxkbfile libxrandr mesa ffmpeg sdl2_net physfs)
makedepends=(glu)
optdepends=()
-conflicts=('dosbox-x-git' 'dosbox-x')
+conflicts=('dosbox-x-git' 'dosbox-x' 'dosbox-x-sdl2-git')
source=(https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v${pkgver}.tar.gz
dosbox-x.png
dosbox-x.desktop)