temporarily switch to Rogach/electricsheep repo, to allow building with ffmpeg5

2 files changed, 11 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0083990c3e75..7684eb58aa8e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = electricsheep
 	pkgdesc = Screensaver that realize the collective dream of sleeping computers from all over the internet
 	pkgver = 3.0.2
-	pkgrel = 4
+	pkgrel = 5
 	url = http://community.electricsheep.org/
 	arch = x86_64
 	license = GPL
@@ -11,7 +11,7 @@ pkgbase = electricsheep
 	makedepends = tinyxml
 	depends = curl
 	depends = flam3
-	depends = ffmpeg4.4
+	depends = ffmpeg
 	depends = lua51
 	depends = libgtop
 	depends = boost-libs
@@ -20,7 +20,7 @@ pkgbase = electricsheep
 	depends = wxgtk2
 	optdepends = xscreensaver: to use electricsheep with xscreensaver
 	options = !emptydirs
-	source = electricsheep-3.0.2.tar.gz::https://github.com/scottdraves/electricsheep/archive/1c4af20b384d19c6844083845004e8f467c9ce39.tar.gz
-	sha256sums = 1b33414d05f1b611224192c6956bb1ef6d9f2cef530e3fd0b8b48aa812a58a0b
+	source = electricsheep-3.0.2.tar.gz::https://github.com/Rogach/electricsheep/archive/2aee05ceb0b8ec2dfbc6858f7525791c827945f6.tar.gz
+	sha256sums = 0ed8accd5b871711c7c8573500b7ccac4f9794ed8784ebc994d0ce472b0b154f
 
 pkgname = electricsheep
diff --git a/PKGBUILD b/PKGBUILD
index 22f5310a44c4..d338140a0845 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,36 +3,29 @@
 
 pkgname=electricsheep
 pkgver=3.0.2
-pkgrel=4
-_gitcommit=1c4af20b384d19c6844083845004e8f467c9ce39
+pkgrel=5
+_gitcommit=2aee05ceb0b8ec2dfbc6858f7525791c827945f6
 pkgdesc='Screensaver that realize the collective dream of sleeping computers from all over the internet'
 url='http://community.electricsheep.org/'
 arch=('x86_64')
 license=('GPL')
-depends=('curl' 'flam3' 'ffmpeg4.4' 'lua51' 'libgtop' 'boost-libs' 'freeglut' 'glee' 'wxgtk2')
+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=(${pkgname}-${pkgver}.tar.gz::https://github.com/scottdraves/electricsheep/archive/${_gitcommit}.tar.gz)
-sha256sums=('1b33414d05f1b611224192c6956bb1ef6d9f2cef530e3fd0b8b48aa812a58a0b')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/Rogach/electricsheep/archive/${_gitcommit}.tar.gz)
+sha256sums=('0ed8accd5b871711c7c8573500b7ccac4f9794ed8784ebc994d0ce472b0b154f')
 
 prepare() {
   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
   install -d m4
-  sed -e 's|\[lua5.1\]|\[lua51\]|g' -i configure.ac
   ./autogen.sh
 }
 
 build() {
   cd ${pkgname}-${_gitcommit}/client_generic
-  export PKG_CONFIG_PATH='/usr/lib/ffmpeg4.4/pkgconfig'
-  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 -DGL_GLEXT_PROTOTYPES" GLEE_LIBS="-lGLee" LDFLAGS+="-lpthread"
+  ./configure --prefix=/usr
+  make CXXFLAGS+="-DGL_GLEXT_PROTOTYPES" GLEE_LIBS="-lGLee" LDFLAGS+="-lpthread"
 }
 
 package() {