reupload

4 files changed, 35 insertions, 61 deletions

diff --git a/.AURINFO b/.AURINFO
deleted file mode 100644
index 9583294b36a3..000000000000
--- a/.AURINFO
+++ /dev/null
@@ -1,21 +0,0 @@
-pkgbase = sdl-ball
-	pkgdesc = A Breakout clone with pretty graphics
-	pkgver = 1.02
-	pkgrel = 2
-	url = http://sdl-ball.sourceforge.net/
-	arch = i686
-	arch = x86_64
-	license = GPL3
-	makedepends = gimp>=2
-	depends = libgl
-	depends = sdl_mixer
-	depends = sdl_ttf
-	depends = sdl_image
-	depends = mesa
-	source = sdl-ball-1.02.tar.bz2::http://sourceforge.net/projects/sdl-ball/files/sdl-ball/1.02/sdl-ball-1.02.tar.bz2/download
-	source = sdl-ball.desktop
-	md5sums = be7f662206b8bc02e07370826c7fb730
-	md5sums = eb9fb4483bd01020c8aba0db74c6cbff
-
-pkgname = sdl-ball
-
diff --git a/.SRCINFO b/.SRCINFO
index 9583294b36a3..fb2c4b7a5ee3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,19 @@
+# Generated by mksrcinfo v8
+# Mon Feb  1 21:38:24 UTC 2016
 pkgbase = sdl-ball
 	pkgdesc = A Breakout clone with pretty graphics
 	pkgver = 1.02
-	pkgrel = 2
+	pkgrel = 3
 	url = http://sdl-ball.sourceforge.net/
 	arch = i686
 	arch = x86_64
 	license = GPL3
-	makedepends = gimp>=2
-	depends = libgl
+	depends = glu
 	depends = sdl_mixer
 	depends = sdl_ttf
 	depends = sdl_image
-	depends = mesa
-	source = sdl-ball-1.02.tar.bz2::http://sourceforge.net/projects/sdl-ball/files/sdl-ball/1.02/sdl-ball-1.02.tar.bz2/download
-	source = sdl-ball.desktop
-	md5sums = be7f662206b8bc02e07370826c7fb730
-	md5sums = eb9fb4483bd01020c8aba0db74c6cbff
+	source = http://sourceforge.net/projects/sdl-ball/files/sdl-ball/1.02/sdl-ball-1.02.tar.bz2
+	sha256sums = 03ae91c0ddbcf055a224b765da55dc5c8417e9b09971eb56280c8e602ba01423
 
 pkgname = sdl-ball
 
diff --git a/PKGBUILD b/PKGBUILD
index 7ae71ec8bc6a..7f3677d24f91 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,49 @@
-# Maintainer: yugrotavele <yugrotavele at archlinux dot us>
+# Maintainer: Michael Straube <m.s.online gmx.de>
+# Contributor: yugrotavele <yugrotavele at archlinux dot us>
 # Contributor: Christoph Zeiler <rabyte*gmail>
 
 pkgname=sdl-ball
 pkgver=1.02
-pkgrel=2
+pkgrel=3
 pkgdesc="A Breakout clone with pretty graphics"
 arch=('i686' 'x86_64')
 url="http://sdl-ball.sourceforge.net/"
 license=('GPL3')
-#uncomment following line for wiimote support. Unable to get libbtctl to build at this time.
-#depends=('libgl' 'wiiuse' 'sdl_mixer' 'sdl_ttf' 'sdl_image' 'mesa' 'gimp>=2' 'libbtctl')
-#comment line below if compiling for wiimote support.
-depends=('libgl' 'sdl_mixer' 'sdl_ttf' 'sdl_image' 'mesa')
-makedepends=('gimp>=2')
-source=(${pkgname}-${pkgver}.tar.bz2::http://sourceforge.net/projects/${pkgname}/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2/download
-        ${pkgname}.desktop)
-md5sums=('be7f662206b8bc02e07370826c7fb730'
-         'eb9fb4483bd01020c8aba0db74c6cbff')
+# uncomment following line for wiimote support. Unable to get libbtctl to build at this time.
+#depends=('glu' 'sdl_mixer' 'sdl_ttf' 'sdl_image' 'wiiuse' 'libbtctl')
+# comment line below if compiling for wiimote support.
+depends=('glu' 'sdl_mixer' 'sdl_ttf' 'sdl_image')
+# uncomment line below if building the gimp-leveleditor
+#makedepends=('gimp')
+source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+sha256sums=('03ae91c0ddbcf055a224b765da55dc5c8417e9b09971eb56280c8e602ba01423')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   
-  #uncomment following 2 lines for wiimote support.
-
+  # uncomment following 2 lines for wiimote support.
   #export LIBS="-lwiiuse"
   #export CFLAGS="${CXXFLAGS} -DWITH_WIIUSE"
 
-  make clean
-  make DATADIR="/usr/share/$pkgname/themes/"
+  make DATADIR="/usr/share/games/${pkgname}/themes/"
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  mkdir -p "${pkgdir}/usr/share/games/${pkgname}"
+  cp -r README themes "${pkgdir}/usr/share/games/${pkgname}/"
+  install -Dm755 sdl-ball "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm644 themes/default/icon32.png "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+  install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 
-  mkdir -p "${pkgdir}"/usr/{bin,share/{${pkgname},applications,pixmaps}}
-  install -m755 ${pkgname} "${pkgdir}"/usr/bin/
-  cp -rf README themes/ "${pkgdir}"/usr/share/${pkgname}
-  install -m644 themes/default/icon32.png "${pkgdir}"/usr/share/pixmaps/${pkgname}.png
-  install -m644 ../${pkgname}.desktop "${pkgdir}"/usr/share/applications/
+  install -Dm644 leveleditor/index.html "${pkgdir}/usr/share/games/${pkgname}/leveleditor/index.html"
+  cp -r leveleditor/gfx "${pkgdir}/usr/share/games/${pkgname}/leveleditor/gfx"
 
-  cd leveleditor/gimp-leveleditor
-  gimptool-2.0 --build gimp-sdlball.c
-  install -Dm755 gimp-sdlball "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/gimp-sdlball
+  # uncomment following lines to build and install the gimp-leveleditor
+  #cd "${srcdir}/${pkgname}-${pkgver}/leveleditor/gimp-leveleditor"
+  #gimptool-2.0 --build gimp-sdlball.c
+  #install -Dm755 gimp-sdlball "${pkgdir}/usr/lib/gimp/2.0/plug-ins/gimp-sdlball"
+  #install -Dm644 readme "${pkgdir}/usr/share/games/${pkgname}/leveleditor/gimp-leveleditor/readme"
+  #install -Dm644 sdlball.xcf "${pkgdir}/usr/share/games/${pkgname}/leveleditor/gimp-leveleditor/sdlball.xcf" 
 }
diff --git a/sdl-ball.desktop b/sdl-ball.desktop
deleted file mode 100644
index 1ccbdf011ed1..000000000000
--- a/sdl-ball.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=SDL-Ball
-Exec=sdl-ball
-Icon=sdl-ball
-Type=Application
-Comment=A Breakout clone
-Categories=Game;ActionGame;ArcadeGame;