Date: Friday, October 7, 2016 @ 18:55:53
Author: arojas
Revision: 191591
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
electricsheep/repos/community-staging-i686/
electricsheep/repos/community-staging-i686/PKGBUILD
(from rev 191590, electricsheep/trunk/PKGBUILD)
electricsheep/repos/community-staging-i686/electricsheep-ffmpeg30.patch
(from rev 191590, electricsheep/trunk/electricsheep-ffmpeg30.patch)
electricsheep/repos/community-staging-i686/electricsheep-no-wxgtk.patch
(from rev 191590, electricsheep/trunk/electricsheep-no-wxgtk.patch)
electricsheep/repos/community-staging-x86_64/
electricsheep/repos/community-staging-x86_64/PKGBUILD
(from rev 191590, electricsheep/trunk/PKGBUILD)
electricsheep/repos/community-staging-x86_64/electricsheep-ffmpeg30.patch
(from rev 191590, electricsheep/trunk/electricsheep-ffmpeg30.patch)
electricsheep/repos/community-staging-x86_64/electricsheep-no-wxgtk.patch
(from rev 191590, electricsheep/trunk/electricsheep-no-wxgtk.patch)
-------------------------------------------------------+
community-staging-i686/PKGBUILD | 70 ++++++++++++
community-staging-i686/electricsheep-ffmpeg30.patch | 89 ++++++++++++++++
community-staging-i686/electricsheep-no-wxgtk.patch | 77 +++++++++++++
community-staging-x86_64/PKGBUILD | 70 ++++++++++++
community-staging-x86_64/electricsheep-ffmpeg30.patch | 89 ++++++++++++++++
community-staging-x86_64/electricsheep-no-wxgtk.patch | 77 +++++++++++++
6 files changed, 472 insertions(+)
Copied: electricsheep/repos/community-staging-i686/PKGBUILD (from rev 191590,
electricsheep/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2016-10-07 18:55:53 UTC (rev 191591)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Eric Bélanger <e...@archlinux.org>
+
+pkgname=electricsheep
+pkgver=2.7b33
+pkgrel=29
+pkgdesc="A screensaver that realize the collective dream of sleeping computers
from all over the internet"
+arch=('i686' 'x86_64')
+url="http://community.electricsheep.org/";
+license=('GPL')
+depends=('curl' 'flam3' 'ffmpeg' 'lua51' 'libgtop' 'boost-libs' 'freeglut'
'glee')
+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
+}
+
+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"
+
+ 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
+
+ sed -e 's|\[lua5.1\]|\[lua51\]|g' -i configure.ac
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./autogen.sh
+ 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}
+ 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"
+}
Copied: electricsheep/repos/community-staging-i686/electricsheep-ffmpeg30.patch
(from rev 191590, electricsheep/trunk/electricsheep-ffmpeg30.patch)
===================================================================
--- community-staging-i686/electricsheep-ffmpeg30.patch
(rev 0)
+++ community-staging-i686/electricsheep-ffmpeg30.patch 2016-10-07 18:55:53 UTC
(rev 191591)
@@ -0,0 +1,89 @@
+diff -rupN electricsheep-2.7b33.orig/Client/Player.cpp
electricsheep-2.7b33/Client/Player.cpp
+--- electricsheep-2.7b33.orig/Client/Player.cpp 2016-02-17
23:58:18.290031068 +0100
++++ electricsheep-2.7b33/Client/Player.cpp 2016-02-18 00:00:10.793496143
+0100
+@@ -357,18 +357,18 @@ ContentDecoder::CContentDecoder *CPlayer
+ return NULL;
+
+ #ifndef LINUX_GNU
+- PixelFormat pf = PIX_FMT_RGB32;
++ AVPixelFormat pf = AV_PIX_FMT_RGB32;
+
+ //On PowerPC machines we need to use different pixel format!
+ #if defined(MAC) && defined(__BIG_ENDIAN__)
+- pf = PIX_FMT_BGR32_1;
++ pf = AV_PIX_FMT_BGR32_1;
+ #endif
+
+ #else
+
+- PixelFormat pf = PIX_FMT_BGR32;
++ AVPixelFormat pf = AV_PIX_FMT_BGR32;
+ #if defined(__BIG_ENDIAN__)
+- pf = PIX_FMT_RGB32_1;
++ pf = AV_PIX_FMT_RGB32_1;
+ #endif
+
+ #endif
+diff -rupN electricsheep-2.7b33.orig/ContentDecoder/ContentDecoder.cpp
electricsheep-2.7b33/ContentDecoder/ContentDecoder.cpp
+--- electricsheep-2.7b33.orig/ContentDecoder/ContentDecoder.cpp
2016-02-17 23:58:18.293364307 +0100
++++ electricsheep-2.7b33/ContentDecoder/ContentDecoder.cpp 2016-02-18
00:02:41.115898486 +0100
+@@ -42,7 +42,7 @@ namespace ContentDecoder
+ CContentDecoder.
+
+ */
+-CContentDecoder::CContentDecoder( spCPlaylist _spPlaylist, bool
_bStartByRandom, const uint32 _queueLenght, PixelFormat _wantedFormat )
++CContentDecoder::CContentDecoder( spCPlaylist _spPlaylist, bool
_bStartByRandom, const uint32 _queueLenght, AVPixelFormat _wantedFormat )
+ {
+ g_Log->Info( "CContentDecoder()" );
+ m_FadeCount = g_Settings()->Get("settings.player.fadecount", 30);
+@@ -472,7 +472,7 @@ void CContentDecoder::ReadPackets()
+ if( !NextSheepForPlaying() )
+ return;
+
+- pFrame = avcodec_alloc_frame();
++ pFrame = av_frame_alloc();
+
+ while( true )
+ {
+diff -rupN electricsheep-2.7b33.orig/ContentDecoder/ContentDecoder.h
electricsheep-2.7b33/ContentDecoder/ContentDecoder.h
+--- electricsheep-2.7b33.orig/ContentDecoder/ContentDecoder.h 2016-02-17
23:58:18.293364307 +0100
++++ electricsheep-2.7b33/ContentDecoder/ContentDecoder.h 2016-02-18
00:00:43.602564223 +0100
+@@ -90,7 +90,7 @@ class CContentDecoder
+ int32 m_VideoStreamID;
+ AVFrame *m_pFrame;
+
+- PixelFormat m_WantedPixelFormat;
++ AVPixelFormat m_WantedPixelFormat;
+ SwsContext *m_pScaler;
+
+ // These are to track changes in input stream resolution, and
recreate m_pScaler if needed.
+@@ -126,7 +126,7 @@ class CContentDecoder
+ static int DumpError( int _err );
+
+ public:
+- CContentDecoder( spCPlaylist _spPlaylist, bool
_bStartByRandom, const uint32 _queueLenght, PixelFormat _wantedPixelFormat =
PIX_FMT_RGB24 );
++ CContentDecoder( spCPlaylist _spPlaylist, bool
_bStartByRandom, const uint32 _queueLenght, AVPixelFormat _wantedPixelFormat =
AV_PIX_FMT_RGB24 );
+ virtual ~CContentDecoder();
+
+ bool Initialized() { return m_Initialized; }
+diff -rupN electricsheep-2.7b33.orig/ContentDecoder/Frame.h
electricsheep-2.7b33/ContentDecoder/Frame.h
+--- electricsheep-2.7b33.orig/ContentDecoder/Frame.h 2016-02-17
23:58:18.293364307 +0100
++++ electricsheep-2.7b33/ContentDecoder/Frame.h 2016-02-18
00:02:17.963221084 +0100
+@@ -59,7 +59,7 @@ class CVideoFrame
+ AVFrame *m_pFrame;
+
+ public:
+- CVideoFrame( AVCodecContext *_pCodecContext, PixelFormat
_format, std::string _filename ) : m_pFrame(NULL)
++ CVideoFrame( AVCodecContext *_pCodecContext, AVPixelFormat
_format, std::string _filename ) : m_pFrame(NULL)
+ {
+ assert( _pCodecContext );
+ if ( _pCodecContext == NULL)
+@@ -75,7 +75,7 @@ class CVideoFrame
+ m_Width = _pCodecContext->width;
+ m_Height = _pCodecContext->height;
+
+- m_pFrame = avcodec_alloc_frame();
++ m_pFrame = av_frame_alloc();
+ if (m_pFrame != NULL)
+ {
+ int32 numBytes = avpicture_get_size(
_format, _pCodecContext->width, _pCodecContext->height );
Copied: electricsheep/repos/community-staging-i686/electricsheep-no-wxgtk.patch
(from rev 191590, electricsheep/trunk/electricsheep-no-wxgtk.patch)
===================================================================
--- community-staging-i686/electricsheep-no-wxgtk.patch
(rev 0)
+++ community-staging-i686/electricsheep-no-wxgtk.patch 2016-10-07 18:55:53 UTC
(rev 191591)
@@ -0,0 +1,77 @@
+--- configure.ac.orig 2014-08-17 17:28:46.314141026 -0400
++++ configure.ac 2014-08-17 17:29:21.084084594 -0400
+@@ -71,64 +71,7 @@
+
+
+
+-dnl Check for WXWidgets
+-WX_VER_291=""
+
+-AC_PATH_PROG(WX_CONFIG, wx-config, no)
+-
+-if test x$WX_CONFIG != xno; then
+- WX_VERSION=`wx-config --version`
+-
+- WX_MAJOR=${WX_VERSION%%.*};
+- WX_MINOR=${WX_VERSION#*.};
+- WX_MINOR=${WX_MINOR%%.*};
+- WX_MICRO=${WX_VERSION##*.};
+-
+- if test $WX_MAJOR -gt 2; then
+- WX_VER_291=yes
+- else
+- if test $WX_MAJOR -eq 2; then
+- if test $WX_MINOR -gt 9; then
+- WX_VER_291=yes
+- else
+- if test $WX_MINOR -eq 9; then
+- if test $WX_MICRO -ge 1; then
+- WX_VER_291=yes
+- fi
+- fi
+- fi
+- fi
+- fi
+-fi
+-
+-if test "$WX_VER_291" != "yes"; then
+-
+-dnl Use static version
+-echo "installed version is too old,"
+-echo "using static source version $reqwx"
+-
+-dnl Need to reset this, else it will override the value below !
+-WX_CONFIG=""
+-
+-AC_CHECK_PROG(WX_CONFIG, wx-config, yes, no)
+-
+-if test $WX_CONFIG = no; then
+-echo
+-echo YOU CAN FIX THIS !
+-AC_MSG_ERROR([Please install development libraries for wxWidgets 2.9.1 or
higher, and then run this configure script again.])
+-fi
+-fi
+-
+-WX_CXXFLAGS="`wx-config --cxxflags`"
+-WX_LIBS="-static `wx-config --libs` `wx-config --libs richtext`"
+-
+-echo "WX_CXXFLAGS is $WX_CXXFLAGS"
+-echo "WX_LIBS is $WX_LIBS"
+-
+-WX_LDADD="$WX_LIBS"
+-
+-AC_SUBST(WX_CXXFLAGS)
+-AC_SUBST(WX_LDADD)
+
+
+
+--- MSVC/SettingsGUI/Makefile.am.orig 2014-08-17 20:22:59.680508699 -0400
++++ MSVC/SettingsGUI/Makefile.am 2014-08-17 20:23:46.397099541 -0400
+@@ -28,7 +28,6 @@
+ -I /usr/include/libswscale \
+ -I /usr/include/libavutil
+
+-bin_PROGRAMS = electricsheep-preferences
+
+ electricsheep_preferences_SOURCES = \
+ config.cpp \
Copied: electricsheep/repos/community-staging-x86_64/PKGBUILD (from rev 191590,
electricsheep/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2016-10-07 18:55:53 UTC (rev 191591)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Eric Bélanger <e...@archlinux.org>
+
+pkgname=electricsheep
+pkgver=2.7b33
+pkgrel=29
+pkgdesc="A screensaver that realize the collective dream of sleeping computers
from all over the internet"
+arch=('i686' 'x86_64')
+url="http://community.electricsheep.org/";
+license=('GPL')
+depends=('curl' 'flam3' 'ffmpeg' 'lua51' 'libgtop' 'boost-libs' 'freeglut'
'glee')
+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
+}
+
+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"
+
+ 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
+
+ sed -e 's|\[lua5.1\]|\[lua51\]|g' -i configure.ac
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./autogen.sh
+ 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}
+ 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"
+}
Copied:
electricsheep/repos/community-staging-x86_64/electricsheep-ffmpeg30.patch (from
rev 191590, electricsheep/trunk/electricsheep-ffmpeg30.patch)
===================================================================
--- community-staging-x86_64/electricsheep-ffmpeg30.patch
(rev 0)
+++ community-staging-x86_64/electricsheep-ffmpeg30.patch 2016-10-07
18:55:53 UTC (rev 191591)
@@ -0,0 +1,89 @@
+diff -rupN electricsheep-2.7b33.orig/Client/Player.cpp
electricsheep-2.7b33/Client/Player.cpp
+--- electricsheep-2.7b33.orig/Client/Player.cpp 2016-02-17
23:58:18.290031068 +0100
++++ electricsheep-2.7b33/Client/Player.cpp 2016-02-18 00:00:10.793496143
+0100
+@@ -357,18 +357,18 @@ ContentDecoder::CContentDecoder *CPlayer
+ return NULL;
+
+ #ifndef LINUX_GNU
+- PixelFormat pf = PIX_FMT_RGB32;
++ AVPixelFormat pf = AV_PIX_FMT_RGB32;
+
+ //On PowerPC machines we need to use different pixel format!
+ #if defined(MAC) && defined(__BIG_ENDIAN__)
+- pf = PIX_FMT_BGR32_1;
++ pf = AV_PIX_FMT_BGR32_1;
+ #endif
+
+ #else
+
+- PixelFormat pf = PIX_FMT_BGR32;
++ AVPixelFormat pf = AV_PIX_FMT_BGR32;
+ #if defined(__BIG_ENDIAN__)
+- pf = PIX_FMT_RGB32_1;
++ pf = AV_PIX_FMT_RGB32_1;
+ #endif
+
+ #endif
+diff -rupN electricsheep-2.7b33.orig/ContentDecoder/ContentDecoder.cpp
electricsheep-2.7b33/ContentDecoder/ContentDecoder.cpp
+--- electricsheep-2.7b33.orig/ContentDecoder/ContentDecoder.cpp
2016-02-17 23:58:18.293364307 +0100
++++ electricsheep-2.7b33/ContentDecoder/ContentDecoder.cpp 2016-02-18
00:02:41.115898486 +0100
+@@ -42,7 +42,7 @@ namespace ContentDecoder
+ CContentDecoder.
+
+ */
+-CContentDecoder::CContentDecoder( spCPlaylist _spPlaylist, bool
_bStartByRandom, const uint32 _queueLenght, PixelFormat _wantedFormat )
++CContentDecoder::CContentDecoder( spCPlaylist _spPlaylist, bool
_bStartByRandom, const uint32 _queueLenght, AVPixelFormat _wantedFormat )
+ {
+ g_Log->Info( "CContentDecoder()" );
+ m_FadeCount = g_Settings()->Get("settings.player.fadecount", 30);
+@@ -472,7 +472,7 @@ void CContentDecoder::ReadPackets()
+ if( !NextSheepForPlaying() )
+ return;
+
+- pFrame = avcodec_alloc_frame();
++ pFrame = av_frame_alloc();
+
+ while( true )
+ {
+diff -rupN electricsheep-2.7b33.orig/ContentDecoder/ContentDecoder.h
electricsheep-2.7b33/ContentDecoder/ContentDecoder.h
+--- electricsheep-2.7b33.orig/ContentDecoder/ContentDecoder.h 2016-02-17
23:58:18.293364307 +0100
++++ electricsheep-2.7b33/ContentDecoder/ContentDecoder.h 2016-02-18
00:00:43.602564223 +0100
+@@ -90,7 +90,7 @@ class CContentDecoder
+ int32 m_VideoStreamID;
+ AVFrame *m_pFrame;
+
+- PixelFormat m_WantedPixelFormat;
++ AVPixelFormat m_WantedPixelFormat;
+ SwsContext *m_pScaler;
+
+ // These are to track changes in input stream resolution, and
recreate m_pScaler if needed.
+@@ -126,7 +126,7 @@ class CContentDecoder
+ static int DumpError( int _err );
+
+ public:
+- CContentDecoder( spCPlaylist _spPlaylist, bool
_bStartByRandom, const uint32 _queueLenght, PixelFormat _wantedPixelFormat =
PIX_FMT_RGB24 );
++ CContentDecoder( spCPlaylist _spPlaylist, bool
_bStartByRandom, const uint32 _queueLenght, AVPixelFormat _wantedPixelFormat =
AV_PIX_FMT_RGB24 );
+ virtual ~CContentDecoder();
+
+ bool Initialized() { return m_Initialized; }
+diff -rupN electricsheep-2.7b33.orig/ContentDecoder/Frame.h
electricsheep-2.7b33/ContentDecoder/Frame.h
+--- electricsheep-2.7b33.orig/ContentDecoder/Frame.h 2016-02-17
23:58:18.293364307 +0100
++++ electricsheep-2.7b33/ContentDecoder/Frame.h 2016-02-18
00:02:17.963221084 +0100
+@@ -59,7 +59,7 @@ class CVideoFrame
+ AVFrame *m_pFrame;
+
+ public:
+- CVideoFrame( AVCodecContext *_pCodecContext, PixelFormat
_format, std::string _filename ) : m_pFrame(NULL)
++ CVideoFrame( AVCodecContext *_pCodecContext, AVPixelFormat
_format, std::string _filename ) : m_pFrame(NULL)
+ {
+ assert( _pCodecContext );
+ if ( _pCodecContext == NULL)
+@@ -75,7 +75,7 @@ class CVideoFrame
+ m_Width = _pCodecContext->width;
+ m_Height = _pCodecContext->height;
+
+- m_pFrame = avcodec_alloc_frame();
++ m_pFrame = av_frame_alloc();
+ if (m_pFrame != NULL)
+ {
+ int32 numBytes = avpicture_get_size(
_format, _pCodecContext->width, _pCodecContext->height );
Copied:
electricsheep/repos/community-staging-x86_64/electricsheep-no-wxgtk.patch (from
rev 191590, electricsheep/trunk/electricsheep-no-wxgtk.patch)
===================================================================
--- community-staging-x86_64/electricsheep-no-wxgtk.patch
(rev 0)
+++ community-staging-x86_64/electricsheep-no-wxgtk.patch 2016-10-07
18:55:53 UTC (rev 191591)
@@ -0,0 +1,77 @@
+--- configure.ac.orig 2014-08-17 17:28:46.314141026 -0400
++++ configure.ac 2014-08-17 17:29:21.084084594 -0400
+@@ -71,64 +71,7 @@
+
+
+
+-dnl Check for WXWidgets
+-WX_VER_291=""
+
+-AC_PATH_PROG(WX_CONFIG, wx-config, no)
+-
+-if test x$WX_CONFIG != xno; then
+- WX_VERSION=`wx-config --version`
+-
+- WX_MAJOR=${WX_VERSION%%.*};
+- WX_MINOR=${WX_VERSION#*.};
+- WX_MINOR=${WX_MINOR%%.*};
+- WX_MICRO=${WX_VERSION##*.};
+-
+- if test $WX_MAJOR -gt 2; then
+- WX_VER_291=yes
+- else
+- if test $WX_MAJOR -eq 2; then
+- if test $WX_MINOR -gt 9; then
+- WX_VER_291=yes
+- else
+- if test $WX_MINOR -eq 9; then
+- if test $WX_MICRO -ge 1; then
+- WX_VER_291=yes
+- fi
+- fi
+- fi
+- fi
+- fi
+-fi
+-
+-if test "$WX_VER_291" != "yes"; then
+-
+-dnl Use static version
+-echo "installed version is too old,"
+-echo "using static source version $reqwx"
+-
+-dnl Need to reset this, else it will override the value below !
+-WX_CONFIG=""
+-
+-AC_CHECK_PROG(WX_CONFIG, wx-config, yes, no)
+-
+-if test $WX_CONFIG = no; then
+-echo
+-echo YOU CAN FIX THIS !
+-AC_MSG_ERROR([Please install development libraries for wxWidgets 2.9.1 or
higher, and then run this configure script again.])
+-fi
+-fi
+-
+-WX_CXXFLAGS="`wx-config --cxxflags`"
+-WX_LIBS="-static `wx-config --libs` `wx-config --libs richtext`"
+-
+-echo "WX_CXXFLAGS is $WX_CXXFLAGS"
+-echo "WX_LIBS is $WX_LIBS"
+-
+-WX_LDADD="$WX_LIBS"
+-
+-AC_SUBST(WX_CXXFLAGS)
+-AC_SUBST(WX_LDADD)
+
+
+
+--- MSVC/SettingsGUI/Makefile.am.orig 2014-08-17 20:22:59.680508699 -0400
++++ MSVC/SettingsGUI/Makefile.am 2014-08-17 20:23:46.397099541 -0400
+@@ -28,7 +28,6 @@
+ -I /usr/include/libswscale \
+ -I /usr/include/libavutil
+
+-bin_PROGRAMS = electricsheep-preferences
+
+ electricsheep_preferences_SOURCES = \
+ config.cpp \
