Date: Thursday, February 18, 2016 @ 00:15:36
Author: alucryd
Revision: 162141
ffmpeg 3.0 rebuild: electricsheep 2.7b33-26
Added:
electricsheep/trunk/electricsheep-ffmpeg30.patch
Modified:
electricsheep/trunk/PKGBUILD
------------------------------+
PKGBUILD | 7 ++-
electricsheep-ffmpeg30.patch | 89 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 94 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-02-17 23:01:23 UTC (rev 162140)
+++ PKGBUILD 2016-02-17 23:15:36 UTC (rev 162141)
@@ -13,10 +13,12 @@
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-no-wxgtk.patch
+ electricsheep-ffmpeg30.patch)
sha1sums=('d86607d97accad8519df2a21d67253abe45f5fdd'
'SKIP'
- 'b186318902dd0abac6e72a81fa374434d7244ac3')
+ 'b186318902dd0abac6e72a81fa374434d7244ac3'
+ 'c28e8a1ad5738c56615bdb431d80eff7f9e2a554')
validpgpkeys=('5357F3B111688D88C1D88119FCF2CB179205AC90')
# source PKGBUILD && mksource
@@ -41,6 +43,7 @@
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
Added: electricsheep-ffmpeg30.patch
===================================================================
--- electricsheep-ffmpeg30.patch (rev 0)
+++ electricsheep-ffmpeg30.patch 2016-02-17 23:15:36 UTC (rev 162141)
@@ -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 );
