File kdetv.diff of Package kdetv

--- kdetv/kvideoio/Makefile.am
+++ kdetv/kvideoio/Makefile.am	2005/04/29 09:03:52
@@ -1,4 +1,4 @@
-SUBDIRS = kdetvv4lsetup
+SUBDIRS =
 
 # Main Library
 lib_LTLIBRARIES = libkvideoio.la
--- kdetv/kvideoio/v4ldev.cpp
+++ kdetv/kvideoio/v4ldev.cpp	2005/04/29 09:03:52
@@ -144,18 +144,18 @@
         // v4l1 does not support multiple fd opening
         ::close(fd);
 
-        kdDebug() << "v4ldev: The device supports overlay. Running kdetvv4lsetup." << endl;
+        kdDebug() << "v4ldev: The device supports overlay. Running v4l-conf." << endl;
 
         KProcess p;
         p.setUseShell(true);
-        p << "kdetvv4lsetup" << "-c" << dev;
+        p << "v4l-conf" << "-c" << dev;
         // p << "-l" << "-b" << QString::number(QPaintDevice::x11AppDepth());
         // FIXME: configure shift
         // p << "-s" << QString::number(shift);
         p.start(KProcess::Block);
 
         if (p.exitStatus() != 0) {
-            kdWarning() << "v4ldev: kdetvv4lsetup had some trouble. Trying to continue anyway." << endl;
+            kdWarning() << "v4ldev: v4l-conf had some trouble. Trying to continue anyway." << endl;
         }
 
         // reopen device
@@ -279,7 +279,7 @@
 
         if (vb.depth != bitspp) {
             kdWarning() << "v4ldev: V4L and KVIDEOIO disagree about the depth of the "
-                        << "display. Is kdetvv4lsetup installed suid root? Overlay disabled." << endl;
+                        << "display. Is v4l-conf installed suid root? Overlay disabled." << endl;
             kdWarning() << "(I think it should be " << bitspp << ", v4l says: " << vb.depth << ")" << endl;
             return;
         }
--- kdetv/plugins/mixer/configure.in.in
+++ kdetv/plugins/mixer/configure.in.in	2005/04/29 09:03:52
@@ -34,7 +34,7 @@
 	AC_FIND_FILE(alsa/asoundlib.h, $alsa_incdirs, alsa_incdir)
 	ac_alsa_includes="$alsa_incdir"
 
-	alsa_libdirs="/usr/lib /usr/local/lib $prefix/lib $exec_prefix/lib $kde_extra_libs"
+	alsa_libdirs="/usr/lib64 /usr/lib /usr/local/lib $prefix/lib $exec_prefix/lib $kde_extra_libs"
 	if test ! "$ac_alsa_libraries" = "NO"; then
 		alsa_libdirs="$ac_alsa_libraries $alsa_libdirs"
 	fi