openbsd-ports/multimedia/kaffeine/patches/patch-kaffeine_src_instwizard_cpp
2006-12-04 01:20:31 +00:00

52 lines
1.6 KiB
Plaintext

$OpenBSD: patch-kaffeine_src_instwizard_cpp,v 1.2 2006/12/04 01:20:31 espie Exp $
--- kaffeine/src/instwizard.cpp.orig Sun Nov 26 20:12:23 2006
+++ kaffeine/src/instwizard.cpp Mon Dec 4 00:42:01 2006
@@ -107,7 +107,7 @@ void InstWizard::internalWizard()
*/
//WIN32-CODECS
info << "<hr><b>" << i18n("WIN32 Codecs") << "...</b><br>";
- QDir d("/usr/lib/win32");
+ QDir d("/usr/local/lib/win32");
QStringList entries = d.entryList("wmv*");
if (entries.count())
info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
@@ -125,13 +125,13 @@ void InstWizard::internalWizard()
else
{
d = QDir("/usr/local/lib");
- entries = d.entryList("libdvdcss.so*");
+ entries = d.entryList("libdvd.so*");
if (entries.count())
dvdcss = true;
else
{
d = QDir("/usr/lib64");
- entries = d.entryList("libdvdcss.so*");
+ entries = d.entryList("libdvd.so*");
if (entries.count())
dvdcss = true;
}
@@ -142,6 +142,7 @@ void InstWizard::internalWizard()
else
info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
+#if !defined(__OpenBSD__)
//DVD-DRIVE
info << "<br><hr><b>" << i18n("DVD Drive") << "...</b><br>";
KProcess process;
@@ -156,6 +157,7 @@ void InstWizard::internalWizard()
else
info << "<font color=\"DarkBlue\">" << i18n("Can't check DMA mode. Permission denied or no such device:")
<< " \"/dev/dvd\".</font>";
+#endif
//DVB-DEVICES
#ifdef HAVE_DVB
@@ -274,5 +276,6 @@ void InstWizard::slotStdout(KProcess *,
{
QString output = QString::fromLatin1(buffer, buflen);
kdDebug() << "WizardDialog: got from hdparm: " << output << "\n";
+#undef stdout
stdout.append(output);
}