Date: Wednesday, February 17, 2016 @ 19:39:54
  Author: jlichtblau
Revision: 162113

upgpkg: goldendict 1.5.0RC-3 - ffmpeg 3.0 rebuild

Added:
  goldendict/trunk/Fix-compilation-with-last-FFMpeg-versions-issue-673.patch
Modified:
  goldendict/trunk/PKGBUILD
  goldendict/trunk/goldendict.changelog
Deleted:
  goldendict/trunk/fix-wikipedia-images.patch
  goldendict/trunk/gcc47.patch

-----------------------------------------------------------+
 Fix-compilation-with-last-FFMpeg-versions-issue-673.patch |   52 ++++++++++++
 PKGBUILD                                                  |   17 +--
 fix-wikipedia-images.patch                                |   26 ------
 gcc47.patch                                               |   23 -----
 goldendict.changelog                                      |    3 
 5 files changed, 62 insertions(+), 59 deletions(-)

Added: Fix-compilation-with-last-FFMpeg-versions-issue-673.patch
===================================================================
--- Fix-compilation-with-last-FFMpeg-versions-issue-673.patch                   
        (rev 0)
+++ Fix-compilation-with-last-FFMpeg-versions-issue-673.patch   2016-02-17 
18:39:54 UTC (rev 162113)
@@ -0,0 +1,52 @@
+From cabc5aa7c353812f847b5d2ccc3f9767c30bde7f Mon Sep 17 00:00:00 2001
+From: Abs62 <ottom...@yandex.ru>
+Date: Wed, 17 Feb 2016 17:37:23 +0300
+Subject: [PATCH] Fix compilation with last FFMpeg versions (issue #673)
+
+---
+ ffmpegaudio.cc | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index 2a13e77..19eecc8 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -334,7 +334,11 @@ void DecoderContext::closeOutputDevice()
+ 
+ bool DecoderContext::play( QString & errorString )
+ {
++#if LIBAVCODEC_VERSION_MAJOR < 55 || ( LIBAVCODEC_VERSION_MAJOR == 55 && 
LIBAVCODEC_VERSION_MINOR < 28 )
+   AVFrame * frame = avcodec_alloc_frame();
++#else
++  AVFrame * frame = av_frame_alloc();
++#endif
+   if ( !frame )
+   {
+     errorString = QObject::tr( "avcodec_alloc_frame() failed." );
+@@ -365,7 +369,11 @@ bool DecoderContext::play( QString & errorString )
+       while( pack.size > 0 );
+     }
+     // av_free_packet() must be called after each call to av_read_frame()
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && 
LIBAVCODEC_VERSION_MINOR < 7 )
+     av_free_packet( &packet );
++#else
++    av_packet_unref( &packet );
++#endif
+   }
+ 
+   if ( !isCancelled_ && codecContext_->codec->capabilities & CODEC_CAP_DELAY )
+@@ -382,8 +390,10 @@ bool DecoderContext::play( QString & errorString )
+ 
+ #if LIBAVCODEC_VERSION_MAJOR < 54
+   av_free( frame );
+-#else
++#elif LIBAVCODEC_VERSION_MAJOR < 55 || ( LIBAVCODEC_VERSION_MAJOR == 55 && 
LIBAVCODEC_VERSION_MINOR < 28 )
+   avcodec_free_frame( &frame );
++#else
++  av_frame_free( &frame );
+ #endif
+ 
+   return true;
+-- 
+2.7.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2016-02-17 18:05:29 UTC (rev 162112)
+++ PKGBUILD    2016-02-17 18:39:54 UTC (rev 162113)
@@ -4,7 +4,7 @@
 
 pkgname=goldendict
 pkgver=1.5.0RC
-pkgrel=2
+pkgrel=3
 pkgdesc="Feature-rich dictionary lookup program"
 arch=('i686' 'x86_64')
 url="http://goldendict.org";
@@ -14,23 +14,20 @@
 changelog=$pkgname.changelog
 
source=($pkgname-$pkgver.tar.gz::https://github.com/goldendict/goldendict/archive/1.5.0-RC.tar.gz
         $pkgname-paths.patch
-        gcc47.patch
-        fix-wikipedia-images.patch)
+        Fix-compilation-with-last-FFMpeg-versions-issue-673.patch)
 sha256sums=('5705d5197509596221faf16a806965c799de7371a41fe2d2c4dc00b737ffe22e'
             '5281dc2f57a93e2aa416de35bd702926bd90b4746d62f81d8dc434f6a689d55e'
-            '2e13857d047186e781c3bd9de3cfdf794f4d44e8e28f9d18dda8df50cfe13c6e'
-            'ab669d96db0cb750d4c865b123474d655b6caca9242457c044a60f1fee5b7dc7')
+            '80bffcac787445ef272c06dfe4b73ab09da4a00733404198f60f25f2bb9edba9')
 
 prepare(){
-  cd "${srcdir}"/${pkgname}-1.5.0-RC
+  cd "${srcdir}"/$pkgname-1.5.0-RC
 
   patch -Np0 -i "${srcdir}"/$pkgname-paths.patch
-#  patch -p1 -i "${srcdir}"/gcc47.patch
-#  patch -Np1 -i "${srcdir}"/fix-wikipedia-images.patch
+  patch -Np1 -i 
"${srcdir}"/Fix-compilation-with-last-FFMpeg-versions-issue-673.patch
 }
 
 build(){
-  cd "${srcdir}"/${pkgname}-1.5.0-RC
+  cd "${srcdir}"/$pkgname-1.5.0-RC
 
   qmake-qt4 PREFIX="/usr"
   make
@@ -37,7 +34,7 @@
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-1.5.0-RC
+  cd "${srcdir}"/$pkgname-1.5.0-RC
 
   make INSTALL_ROOT="${pkgdir}" install
 

Deleted: fix-wikipedia-images.patch
===================================================================
--- fix-wikipedia-images.patch  2016-02-17 18:05:29 UTC (rev 162112)
+++ fix-wikipedia-images.patch  2016-02-17 18:39:54 UTC (rev 162113)
@@ -1,26 +0,0 @@
-From 8c056589e989781c6ed5aac7491c802414489ae9 Mon Sep 17 00:00:00 2001
-From: Abs62 <ottom...@yandex.ru>
-Date: Sat, 22 Oct 2011 15:52:52 +0400
-Subject: [PATCH] Fix Wikipedia images loading
-
----
- mediawiki.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/mediawiki.cc b/mediawiki.cc
-index e67fdb3..9fff3dc 100644
---- a/mediawiki.cc
-+++ b/mediawiki.cc
-@@ -293,6 +293,9 @@ void MediaWikiArticleRequest::requestFinished( 
QNetworkReply * r )
-             // Replace the href="/foo/bar/Baz" to just href="Baz".
-             articleString.replace( QRegExp( "<a\\shref=\"/([\\w\\.]*/)*" ), 
"<a href=\"" );
-   
-+            // Add "http:" to image source urls
-+            articleString.replace( " src=\"//", " src=\"http://"; );
-+
-             // In those strings, change any underscores to spaces
-             for( ; ; )
-             {
--- 
-1.8.4
-

Deleted: gcc47.patch
===================================================================
--- gcc47.patch 2016-02-17 18:05:29 UTC (rev 162112)
+++ gcc47.patch 2016-02-17 18:39:54 UTC (rev 162113)
@@ -1,23 +0,0 @@
-diff -urN goldendict-1.0.1-src.orig/processwrapper.cc 
goldendict-1.0.1-src/processwrapper.cc
---- goldendict-1.0.1-src.orig/processwrapper.cc        2010-12-04 
02:42:46.000000000 +0530
-+++ goldendict-1.0.1-src/processwrapper.cc     2012-08-04 20:51:45.835055609 
+0530
-@@ -94,6 +94,8 @@
- 
- #else
- 
-+#include <unistd.h>
-+
- unsigned int ProcessWrapper::currentProcessId()
- {
-     return getpid();
-diff -urN goldendict-1.0.1-src.orig/qtsingleapplication/src/qtlocalpeer.cpp 
goldendict-1.0.1-src/qtsingleapplication/src/qtlocalpeer.cpp
---- goldendict-1.0.1-src.orig/qtsingleapplication/src/qtlocalpeer.cpp  
2010-12-04 02:42:46.000000000 +0530
-+++ goldendict-1.0.1-src/qtsingleapplication/src/qtlocalpeer.cpp       
2012-08-04 20:48:47.761593825 +0530
-@@ -50,6 +50,7 @@
- #endif
- #if defined(Q_OS_UNIX)
- #include <time.h>
-+#include <unistd.h>
- #endif
- 
- namespace QtLP_Private {

Modified: goldendict.changelog
===================================================================
--- goldendict.changelog        2016-02-17 18:05:29 UTC (rev 162112)
+++ goldendict.changelog        2016-02-17 18:39:54 UTC (rev 162113)
@@ -1,3 +1,6 @@
+2016-02-17 Jaroslav Lichtblau <svetlemo...@archlinux.org>
+       * goldendict 1.5.0RC-3 ffmpeg 3.0 rebuild
+
 2015-02-02 Jaroslav Lichtblau <svetlemo...@archlinux.org>
        * goldendict 1.5.0RC-1 FS#43667 fix, localizations added again
 

Reply via email to