summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2020-04-11 02:41:14 +0000
committerDaniel Bermond2020-04-11 02:41:14 +0000
commite7ebfab42fd1bc32441345989c97f41c963967cd (patch)
tree1d0bd3d9c1f2cfaa8893c1b5fde6a7a7db110bf4
parent8a3a2a5d267e89364528251d7a38ed4c23dcb7eb (diff)
downloadaur-e7ebfab42fd1bc32441345989c97f41c963967cd.tar.gz
Update provides/conflicts
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2005b528d272..82d80cdbb4b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mupen64plus-gui-git
pkgdesc = Mupen64Plus Graphical User Interface written in Qt5 (git version)
pkgver = r205.g93383ee
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/m64p/mupen64plus-gui/
arch = x86_64
license = GPL3
@@ -15,12 +15,11 @@ pkgbase = mupen64plus-gui-git
depends = zlib
depends = freetype2
depends = libgl
- provides = m64p
provides = mupen64plus-gui
provides = mupenplus-video-gliden64
- conflicts = m64p
conflicts = mupen64plus-gui
conflicts = mupenplus-video-gliden64
+ conflicts = m64p
source = git+https://github.com/m64p/mupen64plus-gui.git
source = git+https://github.com/m64p/mupen64plus-input-qt.git
source = GLideN64-loganmc10::git+https://github.com/loganmc10/GLideN64.git#branch=NUI
diff --git a/PKGBUILD b/PKGBUILD
index 6a791759c71f..a2fee3cf4c1d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=mupen64plus-gui-git
pkgver=r205.g93383ee
-pkgrel=1
+pkgrel=2
pkgdesc='Mupen64Plus Graphical User Interface written in Qt5 (git version)'
arch=('x86_64')
url='https://github.com/m64p/mupen64plus-gui/'
@@ -10,8 +10,8 @@ license=('GPL3')
depends=('qt5-base' 'sdl2' 'p7zip' 'mupen64plus-git' 'libpng' 'zlib'
'freetype2' 'libgl')
makedepends=('git' 'cmake')
-provides=('m64p' 'mupen64plus-gui' 'mupenplus-video-gliden64')
-conflicts=('m64p' 'mupen64plus-gui' 'mupenplus-video-gliden64')
+provides=('mupen64plus-gui' 'mupenplus-video-gliden64')
+conflicts=('mupen64plus-gui' 'mupenplus-video-gliden64' 'm64p')
source=('git+https://github.com/m64p/mupen64plus-gui.git'
'git+https://github.com/m64p/mupen64plus-input-qt.git'
'GLideN64-loganmc10'::'git+https://github.com/loganmc10/GLideN64.git#branch=NUI'