- Code: Select all
$ git pull
remote: Counting objects: 530, done.
remote: Compressing objects: 100% (214/214), done.
remote: Total 460 (delta 308), reused 394 (delta 246)
Receiving objects: 100% (460/460), 5.09 MiB | 424 KiB/s, done.
Resolving deltas: 100% (308/308), completed with 46 local objects.
From git://github.com/goldendict/goldendict
fa9c980..525a539 master -> origin/master
Updating fa9c980..525a539
Fast-forward
README.md | 3 +-
aard.cc | 158 ++--
article-style-st-babylon.css | 12 +-
article-style-st-lingvo.css | 17 +-
article-style.css | 8 +
article_netmgr.cc | 8 +
article_netmgr.hh | 7 +-
articleview.cc | 137 +--
articleview.hh | 14 +-
bass.cc | 201 ----
bass.hh | 72 --
config.cc | 40 +-
config.hh | 7 +-
dictionary.cc | 123 +++
dictionary.hh | 3 +
ffmpegaudio.cc | 559 +++++++++++
ffmpegaudio.hh | 54 ++
filetype.cc | 9 +
filetype.hh | 2 +
goldendict.pro | 45 +-
initializing.cc | 1 +
initializing.ui | 12 +
locale/ar_SA.ts | 404 +++++---
locale/ay_WI.ts | 155 +++-
locale/be_BY.ts | 410 +++++----
locale/be_BY@latin.ts | 410 +++++----
locale/bg_BG.ts | 163 +++-
locale/cs_CZ.ts | 155 +++-
locale/de_DE.ts | 406 +++++---
locale/el_GR.ts | 395 +++++---
locale/es_AR.ts | 393 +++++---
locale/es_BO.ts | 404 +++++---
locale/es_ES.ts | 394 +++++---
locale/fr_FR.ts | 394 +++++---
locale/it_IT.ts | 397 +++++---
locale/ja_JP.ts | 404 +++++---
locale/ko_KR.ts | 397 +++++---
locale/lt_LT.ts | 395 +++++---
locale/nl_NL.ts | 438 ++++++---
locale/pl_PL.ts | 397 +++++---
locale/pt_BR.ts | 397 +++++---
locale/qu_WI.ts | 404 +++++---
locale/ru_RU.ts | 414 +++++----
locale/sk_SK.ts | 395 +++++---
locale/sq_AL.ts | 404 +++++---
locale/tg_TJ.ts | 394 +++++---
locale/tr_TR.ts | 155 +++-
locale/uk_UA.ts | 395 +++++---
locale/vi_VN.ts | 155 +++-
locale/zh_CN.ts | 1027 +++++++++++++++++++--
locale/zh_TW.ts | 155 +++-
machotkeywrapper.mm | 4 +-
maclibs/include/ao/ao.h | 139 +++
maclibs/include/ao/os_types.h | 39 +
maclibs/include/ao/plugin.h | 51 +
maclibs/include/libavcodec/avcodec.h | 5108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
maclibs/include/libavcodec/avfft.h | 116 +++
maclibs/include/libavcodec/dxva2.h | 95 ++
maclibs/include/libavcodec/old_codec_ids.h | 398 ++++++++
maclibs/include/libavcodec/vaapi.h | 173 ++++
maclibs/include/libavcodec/vda.h | 226 +++++
maclibs/include/libavcodec/vdpau.h | 151 +++
maclibs/include/libavcodec/version.h | 113 +++
maclibs/include/libavcodec/xvmc.h | 168 ++++
maclibs/include/libavformat/avformat.h | 2135 ++++++++++++++++++++++++++++++++++++++++++
maclibs/include/libavformat/avio.h | 475 ++++++++++
maclibs/include/libavformat/version.h | 89 ++
maclibs/include/libavutil/adler32.h | 43 +
maclibs/include/libavutil/aes.h | 65 ++
maclibs/include/libavutil/attributes.h | 154 ++++
maclibs/include/libavutil/audio_fifo.h | 146 +++
maclibs/include/libavutil/audioconvert.h | 6 +
maclibs/include/libavutil/avassert.h | 66 ++
maclibs/include/libavutil/avconfig.h | 7 +
maclibs/include/libavutil/avstring.h | 315 +++++++
maclibs/include/libavutil/avutil.h | 260 ++++++
maclibs/include/libavutil/base64.h | 67 ++
maclibs/include/libavutil/blowfish.h | 77 ++
maclibs/include/libavutil/bprint.h | 200 ++++
maclibs/include/libavutil/bswap.h | 109 +++
maclibs/include/libavutil/channel_layout.h | 216 +++++
maclibs/include/libavutil/common.h | 436 +++++++++
maclibs/include/libavutil/cpu.h | 108 +++
maclibs/include/libavutil/crc.h | 74 ++
maclibs/include/libavutil/dict.h | 152 +++
maclibs/include/libavutil/error.h | 117 +++
maclibs/include/libavutil/eval.h | 113 +++
maclibs/include/libavutil/fifo.h | 144 +++
maclibs/include/libavutil/file.h | 66 ++
maclibs/include/libavutil/hmac.h | 95 ++
maclibs/include/libavutil/imgutils.h | 200 ++++
maclibs/include/libavutil/intfloat.h | 77 ++
maclibs/include/libavutil/intfloat_readwrite.h | 40 +
maclibs/include/libavutil/intreadwrite.h | 621 +++++++++++++
maclibs/include/libavutil/lfg.h | 62 ++
maclibs/include/libavutil/log.h | 222 +++++
maclibs/include/libavutil/lzo.h | 66 ++
maclibs/include/libavutil/mathematics.h | 147 +++
maclibs/include/libavutil/md5.h | 49 +
maclibs/include/libavutil/mem.h | 235 +++++
maclibs/include/libavutil/old_pix_fmts.h | 171 ++++
maclibs/include/libavutil/opt.h | 733 +++++++++++++++
maclibs/include/libavutil/parseutils.h | 174 ++++
maclibs/include/libavutil/pixdesc.h | 237 +++++
maclibs/include/libavutil/pixfmt.h | 357 +++++++
maclibs/include/libavutil/random_seed.h | 43 +
maclibs/include/libavutil/rational.h | 155 ++++
maclibs/include/libavutil/samplefmt.h | 243 +++++
maclibs/include/libavutil/sha.h | 74 ++
maclibs/include/libavutil/time.h | 41 +
maclibs/include/libavutil/timecode.h | 140 +++
maclibs/include/libavutil/timestamp.h | 74 ++
maclibs/include/libavutil/version.h | 142 +++
maclibs/include/libavutil/xtea.h | 62 ++
maclibs/install_aoplugin.sh | 9 +
maclibs/lib/libao.dylib | Bin 0 -> 100276 bytes
maclibs/lib/libavcodec-gd.dylib | Bin 0 -> 4427432 bytes
maclibs/lib/libavformat-gd.dylib | Bin 0 -> 670932 bytes
maclibs/lib/libavutil-gd.dylib | Bin 0 -> 347664 bytes
maclibs/lib/libmacosx.so | Bin 0 -> 47716 bytes
macmouseover.mm | 5 +
main.cc | 71 +-
mainwindow.cc | 12 +-
mdx.cc | 147 +--
preferences.cc | 31 +-
preferences.ui | 43 +-
sources.cc | 6 +-
sources.hh | 4 +-
speechclient_mac.mm | 191 ++++
stardict.cc | 11 +-
webmultimediadownload.cc | 15 +-
webmultimediadownload.hh | 2 +-
winlibs/include/ao/ao.h | 139 +++
winlibs/include/ao/os_types.h | 39 +
winlibs/include/ao/plugin.h | 51 +
winlibs/include/bass.h | 950 -------------------
winlibs/include/libavcodec/avcodec.h | 5108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
winlibs/include/libavcodec/avfft.h | 116 +++
winlibs/include/libavcodec/dxva2.h | 95 ++
winlibs/include/libavcodec/old_codec_ids.h | 398 ++++++++
winlibs/include/libavcodec/vaapi.h | 173 ++++
winlibs/include/libavcodec/vda.h | 226 +++++
winlibs/include/libavcodec/vdpau.h | 151 +++
winlibs/include/libavcodec/version.h | 113 +++
winlibs/include/libavcodec/xvmc.h | 168 ++++
winlibs/include/libavformat/avformat.h | 2135 ++++++++++++++++++++++++++++++++++++++++++
winlibs/include/libavformat/avio.h | 475 ++++++++++
winlibs/include/libavformat/version.h | 89 ++
winlibs/include/libavutil/adler32.h | 43 +
winlibs/include/libavutil/aes.h | 65 ++
winlibs/include/libavutil/attributes.h | 154 ++++
winlibs/include/libavutil/audio_fifo.h | 146 +++
winlibs/include/libavutil/audioconvert.h | 6 +
winlibs/include/libavutil/avassert.h | 66 ++
winlibs/include/libavutil/avconfig.h | 7 +
winlibs/include/libavutil/avstring.h | 315 +++++++
winlibs/include/libavutil/avutil.h | 260 ++++++
winlibs/include/libavutil/base64.h | 67 ++
winlibs/include/libavutil/blowfish.h | 77 ++
winlibs/include/libavutil/bprint.h | 200 ++++
winlibs/include/libavutil/bswap.h | 109 +++
winlibs/include/libavutil/channel_layout.h | 216 +++++
winlibs/include/libavutil/common.h | 436 +++++++++
winlibs/include/libavutil/cpu.h | 108 +++
winlibs/include/libavutil/crc.h | 74 ++
winlibs/include/libavutil/dict.h | 152 +++
winlibs/include/libavutil/error.h | 117 +++
winlibs/include/libavutil/eval.h | 113 +++
winlibs/include/libavutil/fifo.h | 144 +++
winlibs/include/libavutil/file.h | 66 ++
winlibs/include/libavutil/hmac.h | 95 ++
winlibs/include/libavutil/imgutils.h | 200 ++++
winlibs/include/libavutil/intfloat.h | 77 ++
winlibs/include/libavutil/intfloat_readwrite.h | 40 +
winlibs/include/libavutil/intreadwrite.h | 621 +++++++++++++
winlibs/include/libavutil/lfg.h | 62 ++
winlibs/include/libavutil/log.h | 222 +++++
winlibs/include/libavutil/lzo.h | 66 ++
winlibs/include/libavutil/mathematics.h | 147 +++
winlibs/include/libavutil/md5.h | 49 +
winlibs/include/libavutil/mem.h | 235 +++++
winlibs/include/libavutil/old_pix_fmts.h | 171 ++++
winlibs/include/libavutil/opt.h | 733 +++++++++++++++
winlibs/include/libavutil/parseutils.h | 174 ++++
winlibs/include/libavutil/pixdesc.h | 237 +++++
winlibs/include/libavutil/pixfmt.h | 357 +++++++
winlibs/include/libavutil/random_seed.h | 43 +
winlibs/include/libavutil/rational.h | 155 ++++
winlibs/include/libavutil/samplefmt.h | 243 +++++
winlibs/include/libavutil/sha.h | 74 ++
winlibs/include/libavutil/time.h | 41 +
winlibs/include/libavutil/timecode.h | 140 +++
winlibs/include/libavutil/timestamp.h | 74 ++
winlibs/include/libavutil/version.h | 142 +++
winlibs/include/libavutil/xtea.h | 62 ++
winlibs/include/zconf.h | 33 +-
winlibs/include/zlib.h | 48 +-
winlibs/lib/avcodec-gd-54.dll | Bin 0 -> 2352142 bytes
winlibs/lib/avformat-gd-54.dll | Bin 0 -> 369678 bytes
winlibs/lib/avutil-gd-52.dll | Bin 0 -> 205838 bytes
winlibs/lib/libao-4.dll | Bin 0 -> 88900 bytes
winlibs/lib/libao.dll.a | Bin 0 -> 9614 bytes
winlibs/lib/libavcodec-gd.dll.a | Bin 0 -> 173330 bytes
winlibs/lib/libavformat-gd.dll.a | Bin 0 -> 82834 bytes
winlibs/lib/libavutil-gd.dll.a | Bin 0 -> 198962 bytes
winlibs/lib/libz.dll.a | Bin 45552 -> 46772 bytes
winlibs/lib/zlib1.dll | Bin 79872 -> 101888 bytes
winlibs/scripts/00README.txt | 42 +
winlibs/scripts/ffmpeg-configure-mingw32.sh | 189 ++++
winlibs/scripts/libao-configure-mingw32.sh | 5 +
winlibs/scripts/libspeex-configure-mingw32.sh | 6 +
xdxf.cc | 2 +-
212 files changed, 42941 insertions(+), 4937 deletions(-)
delete mode 100644 bass.cc
delete mode 100644 bass.hh
create mode 100644 ffmpegaudio.cc
create mode 100644 ffmpegaudio.hh
create mode 100644 maclibs/include/ao/ao.h
create mode 100644 maclibs/include/ao/os_types.h
create mode 100644 maclibs/include/ao/plugin.h
create mode 100644 maclibs/include/libavcodec/avcodec.h
create mode 100644 maclibs/include/libavcodec/avfft.h
create mode 100644 maclibs/include/libavcodec/dxva2.h
create mode 100644 maclibs/include/libavcodec/old_codec_ids.h
create mode 100644 maclibs/include/libavcodec/vaapi.h
create mode 100644 maclibs/include/libavcodec/vda.h
create mode 100644 maclibs/include/libavcodec/vdpau.h
create mode 100644 maclibs/include/libavcodec/version.h
create mode 100644 maclibs/include/libavcodec/xvmc.h
create mode 100644 maclibs/include/libavformat/avformat.h
create mode 100644 maclibs/include/libavformat/avio.h
create mode 100644 maclibs/include/libavformat/version.h
create mode 100644 maclibs/include/libavutil/adler32.h
create mode 100644 maclibs/include/libavutil/aes.h
create mode 100644 maclibs/include/libavutil/attributes.h
create mode 100644 maclibs/include/libavutil/audio_fifo.h
create mode 100644 maclibs/include/libavutil/audioconvert.h
create mode 100644 maclibs/include/libavutil/avassert.h
create mode 100644 maclibs/include/libavutil/avconfig.h
create mode 100644 maclibs/include/libavutil/avstring.h
create mode 100644 maclibs/include/libavutil/avutil.h
create mode 100644 maclibs/include/libavutil/base64.h
create mode 100644 maclibs/include/libavutil/blowfish.h
create mode 100644 maclibs/include/libavutil/bprint.h
create mode 100644 maclibs/include/libavutil/bswap.h
create mode 100644 maclibs/include/libavutil/channel_layout.h
create mode 100644 maclibs/include/libavutil/common.h
create mode 100644 maclibs/include/libavutil/cpu.h
create mode 100644 maclibs/include/libavutil/crc.h
create mode 100644 maclibs/include/libavutil/dict.h
create mode 100644 maclibs/include/libavutil/error.h
create mode 100644 maclibs/include/libavutil/eval.h
create mode 100644 maclibs/include/libavutil/fifo.h
create mode 100644 maclibs/include/libavutil/file.h
create mode 100644 maclibs/include/libavutil/hmac.h
create mode 100644 maclibs/include/libavutil/imgutils.h
create mode 100644 maclibs/include/libavutil/intfloat.h
create mode 100644 maclibs/include/libavutil/intfloat_readwrite.h
create mode 100644 maclibs/include/libavutil/intreadwrite.h
create mode 100644 maclibs/include/libavutil/lfg.h
create mode 100644 maclibs/include/libavutil/log.h
create mode 100644 maclibs/include/libavutil/lzo.h
create mode 100644 maclibs/include/libavutil/mathematics.h
create mode 100644 maclibs/include/libavutil/md5.h
create mode 100644 maclibs/include/libavutil/mem.h
create mode 100644 maclibs/include/libavutil/old_pix_fmts.h
create mode 100644 maclibs/include/libavutil/opt.h
create mode 100644 maclibs/include/libavutil/parseutils.h
create mode 100644 maclibs/include/libavutil/pixdesc.h
create mode 100644 maclibs/include/libavutil/pixfmt.h
create mode 100644 maclibs/include/libavutil/random_seed.h
create mode 100644 maclibs/include/libavutil/rational.h
create mode 100644 maclibs/include/libavutil/samplefmt.h
create mode 100644 maclibs/include/libavutil/sha.h
create mode 100644 maclibs/include/libavutil/time.h
create mode 100644 maclibs/include/libavutil/timecode.h
create mode 100644 maclibs/include/libavutil/timestamp.h
create mode 100644 maclibs/include/libavutil/version.h
create mode 100644 maclibs/include/libavutil/xtea.h
create mode 100755 maclibs/install_aoplugin.sh
create mode 100644 maclibs/lib/libao.dylib
create mode 100644 maclibs/lib/libavcodec-gd.dylib
create mode 100644 maclibs/lib/libavformat-gd.dylib
create mode 100644 maclibs/lib/libavutil-gd.dylib
create mode 100644 maclibs/lib/libmacosx.so
create mode 100644 speechclient_mac.mm
create mode 100644 winlibs/include/ao/ao.h
create mode 100644 winlibs/include/ao/os_types.h
create mode 100644 winlibs/include/ao/plugin.h
delete mode 100644 winlibs/include/bass.h
create mode 100644 winlibs/include/libavcodec/avcodec.h
create mode 100644 winlibs/include/libavcodec/avfft.h
create mode 100644 winlibs/include/libavcodec/dxva2.h
create mode 100644 winlibs/include/libavcodec/old_codec_ids.h
create mode 100644 winlibs/include/libavcodec/vaapi.h
create mode 100644 winlibs/include/libavcodec/vda.h
create mode 100644 winlibs/include/libavcodec/vdpau.h
create mode 100644 winlibs/include/libavcodec/version.h
create mode 100644 winlibs/include/libavcodec/xvmc.h
create mode 100644 winlibs/include/libavformat/avformat.h
create mode 100644 winlibs/include/libavformat/avio.h
create mode 100644 winlibs/include/libavformat/version.h
create mode 100644 winlibs/include/libavutil/adler32.h
create mode 100644 winlibs/include/libavutil/aes.h
create mode 100644 winlibs/include/libavutil/attributes.h
create mode 100644 winlibs/include/libavutil/audio_fifo.h
create mode 100644 winlibs/include/libavutil/audioconvert.h
create mode 100644 winlibs/include/libavutil/avassert.h
create mode 100644 winlibs/include/libavutil/avconfig.h
create mode 100644 winlibs/include/libavutil/avstring.h
create mode 100644 winlibs/include/libavutil/avutil.h
create mode 100644 winlibs/include/libavutil/base64.h
create mode 100644 winlibs/include/libavutil/blowfish.h
create mode 100644 winlibs/include/libavutil/bprint.h
create mode 100644 winlibs/include/libavutil/bswap.h
create mode 100644 winlibs/include/libavutil/channel_layout.h
create mode 100644 winlibs/include/libavutil/common.h
create mode 100644 winlibs/include/libavutil/cpu.h
create mode 100644 winlibs/include/libavutil/crc.h
create mode 100644 winlibs/include/libavutil/dict.h
create mode 100644 winlibs/include/libavutil/error.h
create mode 100644 winlibs/include/libavutil/eval.h
create mode 100644 winlibs/include/libavutil/fifo.h
create mode 100644 winlibs/include/libavutil/file.h
create mode 100644 winlibs/include/libavutil/hmac.h
create mode 100644 winlibs/include/libavutil/imgutils.h
create mode 100644 winlibs/include/libavutil/intfloat.h
create mode 100644 winlibs/include/libavutil/intfloat_readwrite.h
create mode 100644 winlibs/include/libavutil/intreadwrite.h
create mode 100644 winlibs/include/libavutil/lfg.h
create mode 100644 winlibs/include/libavutil/log.h
create mode 100644 winlibs/include/libavutil/lzo.h
create mode 100644 winlibs/include/libavutil/mathematics.h
create mode 100644 winlibs/include/libavutil/md5.h
create mode 100644 winlibs/include/libavutil/mem.h
create mode 100644 winlibs/include/libavutil/old_pix_fmts.h
create mode 100644 winlibs/include/libavutil/opt.h
create mode 100644 winlibs/include/libavutil/parseutils.h
create mode 100644 winlibs/include/libavutil/pixdesc.h
create mode 100644 winlibs/include/libavutil/pixfmt.h
create mode 100644 winlibs/include/libavutil/random_seed.h
create mode 100644 winlibs/include/libavutil/rational.h
create mode 100644 winlibs/include/libavutil/samplefmt.h
create mode 100644 winlibs/include/libavutil/sha.h
create mode 100644 winlibs/include/libavutil/time.h
create mode 100644 winlibs/include/libavutil/timecode.h
create mode 100644 winlibs/include/libavutil/timestamp.h
create mode 100644 winlibs/include/libavutil/version.h
create mode 100644 winlibs/include/libavutil/xtea.h
create mode 100644 winlibs/lib/avcodec-gd-54.dll
create mode 100644 winlibs/lib/avformat-gd-54.dll
create mode 100644 winlibs/lib/avutil-gd-52.dll
create mode 100644 winlibs/lib/libao-4.dll
create mode 100644 winlibs/lib/libao.dll.a
create mode 100644 winlibs/lib/libavcodec-gd.dll.a
create mode 100644 winlibs/lib/libavformat-gd.dll.a
create mode 100644 winlibs/lib/libavutil-gd.dll.a
create mode 100644 winlibs/scripts/00README.txt
create mode 100644 winlibs/scripts/ffmpeg-configure-mingw32.sh
create mode 100644 winlibs/scripts/libao-configure-mingw32.sh
create mode 100644 winlibs/scripts/libspeex-configure-mingw32.sh
Вроде, ничего подозрительного. Однако собрать не получается:
- Code: Select all
qmake && make
Project ERROR: Package libavformat not found
Однако:
- Code: Select all
zypper se libavformat
Загрузка данных о репозиториях...
Чтение установленных пакетов...
С | Имя | Заключение | Тип
--+-------------------------+---------------------------------------------+------
i | libavformat52 | FFmpeg libavformat | пакет
| libavformat52-debuginfo | Debug information for package libavformat52 | пакет
i | libavformat54 | FFmpeg libavformat | пакет
| libavformat54-debuginfo | Debug information for package libavformat54 | пакет
Что делать?