[arch-commits] Commit in goldendict/repos (10 files)

Jaroslav Lichtblau jlichtblau at archlinux.org
Wed Feb 17 18:40:13 UTC 2016


    Date: Wednesday, February 17, 2016 @ 19:40:13
  Author: jlichtblau
Revision: 162114

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  goldendict/repos/community-staging-i686/
  goldendict/repos/community-staging-i686/Fix-compilation-with-last-FFMpeg-versions-issue-673.patch
    (from rev 162113, goldendict/trunk/Fix-compilation-with-last-FFMpeg-versions-issue-673.patch)
  goldendict/repos/community-staging-i686/PKGBUILD
    (from rev 162113, goldendict/trunk/PKGBUILD)
  goldendict/repos/community-staging-i686/goldendict-paths.patch
    (from rev 162113, goldendict/trunk/goldendict-paths.patch)
  goldendict/repos/community-staging-i686/goldendict.changelog
    (from rev 162113, goldendict/trunk/goldendict.changelog)
  goldendict/repos/community-staging-x86_64/
  goldendict/repos/community-staging-x86_64/Fix-compilation-with-last-FFMpeg-versions-issue-673.patch
    (from rev 162113, goldendict/trunk/Fix-compilation-with-last-FFMpeg-versions-issue-673.patch)
  goldendict/repos/community-staging-x86_64/PKGBUILD
    (from rev 162113, goldendict/trunk/PKGBUILD)
  goldendict/repos/community-staging-x86_64/goldendict-paths.patch
    (from rev 162113, goldendict/trunk/goldendict-paths.patch)
  goldendict/repos/community-staging-x86_64/goldendict.changelog
    (from rev 162113, goldendict/trunk/goldendict.changelog)

------------------------------------------------------------------------------------+
 community-staging-i686/Fix-compilation-with-last-FFMpeg-versions-issue-673.patch   |   52 ++++++++++
 community-staging-i686/PKGBUILD                                                    |   47 +++++++++
 community-staging-i686/goldendict-paths.patch                                      |   12 ++
 community-staging-i686/goldendict.changelog                                        |   17 +++
 community-staging-x86_64/Fix-compilation-with-last-FFMpeg-versions-issue-673.patch |   52 ++++++++++
 community-staging-x86_64/PKGBUILD                                                  |   47 +++++++++
 community-staging-x86_64/goldendict-paths.patch                                    |   12 ++
 community-staging-x86_64/goldendict.changelog                                      |   17 +++
 8 files changed, 256 insertions(+)

Copied: goldendict/repos/community-staging-i686/Fix-compilation-with-last-FFMpeg-versions-issue-673.patch (from rev 162113, goldendict/trunk/Fix-compilation-with-last-FFMpeg-versions-issue-673.patch)
===================================================================
--- community-staging-i686/Fix-compilation-with-last-FFMpeg-versions-issue-673.patch	                        (rev 0)
+++ community-staging-i686/Fix-compilation-with-last-FFMpeg-versions-issue-673.patch	2016-02-17 18:40:13 UTC (rev 162114)
@@ -0,0 +1,52 @@
+From cabc5aa7c353812f847b5d2ccc3f9767c30bde7f Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann at 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
+

Copied: goldendict/repos/community-staging-i686/PKGBUILD (from rev 162113, goldendict/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2016-02-17 18:40:13 UTC (rev 162114)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: m0rph <m0rph.mailbox at gmail.com>
+
+pkgname=goldendict
+pkgver=1.5.0RC
+pkgrel=3
+pkgdesc="Feature-rich dictionary lookup program"
+arch=('i686' 'x86_64')
+url="http://goldendict.org"
+license=('GPL3')
+depends=('hunspell' 'libxtst' 'libzip' 'libao' 'qtwebkit' 'phonon-qt4' 'ffmpeg')
+provides=('stardict')
+changelog=$pkgname.changelog
+source=($pkgname-$pkgver.tar.gz::https://github.com/goldendict/goldendict/archive/1.5.0-RC.tar.gz
+        $pkgname-paths.patch
+        Fix-compilation-with-last-FFMpeg-versions-issue-673.patch)
+sha256sums=('5705d5197509596221faf16a806965c799de7371a41fe2d2c4dc00b737ffe22e'
+            '5281dc2f57a93e2aa416de35bd702926bd90b4746d62f81d8dc434f6a689d55e'
+            '80bffcac787445ef272c06dfe4b73ab09da4a00733404198f60f25f2bb9edba9')
+
+prepare(){
+  cd "${srcdir}"/$pkgname-1.5.0-RC
+
+  patch -Np0 -i "${srcdir}"/$pkgname-paths.patch
+  patch -Np1 -i "${srcdir}"/Fix-compilation-with-last-FFMpeg-versions-issue-673.patch
+}
+
+build(){
+  cd "${srcdir}"/$pkgname-1.5.0-RC
+
+  qmake-qt4 PREFIX="/usr"
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-1.5.0-RC
+
+  make INSTALL_ROOT="${pkgdir}" install
+
+# languages
+  install -d "${pkgdir}"/usr/share/$pkgname/locale
+  install -m644 locale/*.qm -t "${pkgdir}"/usr/share/$pkgname/locale
+
+# removing unneeded
+  rm -rf "${pkgdir}"/usr/share/app-install
+}

Copied: goldendict/repos/community-staging-i686/goldendict-paths.patch (from rev 162113, goldendict/trunk/goldendict-paths.patch)
===================================================================
--- community-staging-i686/goldendict-paths.patch	                        (rev 0)
+++ community-staging-i686/goldendict-paths.patch	2016-02-17 18:40:13 UTC (rev 162114)
@@ -0,0 +1,12 @@
+--- goldendict.pro.orig	2013-06-06 15:39:06.000000000 +0200
++++ goldendict.pro	2015-02-02 12:10:35.393194928 +0100
+@@ -84,6 +84,6 @@
+     PREFIX = $$(PREFIX)
+-    isEmpty( PREFIX ):PREFIX = /usr/local
+-    DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/apps/goldendict/\\\"
++    isEmpty( PREFIX ):PREFIX = /usr
++    DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/goldendict/\\\"
+     target.path = $$PREFIX/bin/
+-    locale.path = $$PREFIX/share/apps/goldendict/locale/
++    locale.path = $$PREFIX/share/goldendict/locale/
+     locale.files = locale/*.qm

Copied: goldendict/repos/community-staging-i686/goldendict.changelog (from rev 162113, goldendict/trunk/goldendict.changelog)
===================================================================
--- community-staging-i686/goldendict.changelog	                        (rev 0)
+++ community-staging-i686/goldendict.changelog	2016-02-17 18:40:13 UTC (rev 162114)
@@ -0,0 +1,17 @@
+2016-02-17 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* goldendict 1.5.0RC-3 ffmpeg 3.0 rebuild
+
+2015-02-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* goldendict 1.5.0RC-1 FS#43667 fix, localizations added again
+
+2011-12-17 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* goldendict 1.0.1-5 libQtWebKit.so.4 now in new qtwebkit package
+
+2010-12-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* Update to major release 1.0.1
+
+2010-02-16 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* FS#18350 fixed in 0.9.0-5
+
+2009-06-21 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* Package moved to [community] in v0.9.0

Copied: goldendict/repos/community-staging-x86_64/Fix-compilation-with-last-FFMpeg-versions-issue-673.patch (from rev 162113, goldendict/trunk/Fix-compilation-with-last-FFMpeg-versions-issue-673.patch)
===================================================================
--- community-staging-x86_64/Fix-compilation-with-last-FFMpeg-versions-issue-673.patch	                        (rev 0)
+++ community-staging-x86_64/Fix-compilation-with-last-FFMpeg-versions-issue-673.patch	2016-02-17 18:40:13 UTC (rev 162114)
@@ -0,0 +1,52 @@
+From cabc5aa7c353812f847b5d2ccc3f9767c30bde7f Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann at 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
+

Copied: goldendict/repos/community-staging-x86_64/PKGBUILD (from rev 162113, goldendict/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2016-02-17 18:40:13 UTC (rev 162114)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: m0rph <m0rph.mailbox at gmail.com>
+
+pkgname=goldendict
+pkgver=1.5.0RC
+pkgrel=3
+pkgdesc="Feature-rich dictionary lookup program"
+arch=('i686' 'x86_64')
+url="http://goldendict.org"
+license=('GPL3')
+depends=('hunspell' 'libxtst' 'libzip' 'libao' 'qtwebkit' 'phonon-qt4' 'ffmpeg')
+provides=('stardict')
+changelog=$pkgname.changelog
+source=($pkgname-$pkgver.tar.gz::https://github.com/goldendict/goldendict/archive/1.5.0-RC.tar.gz
+        $pkgname-paths.patch
+        Fix-compilation-with-last-FFMpeg-versions-issue-673.patch)
+sha256sums=('5705d5197509596221faf16a806965c799de7371a41fe2d2c4dc00b737ffe22e'
+            '5281dc2f57a93e2aa416de35bd702926bd90b4746d62f81d8dc434f6a689d55e'
+            '80bffcac787445ef272c06dfe4b73ab09da4a00733404198f60f25f2bb9edba9')
+
+prepare(){
+  cd "${srcdir}"/$pkgname-1.5.0-RC
+
+  patch -Np0 -i "${srcdir}"/$pkgname-paths.patch
+  patch -Np1 -i "${srcdir}"/Fix-compilation-with-last-FFMpeg-versions-issue-673.patch
+}
+
+build(){
+  cd "${srcdir}"/$pkgname-1.5.0-RC
+
+  qmake-qt4 PREFIX="/usr"
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-1.5.0-RC
+
+  make INSTALL_ROOT="${pkgdir}" install
+
+# languages
+  install -d "${pkgdir}"/usr/share/$pkgname/locale
+  install -m644 locale/*.qm -t "${pkgdir}"/usr/share/$pkgname/locale
+
+# removing unneeded
+  rm -rf "${pkgdir}"/usr/share/app-install
+}

Copied: goldendict/repos/community-staging-x86_64/goldendict-paths.patch (from rev 162113, goldendict/trunk/goldendict-paths.patch)
===================================================================
--- community-staging-x86_64/goldendict-paths.patch	                        (rev 0)
+++ community-staging-x86_64/goldendict-paths.patch	2016-02-17 18:40:13 UTC (rev 162114)
@@ -0,0 +1,12 @@
+--- goldendict.pro.orig	2013-06-06 15:39:06.000000000 +0200
++++ goldendict.pro	2015-02-02 12:10:35.393194928 +0100
+@@ -84,6 +84,6 @@
+     PREFIX = $$(PREFIX)
+-    isEmpty( PREFIX ):PREFIX = /usr/local
+-    DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/apps/goldendict/\\\"
++    isEmpty( PREFIX ):PREFIX = /usr
++    DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/goldendict/\\\"
+     target.path = $$PREFIX/bin/
+-    locale.path = $$PREFIX/share/apps/goldendict/locale/
++    locale.path = $$PREFIX/share/goldendict/locale/
+     locale.files = locale/*.qm

Copied: goldendict/repos/community-staging-x86_64/goldendict.changelog (from rev 162113, goldendict/trunk/goldendict.changelog)
===================================================================
--- community-staging-x86_64/goldendict.changelog	                        (rev 0)
+++ community-staging-x86_64/goldendict.changelog	2016-02-17 18:40:13 UTC (rev 162114)
@@ -0,0 +1,17 @@
+2016-02-17 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* goldendict 1.5.0RC-3 ffmpeg 3.0 rebuild
+
+2015-02-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* goldendict 1.5.0RC-1 FS#43667 fix, localizations added again
+
+2011-12-17 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* goldendict 1.0.1-5 libQtWebKit.so.4 now in new qtwebkit package
+
+2010-12-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* Update to major release 1.0.1
+
+2010-02-16 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* FS#18350 fixed in 0.9.0-5
+
+2009-06-21 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* Package moved to [community] in v0.9.0



More information about the arch-commits mailing list