namcap cleanup

4 files changed, 10 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 04d05a086c2f..0fcb6bbc1ee4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
 pkgbase = attract
 	pkgdesc = A graphical front-end for command line emulators that hides the underlying operating system and is intended to be controlled with a joystick or gamepad.
 	pkgver = 2.6.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.attractmode.org/
-	install = attract.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = git
+	depends = curl
 	depends = sfml
-	depends = openal
 	depends = ffmpeg
-	depends = fontconfig
 	depends = libxinerama
 	depends = libarchive
 	provides = attract
@@ -20,12 +18,10 @@ pkgbase = attract
 	source = https://github.com/mickelson/attract/releases/download/v1.6.2/ATTRACT.MODE.intro.16-9.v6.1080p.mp4
 	source = https://github.com/mickelson/attract/releases/download/v1.6.2/ATTRACT.MODE.intro.4-3.v6.1080p.mp4
 	source = attract.desktop
-	source = attract.install
 	sha256sums = 4c17641ce0a0b9ff77da5e75f0cb26cc48e4c6295ef57d86a37db18b2bd9fbe9
 	sha256sums = 0a21286df3bd51edd24f6eb21a246f8a6576020d34ce3f5cfe93304dbbadc23b
 	sha256sums = 5750cf26864a86d7625f52223ac1a4050ff4475a016bb4f94fc506b7558dbaf9
 	sha256sums = d5e94d30bf6329bef87f58aad31ae9ff4632550a8576c243e41f220262c36cf6
-	sha256sums = 4a0ad1e453b8fd9b14495d2f88da8ff9502dcb3902182f171e452ff67ae0f948
 
 pkgname = attract
 
diff --git a/0001-fix-build-when-TR1-enabled.patch b/0001-fix-build-when-TR1-enabled.patch
deleted file mode 100644
index ab381a7091ef..000000000000
--- a/0001-fix-build-when-TR1-enabled.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2220b6cab905a4e96e1508bc2f9bb2d6c844d1dc Mon Sep 17 00:00:00 2001
-From: Jeffrey Clark <h0tw1r3@users.noreply.github.com>
-Date: Sat, 21 May 2016 17:33:02 -0500
-Subject: [PATCH 1/1] fix build when TR1 enabled
-
-appears to be the default with g++ 6
----
- extlibs/gameswf/base/utility.h | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/extlibs/gameswf/base/utility.h b/extlibs/gameswf/base/utility.h
-index 116cec7..28e7727 100644
---- a/extlibs/gameswf/base/utility.h
-+++ b/extlibs/gameswf/base/utility.h
-@@ -81,9 +81,11 @@ void	operator delete[](void* ptr);
- inline int64	i64abs(int64 i) { if (i < 0) return -i; else return i; }
- inline int	iabs(int i) { if (i < 0) return -i; else return i; }
- inline int	imax(int a, int b) { if (a < b) return b; else return a; }
--inline float	fmax(float a, float b) { if (a < b) return b; else return a; }
- inline int	imin(int a, int b) { if (a < b) return a; else return b; }
-+#ifndef _GLIBCXX_USE_C99_MATH_TR1
- inline float	fmin(float a, float b) { if (a < b) return a; else return b; }
-+inline float	fmax(float a, float b) { if (a < b) return b; else return a; }
-+#endif
- 
- 
- inline int	iclamp(int i, int min, int max) {
-@@ -99,7 +101,9 @@ inline float	fclamp(float f, float xmin, float xmax) {
- inline float flerp(float a, float b, float f) { return (b - a) * f + a; }
- 
- const float LN_2 = 0.693147180559945f;
-+#ifndef _GLIBCXX_USE_C99_MATH_TR1
- inline float	log2(float f) { return logf(f) / LN_2; }
-+#endif
- 
- inline int	fchop( float f ) { return (int) f; }	// replace w/ inline asm if desired
- inline int	frnd(float f) { return fchop(f + 0.5f); }	// replace with inline asm if desired
--- 
-2.8.2
-
diff --git a/PKGBUILD b/PKGBUILD
index 5ee1dea3bc68..45c6c46a9516 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,21 +3,23 @@
 
 pkgname=attract
 pkgver=2.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A graphical front-end for command line emulators that hides the underlying operating system and is intended to be controlled with a joystick or gamepad."
 arch=('i686' 'x86_64')
 url="http://www.attractmode.org/"
 license=('GPL3')
-depends=('sfml' 'openal' 'ffmpeg' 'fontconfig' 'libxinerama' 'libarchive')
+depends=('curl' 'sfml' 'ffmpeg' 'libxinerama' 'libarchive')
 makedepends=('git')
 provides=('attract')
 conflicts=('attractmode-git')
 source=("https://github.com/mickelson/${pkgname}/archive/v${pkgver}.tar.gz"
 	"https://github.com/mickelson/${pkgname}/releases/download/v1.6.2/ATTRACT.MODE.intro.16-9.v6.1080p.mp4"
 	"https://github.com/mickelson/${pkgname}/releases/download/v1.6.2/ATTRACT.MODE.intro.4-3.v6.1080p.mp4"
-	attract.desktop
-	attract.install)
-install=attract.install
+	attract.desktop)
+sha256sums=('4c17641ce0a0b9ff77da5e75f0cb26cc48e4c6295ef57d86a37db18b2bd9fbe9'
+            '0a21286df3bd51edd24f6eb21a246f8a6576020d34ce3f5cfe93304dbbadc23b'
+            '5750cf26864a86d7625f52223ac1a4050ff4475a016bb4f94fc506b7558dbaf9'
+            'd5e94d30bf6329bef87f58aad31ae9ff4632550a8576c243e41f220262c36cf6')
 
 build() {
 	cd "${pkgname}-${pkgver}"
@@ -33,8 +35,4 @@ package() {
 	install -Dm644 util/icon.png ${pkgdir}/usr/share/pixmaps/attract.png
 	install -Dm644 ${srcdir}/attract.desktop ${pkgdir}/usr/share/applications/attract.desktop
 }
-sha256sums=('4c17641ce0a0b9ff77da5e75f0cb26cc48e4c6295ef57d86a37db18b2bd9fbe9'
-            '0a21286df3bd51edd24f6eb21a246f8a6576020d34ce3f5cfe93304dbbadc23b'
-            '5750cf26864a86d7625f52223ac1a4050ff4475a016bb4f94fc506b7558dbaf9'
-            'd5e94d30bf6329bef87f58aad31ae9ff4632550a8576c243e41f220262c36cf6'
-            '4a0ad1e453b8fd9b14495d2f88da8ff9502dcb3902182f171e452ff67ae0f948')
+
diff --git a/attract.install b/attract.install
deleted file mode 100644
index 841d8012a3b2..000000000000
--- a/attract.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-  xdg-icon-resource forceupdate >/dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}