Merge branch 'staged' into dev

.github/scripts/windows-publish.ps1

@@ -62,6 +62,13 @@ function Main() {
     $webengineqm="{0}\translations\qtwebengine_*.qm" -f $env:QTDIR.Trim()
     Write-Host "copy qtwebengine qm from $($webengineqm)"
     Copy-Item $webengineqm $archiveName\locale\
+    
+    $multimedia="{0}\plugins\multimedia" -f $env:QTDIR.Trim()
+    if(Test-Path $multimedia){
+    Write-Host "copy multimedia  $($multimedia) to plugins"
+    Copy-Item -Path $multimedia -Destination $archiveName\plugins -Recurse
+    }
+
     Write-Host "compress zip..."
     # 打包zip
     Compress-Archive -Path $archiveName -DestinationPath $archiveName'.zip'

.github/workflows/macos-6.x.yml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-11]
-        qt_ver: [6.3.1]
+        qt_ver: [6.4.0]
         qt_arch: [clang_64]
     env:
       targetName: GoldenDict

.github/workflows/macos-homebrew-PR-check.yml

@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-12]
-        qt_ver: [6.3.1]
+        qt_ver: [6.4.0]
         qt_arch: [clang_64]
     env:
       targetName: GoldenDict

.github/workflows/ubuntu-6.2.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        qt_ver: [6.3.1]
+        qt_ver: [6.4.0]
         qt_arch: [gcc_64]
     env:
       version: 22.9.24

.github/workflows/windows-6.x-xapian.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-2019]
-        qt_ver: [6.3.1]
+        qt_ver: [6.4.0]
         qt_arch: [win64_msvc2019_64]
     env:
       targetName: GoldenDict.exe

.github/workflows/windows-6.x.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-2019]
-        qt_ver: [6.3.1]
+        qt_ver: [6.4.0]
         qt_arch: [win64_msvc2019_64]
     env:
       targetName: GoldenDict.exe

README.md

@@ -85,7 +85,9 @@ Then pass `"CONFIG+=zim_support"` to `qmake`
 
     qmake "CONFIG+=zim_support"
 
-### Building without extra tiff handler
+### Building without extra tiff handler( DEPRECATED )
+
+**deprecated: qt has offered b/w tiff support which means this options should always _enabled_.  intend to remove in the future.**
 
 If you have problem building with libtiff5-dev package, you can pass
 `"CONFIG+=no_extra_tiff_handler"` to `qmake` in order to disable extra tiff support

article_inspect.cpp

@@ -27,19 +27,27 @@ void ArticleInspector::setInspectPage( QWebEnginePage * page )
     return;
   }
 
-  qDebug() << page->lifecycleState();
-#if( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) || QT_VERSION > QT_VERSION_CHECK(6,3,0) )
-  page->triggerAction( QWebEnginePage::InspectElement );
-#else
-  // without this line, application will crash on qt6.2 ,see https://bugreports.qt.io/browse/QTBUG-101724
-  // and seems to hangup forever on qt6.3.0 ,so the best solution for now is to comment out the following lines.
-#endif
-
   raise();
   show();
   qDebug() << "inspector finished";
 }
 
+void ArticleInspector::triggerAction( QWebEnginePage * page )
+{
+  if( !page )
+  {
+    qDebug() << "set inspected page to nullptr";
+    return;
+  }
+
+  setInspectPage(page);
+
+#if( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) || QT_VERSION > QT_VERSION_CHECK(6,3,0) )
+  page->triggerAction( QWebEnginePage::InspectElement );
+#endif
+
+}
+
 void ArticleInspector::closeEvent( QCloseEvent * )
 {
   viewContainer->page()->setInspectedPage(nullptr);

article_inspect.h

@@ -14,6 +14,7 @@ public:
   ArticleInspector( QWidget * parent = nullptr );
 
   void setInspectPage( QWebEnginePage * page);
+  void triggerAction( QWebEnginePage * page );
 private:
 
   virtual void closeEvent( QCloseEvent * );

article_netmgr.cc

@@ -200,7 +200,7 @@ QNetworkReply * ArticleNetworkAccessManager::getArticleReply( QNetworkRequest co
     QUrl refererUrl = QUrl::fromEncoded( referer );
 
     if ( !url.host().endsWith( refererUrl.host() ) &&
-         getHostBaseFromUrl( url ) != getHostBaseFromUrl( refererUrl ) && !url.scheme().startsWith("data") )
+        Utils::Url::getHostBaseFromUrl( url ) != Utils::Url::getHostBaseFromUrl( refererUrl ) && !url.scheme().startsWith("data") )
     {
       gdWarning( "Blocking element \"%s\" due to not same domain", url.toEncoded().data() );
 

globalbroadcaster.cpp

@@ -28,13 +28,13 @@ Config::Preferences * GlobalBroadcaster::getPreference()
 
 void GlobalBroadcaster::addWhitelist( QString url )
 {
-  whitelist.push_back( url );
+  whitelist.insert( url );
-  auto baseUrl = ::getHostBase( url );
+  auto baseUrl = Utils::Url::getHostBase( url );
-  whitelist.push_back( baseUrl );
+  whitelist.insert( baseUrl );
 }
 
 bool GlobalBroadcaster::existedInWhitelist( QString url )
 {
-  return std::find( whitelist.begin(), whitelist.end(), url ) != whitelist.end();
+  return whitelist.contains(url);
 }
 // namespace global

globalbroadcaster.h

@@ -16,7 +16,7 @@ class GlobalBroadcaster : public QObject
   Q_OBJECT
 private:
   Config::Preferences * preference;
-  std::vector<QString> whitelist;
+  QSet<QString> whitelist;
 
 public:
   void setPreference( Config::Preferences * _pre );

mainwindow.cc

@@ -1739,7 +1739,7 @@ ArticleView * MainWindow::createNewTab( bool switchToIt,
 
 void MainWindow::inspectElement( QWebEnginePage * page )
 {
-  inspector->setInspectPage( page );
+  inspector->triggerAction( page );
 }
 
 void MainWindow::tabCloseRequested( int x )
@@ -3057,21 +3057,7 @@ void MainWindow::checkForNewRelease()
   latestReleaseReply = 0;
 
   QNetworkRequest req(
-    QUrl( "http://goldendict.org/latest_release.php?current="
+    QUrl( "https://github.com/xiaoyifang/goldendict/releases") );
-          PROGRAM_VERSION "&platform="
-#ifdef HAVE_X11
-          "x11"
-#endif
-#ifdef Q_OS_MAC
-          "mac"
-#endif
-#ifdef Q_WS_QWS
-          "qws"
-#endif
-#ifdef Q_OS_WIN
-          "win"
-#endif
-          ) );
 
   latestReleaseReply = articleNetMgr.get( req );
 
@@ -3091,13 +3077,25 @@ void MainWindow::latestReleaseReplyReady()
 
   if ( latestReleaseReply->error() == QNetworkReply::NoError )
   {
-    QString latestReleaseInfo = QString::fromUtf8( latestReleaseReply->readLine() ).trimmed();
+    QString latestReleaseInfo = QString::fromUtf8( latestReleaseReply->readAll() );
-    QStringList parts = latestReleaseInfo.split( ' ' );
+    QRegularExpression firstReleaseAnchor ("<a\\s+[^>]*?class=\\\"Link--primary\\\"[^>]*?>[^<]*?<\\/a>",QRegularExpression::DotMatchesEverythingOption|QRegularExpression::CaseInsensitiveOption);
-    if ( parts.size() == 2 )
+    auto match = firstReleaseAnchor.match(latestReleaseInfo);
-    {
+    if(match.hasMatch()){
-      latestVersion = parts[ 0 ];
+      auto releaseAnchor = match.captured();
-      downloadUrl = parts[ 1 ];
+      QRegularExpression extractReleaseRx ("<a\\s+.*?href=\\\"([^\\\"]*)\\\".*?>(.*?)<\\/a>",QRegularExpression::DotMatchesEverythingOption|QRegularExpression::CaseInsensitiveOption);
-      success = true;
+      auto matchParts = extractReleaseRx.match(releaseAnchor);
+      if(matchParts.hasMatch()){
+        latestVersion = matchParts.captured(2);
+        QString prefix("GoldenDict-v");
+        if(latestVersion.startsWith(prefix)){
+          latestVersion = latestVersion.mid(prefix.length());
+        }
+        downloadUrl = matchParts.captured(1);
+        if(downloadUrl.startsWith("/")){
+          downloadUrl = latestReleaseReply->request().url().host() + downloadUrl;
+        }
+        success = true;
+      }
     }
   }
 

utils.cc

@@ -5,3 +5,11 @@ QString Utils::Path::combine(const QString& path1, const QString& path2)
 {
   return QDir::cleanPath(path1 + QDir::separator() + path2);
 }
+
+QString Utils::Url::getSchemeAndHost( QUrl const & url )
+{
+  auto _url = url.url();
+  auto index = _url.indexOf("://");
+  auto hostEndIndex = _url.indexOf("/",index+3);
+  return _url.mid(0,hostEndIndex);
+}

utils.hh

@@ -272,16 +272,6 @@ inline bool isAudioUrl( QUrl const & url )
          && ( Filetype::isNameOfSound( url.path().toUtf8().data() ) || url.host() == "apifree.forvo.com" );
 }
 
-}
-
-namespace Path{
-QString combine(const QString& path1, const QString& path2);
-}
-
-}
-
-namespace
-{
 /// Uses some heuristics to chop off the first domain name from the host name,
 /// but only if it's not too base. Returns the resulting host name.
 inline QString getHostBase( QString const & host )
@@ -315,8 +305,15 @@ inline QString getHostBaseFromUrl( QUrl const & url )
 
   return getHostBase( host );
 }
+
+QString getSchemeAndHost( QUrl const & url );
+
 }
 
+namespace Path{
+QString combine(const QString& path1, const QString& path2);
+}
 
+}
 
 #endif // UTILS_HH

weburlrequestinterceptor.cpp

@@ -15,7 +15,7 @@ void WebUrlRequestInterceptor::interceptRequest( QWebEngineUrlRequestInfo &info)
     if(info.requestUrl().scheme()=="file"){
       return;
     }
-    auto hostBase = getHostBase( info.requestUrl().host() );
+    auto hostBase = Utils::Url::getHostBase( info.requestUrl().host() );
     if( GlobalBroadcaster::instance()->existedInWhitelist( hostBase ) )
     {
       //whitelist url does not block

winlibs/scripts/00README.txt

@@ -1,42 +1,11 @@
-FFmpeg, libao, zLib build instructions
+FFmpeg, libao, speex, zLib build instructions
 -----------------------------------
 
-Prerequisites
-=============
-* MSYS and MinGW ( 4.4 up to 4.6 )
-
 Build
 =====
 
-* Get source tarball for libspeex, ffmpeg, libao, zlib and extract them respectively:
+vcpkg install libao,libspeex,ffmpeg[core,avcodec,avformat,mp3lame,opus,speex,swresample,vorbis,fdk-aac,gpl],zlib:x64-windows-release
-  * libspeex: http://www.speex.org/downloads/
-  * libao: http://www.xiph.org/downloads/
-  * ffmpeg: http://ffmpeg.org/download.html
-  * zlib: http://zlib.net/
 
-* Define environment variable: PREFIX, for example: export PREFIX=/usr/local
+binaries (dlls):  ${vcpkg}/installed/bin
-  * NOTE: You may also want to define CPATH and LIBRARY_PATH:
+C headers:        ${vcpkg}/installed/include
-    export CPATH=${CPATH}:${PREFIX}/include
+Linker files:     ${vcpkg}/installed/lib
-    export LIBRARY_PATH=${LIBRARY_PATH}:${PREFIX}/lib
-
-* First, build the libspeex as static library:
-  * Copy "libspeex-configure-mingw32.sh" to the speex source folder.
-  * ./libspeex-configure-mingw32.sh
-  * make && make install
-
-* Build ffmpeg:
-  * Copy "ffmpeg-configure-mingw32.sh" to the ffmpeg source folder.
-  * ./ffmpeg-configure-mingw32.sh
-  * make && make install
-
-* Build libao:
-  * Copy "libao-configure-mingw32.sh" to the libao source folder.
-  * ./libao-configure-mingw32.sh
-  * make && make install
-
-* Build zlib:
-  * make -f./win32/makefile.gcc && make -f./win32/makefile.gcc install
-
-binaries (dlls):  ${PREFIX}/bin
-C headers:        ${PREFIX}/include
-Linker files:     ${PREFIX}/lib

winlibs/scripts/ffmpeg-configure-mingw32-vs.sh

@@ -1,190 +0,0 @@
-#!/bin/sh
-
-./configure \
-   	--toolchain=msvc \
-    --arch=x86_64 \
-    --enable-yasm \
-    --enable-asm\
-	--prefix=$PREFIX \
-	--enable-runtime-cpudetect \
-	--enable-shared \
-	--disable-static \
-	--disable-debug \
-	--disable-programs \
-	--disable-network \
-	--disable-avdevice \
-	--disable-avfilter \
-	--disable-swscale \
-	--disable-network \
-	--disable-muxers \
-	--disable-demuxers \
-	--enable-rdft \
-	--enable-demuxer=aac \
-	--enable-demuxer=ac3 \
-	--enable-demuxer=aiff \
-	--enable-demuxer=ape \
-	--enable-demuxer=asf \
-	--enable-demuxer=flac \
-	--enable-demuxer=matroska \
-	--enable-demuxer=mp3 \
-	--enable-demuxer=mpc \
-	--enable-demuxer=mov \
-	--enable-demuxer=mpc8 \
-	--enable-demuxer=ogg \
-	--enable-demuxer=tta \
-	--enable-demuxer=wav \
-	--enable-demuxer=wv \
-	--disable-bsfs \
-	--disable-filters \
-	--disable-parsers \
-	--enable-parser=aac \
-	--enable-parser=ac3 \
-	--enable-parser=mpegaudio \
-	--disable-protocols \
-	--disable-indevs \
-	--disable-outdevs \
-	--disable-encoders \
-	--disable-decoders \
-	--enable-decoder=eightsvx_exp \
-	--enable-decoder=eightsvx_fib \
-	--enable-decoder=aac \
-	--enable-decoder=aac_latm \
-	--enable-decoder=ac3 \
-	--enable-decoder=adpcm_4xm \
-	--enable-decoder=adpcm_adx \
-	--enable-decoder=adpcm_afc \
-	--enable-decoder=adpcm_ct \
-	--enable-decoder=adpcm_ea \
-	--enable-decoder=adpcm_ea_maxis_xa \
-	--enable-decoder=adpcm_ea_r1 \
-	--enable-decoder=adpcm_ea_r2 \
-	--enable-decoder=adpcm_ea_r3 \
-	--enable-decoder=adpcm_ea_xas \
-	--enable-decoder=adpcm_g722 \
-	--enable-decoder=adpcm_g726 \
-	--enable-decoder=adpcm_ima_amv \
-	--enable-decoder=adpcm_ima_apc \
-	--enable-decoder=adpcm_ima_dk3 \
-	--enable-decoder=adpcm_ima_dk4 \
-	--enable-decoder=adpcm_ima_ea_eacs \
-	--enable-decoder=adpcm_ima_ea_sead \
-	--enable-decoder=adpcm_ima_iss \
-	--enable-decoder=adpcm_ima_oki \
-	--enable-decoder=adpcm_ima_qt \
-	--enable-decoder=adpcm_ima_smjpeg \
-	--enable-decoder=adpcm_ima_wav \
-	--enable-decoder=adpcm_ima_ws \
-	--enable-decoder=adpcm_ms \
-	--enable-decoder=adpcm_sbpro_2 \
-	--enable-decoder=adpcm_sbpro_3 \
-	--enable-decoder=adpcm_sbpro_4 \
-	--enable-decoder=adpcm_swf \
-	--enable-decoder=adpcm_thp \
-	--enable-decoder=adpcm_xa \
-	--enable-decoder=adpcm_yamaha \
-	--enable-decoder=alac \
-	--enable-decoder=amrnb \
-	--enable-decoder=libopencore_amrnb \
-	--enable-decoder=amrwb \
-	--enable-decoder=libopencore_amrwb \
-	--enable-decoder=ape \
-	--enable-decoder=atrac1 \
-	--enable-decoder=atrac3 \
-	--enable-decoder=binkaudio_dct \
-	--enable-decoder=binkaudio_rdft \
-	--enable-decoder=bmv_audio \
-	--enable-decoder=comfortnoise \
-	--enable-decoder=cook \
-	--enable-decoder=dsicinaudio \
-	--enable-decoder=dca \
-	--enable-decoder=eac3 \
-	--enable-decoder=flac \
-	--enable-decoder=g723_1 \
-	--enable-decoder=g729 \
-	--enable-decoder=gsm \
-	--enable-decoder=libgsm \
-	--enable-decoder=gsm_ms \
-	--enable-decoder=libgsm_ms \
-	--enable-decoder=iac \
-	--enable-decoder=imc \
-	--enable-decoder=interplay_dpcm \
-	--enable-decoder=mace3 \
-	--enable-decoder=mace6 \
-	--enable-decoder=mlp \
-	--enable-decoder=mp1 \
-	--enable-decoder=mp1float \
-	--enable-decoder=mp2 \
-	--enable-decoder=mp2float \
-	--enable-decoder=mp3 \
-	--enable-decoder=mp3float \
-	--enable-decoder=mp3adu \
-	--enable-decoder=mp3adufloat \
-	--enable-decoder=mp3on4 \
-	--enable-decoder=mp3on4float \
-	--enable-decoder=als \
-	--enable-decoder=mpc7 \
-	--enable-decoder=mpc8 \
-	--enable-decoder=nellymoser \
-	--enable-decoder=libopus \
-	--enable-decoder=paf_audio \
-	--enable-decoder=pcm_alaw \
-	--enable-decoder=pcm_bluray \
-	--enable-decoder=pcm_dvd \
-	--enable-decoder=pcm_f32be \
-	--enable-decoder=pcm_f32le \
-	--enable-decoder=pcm_f64be \
-	--enable-decoder=pcm_f64le \
-	--enable-decoder=pcm_lxf \
-	--enable-decoder=pcm_mulaw \
-	--enable-decoder=pcm_s16be \
-	--enable-decoder=pcm_s16be_planar \
-	--enable-decoder=pcm_s16le \
-	--enable-decoder=pcm_s16le_planar \
-	--enable-decoder=pcm_s24be \
-	--enable-decoder=pcm_s24daud \
-	--enable-decoder=pcm_s24le \
-	--enable-decoder=pcm_s24le_planar \
-	--enable-decoder=pcm_s32be \
-	--enable-decoder=pcm_s32le \
-	--enable-decoder=pcm_s32le_planar \
-	--enable-decoder=pcm_s8 \
-	--enable-decoder=pcm_s8_planar \
-	--enable-decoder=pcm_u16be \
-	--enable-decoder=pcm_u16le \
-	--enable-decoder=pcm_u24be \
-	--enable-decoder=pcm_u24le \
-	--enable-decoder=pcm_u32be \
-	--enable-decoder=pcm_u32le \
-	--enable-decoder=pcm_u8 \
-	--enable-decoder=pcm_zork \
-	--enable-decoder=qcelp \
-	--enable-decoder=qdm2 \
-	--enable-decoder=ra_144 \
-	--enable-decoder=ra_288 \
-	--enable-decoder=ralf \
-	--enable-decoder=roq_dpcm \
-	--enable-decoder=s302m \
-	--enable-decoder=shorten \
-	--enable-decoder=sipr \
-	--enable-decoder=smackaud \
-	--enable-decoder=sol_dpcm \
-	--enable-decoder=sonic \
-	--enable-decoder=libspeex \
-	--enable-decoder=tak \
-	--enable-decoder=truehd \
-	--enable-decoder=truespeech \
-	--enable-decoder=tta \
-	--enable-decoder=twinvq \
-	--enable-decoder=vima \
-	--enable-decoder=vmdaudio \
-	--enable-decoder=vorbis \
-	--enable-decoder=ffwavesynth \
-	--enable-decoder=wavpack \
-	--enable-decoder=ws_snd1 \
-	--enable-decoder=wmalossless \
-	--enable-decoder=wmapro \
-	--enable-decoder=wmav1 \
-	--enable-decoder=wmav2 \
-	--enable-decoder=wmavoice \
-	--enable-decoder=xan_dpcm \
-	--enable-libspeex

winlibs/scripts/ffmpeg-configure-mingw32.sh

@@ -1,186 +0,0 @@
-#!/bin/sh
-
-./configure \
-	--prefix=$PREFIX \
-	--enable-runtime-cpudetect \
-	--enable-shared \
-	--disable-static \
-	--disable-debug \
-	--disable-programs \
-	--disable-network \
-	--disable-avdevice \
-	--disable-avfilter \
-	--disable-swscale \
-	--disable-network \
-	--disable-muxers \
-	--disable-demuxers \
-	--enable-rdft \
-	--enable-demuxer=aac \
-	--enable-demuxer=ac3 \
-	--enable-demuxer=aiff \
-	--enable-demuxer=ape \
-	--enable-demuxer=asf \
-	--enable-demuxer=flac \
-	--enable-demuxer=matroska \
-	--enable-demuxer=mp3 \
-	--enable-demuxer=mpc \
-	--enable-demuxer=mov \
-	--enable-demuxer=mpc8 \
-	--enable-demuxer=ogg \
-	--enable-demuxer=tta \
-	--enable-demuxer=wav \
-	--enable-demuxer=wv \
-	--disable-bsfs \
-	--disable-filters \
-	--disable-parsers \
-	--enable-parser=aac \
-	--enable-parser=ac3 \
-	--enable-parser=mpegaudio \
-	--disable-protocols \
-	--disable-indevs \
-	--disable-outdevs \
-	--disable-encoders \
-	--disable-decoders \
-	--enable-decoder=eightsvx_exp \
-	--enable-decoder=eightsvx_fib \
-	--enable-decoder=aac \
-	--enable-decoder=aac_latm \
-	--enable-decoder=ac3 \
-	--enable-decoder=adpcm_4xm \
-	--enable-decoder=adpcm_adx \
-	--enable-decoder=adpcm_afc \
-	--enable-decoder=adpcm_ct \
-	--enable-decoder=adpcm_ea \
-	--enable-decoder=adpcm_ea_maxis_xa \
-	--enable-decoder=adpcm_ea_r1 \
-	--enable-decoder=adpcm_ea_r2 \
-	--enable-decoder=adpcm_ea_r3 \
-	--enable-decoder=adpcm_ea_xas \
-	--enable-decoder=adpcm_g722 \
-	--enable-decoder=adpcm_g726 \
-	--enable-decoder=adpcm_ima_amv \
-	--enable-decoder=adpcm_ima_apc \
-	--enable-decoder=adpcm_ima_dk3 \
-	--enable-decoder=adpcm_ima_dk4 \
-	--enable-decoder=adpcm_ima_ea_eacs \
-	--enable-decoder=adpcm_ima_ea_sead \
-	--enable-decoder=adpcm_ima_iss \
-	--enable-decoder=adpcm_ima_oki \
-	--enable-decoder=adpcm_ima_qt \
-	--enable-decoder=adpcm_ima_smjpeg \
-	--enable-decoder=adpcm_ima_wav \
-	--enable-decoder=adpcm_ima_ws \
-	--enable-decoder=adpcm_ms \
-	--enable-decoder=adpcm_sbpro_2 \
-	--enable-decoder=adpcm_sbpro_3 \
-	--enable-decoder=adpcm_sbpro_4 \
-	--enable-decoder=adpcm_swf \
-	--enable-decoder=adpcm_thp \
-	--enable-decoder=adpcm_xa \
-	--enable-decoder=adpcm_yamaha \
-	--enable-decoder=alac \
-	--enable-decoder=amrnb \
-	--enable-decoder=libopencore_amrnb \
-	--enable-decoder=amrwb \
-	--enable-decoder=libopencore_amrwb \
-	--enable-decoder=ape \
-	--enable-decoder=atrac1 \
-	--enable-decoder=atrac3 \
-	--enable-decoder=binkaudio_dct \
-	--enable-decoder=binkaudio_rdft \
-	--enable-decoder=bmv_audio \
-	--enable-decoder=comfortnoise \
-	--enable-decoder=cook \
-	--enable-decoder=dsicinaudio \
-	--enable-decoder=dca \
-	--enable-decoder=eac3 \
-	--enable-decoder=flac \
-	--enable-decoder=g723_1 \
-	--enable-decoder=g729 \
-	--enable-decoder=gsm \
-	--enable-decoder=libgsm \
-	--enable-decoder=gsm_ms \
-	--enable-decoder=libgsm_ms \
-	--enable-decoder=iac \
-	--enable-decoder=imc \
-	--enable-decoder=interplay_dpcm \
-	--enable-decoder=mace3 \
-	--enable-decoder=mace6 \
-	--enable-decoder=mlp \
-	--enable-decoder=mp1 \
-	--enable-decoder=mp1float \
-	--enable-decoder=mp2 \
-	--enable-decoder=mp2float \
-	--enable-decoder=mp3 \
-	--enable-decoder=mp3float \
-	--enable-decoder=mp3adu \
-	--enable-decoder=mp3adufloat \
-	--enable-decoder=mp3on4 \
-	--enable-decoder=mp3on4float \
-	--enable-decoder=als \
-	--enable-decoder=mpc7 \
-	--enable-decoder=mpc8 \
-	--enable-decoder=nellymoser \
-	--enable-decoder=libopus \
-	--enable-decoder=paf_audio \
-	--enable-decoder=pcm_alaw \
-	--enable-decoder=pcm_bluray \
-	--enable-decoder=pcm_dvd \
-	--enable-decoder=pcm_f32be \
-	--enable-decoder=pcm_f32le \
-	--enable-decoder=pcm_f64be \
-	--enable-decoder=pcm_f64le \
-	--enable-decoder=pcm_lxf \
-	--enable-decoder=pcm_mulaw \
-	--enable-decoder=pcm_s16be \
-	--enable-decoder=pcm_s16be_planar \
-	--enable-decoder=pcm_s16le \
-	--enable-decoder=pcm_s16le_planar \
-	--enable-decoder=pcm_s24be \
-	--enable-decoder=pcm_s24daud \
-	--enable-decoder=pcm_s24le \
-	--enable-decoder=pcm_s24le_planar \
-	--enable-decoder=pcm_s32be \
-	--enable-decoder=pcm_s32le \
-	--enable-decoder=pcm_s32le_planar \
-	--enable-decoder=pcm_s8 \
-	--enable-decoder=pcm_s8_planar \
-	--enable-decoder=pcm_u16be \
-	--enable-decoder=pcm_u16le \
-	--enable-decoder=pcm_u24be \
-	--enable-decoder=pcm_u24le \
-	--enable-decoder=pcm_u32be \
-	--enable-decoder=pcm_u32le \
-	--enable-decoder=pcm_u8 \
-	--enable-decoder=pcm_zork \
-	--enable-decoder=qcelp \
-	--enable-decoder=qdm2 \
-	--enable-decoder=ra_144 \
-	--enable-decoder=ra_288 \
-	--enable-decoder=ralf \
-	--enable-decoder=roq_dpcm \
-	--enable-decoder=s302m \
-	--enable-decoder=shorten \
-	--enable-decoder=sipr \
-	--enable-decoder=smackaud \
-	--enable-decoder=sol_dpcm \
-	--enable-decoder=sonic \
-	--enable-decoder=libspeex \
-	--enable-decoder=tak \
-	--enable-decoder=truehd \
-	--enable-decoder=truespeech \
-	--enable-decoder=tta \
-	--enable-decoder=twinvq \
-	--enable-decoder=vima \
-	--enable-decoder=vmdaudio \
-	--enable-decoder=vorbis \
-	--enable-decoder=ffwavesynth \
-	--enable-decoder=wavpack \
-	--enable-decoder=ws_snd1 \
-	--enable-decoder=wmalossless \
-	--enable-decoder=wmapro \
-	--enable-decoder=wmav1 \
-	--enable-decoder=wmav2 \
-	--enable-decoder=wmavoice \
-	--enable-decoder=xan_dpcm \
-	--enable-libspeex 

winlibs/scripts/libao-configure-mingw32.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-./configure \
-	--prefix=$PREFIX \
-	--enable-shared

winlibs/scripts/libspeex-configure-mingw32.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-./configure \
-	--prefix=$PREFIX \
-	--enable-static \
-	--disable-shared