goldendict: 2020-12-09 → 2021-03-09, use ffmpeg instead of ffmpeg_3

This commit is contained in:
Nikolay Korotkiy 2021-05-18 17:58:18 +03:00
parent fc2e0709f0
commit 154020654c
No known key found for this signature in database
GPG key ID: D1DE6D7F693663A5
2 changed files with 17 additions and 17 deletions

View file

@ -1,14 +1,16 @@
diff --git i/goldendict.pro w/goldendict.pro diff --git i/goldendict.pro w/goldendict.pro
index 328dc20..5202a07 100644 index 4a4a3094..082b728f 100644
--- i/goldendict.pro --- i/goldendict.pro
+++ w/goldendict.pro +++ w/goldendict.pro
@@ -210,21 +210,18 @@ mac { @@ -212,22 +212,19 @@ mac {
-llzo2 -llzo2
!CONFIG( no_ffmpeg_player ) { !CONFIG( no_ffmpeg_player ) {
LIBS += -lao \ LIBS += -lao \
- -lswresample-gd \
- -lavutil-gd \ - -lavutil-gd \
- -lavformat-gd \ - -lavformat-gd \
- -lavcodec-gd - -lavcodec-gd
+ -lswresample \
+ -lavutil \ + -lavutil \
+ -lavformat \ + -lavformat \
+ -lavcodec + -lavcodec
@ -29,7 +31,7 @@ index 328dc20..5202a07 100644
cp -R locale/*.qm GoldenDict.app/Contents/MacOS/locale/ & \ cp -R locale/*.qm GoldenDict.app/Contents/MacOS/locale/ & \
mkdir -p GoldenDict.app/Contents/MacOS/help & \ mkdir -p GoldenDict.app/Contents/MacOS/help & \
cp -R $${PWD}/help/*.qch GoldenDict.app/Contents/MacOS/help/ cp -R $${PWD}/help/*.qch GoldenDict.app/Contents/MacOS/help/
@@ -232,15 +229,6 @@ mac { @@ -235,15 +232,6 @@ mac {
CONFIG += zim_support CONFIG += zim_support
!CONFIG( no_chinese_conversion_support ) { !CONFIG( no_chinese_conversion_support ) {
CONFIG += chinese_conversion_support CONFIG += chinese_conversion_support
@ -46,17 +48,15 @@ index 328dc20..5202a07 100644
} }
DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\" DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\"
diff --git i/tiff.cc w/tiff.cc diff --git i/tiff.cc w/tiff.cc
index e3cb8bf..9ff880f 100644 index e3cb8bf5..95dd812f 100644
--- i/tiff.cc --- i/tiff.cc
+++ w/tiff.cc +++ w/tiff.cc
@@ -6,8 +6,8 @@ @@ -5,7 +5,7 @@
#include "tiff.hh" #include "tiff.hh"
#if defined (Q_OS_MAC) || defined (Q_OS_WIN) -#if defined (Q_OS_MAC) || defined (Q_OS_WIN)
-#include "tiff/tiff.h" +#if defined (Q_OS_WIN)
-#include "tiff/tiffio.h" #include "tiff/tiff.h"
+#include "tiff.h" #include "tiff/tiffio.h"
+#include "tiffio.h"
#else #else
#include "tiff.h"
#include "tiffio.h"

View file

@ -4,19 +4,19 @@
, withCC ? true, opencc , withCC ? true, opencc
, withEpwing ? true, libeb , withEpwing ? true, libeb
, withExtraTiff ? true, libtiff , withExtraTiff ? true, libtiff
, withFFmpeg ? true, libao, ffmpeg_3 , withFFmpeg ? true, libao, ffmpeg
, withMultimedia ? true , withMultimedia ? true
, withZim ? true, zstd }: , withZim ? true, zstd }:
mkDerivation rec { mkDerivation rec {
pname = "goldendict"; pname = "goldendict";
version = "2020-12-09"; version = "2021-03-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "goldendict"; owner = "goldendict";
repo = pname; repo = pname;
rev = "261e45a5d79f9df2fbc050292410bed0f4ef3132"; rev = "b2e673961d28ca5eb920a909091252d3321f09d6";
sha256 = "01pny06d4cmwf998hpqd7xx7mccbbasb8js1bv3rkdi1ljg01f7n"; sha256 = "sha256-+AAamnICq0/B54ggFpgF/Uupm1a4YiEYgHXrhIK4M0E=";
}; };
patches = [ patches = [
@ -39,7 +39,7 @@ mkDerivation rec {
++ lib.optional withCC opencc ++ lib.optional withCC opencc
++ lib.optional withEpwing libeb ++ lib.optional withEpwing libeb
++ lib.optional withExtraTiff libtiff ++ lib.optional withExtraTiff libtiff
++ lib.optionals withFFmpeg [ libao ffmpeg_3 ] ++ lib.optionals withFFmpeg [ libao ffmpeg ]
++ lib.optional withZim zstd; ++ lib.optional withZim zstd;
qmakeFlags = with lib; [ qmakeFlags = with lib; [