upgpkg: electricsheep 3.0.2-1

upstream release

2 files changed, 25 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ad0d6830326d..20615c6e232a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Tue Dec 26 20:58:40 UTC 2017
 pkgbase = electricsheep
-	pkgdesc = A screensaver that realize the collective dream of sleeping computers from all over the internet
-	pkgver = 2.7b33
-	pkgrel = 33
+	pkgdesc = Screensaver that realize the collective dream of sleeping computers from all over the internet
+	pkgver = 3.0.2
+	pkgrel = 1
 	url = http://community.electricsheep.org/
 	arch = x86_64
 	license = GPL
@@ -19,16 +17,11 @@ pkgbase = electricsheep
 	depends = boost-libs
 	depends = freeglut
 	depends = glee
+	depends = wxgtk2
 	optdepends = xscreensaver: to use electricsheep with xscreensaver
 	options = !emptydirs
-	source = https://sources.archlinux.org/other/community/electricsheep/electricsheep-2.7b33.tar.xz
-	source = https://sources.archlinux.org/other/community/electricsheep/electricsheep-2.7b33.tar.xz.sig
-	source = electricsheep-no-wxgtk.patch
-	source = electricsheep-ffmpeg30.patch
-	sha1sums = d86607d97accad8519df2a21d67253abe45f5fdd
-	sha1sums = SKIP
-	sha1sums = b186318902dd0abac6e72a81fa374434d7244ac3
-	sha1sums = c28e8a1ad5738c56615bdb431d80eff7f9e2a554
+	source = electricsheep-3.0.2.tar.gz::https://github.com/scottdraves/electricsheep/archive/1c4af20b384d19c6844083845004e8f467c9ce39.tar.gz
+	sha256sums = 1b33414d05f1b611224192c6956bb1ef6d9f2cef530e3fd0b8b48aa812a58a0b
 
 pkgname = electricsheep
 
diff --git a/PKGBUILD b/PKGBUILD
index c43bcf583072..e97dc337c681 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,70 +1,44 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Eric Bélanger <eric@archlinux.org>
 
 pkgname=electricsheep
-pkgver=2.7b33
-pkgrel=33
-pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet"
+pkgver=3.0.2
+pkgrel=1
+_gitcommit=1c4af20b384d19c6844083845004e8f467c9ce39
+pkgdesc='Screensaver that realize the collective dream of sleeping computers from all over the internet'
+url='http://community.electricsheep.org/'
 arch=('x86_64')
-url="http://community.electricsheep.org/"
 license=('GPL')
-depends=('curl' 'flam3' 'ffmpeg' 'lua51' 'libgtop' 'boost-libs' 'freeglut' 'glee')
+depends=('curl' 'flam3' 'ffmpeg' 'lua51' 'libgtop' 'boost-libs' 'freeglut' 'glee' 'wxgtk2')
 makedepends=('boost' 'mesa' 'glu' 'tinyxml')
 optdepends=('xscreensaver: to use electricsheep with xscreensaver')
 options=('!emptydirs')
-source=(https://sources.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
-        electricsheep-no-wxgtk.patch
-        electricsheep-ffmpeg30.patch)
-sha1sums=('d86607d97accad8519df2a21d67253abe45f5fdd'
-          'SKIP'
-          'b186318902dd0abac6e72a81fa374434d7244ac3'
-          'c28e8a1ad5738c56615bdb431d80eff7f9e2a554')
-validpgpkeys=('5357F3B111688D88C1D88119FCF2CB179205AC90')
-
-# source PKGBUILD && mksource
-mksource() {
-  [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
-  _svnver=r125
-  _svntrunk="http://electricsheep.googlecode.com/svn/trunk/client_generic"
-  _svnmod="${pkgname}-${pkgver}"
-  mkdir ${pkgname}-${pkgver}
-  pushd ${pkgname}-${pkgver}
-  svn co ${_svntrunk} --config-dir ./ -r ${_svnver} ${_svnmod}
-  find . -depth -type d -name .svn -exec rm -rf {} \;
-  (cd ${pkgname}-${pkgver} ; rm -r boost Build_guides curlTest ffmpeg InstallerMSVC \
-    Launcher libpng libxml lua5.1 MacBuild RuntimeMSVC wxConfig)
-  tar -cJf ../${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/*
-  popd
-  rm -r ${pkgname}-${pkgver}
-  gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
-}
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/scottdraves/electricsheep/archive/${_gitcommit}.tar.gz)
+sha256sums=('1b33414d05f1b611224192c6956bb1ef6d9f2cef530e3fd0b8b48aa812a58a0b')
 
 prepare() {
-  cd ${pkgname}-${pkgver}
-# Do not build broken electricsheep-preferences
-  patch -p0 -i "${srcdir}/electricsheep-no-wxgtk.patch"
-  patch -p1 -i "${srcdir}/electricsheep-ffmpeg30.patch"
-
+  cd ${pkgname}-${_gitcommit}/client_generic
   sed -i -e 's/av_close_input_file( m_pFormatContext )/avformat_close_input( \&m_pFormatContext )/' ContentDecoder/ContentDecoder.cpp
   sed -i -e 's/AM_PROG_CC_STDC/AC_PROG_CC/' configure.ac
   sed -i '12 i\
 #include <cstdio>' Common/Singleton.h
-  mkdir m4
-
+  install -d m4
   sed -e 's|\[lua5.1\]|\[lua51\]|g' -i configure.ac
+  ./autogen.sh
 }
 
 build() {
-  cd ${pkgname}-${pkgver}
-  ./autogen.sh
+  cd ${pkgname}-${_gitcommit}/client_generic
   CPPFLAGS+=" -I/usr/include/lua5.1" ./configure --prefix=/usr
   sed -i 's|-I /usr/include/libavutil||' MSVC/SettingsGUI/Makefile
   make CXXFLAGS+="-DUSE_NEW_FFMPEG_API=1" GLEE_LIBS="-lGLee"
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-${_gitcommit}/client_generic
   make DESTDIR="${pkgdir}" install
-  install -D -m644 menu-entries/ElectricSheep.desktop.kde "${pkgdir}/usr/share/kde4/services/ScreenSavers/electricsheep.desktop"
-  install -D -m644 Runtime/logo.png "${pkgdir}/usr/share/icons/electricsheep.png"
+  install -Dm 644 menu-entries/ElectricSheep.desktop.kde "${pkgdir}/usr/share/kde4/services/ScreenSavers/electricsheep.desktop"
+  install -Dm 644 Runtime/logo.png "${pkgdir}/usr/share/icons/electricsheep.png"
 }
+
+# vim: ts=2 sw=2 et: