Changed upstream URL to github

4 files changed, 45 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 96d802438376..7c58b6cdc05b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,28 @@
 pkgbase = et-sdl-sound
 	pkgdesc = Replacement for standard OSS sound system of Wolfenstein: Enemy Territory
 	pkgver = 29
-	pkgrel = 10
-	url = http://nullkey.kapsi.fi/et-sdl-sound/
+	pkgrel = 11
+	url = http://github.com/nullkey/et-sdl-sound/
 	arch = i686
 	arch = x86_64
 	license = GPL
+	makedepends = multilib-devel
+	depends = lib32-sdl
+	depends = lib32-alsa-lib
+	depends = lib32-alsa-plugins
+	optdepends = lib32-libpulse: Pulseaudio audio driver
 	options = !strip
-	source = http://nullkey.kapsi.fi/et-sdl-sound/archive/et-sdl-sound-r29.tar.gz
-	source = 0001-adlerweb-s-patches.patch
-	source = 0002-Fixed-CRC-for-ET2.60b-on-Arch-Linux.patch
+	source = git://github.com/nullkey/et-sdl-sound.git
+	source = 0001-Added-various-Arch-Linux-patches.patch
 	source = enemy-territory.sh
-	md5sums = 77c2433fc757e5ffb08ec2c78a9853b3
-	md5sums = ddf378d41ffa50af8b1033fd343e2d64
-	md5sums = d8b0125b0b05150da2fb5d3e3e410bd7
+	md5sums = SKIP
+	md5sums = ae2853636171d15cb80ea2f7cf99e91e
 	md5sums = 0c25da1545764f34122e90a9f49281ce
 	depends_i686 = sdl
 	depends_i686 = alsa-lib
 	depends_i686 = alsa-plugins
 	optdepends_i686 = libpulse: PulseAudio audio driver
-	depends_x86_64 = lib32-sdl
-	depends_x86_64 = lib32-alsa-lib
-	depends_x86_64 = lib32-alsa-plugins
-	optdepends_x86_64 = lib32-libpulse: Pulseaudio audio driver
+	makedepends_i686 = base-devel
 
 pkgname = et-sdl-sound
 
diff --git a/0001-adlerweb-s-patches.patch b/0001-Added-various-Arch-Linux-patches.patch
index a6b915ef23e2..fc74ca8f391c 100644
--- a/0001-adlerweb-s-patches.patch
+++ b/0001-Added-various-Arch-Linux-patches.patch
@@ -1,16 +1,21 @@
-From 4887dceb4728226e50ce03cb34f69b4125eb4a47 Mon Sep 17 00:00:00 2001
+From b7a63c51be530ce9481b8ad0a8df1af53b3018d3 Mon Sep 17 00:00:00 2001
 From: Florian Knodt <git@adlerweb.info>
-Date: Sun, 14 Jul 2013 17:13:02 +0200
-Subject: [PATCH 1/2] adlerweb's patches
+Date: Sun, 14 Jul 2013 17:10:19 +0200
+Subject: [PATCH 1/1] Added various Arch Linux patches
 
-- Fix missing readlink on newer compilers
-- Added current directory for executable search
-- Newer versions of file may use two spaces
-- Always use latest gcc from PATH
-- Add /usr/share/ to pathlist (Arch Linux)
-- Simplify libsdl-detection
-- Fix segfaults on Arch x64 due to broken stdout
-- Add CRC for ET2.60b on Arch Linux
+by fmarot:
+
+* Fixed launcher-script.in
+
+by adlerweb:
+
+* Fix missing readlink on newer compilers
+* Always use latest gcc from PATH
+* Newer versions of file may use two spaces
+* Add /usr/share/ to pathlist (Arch Linux)
+* Simplify libsdl-detection
+* Fix segfaults on Arch x64 due to broken stdout
+* Add CRC for ET2.60b on Arch Linux
 ---
  Makefile           |  9 +++------
  hooks.cpp          | 53 +++++++++++++++++++----------------------------------
@@ -24,7 +29,7 @@ index 821b6a9..38afe9d 100644
 @@ -1,10 +1,8 @@
  # Makefile for et-sdl-sound
  
--# _GCC_PATH=/usr/x86_64-pc-linux-gnu/gcc-bin/3.4.6/
+-_GCC_PATH=/usr/x86_64-pc-linux-gnu/gcc-bin/3.4.6/
 -
 -LD = $(_GCC_PATH)g++
 -CPP = $(_GCC_PATH)g++
@@ -265,5 +270,5 @@ index 3692e3e..0b1e676 100644
  export SDL_AUDIODRIVER="$SDL_AUDIODRIVER"
  LD_PRELOAD="${LD_PRELOAD}:${TMP_DIR}/et-sdl-sound.so" ./$GAME_BIN $*
 -- 
-2.2.1
+2.9.3
 
diff --git a/0002-Fixed-CRC-for-ET2.60b-on-Arch-Linux.patch b/0002-Fixed-CRC-for-ET2.60b-on-Arch-Linux.patch
deleted file mode 100644
index e071829231db..000000000000
--- a/0002-Fixed-CRC-for-ET2.60b-on-Arch-Linux.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 636d139d80f59322112e80b21de00216b8dc7013 Mon Sep 17 00:00:00 2001
-From: Remy Marquis <remy.marquis@gmail.com>
-Date: Wed, 31 Dec 2014 01:47:40 +0100
-Subject: [PATCH 2/2] Fixed CRC for ET2.60b on Arch Linux
-
----
- hooks.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hooks.cpp b/hooks.cpp
-index cc52bc2..8f4bd9b 100644
---- a/hooks.cpp
-+++ b/hooks.cpp
-@@ -166,7 +166,7 @@ void initHooks()
- 		break;
- 	
- 	case 0x6ab49f82: //Vanilla
--	case 0x91b6b864: //Arch Linux
-+	case 0x44ce1231: //Arch Linux
- 		version = "ET 2.60b";
- 		
- 		writeJump((void *) 0x08188250, (void *) SNDDMA_Init);
--- 
-2.2.1
-
diff --git a/PKGBUILD b/PKGBUILD
index dcfac52cd670..d4f6cf74ae2b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,29 @@
 pkgname=et-sdl-sound
 pkgver=29
-pkgrel=10
+pkgrel=11
 pkgdesc="Replacement for standard OSS sound system of Wolfenstein: Enemy Territory"
 arch=('i686' 'x86_64')
-url="http://nullkey.kapsi.fi/et-sdl-sound/"
+url="http://github.com/nullkey/et-sdl-sound/"
 license=('GPL')
 depends_i686=('sdl' 'alsa-lib' 'alsa-plugins')
+makedepends_i686=('base-devel')
 optdepends_i686=('libpulse: PulseAudio audio driver')
 depends_x86_64=('lib32-sdl' 'lib32-alsa-lib' 'lib32-alsa-plugins')
+makedepends_x86_64=('multilib-devel')
 optdepends_x86_64=('lib32-libpulse: Pulseaudio audio driver')
 options=(!strip)
-source=("http://nullkey.kapsi.fi/et-sdl-sound/archive/et-sdl-sound-r$pkgver.tar.gz"
-        "0001-adlerweb-s-patches.patch"
-        "0002-Fixed-CRC-for-ET2.60b-on-Arch-Linux.patch"
+source=("git://github.com/nullkey/et-sdl-sound.git"
+        "0001-Added-various-Arch-Linux-patches.patch"
         "enemy-territory.sh")
-md5sums=('77c2433fc757e5ffb08ec2c78a9853b3'
-         'ddf378d41ffa50af8b1033fd343e2d64'
-         'd8b0125b0b05150da2fb5d3e3e410bd7'
+md5sums=('SKIP'
+         'ae2853636171d15cb80ea2f7cf99e91e'
          '0c25da1545764f34122e90a9f49281ce')
+_gitname="et-sdl-sound"
+
+pkgver() {
+    cd "$pkgbase"
+    echo "r$pkgver"
+}
 
 build() {
     cd "$pkgbase"
@@ -25,8 +31,7 @@ build() {
     if [[ "$CARCH" == "i686" ]]; then
         sed -i 's:/usr/lib32/:/usr/lib/:' ../enemy-territory.sh
     fi
-    patch -Np1 -i ../0001-adlerweb-s-patches.patch 
-    patch -Np1 -i ../0002-Fixed-CRC-for-ET2.60b-on-Arch-Linux.patch
+    patch -Np1 -i ../0001-Added-various-Arch-Linux-patches.patch
     make
 }