Commit 2559d2d6 authored by Andreas Beckmann's avatar Andreas Beckmann Committed by Tobias Frost

Import Debian changes 1.0.2-15

tvtime (1.0.2-15) unstable; urgency=medium

  * QA upload.
  * Fix-asm-compilation-with-cpp-from-gcc6.patch: New patch from upstream,
    thanks to Adrian Bunk.  (Closes: #811894)
  * Use-XScreenSaverExtension-instead-of-typing-text-via.patch: New patch,
    thanks to Resul Cetin.  (Closes: #458041)
  * New Brazilian Portuguese (pt_BR) debconf translations by
    Adriano Rafael Gomes.  (Closes: #816930)
  * Switch to source format 3.0 (quilt).
  * Build with autotools-dev.
parent 616c5ccc
This diff is collapsed.
This diff is collapsed.
tvtime (1.0.2-15) unstable; urgency=medium
* QA upload.
* Fix-asm-compilation-with-cpp-from-gcc6.patch: New patch from upstream,
thanks to Adrian Bunk. (Closes: #811894)
* Use-XScreenSaverExtension-instead-of-typing-text-via.patch: New patch,
thanks to Resul Cetin. (Closes: #458041)
* New Brazilian Portuguese (pt_BR) debconf translations by
Adriano Rafael Gomes. (Closes: #816930)
* Switch to source format 3.0 (quilt).
* Build with autotools-dev.
-- Andreas Beckmann <anbe@debian.org> Mon, 12 Dec 2016 02:17:19 +0100
tvtime (1.0.2-14) unstable; urgency=medium
* QA upload.
......
......@@ -4,6 +4,7 @@ Priority: optional
Maintainer: Debian QA Group <packages@qa.debian.org>
Build-Depends:
debhelper (>= 7),
autotools-dev,
zlib1g-dev,
libpng-dev,
libfreetype6-dev,
......@@ -11,12 +12,11 @@ Build-Depends:
libxext-dev,
libxinerama-dev,
libxt-dev,
libxtst-dev,
libxss-dev,
libxv-dev,
libxxf86vm-dev,
libxml2-dev,
fontforge,
quilt,
chrpath,
Standards-Version: 3.9.3
Homepage: http://tvtime.net/
......
......@@ -167,7 +167,7 @@ plugins/vfir.c
/**
* This file contains code from ffmpeg, see http://ffmpeg.org/
*
* Originated in imgconvert.c: Misc image convertion routines
* Originated in imgconvert.c: Misc image conversion routines
* Copyright (c) 2001, 2002, 2003 Fabrice Bellard.
*
* tvtime port Copyright (C) 2003 Billy Biggs <vektor@dumbterm.net>.
......@@ -776,7 +776,7 @@ plugins/vfir.c
/**
* This file contains code from ffmpeg, see http://ffmpeg.org/
*
* Originated in imgconvert.c: Misc image convertion routines
* Originated in imgconvert.c: Misc image conversion routines
* Copyright (c) 2001, 2002, 2003 Fabrice Bellard.
*
* tvtime port Copyright (C) 2003 Billy Biggs <vektor@dumbterm.net>.
......
This diff is collapsed.
From f6abc0242df2dba902ea4d59be2af125e2492fde Mon Sep 17 00:00:00 2001
From: Resul Cetin <resul-cetin@gmx.net>
Date: Thu, 11 Dec 2008 17:50:28 +0100
Subject: [PATCH] Use XScreenSaverExtension instead of typing text via Xtest
---
config.h.in | 2 +-
configure | 26 +++++++++++++-------------
configure.ac | 8 ++++----
debian/control | 2 +-
src/xcommon.c | 52 ++++++++++++++++++++++++----------------------------
5 files changed, 43 insertions(+), 47 deletions(-)
diff --git a/config.h.in b/config.h.in
index 6180c73..455e380 100644
--- a/config.h.in
+++ b/config.h.in
@@ -296,7 +296,7 @@
#undef HAVE_XINERAMA
/* XTest support */
-#undef HAVE_XTESTEXTENSION
+#undef HAVE_XSSEXTENSION
/* Xv support */
#undef HAVE_XV
diff --git a/configure b/configure
index a6c5138..6c2dd5e 100755
--- a/configure
+++ b/configure
@@ -25906,13 +25906,13 @@ _ACEOF
fi
- echo "$as_me:$LINENO: checking for XTestFakeKeyEvent in -lXtst" >&5
-echo $ECHO_N "checking for XTestFakeKeyEvent in -lXtst... $ECHO_C" >&6
-if test "${ac_cv_lib_Xtst_XTestFakeKeyEvent+set}" = set; then
+ echo "$as_me:$LINENO: checking for XScreenSaverSuspend in -lXss" >&5
+echo $ECHO_N "checking for XScreenSaverSuspend in -lXss... $ECHO_C" >&6
+if test "${ac_cv_lib_Xss_XScreenSaverSuspend+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXtst $X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lXext $LIBS"
+LIBS="-lXss $X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lXext $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -25926,11 +25926,11 @@ extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char XTestFakeKeyEvent ();
+char XScreenSaverSuspend ();
int
main ()
{
-XTestFakeKeyEvent ();
+XScreenSaverSuspend ();
;
return 0;
}
@@ -25956,26 +25956,26 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_Xtst_XTestFakeKeyEvent=yes
+ ac_cv_lib_Xss_XScreenSaverSuspend=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_Xtst_XTestFakeKeyEvent=no
+ac_cv_lib_Xss_XScreenSaverSuspend=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xtst_XTestFakeKeyEvent" >&5
-echo "${ECHO_T}$ac_cv_lib_Xtst_XTestFakeKeyEvent" >&6
-if test $ac_cv_lib_Xtst_XTestFakeKeyEvent = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_XScreenSaverSuspend" >&5
+echo "${ECHO_T}$ac_cv_lib_Xss_XScreenSaverSuspend" >&6
+if test $ac_cv_lib_Xss_XScreenSaverSuspend = yes; then
cat >>confdefs.h <<\_ACEOF
-#define HAVE_XTESTEXTENSION
+#define HAVE_XSSEXTENSION
_ACEOF
- X11_LIBS="$X11_LIBS -lXtst"
+ X11_LIBS="$X11_LIBS -lXss"
fi
diff --git a/configure.ac b/configure.ac
index 9692b31..ee240df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,10 +118,10 @@ if test x"$no_x" != x"yes"; then
X11_LIBS="$X11_LIBS -lXinerama"],,
[$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lXext])
- dnl check for XTest
- AC_CHECK_LIB([Xtst],[XTestFakeKeyEvent],
- [AC_DEFINE([HAVE_XTESTEXTENSION],,[XTest support])
- X11_LIBS="$X11_LIBS -lXtst"],,
+ dnl check for XSs
+ AC_CHECK_LIB([Xss],[XScreenSaverSuspend],
+ [AC_DEFINE([HAVE_XSSEXTENSION],,[XSs support])
+ X11_LIBS="$X11_LIBS -lXss"],,
[$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lXext])
dnl check for Xvidmode
diff --git a/src/xcommon.c b/src/xcommon.c
index 8e3be4c..408f231 100644
--- a/src/xcommon.c
+++ b/src/xcommon.c
@@ -45,8 +45,8 @@
#include <X11/keysym.h>
#include <X11/cursorfont.h>
#include <X11/extensions/XShm.h>
-#ifdef HAVE_XTESTEXTENSION
-#include <X11/extensions/XTest.h>
+#ifdef HAVE_XSSEXTENSION
+#include <X11/extensions/scrnsaver.h>
#endif
#include "xfullscreen.h"
@@ -67,7 +67,7 @@ static Window wm_window;
static Window fs_window;
static Window output_window;
static GC gc;
-static int have_xtest;
+static int have_xss;
static int output_width, output_height;
static int output_aspect;
static int output_on_root;
@@ -107,10 +107,6 @@ static Atom wm_delete_window;
static Atom xawtv_station;
static Atom xawtv_remote;
-#ifdef HAVE_XTESTEXTENSION
-static KeyCode kc_shift_l; /* Fake key to send. */
-#endif
-
static area_t video_area;
static area_t window_area;
static area_t scale_area;
@@ -248,12 +244,12 @@ static void x11_wait_mapped( Display *dpy, Window win )
} while ( (event.type != MapNotify) || (event.xmap.event != win) );
}
-static int have_xtestextention( void )
+static int have_xssextention( void )
{
-#ifdef HAVE_XTESTEXTENSION
- int dummy1, dummy2, dummy3, dummy4;
+#ifdef HAVE_XSSEXTENSION
+ int dummy1, dummy2;
- return (XTestQueryExtension( display, &dummy1, &dummy2, &dummy3, &dummy4 ) == True);
+ return (XScreenSaverQueryExtension( display, &dummy1, &dummy2 ) == True);
#endif
return 0;
}
@@ -843,7 +839,7 @@ int xcommon_open_display( const char *user_geometry, int aspect, int verbose )
output_aspect = aspect;
output_height = 576;
- have_xtest = 0;
+ have_xss = 0;
output_on_root = 0;
has_ewmh_state_fullscreen = 0;
has_ewmh_state_above = 0;
@@ -927,13 +923,16 @@ int xcommon_open_display( const char *user_geometry, int aspect, int verbose )
xfullscreen_print_summary( xf );
}
-#ifdef HAVE_XTESTEXTENSION
- kc_shift_l = XKeysymToKeycode( display, XK_Shift_L );
-#endif
- have_xtest = have_xtestextention();
- if( have_xtest && xcommon_verbose ) {
- fprintf( stderr, "xcommon: Have XTest, will use it to ping the screensaver.\n" );
+ have_xss = have_xssextention();
+ if( have_xss && xcommon_verbose ) {
+ fprintf( stderr, "xcommon: Have XSS, will use it to disable the screensaver.\n" );
+ }
+
+#ifdef HAVE_XSSEXTENSION
+ if ( have_xss ) {
+ XScreenSaverSuspend( display, True );
}
+#endif
/* Initially, get the best width for our height. */
output_width = xv_get_width_for_height( output_height );
@@ -1110,17 +1109,9 @@ void xcommon_ping_screensaver( void )
}
gettimeofday( &curtime, 0 );
- if( timediff( &curtime, &last_ping_time ) > SCREENSAVER_PING_TIME ) {
+ if( timediff( &curtime, &last_ping_time ) > SCREENSAVER_PING_TIME ) {
last_ping_time = curtime;
-#ifdef HAVE_XTESTEXTENSION
- if( have_xtest ) {
- XTestFakeKeyEvent( display, kc_shift_l, True, CurrentTime );
- XTestFakeKeyEvent( display, kc_shift_l, False, CurrentTime );
- } else
-#endif
- {
- XResetScreenSaver( display );
- }
+ XResetScreenSaver( display );
}
}
@@ -1715,6 +1706,11 @@ void xcommon_poll_events( input_t *in )
void xcommon_close_display( void )
{
+#ifdef HAVE_XSSEXTENSION
+ if ( have_xss ) {
+ XScreenSaverSuspend( display, False );
+ }
+#endif
XDestroyWindow( display, output_window );
XDestroyWindow( display, wm_window );
XDestroyWindow( display, fs_window );
--
1.6.0.6
tvtime-1.0.2-14.patch
fullscreen.diff
typo.diff
libpng.diff
saveconfig.diff
home.diff
Fix-asm-compilation-with-cpp-from-gcc6.patch
Use-XScreenSaverExtension-instead-of-typing-text-via.patch
This diff is collapsed.
# Debconf translations for tvtime.
# Copyright (C) 2016 THE tvtime'S COPYRIGHT HOLDER
# This file is distributed under the same license as the tvtime package.
# Adriano Rafael Gomes <adrianorg@arg.eti.br>, 2016.
#
msgid ""
msgstr ""
"Project-Id-Version: tvtime\n"
"Report-Msgid-Bugs-To: tvtime@packages.debian.org\n"
"POT-Creation-Date: 2012-05-06 12:57+0000\n"
"PO-Revision-Date: 2016-01-24 13:42-0200\n"
"Last-Translator: Adriano Rafael Gomes <adrianorg@arg.eti.br>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
"org>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: select
#. Description
#: ../templates:2001
msgid "TV standard:"
msgstr "Padrão de TV:"
#. Type: select
#. Description
#: ../templates:2001
msgid ""
"Please choose the TV standard to use. NTSC is used in North America, much of "
"South America, and Japan; SECAM in France, the former USSR, and parts of "
"Africa and the Middle East; and PAL elsewhere."
msgstr ""
"Por favor, escolha o padrão de TV para usar. NTSC é usado na América do "
"Norte, muito usado na América do Sul e Japão; SECAM na França, na ex-União "
"Soviética, e em partes da África e Meio Oeste; e PAL em outros lugares."
#. Type: select
#. Choices
#. Type: select
#. Choices
#: ../templates:3001 ../templates:4001
msgid "Cable"
msgstr "Cabo"
#. Type: select
#. Choices
#. Type: select
#. Choices
#: ../templates:3001 ../templates:4001
msgid "Broadcast"
msgstr "Broadcast"
#. Type: select
#. Choices
#: ../templates:3001
msgid "Cable including channels 100+"
msgstr "Cabo incluindo canais 100+"
#. Type: select
#. Description
#. Type: select
#. Description
#. Type: select
#. Description
#: ../templates:3002 ../templates:4002 ../templates:5002
msgid "Default frequency table:"
msgstr "Tabela de frequências padrão:"
#. Type: select
#. Description
#: ../templates:3002
msgid ""
"Please choose the frequency table to use. It specifies which frequencies "
"correspond to the familiar channel numbers. You should select \"Broadcast\" "
"if you use an antenna for over-the-air signals."
msgstr ""
"Por favor, escolha a tabela de frequências para usar. Ela especifica quais "
"frequências correspondem aos números de canais comuns. Você deve escolher "
"\"Broadcast\" se você usa uma antena para sinais \"over-the-air\"."
#. Type: select
#. Description
#. Type: select
#. Description
#: ../templates:4002 ../templates:5002
msgid ""
"Please choose the frequency table to use. It specifies which frequencies "
"correspond to the familiar channel numbers."
msgstr ""
"Por favor, escolha a tabela de frequências para usar. Ela especifica quais "
"frequências correspondem aos números de canais comuns."
#. Type: select
#. Description
#: ../templates:4002
msgid ""
"You should select \"Broadcast\" if you use an antenna for over-the-air "
"signals."
msgstr ""
"Você deve escolher \"Broadcast\" se você usa uma antena para sinais \"over-"
"the-air\"."
#. Type: select
#. Choices
#: ../templates:5001
msgid "Europe"
msgstr "Europa"
#. Type: select
#. Choices
#: ../templates:5001
msgid "France"
msgstr "França"
#. Type: select
#. Choices
#: ../templates:5001
msgid "Russia"
msgstr "Rússia"
# #-#-#-#-# iso-codes_3.63-1_pt_BR.po (iso_3166) #-#-#-#-#
# AU
#. Type: select
#. Choices
#: ../templates:5001
msgid "Australia"
msgstr "Austrália"
#. Type: select
#. Choices
#: ../templates:5001
msgid "New Zealand"
msgstr "Nova Zelândia"
#. Type: select
#. Choices
#: ../templates:5001
msgid "China Broadcast"
msgstr "China Broadcast"
#. Type: select
#. Choices
#: ../templates:5001
msgid "Australia Optus"
msgstr "Austrália Optus"
#. Type: select
#. Choices
#: ../templates:5001
msgid "Custom (must run tvtime-scanner first)"
msgstr "Personalizado (deve executar tvtime-scanner primeiro)"
#. Type: select
#. Description
#: ../templates:5002
msgid ""
"If you are a user of a cable company that does not use standard frequencies, "
"you should select \"Custom\" and run the tvtime-scanner application before "
"using tvtime."
msgstr ""
"Se você for um usuário de uma companhia de TV à cabo que não usa frequências "
"padrão, você deve escolher \"Personalizado\" e executar o aplicativo tvtime-"
"scanner antes de usar o tvtime."
#. Type: string
#. Description
#: ../templates:6001
msgid "Default television capture device:"
msgstr "Dispositivo padrão de captura de televisão:"
#. Type: string
#. Description
#: ../templates:6001
msgid ""
"Please choose the video4linux device which corresponds to your capture card."
msgstr ""
"Por favor, selecione o dispositivo video4linux correspondente à sua placa de "
"captura."
#. Type: string
#. Description
#: ../templates:7001
msgid "Device to use for VBI decoding:"
msgstr "Dispositivo para ser usado para decodificação VBI:"
#. Type: string
#. Description
#: ../templates:7001
msgid ""
"Please choose the device that will be used in NTSC areas for decoding closed "
"captions and XDS channel information."
msgstr ""
"Por favor, escolha o dispositivo que será usado em áreas NTSC para "
"decodificação de legendas \"closed caption\" e informações de canal XDS."
#. Type: boolean
#. Description
#: ../templates:8001
msgid "Allow tvtime to run with root privileges?"
msgstr "Permitir que o tvtime execute com privilégios de root?"
#. Type: boolean
#. Description
#: ../templates:8001
msgid ""
"Please choose whether tvtime should be \"setuid root\", therefore getting "
"root privileges when running."
msgstr ""
"Por favor, escolha se o tvtime deve ser \"setuid root\", portanto recebendo "
"privilégios de root ao executar."
#. Type: boolean
#. Description
#: ../templates:8001
msgid ""
"This allows tvtime to run at a high priority to ensure smooth video and "
"should be used for high quality video output even during high CPU load."
msgstr ""
"Isso permite que o tvtime execute com uma prioridade mais alta para "
"assegurar vídeo fluido e deve ser usado para saída de vídeo de alta "
"qualidade mesmo sob alta carga de CPU."
#. Type: string
#. Description
#: ../templates:9001
msgid "Process priority for the tvtime binary:"
msgstr "Prioridade do processo para o binário do tvtime:"
#. Type: string
#. Description
#: ../templates:9001
msgid ""
"This setting controls the priority of the tvtime process relative to other "
"processes on the system."
msgstr ""
"Essa configuração controla a prioridade do processo do tvtime em relação a "
"outros processos no sistema."
#. Type: string
#. Description
#: ../templates:9001
msgid ""
"Allowed values are integers between -20 and 19. Lower values indicate higher "
"priority, and a value of 0 would give tvtime the same priority as a normal "
"process."
msgstr ""
"São permitidos valores inteiros entre -20 e 19. Valores mais baixos indicam "
"prioridades mais altas, e um valor igual a 0 dará ao tvtime a mesma "
"prioridade de um processo normal."
......@@ -23,8 +23,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
include /usr/share/quilt/quilt.make
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
......@@ -32,8 +30,9 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
CFLAGS += -Wall
config.status: configure patch
config.status: configure
dh_testdir
dh_autotools-dev_updateconfig
# Add here commands to configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
......@@ -59,18 +58,14 @@ build-stamp: config.status
touch build-stamp
clean: unpatch
clean:
dh_testdir
dh_testroot
rm -f build-stamp
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
-test -r /usr/share/misc/config.sub && \
cp -f /usr/share/misc/config.sub config.sub
-test -r /usr/share/misc/config.guess && \
cp -f /usr/share/misc/config.guess config.guess
dh_autotools-dev_restoreconfig
dh_clean
rm -f po/stamp-po po/*.gmo
......
tvtime source: patch-system-but-direct-changes-in-diff
......@@ -63,7 +63,7 @@ eigenen Abschnitt in der Konfigurationsdatei. Der Name der Frequenztabelle
ist nicht vordefiniert, Sie können also einen Abschnitt mit
frequencies="foobar" einleiten und durch
.br
\h'4n'tvtime -f foobar
.h'4n'tvtime -f foobar
.br
aufrufen. Die Fernsehnorm muß jedoch mit der verwendeten Norm übereinstimmen.
......
......@@ -61,7 +61,7 @@ That is, each norm/frequency combination will get its own section in the
configuration file. The frequencies name is not special, you can have
frequencies="foobar" and running
.br
\h'4n'tvtime -f foobar
.h'4n'tvtime -f foobar
.br
will do the right thing. The norm, however, must match the norm being
used.
......
......@@ -493,7 +493,7 @@ bound to the command as well as a mouse button
</bind>
Some commands can take arguments, for example, the
.I SCREENSHOT
.IT SCREENSHOT
command can take an argument for the filename. Arguments can be given
to a key binding as follows:
......
......@@ -66,7 +66,7 @@ Es decir, cada combinaci
el archivo de configuración. El nombre de la frecuencia no es especial, puedes tener
frequencies="foobar", ejecutar
.br
\h'4n'tvtime -f foobar
.h'4n'tvtime -f foobar
.br
y obtendrás los resultados deseados. La norma; sin embargo, debe coincidir
con la que estás usando.
......
......@@ -493,7 +493,7 @@ asociadas al comando, as
</bind>
Algunos comandos pueden recibir argumentos; por ejemplo, el comando
.I SCREENSHOT
.IT SCREENSHOT
puede coger como argumento el nombre del fichero. Los argumentos pueden
ser enviados a una asociación de tecla como sigue:
......
......@@ -18,7 +18,7 @@
#include "x86-64_macros.inc"
void FUNCT_NAME(TDeinterlaceInfo* pInfo)
void DScalerFilterGreedyH::FUNCT_NAME(TDeinterlaceInfo* pInfo)
{
int64_t i;
bool InfoIsOdd = (pInfo->PictureHistory[0]->Flags & PICTURE_INTERLACED_ODD) ? 1 : 0;
......
......@@ -31,7 +31,7 @@ public:
#define IS_MMX
#define SSE_TYPE MMX
#define FUNCT_NAME filterDScaler_MMX
#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_MMX
#include "tomsmocomp/TomsMoCompAll.inc"
#undef IS_MMX
#undef SSE_TYPE
......@@ -39,7 +39,7 @@ public:
#define IS_3DNOW
#define SSE_TYPE 3DNOW
#define FUNCT_NAME filterDScaler_3DNOW
#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_3DNOW
#include "tomsmocomp/TomsMoCompAll.inc"
#undef IS_3DNOW
#undef SSE_TYPE
......@@ -47,7 +47,7 @@ public:
#define IS_SSE
#define SSE_TYPE SSE
#define FUNCT_NAME filterDScaler_SSE
#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_SSE
#include "tomsmocomp/TomsMoCompAll.inc"
#undef IS_SSE
#undef SSE_TYPE
......
......@@ -5,9 +5,9 @@
#endif
#ifdef USE_STRANGE_BOB
#define SEARCH_EFFORT_FUNC(n) SEFUNC(n##_SB)
#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n##_SB)
#else
#define SEARCH_EFFORT_FUNC(n) SEFUNC(n)
#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n)
#endif
int SEARCH_EFFORT_FUNC(0) // we don't try at all ;-)
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -269,18 +269,18 @@ tvtime_command_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
tvtime-command.c
tvtime_command_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
tvtime_command_LDFLAGS = $(ZLIB_LIBS) $(XML2_LIBS) -lm
tvtime_command_LDFLAGS = $(ZLIB_LIBS) $(XML2_LIBS)
tvtime_configure_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
tvtime-configure.c
tvtime_configure_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
tvtime_configure_LDFLAGS = $(ZLIB_LIBS) $(XML2_LIBS) -lm
tvtime_configure_LDFLAGS = $(ZLIB_LIBS) $(XML2_LIBS)
tvtime_scanner_SOURCES = utils.h utils.c videoinput.h videoinput.c \
tvtimeconf.h tvtimeconf.c station.h station.c tvtime-scanner.c \
mixer.h mixer.c
tvtime_scanner_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
tvtime_scanner_LDFLAGS = $(ZLIB_LIBS) $(XML2_LIBS) -lm
tvtime_scanner_LDFLAGS = $(ZLIB_LIBS) $(XML2_LIBS)
subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
......
......@@ -16,6 +16,7 @@
#ifdef __KERNEL__
#include <linux/time.h> /* need struct timeval */
#endif
#include <linux/compiler.h> /* need __user */
/* for kernel versions 2.4.26 and below: */
#ifndef __user
......
......@@ -118,9 +118,9 @@ const int num_timezones = sizeof( date_manip_timezones ) / sizeof( tz_map_t );
typedef struct {
const char *code;
const char *name;
} tvtime_locale_t;
} locale_t;
static tvtime_locale_t locale_table[] = {
static locale_t locale_table[] = {
{"AA", "Afar"}, {"AB", "Abkhazian"}, {"AF", "Afrikaans"},
{"AM", "Amharic"}, {"AR", "Arabic"}, {"AS", "Assamese"},
{"AY", "Aymara"}, {"AZ", "Azerbaijani"}, {"BA", "Bashkir"},
......@@ -168,7 +168,7 @@ static tvtime_locale_t locale_table[] = {
{"XH", "Xhosa"}, {"YO", "Yoruba"}, {"ZH", "Chinese"},
{"ZU", "Zulu"} };
const int num_locales = sizeof( locale_table ) / sizeof( tvtime_locale_t );
const int num_locales = sizeof( locale_table ) / sizeof( locale_t );
/**
* Timezone parsing code based loosely on the algorithm in
......