[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/multimedia/kdetv
From: Dirk Ziegelmeier <dziegel () gmx ! de>
Date: 2005-08-14 19:42:43
Message-ID: 1124048563.135541.13498.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 449222 by dziegel:
rename kv4lsetup to kdetvv4lsetup to avoid collision with avifile lib
M +1 -2 Makefile.am
M +1 -1 kvideoio/Makefile.am
A kvideoio/kdetvv4lsetup (directory) kvideoio/kv4lsetup#449205
M +8 -11 kvideoio/kdetvv4lsetup/Makefile.am
M +11 -11 kvideoio/kdetvv4lsetup/kv4lsetup.c
D kvideoio/kv4lsetup (directory)
M +1 -1 kvideoio/v4l2dev.cpp
M +5 -5 kvideoio/v4ldev.cpp
M +1 -1 kvideoio/v4ldevcamera.cpp
M +1 -1 kvideoio/v4ldevtuner.cpp
--- trunk/extragear/multimedia/kdetv/Makefile.am #449221:449222
@@ -6,8 +6,7 @@
export UNSERMAKE=no
cd ../../../; svn2dist -d extragear/multimedia kdetv -v svn`date +%G%m%d` --no-gzip
-#release: changes kdetv-clean
-release: kdetv-clean
+release: changes kdetv-clean
export UNSERMAKE=no
cd ../../../; svn2dist -d extragear/multimedia kdetv -v `cat \
extragear/multimedia/kdetv/kdetv_version.h | grep KDETV_VERSION | sed \
"s/.*\"\(.*\)\"/\\1/"` --no-gzip
--- trunk/extragear/multimedia/kdetv/kvideoio/Makefile.am #449221:449222
@@ -1,4 +1,4 @@
-SUBDIRS = kv4lsetup
+SUBDIRS = kdetvv4lsetup
# Main Library
lib_LTLIBRARIES = libkvideoio.la
--- trunk/extragear/multimedia/kdetv/kvideoio/kdetvv4lsetup/Makefile.am \
#449205:449222 @@ -1,22 +1,19 @@
-#lnk_DATA = kv4lsetup.desktop
-#lnkdir = $(kde_appsdir)/Multimedia
-
-####### This part is very kv4lsetup specific
+####### This part is very kdetvv4lsetup specific
# you can add here more. This one gets installed
-bin_PROGRAMS = kv4lsetup
+bin_PROGRAMS = kdetvv4lsetup
# Which sources should be compiled for kv4lsetup.
-kv4lsetup_SOURCES = kv4lsetup.c
+kdetvv4lsetup_SOURCES = kdetvv4lsetup.c
-kv4lsetup_CFLAGS = $(KDE_USE_FPIE)
+kdetvv4lsetup_CFLAGS = $(KDE_USE_FPIE)
# the library search path
-kv4lsetup_LDFLAGS = $(KDE_USE_PIE) $(all_libraries)
+kdetvv4lsetup_LDFLAGS = $(KDE_USE_PIE) $(all_libraries)
# the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones.
-kv4lsetup_LDADD = -lX11 -lXxf86dga -lXext
+kdetvv4lsetup_LDADD = -lX11 -lXxf86dga -lXext
-## my own install-binPROGRAMS; we install kv4lsetup with -m4755
+## my own install-binPROGRAMS; we install kdetvv4lsetup with -m4755
install-exec-hook:
- @(chown root $(DESTDIR)$(bindir)/kv4lsetup && chmod 4755 \
$(DESTDIR)$(bindir)/kv4lsetup) || echo "make kv4lsetup SUID root!" + @(chown root \
$(DESTDIR)$(bindir)/kdetvv4lsetup && chmod 4755 $(DESTDIR)$(bindir)/kdetvv4lsetup) \
|| echo "make kv4lsetup SUID root!"
--- trunk/extragear/multimedia/kdetv/kvideoio/kdetvv4lsetup/kv4lsetup.c \
#449205:449222 @@ -119,7 +119,7 @@
int fd;
if (verbose)
- fprintf(stderr,"kv4lsetup: using mklinux console driver\n");
+ fprintf(stderr,"kdetvv4lsetup: using mklinux console driver\n");
if (-1 == (fd = open("/dev/console",O_RDWR|O_NDELAY))) {
fprintf(stderr,"open console: %s\n",strerror(errno));
@@ -202,7 +202,7 @@
int found,v,i,n;
if (verbose)
- fprintf(stderr,"kv4lsetup: using X11 display %s\n",display);
+ fprintf(stderr,"kdetvv4lsetup: using X11 display %s\n",display);
/* take size from root window */
root = DefaultRootWindow(dpy);
@@ -264,7 +264,7 @@
d->bpl = width * d->bpp/8;
d->base = base;
#else
- fprintf(stderr,"WARNING: kv4lsetup is compiled without DGA support.\n");
+ fprintf(stderr,"WARNING: kdetvv4lsetup is compiled without DGA support.\n");
#endif
}
#endif
@@ -302,7 +302,7 @@
sprintf(fbdev=malloc(16),"/dev/fb%d",c2m.framebuffer);
}
if (verbose)
- fprintf(stderr,"kv4lsetup: using framebuffer device %s\n",fbdev);
+ fprintf(stderr,"kdetvv4lsetup: using framebuffer device %s\n",fbdev);
/* Open frame buffer device, with security checks */
fd = dev_open(fbdev, 29 /* VIDEO_MAJOR */);
@@ -384,15 +384,15 @@
if (NULL == fb.base)
fprintf(stderr,
"WARNING: couldn't find framebuffer base address, try manual\n"
- " configuration (\"kv4lsetup -a <addr>\")\n");
+ " configuration (\"kdetvv4lsetup -a <addr>\")\n");
if (-1 == ioctl(fd,VIDIOC_S_FBUF,&fb)) {
fprintf(stderr,"%s [v4l2]: ioctl VIDIOC_S_FBUF: %s\n",
videodev,strerror(errno));
if (EPERM == errno && 0 != geteuid())
fprintf(stderr,
- "kv4lsetup: You should install me suid root, I need\n"
- " root privileges for the VIDIOCSFBUF ioctl.\n");
+ "kdetvv4lsetup: You should install me suid root, I need\n"
+ " root privileges for the VIDIOCSFBUF ioctl.\n");
exit(1);
}
if (verbose)
@@ -433,7 +433,7 @@
if (NULL == fbuf.base)
fprintf(stderr,
"WARNING: couldn't find framebuffer base address, try manual\n"
- " configuration (\"kv4lsetup -a <addr>\")\n");
+ " configuration (\"kdetvv4lsetup -a <addr>\")\n");
/* XXX bttv confuses color depth and bits/pixel */
if (d->depth == 15)
@@ -444,8 +444,8 @@
videodev,strerror(errno));
if (EPERM == errno && 0 != geteuid())
fprintf(stderr,
- "kv4lsetup: You should install me suid root, I need\n"
- " root privileges for the VIDIOCSFBUF ioctl.\n");
+ "kdetvv4lsetup: You should install me suid root, I need\n"
+ " root privileges for the VIDIOCSFBUF ioctl.\n");
exit(1);
}
if (verbose)
@@ -513,7 +513,7 @@
case 'a':
if (0 == getuid()) {
/* only root is allowed to set this, and it will work only
- * if kv4lsetup can't figure out the correct address itself.
+ * if kdetvv4lsetup can't figure out the correct address itself.
* Useful for "post-install bttv ..." */
sscanf(optarg,"%p",&user_base);
} else {
--- trunk/extragear/multimedia/kdetv/kvideoio/v4l2dev.cpp #449221:449222
@@ -50,7 +50,7 @@
#include <kdebug.h>
#include <klocale.h>
-#include "kv4lsetup/videodev2.h"
+#include "kdetvv4lsetup/videodev2.h"
#include "v4l2dev.h"
--- trunk/extragear/multimedia/kdetv/kvideoio/v4ldev.cpp #449221:449222
@@ -41,7 +41,7 @@
#endif
#define _LINUX_TIME_H
#define _DEVICE_H_
-#include "kv4lsetup/videodev.h"
+#include "kdetvv4lsetup/videodev.h"
#include <qimage.h>
#include <kdebug.h>
@@ -144,18 +144,18 @@
// v4l1 does not support multiple fd opening
::close(fd);
- kdDebug() << "v4ldev: The device supports overlay. Running kv4lsetup." << \
endl; + kdDebug() << "v4ldev: The device supports overlay. Running \
kdetvv4lsetup." << endl;
KProcess p;
p.setUseShell(true);
- p << "kv4lsetup" << "-c" << dev;
+ p << "kdetvv4lsetup" << "-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: kv4lsetup had some trouble. Trying to continue \
anyway." << endl; + kdWarning() << "v4ldev: kdetvv4lsetup 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 kv4lsetup installed suid root? Overlay \
disabled." << endl; + << "display. Is kdetvv4lsetup installed \
suid root? Overlay disabled." << endl;
kdWarning() << "(I think it should be " << bitspp << ", v4l says: " << \
vb.depth << ")" << endl; return;
}
--- trunk/extragear/multimedia/kdetv/kvideoio/v4ldevcamera.cpp #449221:449222
@@ -39,7 +39,7 @@
#endif
#define _LINUX_TIME_H
#define _DEVICE_H_
-#include "kv4lsetup/videodev.h"
+#include "kdetvv4lsetup/videodev.h"
#include <qimage.h>
#include <kdebug.h>
--- trunk/extragear/multimedia/kdetv/kvideoio/v4ldevtuner.cpp #449221:449222
@@ -41,7 +41,7 @@
#endif
#define _LINUX_TIME_H
#define _DEVICE_H_
-#include "kv4lsetup/videodev.h"
+#include "kdetvv4lsetup/videodev.h"
#include <kdebug.h>
#include <klocale.h>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic