Peg to the sdl2-branch for now.

Currently the default in clones, and strip out the period
before beta1, so pacman will upgrade this to 3.0.0 in the future.

2 files changed, 19 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f1298367260..bc3758772cd8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Dec 30 02:18:51 UTC 2016
+# Mon Feb 27 02:47:28 UTC 2017
 pkgbase = chocolate-doom-git
 	pkgdesc = Historically-accurate Doom, Heretic, Hexen, and Strife ports.
-	pkgver = 2.3.0.r0.939cbfeb
+	pkgver = 3.0.0beta1.r16.64ad6083
 	pkgrel = 1
 	url = http://www.chocolate-doom.org/
 	arch = i686
@@ -12,15 +12,17 @@ pkgbase = chocolate-doom-git
 	makedepends = python
 	depends = libpng
 	depends = libsamplerate
-	depends = sdl_mixer
-	source = git+https://github.com/chocolate-doom/chocolate-doom.git
-	sha256sums = SKIP
+	depends = sdl2_mixer
+	depends = sdl2_net
+	source = git+https://github.com/chocolate-doom/chocolate-doom.git#branch=sdl2-branch
+	sha512sums = SKIP
 
 pkgname = chocolate-doom-git
 	pkgdesc = Doom port accurately reproducing the original DOS EXEs.
 	depends = libpng
 	depends = libsamplerate
-	depends = sdl_mixer
+	depends = sdl2_mixer
+	depends = sdl2_net
 	depends = chocolate-common-git
 	optdepends = freedm: Free deathmatch game
 	optdepends = freedoom1: Free Ultimate Doom-compatible game (not vanilla compatible, but useful for mods)
@@ -31,7 +33,8 @@ pkgname = chocolate-heretic-git
 	pkgdesc = Heretic port accurately reproducing the original DOS EXEs.
 	depends = libpng
 	depends = libsamplerate
-	depends = sdl_mixer
+	depends = sdl2_mixer
+	depends = sdl2_net
 	depends = chocolate-common-git
 	optdepends = blasphemer: Free Heretic-compatible game
 	conflicts = chocolate-heretic
@@ -40,7 +43,8 @@ pkgname = chocolate-hexen-git
 	pkgdesc = Hexen port accurately reproducing the original DOS EXEs.
 	depends = libpng
 	depends = libsamplerate
-	depends = sdl_mixer
+	depends = sdl2_mixer
+	depends = sdl2_net
 	depends = chocolate-common-git
 	conflicts = chocolate-hexen
 
@@ -48,13 +52,13 @@ pkgname = chocolate-strife-git
 	pkgdesc = Strife port accurately reproducing the original DOS EXEs.
 	depends = libpng
 	depends = libsamplerate
-	depends = sdl_mixer
+	depends = sdl2_mixer
+	depends = sdl2_net
 	depends = chocolate-common-git
 	conflicts = chocolate-strife
 
 pkgname = chocolate-common-git
 	pkgdesc = Files shared in common with Chocolate Doom-based games.
 	install = chocolate-doom.install
-	depends = sdl_net
 	conflicts = chocolate-common
 
diff --git a/PKGBUILD b/PKGBUILD
index 721ed426ea57..dff09069dab7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,19 +3,19 @@
 pkgname=(chocolate-{doom,heretic,hexen,strife,common}-git)
 _pkgname=${pkgname[0]/-git/}
 pkgdesc="Historically-accurate Doom, Heretic, Hexen, and Strife ports."
-pkgver=2.3.0.r0.939cbfeb
+pkgver=3.0.0beta1.r16.64ad6083
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.chocolate-doom.org/"
 license=('GPL2')
-depends=('libpng' 'libsamplerate' 'sdl_mixer')
+depends=('libpng' 'libsamplerate' 'sdl2_mixer' 'sdl2_net')
 makedepends=('git' 'python')
-source=(git+https://github.com/chocolate-doom/chocolate-doom.git)
-sha256sums=('SKIP')
+source=(git+https://github.com/chocolate-doom/chocolate-doom.git#branch=sdl2-branch)
+sha512sums=('SKIP')
 
 pkgver() {
   cd "${_pkgname}"
-  local version="$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+  local version="$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g;s/\.beta/beta/g')"
   printf %s "${version##chocolate.doom.}"
 }
 
@@ -28,7 +28,6 @@ build() {
 
 package_chocolate-common-git() {
   pkgdesc="Files shared in common with Chocolate Doom-based games."
-  depends=('sdl_net')
   conflicts=(chocolate-common)
   install=chocolate-doom.install