aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2010-04-01 09:24:41 (GMT)
committerGerd Hoffmann <kraxel@redhat.com>2010-04-01 09:24:41 (GMT)
commit291d7b864be127f1fe78138b5fe476387d18f1ba (patch)
tree5842836baef5297b73a48c2713b56785c6d8b891
parent1ddc68f41b45a67503550821e4492c6a08970c88 (diff)
v3.91
-rw-r--r--Changes6
-rw-r--r--console/scantv.c5
-rw-r--r--console/v4l-conf.c28
-rw-r--r--debian/changelog8
-rw-r--r--debian/control2
-rw-r--r--debian/po/jp.po114
-rw-r--r--x11/Subdir.mk12
-rw-r--r--x11/v4lctl.c4
-rw-r--r--x11/xt.c10
-rw-r--r--xawtv.spec2
10 files changed, 175 insertions, 16 deletions
diff --git a/Changes b/Changes
index 92038f1..0e9cfb3 100644
--- a/Changes
+++ b/Changes
@@ -1,4 +1,10 @@
+3.91
+====
+
+ * misc minor bugfixes.
+
+
3.90
====
diff --git a/console/scantv.c b/console/scantv.c
index 3bebf78..0a470f6 100644
--- a/console/scantv.c
+++ b/console/scantv.c
@@ -308,7 +308,10 @@ main(int argc, char **argv)
name = get_vbi_name(vbi);
fprintf(stderr,"%s\n",name ? name : "???");
if (NULL == name) {
- sprintf(dummy,"unknown (%s)",chanlist[fi].name);
+ if (-1 == fi)
+ sprintf(dummy,"unknown (%s)",chanlist[fi].name);
+ else
+ sprintf(dummy,"unknown (%.2f)",fc/16.0);
name = dummy;
}
if (-1 != fi) {
diff --git a/console/v4l-conf.c b/console/v4l-conf.c
index e492644..fd9919f 100644
--- a/console/v4l-conf.c
+++ b/console/v4l-conf.c
@@ -49,6 +49,8 @@ struct DISPLAYINFO {
int verbose = 1;
int yuv = 0;
+int v4l1 = 1;
+int v4l2 = 1;
int user_bpp = 0;
int user_shift = 0;
void *user_base = NULL;
@@ -318,6 +320,12 @@ displayinfo_v4l2(int fd, struct DISPLAYINFO *d)
struct v4l2_capability cap;
struct v4l2_framebuffer fb;
+ if (0 == v4l2) {
+ if (verbose)
+ fprintf(stderr,"skipping v4l2 (disabled on the cmd line)\n");
+ return -1;
+ }
+
if (-1 == ioctl(fd,VIDIOC_QUERYCAP,&cap)) {
if (verbose)
fprintf(stderr,"%s [v4l2]: ioctl VIDIOC_QUERYCAP: %s\n",
@@ -384,6 +392,12 @@ displayinfo_v4l(int fd, struct DISPLAYINFO *d)
struct video_capability capability;
struct video_buffer fbuf;
+ if (0 == v4l1) {
+ if (verbose)
+ fprintf(stderr,"skipping v4l (disabled on the cmd line)\n");
+ return -1;
+ }
+
if (-1 == ioctl(fd,VIDIOCGCAP,&capability)) {
fprintf(stderr,"%s [v4l]: ioctl VIDIOCGCAP: %s\n",
videodev,strerror(errno));
@@ -462,7 +476,7 @@ main(int argc, char *argv[])
/* parse options */
for (;;) {
- if (-1 == (c = getopt(argc, argv, "hyqd:c:b:s:fa:")))
+ if (-1 == (c = getopt(argc, argv, "hyq12d:c:b:s:fa:")))
break;
switch (c) {
case 'q':
@@ -471,6 +485,14 @@ main(int argc, char *argv[])
case 'y':
yuv = 1;
break;
+ case '1':
+ v4l1 = 1;
+ v4l2 = 0;
+ break;
+ case '2':
+ v4l1 = 0;
+ v4l2 = 1;
+ break;
case 'd':
display = optarg;
break;
@@ -515,7 +537,9 @@ main(int argc, char *argv[])
" -f query frame buffer device for info\n"
" -a <addr> set framebuffer address to <addr>\n"
" (in hex, root only, successful autodetect\n"
- " will overwrite this address)\n",
+ " will overwrite this address)\n"
+ " -1 force v4l API\n"
+ " -2 force v4l2 API\n",
argv[0],
#ifndef X_DISPLAY_MISSING
display ? display : "none",
diff --git a/debian/changelog b/debian/changelog
index a4f6327..b2b52d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xawtv (3.91) unstable; urgency=low
+
+ * bugfix release.
+ * fix dependencies (closes: #217451).
+ * added Japanese po-debconf template (closes: #227811).
+
+ -- Gerd Knorr <kraxel@debian.org> Thu, 29 Jan 2004 14:23:49 +0100
+
xawtv (3.90) unstable; urgency=low
* bugfix release (closes: #204990).
diff --git a/debian/control b/debian/control
index 9ee4c70..41752dc 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Description: X11 TV application
Package: pia
Section: x11
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, xawtv-plugins (=${Source-Version})
Description: movie player
This is a simple movie player. It is used by xawtv and motv to
playback movie files which are recorded from TV.
diff --git a/debian/po/jp.po b/debian/po/jp.po
new file mode 100644
index 0000000..4cc094e
--- /dev/null
+++ b/debian/po/jp.po
@@ -0,0 +1,114 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-10-07 13:31+0200\n"
+"PO-Revision-Date: 2004-01-04 00:02+0900\n"
+"Last-Translator: Hideki Yamane <henrich@samba.gr.jp>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../xawtv.templates:4
+msgid "Create video4linux (/dev/video*) special files?"
+msgstr "video4linux (/dev/video*) の特殊ファイルを作成しますか?"
+
+#. Description
+#: ../xawtv.templates:9
+msgid "scan for TV stations?"
+msgstr "TV 局の一覧をスキャンしますか?"
+
+#. Description
+#: ../xawtv.templates:9
+msgid ""
+"I can do a scan of all channels and put a list of the TV stations I've found "
+"into the config file."
+msgstr "すべてのチャンネルをスキャンし、見つかった TV 局のリストを設定ファイルに追加できます。"
+
+#. Description
+#: ../xawtv.templates:9
+msgid ""
+"This requires a working bttv driver. If bttv isn't configured correctly I "
+"might not find the TV stations."
+msgstr "bttv ドライバが既に動作している必要があります。まだ bttv がきちんと設定されていない場合、"
+"TV 局を見つける事ができないかもしれません。"
+
+#. Description
+#: ../xawtv.templates:9
+msgid ""
+"I'll try to pick up the channel names from videotext. This will work with "
+"PAL only."
+msgstr "videotext からチャンネル名を取り出してみます。"
+"これは PAL でのみ動作します (日本では NTSC を利用しているので動作しません)。"
+
+#. Choices
+#: ../xawtv.templates:21
+msgid "PAL, SECAM, NTSC"
+msgstr "PAL, SECAM, NTSC"
+
+#. Description
+#: ../xawtv.templates:22
+msgid "Which TV norm is used in your country?"
+msgstr "あなたの国ではどの TV 規格を使っていますか? (なお、日本では NTSC を利用しています)"
+"
+
+#. Description
+#: ../xawtv.templates:27
+msgid "Create a default configuration for xawtv?"
+msgstr "xawtv の標準設定を作成しますか?"
+
+#. Description
+#: ../xawtv.templates:27
+msgid ""
+"You can create a system-wide configuration file for xawtv with reasonable "
+"default values for the country you live in (which TV norm is used for "
+"example)."
+msgstr "あなたが住んでいる国での適切な初期値 (TV 規格が例として使われています) "
+"が記載されている xawtv 用のシステム全般での設定ファイルを作成できます。"
+
+#. Description
+#: ../xawtv.templates:27
+msgid ""
+"It is not required to have a global configuration file, but it will be more "
+"comfortable for your users if they find a working default configuration."
+msgstr "標準設定ファイルは必要ではありませんが、ユーザが動作する標準の設定を"
+"見つけ出すのにより役立つでしょう。"
+
+#. Choices
+#: ../xawtv.templates:38
+msgid ""
+"us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, "
+"europe-east, italy, newzealand, australia, ireland, france, china-bcast"
+msgstr "アメリカ(地上波), アメリカ(ケーブルテレビ), アメリカ(光同軸ケーブルテレビ), "
+"日本(地上波), 日本(ケーブルテレビ), 西ヨーロッパ, 東ヨーロッパ, イタリア, ニュージーランド, "
+"オーストラリア, アイルランド, フランス, 中国(地上波)"
+
+#. Description
+#: ../xawtv.templates:39
+msgid "Which frequency table should be used?"
+msgstr "どの周波数テーブルを利用しますか?"
+
+#. Description
+#: ../xawtv.templates:39
+msgid ""
+"A frequency table is just a list of TV channel names/numbers and the "
+"corresponding broadcast frequencies for these channels. Different regions "
+"use different standards here..."
+msgstr "周波数テーブルは TV チャンネルの名前・数字とチャンネルに対応する放送周波数のリストです。"
+"これは地域ごとに異なっています。"
diff --git a/x11/Subdir.mk b/x11/Subdir.mk
index 909ddf0..7f853f9 100644
--- a/x11/Subdir.mk
+++ b/x11/Subdir.mk
@@ -1,11 +1,11 @@
# targets to build
-TARGETS-x11 :=
+TARGETS-x11 := \
+ x11/v4lctl
ifeq ($(FOUND_X11),yes)
TARGETS-x11 += \
x11/propwatch \
- x11/v4lctl \
x11/xawtv-remote \
x11/rootv \
x11/xawtv \
@@ -73,11 +73,15 @@ x11/mtt: \
x11/v4lctl: \
x11/v4lctl.o \
- x11/atoms.o \
- x11/xv.o \
common/channel-no-x11.o \
$(OBJS-common-capture)
+ifeq ($(FOUND_X11),yes)
+x11/v4lctl: \
+ x11/atoms.o \
+ x11/xv.o
+endif
+
x11/rootv: \
x11/rootv.o \
x11/atoms.o \
diff --git a/x11/v4lctl.c b/x11/v4lctl.c
index b916623..c6baded 100644
--- a/x11/v4lctl.c
+++ b/x11/v4lctl.c
@@ -17,14 +17,14 @@
# include <X11/Xlib.h>
# include <X11/extensions/Xv.h>
# include <X11/extensions/Xvlib.h>
+# include "atoms.h"
+# include "xv.h"
#endif
#include "grab-ng.h"
#include "channel.h"
#include "frequencies.h"
#include "commands.h"
-#include "atoms.h"
-#include "xv.h"
int debug = 0;
int have_dga = 0;
diff --git a/x11/xt.c b/x11/xt.c
index e8407f4..c4fda24 100644
--- a/x11/xt.c
+++ b/x11/xt.c
@@ -901,14 +901,14 @@ do_modeswitch(int fs_state, int *vp_width, int *vp_height)
*vp_width = swidth;
*vp_height = sheight;
-#ifdef HAVE_LIBXRANDR
- if (have_randr)
- do_randr_modeswitch(fs_state,vp_width,vp_height);
-#endif
#ifdef HAVE_LIBXXF86VM
- if (!have_randr && have_vm)
+ if (have_vm)
do_vidmode_modeswitch(fs_state,vp_width,vp_height);
#endif
+#ifdef HAVE_LIBXRANDR
+ if (!have_vm && have_randr)
+ do_randr_modeswitch(fs_state,vp_width,vp_height);
+#endif
}
/*----------------------------------------------------------------------*/
diff --git a/xawtv.spec b/xawtv.spec
index 8643af9..e50098e 100644
--- a/xawtv.spec
+++ b/xawtv.spec
@@ -1,7 +1,7 @@
Name: xawtv
Group: Applications/Multimedia
Autoreqprov: on
-Version: 3.90
+Version: 3.91
Release: 0
License: GPL
Summary: v4l applications

Privacy Policy