diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2022-03-30 18:58:56 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2022-03-31 01:10:50 +0200 |
| commit | a91c7c1df5f039a3611bf0aa320b15f70305e8b3 (patch) | |
| tree | c9dc53a99ea050485e4130dbcebe2628cad939a8 /kaffeine | |
| parent | 298fe4635696966d3cfcade2b8bce7fc908e4b84 (diff) | |
| download | kaffeine-a91c7c1df5f039a3611bf0aa320b15f70305e8b3.tar.gz kaffeine-a91c7c1df5f039a3611bf0aa320b15f70305e8b3.zip | |
Change libdvdcss detection to search the default system directory for libraries.
This resolves issue TDE/tde-packaging#113.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'kaffeine')
| -rw-r--r-- | kaffeine/src/instwizard.cpp | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/kaffeine/src/instwizard.cpp b/kaffeine/src/instwizard.cpp index cc880d1..7733efb 100644 --- a/kaffeine/src/instwizard.cpp +++ b/kaffeine/src/instwizard.cpp @@ -116,25 +116,28 @@ void InstWizard::internalWizard() info << "<font color=\"DarkRed\">" << i18n("No WIN32 codecs found in /usr/lib/win32. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats. Download the codecs here:") << " <a href=\"http://www1.mplayerhq.hu/design7/dload.html#binary_codecs\">http://www1.mplayerhq.hu/design7/dload.html#binary_codecs</a>.</font>"; */ + //LIBDVDCSS info << "<br><hr><b>" << "libdvdcss" << "...</b><br>"; bool dvdcss = false; - TQDir d("/usr/lib"); - TQStringList entries = d.entryList("libdvdcss.so*"); - if (entries.count()) - dvdcss = true; - else + TQStringList libDirs; + TQStringList entries; + TQDir d; + libDirs + << "/" SYSTEM_LIBDIR + << "/usr/" SYSTEM_LIBDIR + << "/usr/local/" SYSTEM_LIBDIR + << "/lib" + << "/usr/lib" + << "/usr/local/lib"; + for (TQStringList::ConstIterator it = libDirs.begin(); it != libDirs.end(); ++it) { - d = TQDir("/usr/local/lib"); + d = TQDir(*it); entries = d.entryList("libdvdcss.so*"); if (entries.count()) - dvdcss = true; - else { - d = TQDir("/usr/lib64"); - entries = d.entryList("libdvdcss.so*"); - if (entries.count()) - dvdcss = true; + dvdcss = true; + break; } } if (!dvdcss) |