diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | libav.patch | 12 | ||||
| -rw-r--r-- | luaver.patch | 11 |
4 files changed, 38 insertions, 5 deletions
@@ -1,7 +1,7 @@ pkgbase = electricsheep-svn pkgdesc = A screensaver that realize the collective dream of sleeping computers from all over the Internet pkgver = r134 - pkgrel = 3 + pkgrel = 4 url = http://www.electricsheep.org/ arch = i686 arch = x86_64 @@ -25,8 +25,12 @@ pkgbase = electricsheep-svn provides = electricsheep-svn source = electricsheep-svn::svn+https://github.com/scottdraves/electricsheep/ source = electricsheep-160.patch + source = libav.patch + source = luaver.patch sha1sums = SKIP sha1sums = 02c507eff0fccd13071c157bda44231294e17e56 + sha1sums = f4fcb0d1f7238305638235f69ea29c9ac895824b + sha1sums = a92928fef66f2d612546ebbbd4fae353f4f85565 pkgname = electricsheep-svn @@ -5,7 +5,7 @@ pkgname=electricsheep-svn pkgver=r134 -pkgrel=3 +pkgrel=4 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the Internet" url="http://www.electricsheep.org/" arch=('i686' 'x86_64') @@ -16,11 +16,15 @@ makedepends=('subversion') provides=('electricsheep-svn') source=("$pkgname::svn+https://github.com/scottdraves/electricsheep/" - 'electricsheep-160.patch') + 'electricsheep-160.patch' + 'libav.patch' + 'luaver.patch') sha1sums=('SKIP' - '02c507eff0fccd13071c157bda44231294e17e56') + '02c507eff0fccd13071c157bda44231294e17e56' + 'f4fcb0d1f7238305638235f69ea29c9ac895824b' + 'a92928fef66f2d612546ebbbd4fae353f4f85565') pkgver() { cd "$pkgname" @@ -31,8 +35,10 @@ pkgver() { build() { cd "${srcdir}/${pkgname}/trunk" - #TODO: Apply patch only if it hasn't been applied already + #TODO: Apply patches only if they haven't been applied already patch --forward -p0 < "${srcdir}/electricsheep-160.patch" + patch --forward -p0 < "${srcdir}/libav.patch" + patch --forward -p0 < "${srcdir}/luaver.patch" cd "client_generic" ./autogen.sh diff --git a/libav.patch b/libav.patch new file mode 100644 index 000000000000..7751a8daeaa4 --- /dev/null +++ b/libav.patch @@ -0,0 +1,12 @@ +--- client_generic/ContentDecoder/ContentDecoder.h 2016-10-02 15:51:59.070513556 -0400 ++++ ../../ContentDecoder.h 2016-10-02 15:53:23.072223197 -0400 +@@ -35,6 +35,9 @@ + #include "swscale.h" + #endif + } ++#define PixelFormat AVPixelFormat ++#define PIX_FMT_RGB24 AV_PIX_FMT_RGB24 ++#define PIX_FMT_BGR32 AV_PIX_FMT_BGR32 + + #include "base.h" + #include <string> diff --git a/luaver.patch b/luaver.patch new file mode 100644 index 000000000000..3b014a23c3aa --- /dev/null +++ b/luaver.patch @@ -0,0 +1,11 @@ +--- client_generic/configure.ac 2016-10-04 06:05:56.577882696 -0400 ++++ ../../configure.ac 2016-10-04 14:40:19.148741667 -0400 +@@ -164,7 +164,7 @@ + + dnl Check for lua + +-PKG_CHECK_MODULES([LUA], [lua5.1],, ++PKG_CHECK_MODULES([LUA], [lua51],, + [PKG_CHECK_MODULES([LUA], [lua >= 5.1]) + ]) + |