aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvektor <devnull@localhost>2004-10-30 15:07:28 +0000
committervektor <devnull@localhost>2004-10-30 15:07:28 +0000
commit3267e210ebb82a2ec87842240841b027bf34ba29 (patch)
treebae51524cc39bd02e133b4e9948e865ce23683b7
parent48338f66d64d8e69f056cdd60c79518e0606635a (diff)
30 Oct 2004 Billy Biggs <vektor@dumbterm.net>
* tvtime/configure.ac: Update to 0.9.15, define ARCH_X86_64 instead of ARCH_AMD64 to follow kdetv (and fix compile problems), add locale.h to the list of headers we check for. * tvtime/ChangeLog: Add some crap about 0.9.15. * tvtime/INSTALL: Refer to 0.9.15. * tvtime/NEWS: Announce about 0.9.15. * tvtime/src/speedy.c: Use ARCH_X86_64 instead of ARCH_AMD64.
-rw-r--r--ChangeLog4
-rw-r--r--INSTALL8
-rw-r--r--NEWS4
-rw-r--r--configure.ac26
-rw-r--r--src/speedy.c2
5 files changed, 19 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog
index dbebe76..2405650 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
+0.9.15 -
+ * vektor: It seems that some systems need #include <locale.h>
+ * vektor: Use ARCH_X86_64 instead of ARCH_AMD64 to follow kdetv.
+
0.9.14 - Thu Oct 28 22:20:47 EDT 2004
* vektor: Don't show the hue control for non-NTSC-like norms.
* vektor: Improve usability of the menu system when using a mouse.
diff --git a/INSTALL b/INSTALL
index cf16628..ecf0a5f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -22,7 +22,7 @@ tvtime install itself and all required files under /usr/local. To
instead use paths according to the Filesystem Hierarchy Standard, we
recommend you run configure with these options:
- ~/tvtime-0.9.14$ ./configure --prefix=/usr --sysconfdir=/etc
+ ~/tvtime-0.9.15$ ./configure --prefix=/usr --sysconfdir=/etc
This will have tvtime use /usr/bin for its executables,
/usr/share/tvtime for its data files, /etc/tvtime for its global
@@ -30,13 +30,13 @@ configuration files, and /usr/share/... for icons and menu entries.
Next, compile tvtime using make.
- ~/tvtime-0.9.14$ make
+ ~/tvtime-0.9.15$ make
And then, install it as root.
- ~/tvtime-0.9.14$ su
+ ~/tvtime-0.9.15$ su
<enter password>
- /home/user/tvtime-0.9.14# make install
+ /home/user/tvtime-0.9.15# make install
Compiling with optimized CFLAGS
===============================
diff --git a/NEWS b/NEWS
index 89f49a8..f92929d 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,10 @@ For news and updates on tvtime, please visit our website at:
http://tvtime.net/
+News for 0.9.15
+
+ * Compile fixes.
+
News for 0.9.14
* Improved the usability of the menu system when using a mouse.
diff --git a/configure.ac b/configure.ac
index ad3ffb7..9c6838b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
-AC_INIT(tvtime, 0.9.14, http://tvtime.net/)
+AC_INIT(tvtime, 0.9.15, http://tvtime.net/)
AC_CONFIG_SRCDIR([src/tvtime.c])
-AM_INIT_AUTOMAKE(tvtime,0.9.14)
+AM_INIT_AUTOMAKE(tvtime,0.9.15)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
AC_CANONICAL_HOST
@@ -22,7 +22,7 @@ AC_PROG_LIBTOOL
# Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADERS([ctype.h dirent.h errno.h fcntl.h getopt.h langinfo.h math.h netinet/in.h pwd.h signal.h stdint.h stdio.h stdlib.h string.h sys/ioctl.h sys/mman.h sys/resource.h sys/stat.h sys/time.h sys/wait.h sys/types.h unistd.h wordexp.h])
+AC_CHECK_HEADERS([ctype.h dirent.h errno.h fcntl.h getopt.h langinfo.h math.h netinet/in.h pwd.h signal.h stdint.h stdio.h stdlib.h string.h sys/ioctl.h sys/mman.h sys/resource.h sys/stat.h sys/time.h sys/wait.h sys/types.h unistd.h wordexp.h locale.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_HEADER_TIME
@@ -79,20 +79,6 @@ AC_PATH_PROG(LIBXML2_CONFIG,xml2-config,no)
if test "$LIBXML2_CONFIG" = "no" ; then
AC_MSG_ERROR(libxml2 needed and xml2-config not found)
else
- LIBXML_VERSION=`$LIBXML2_CONFIG --version`
- export MAJOR=0 ; export MINOR=0 ; export MICRO=0
- MAJOR=`echo $LIBXML_VERSION | awk 'BEGIN {FS = "."} {print $1}'`
- MINOR=`echo $LIBXML_VERSION | awk 'BEGIN {FS = "."} {print $2}'`
- MICRO=`echo $LIBXML_VERSION | awk 'BEGIN {FS = "."} {print $3}'`
-dnl if test $MAJOR -lt 2 ; then
-dnl AC_MSG_ERROR([Found libxml2 with major version number = $MAJOR < 2])
-dnl fi
-dnl if test $MINOR -lt 4 ; then
-dnl AC_MSG_ERROR([Found libxml2 with minor version number = $MINOR < 4])
-dnl fi
-dnl if test $MICRO -lt 4 ; then
-dnl AC_MSG_ERROR([Found libxml2 with micro version number = $MICRO < 26])
-dnl fi
XML2_LIBS="`$LIBXML2_CONFIG --libs`"
XML2_FLAG="`$LIBXML2_CONFIG --cflags`"
AC_DEFINE(HAVE_LIBXML2,,[LIBXML2 support])
@@ -190,9 +176,9 @@ if test x"$GCC" = x"yes"; then
AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
x86_64-*)
AC_DEFINE([ARCH_X86],,[x86 architecture])
- AC_DEFINE([ARCH_AMD64],,[amd64 architecture])
+ AC_DEFINE([ARCH_X86_64],,[x86_64 architecture])
ARCH_X86=yes
- ARCH_AMD64=yes;;
+ ARCH_X86_64=yes;;
ppc-* | powerpc-*)
OPT_CFLAGS="$CFLAGS -Wa,-m7400"
AC_TRY_CFLAGS([$OPT_CFLAGS],
@@ -223,7 +209,7 @@ else
fi
AM_CONDITIONAL(ARCH_X86, [test "$ARCH_X86" = "yes"])
AM_CONDITIONAL(ARCH_386, [test "$ARCH_386" = "yes"])
-AM_CONDITIONAL(ARCH_AMD64, [test "$ARCH_AMD64" = "yes"])
+AM_CONDITIONAL(ARCH_X86_64, [test "$ARCH_X86_64" = "yes"])
dnl Checks for library functions.
AC_CHECK_FUNCS([memalign])
diff --git a/src/speedy.c b/src/speedy.c
index c5f9aac..7124a27 100644
--- a/src/speedy.c
+++ b/src/speedy.c
@@ -856,7 +856,7 @@ static void convert_uyvy_to_yuyv_scanline_mmx( uint8_t *uyvy_buf, uint8_t *yuyv_
/* input */ : "g" (uyvy_buf), "g" (yuyv_buf), "g" (width)
/* clobber registers */ : "cc", "edx", "esi", "edi" );
#endif
-#ifdef ARCH_AMD64
+#ifdef ARCH_X86_64
__asm__ __volatile__(
" movq %0, %%rsi \n"
" movq %1, %%rdi \n"

Privacy Policy