diff options
author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-03 04:50:46 +0200 |
---|---|---|
committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-03 04:50:46 +0200 |
commit | 29de55140caf6b28a8147290436981dc90b90333 (patch) | |
tree | 280e230a5c06265e8159a9a0ba955c7c1f50c6ac | |
parent | 53e35bf59a7106fabd7d10e24190919e44dbf792 (diff) | |
parent | 2a1cde453a5a08542963c7a02443056e94249124 (diff) | |
download | xine-lib-29de55140caf6b28a8147290436981dc90b90333.tar.gz xine-lib-29de55140caf6b28a8147290436981dc90b90333.tar.bz2 |
Merge tonight's changes to main branch.
95 files changed, 68 insertions, 504 deletions
@@ -1,5 +1,13 @@ +syntax: glob +*~ + +*.lo +*.la +.libs/* +.deps/* Makefile Makefile.in + aclocal.m4 compile configure @@ -20,3 +28,6 @@ mkinstalldirs stamp-h1 post-install.sh autom4te.cache + +po/POTFILES +po/*.gmo @@ -1,13 +1,19 @@ -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software -Foundation, Inc. +Installation Instructions +************************* - This file is free documentation; the Free Software Foundation gives +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006 Free Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Basic Installation ================== - These are generic installation instructions. +Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -20,9 +26,9 @@ debugging `configure'). It can also use an optional file (typically called `config.cache' and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is +the results of its tests to speed up reconfiguring. Caching is disabled by default to prevent problems with accidental use of stale -cache files.) +cache files. If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail @@ -32,20 +38,17 @@ some point `config.cache' contains results you don't want to keep, you may remove or edit it. The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. + `./configure' to configure the package for your system. - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. 2. Type `make' to compile the package. @@ -67,51 +70,49 @@ The simplest way to compile this package is: Compilers and Options ===================== - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here is an example: - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + ./configure CC=c99 CFLAGS=-g LIBS=-lposix *Note Defining Variables::, for more details. Compiling For Multiple Architectures ==================================== - You can compile the package for more than one kind of computer at the +You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the +own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. Installation Names ================== - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. +By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular +options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. @@ -122,7 +123,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. Optional Features ================= - Some packages pay attention to `--enable-FEATURE' options to +Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -137,11 +138,11 @@ you can use the `configure' options `--x-includes=DIR' and Specifying the System Type ========================== - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -156,7 +157,7 @@ where SYSTEM can have one of these forms: need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will +use the option `--target=TYPE' to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a @@ -167,9 +168,9 @@ eventually be run) with `--host=TYPE'. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -178,7 +179,7 @@ A warning: not all `configure' scripts look for a site script. Defining Variables ================== - Variables not defined in a site shell script can be set in the +Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -186,14 +187,18 @@ them in the `configure' command line, using `VAR=value'. For example: ./configure CC=/usr/local2/bin/gcc -will cause the specified gcc to be used as the C compiler (unless it is +causes the specified `gcc' to be used as the C compiler (unless it is overridden in the site shell script). +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + `configure' Invocation ====================== - `configure' recognizes the following options to control how it -operates. +`configure' recognizes the following options to control how it operates. `--help' `-h' diff --git a/doc/.hgignore b/doc/.hgignore deleted file mode 100644 index 282522db0..000000000 --- a/doc/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/doc/faq/.hgignore b/doc/faq/.hgignore index 647d53c1d..ff13beb09 100644 --- a/doc/faq/.hgignore +++ b/doc/faq/.hgignore @@ -1,4 +1,2 @@ -Makefile -Makefile.in faq.html faq.txt diff --git a/doc/hackersguide/.hgignore b/doc/hackersguide/.hgignore index 28b4cdaa4..23ef1d30c 100644 --- a/doc/hackersguide/.hgignore +++ b/doc/hackersguide/.hgignore @@ -1,4 +1,2 @@ -Makefile -Makefile.in hackersguide.html *.png diff --git a/doc/man/.hgignore b/doc/man/.hgignore deleted file mode 100644 index 282522db0..000000000 --- a/doc/man/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/doc/man/en/.hgignore b/doc/man/en/.hgignore deleted file mode 100644 index 282522db0..000000000 --- a/doc/man/en/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/include/.hgignore b/include/.hgignore index dac399d97..fa9cc0888 100644 --- a/include/.hgignore +++ b/include/.hgignore @@ -1,3 +1 @@ -Makefile -Makefile.in xine.h diff --git a/intl/.hgignore b/intl/.hgignore deleted file mode 100644 index f3c7a7c5d..000000000 --- a/intl/.hgignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/lib/.hgignore b/lib/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/lib/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/m4/.hgignore b/m4/.hgignore deleted file mode 100644 index 282522db0..000000000 --- a/m4/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/misc/.hgignore b/misc/.hgignore index fe4e75d06..e126a36c8 100644 --- a/misc/.hgignore +++ b/misc/.hgignore @@ -1,5 +1,3 @@ -Makefile -Makefile.in SlackBuild build_rpms.sh libxine.pc diff --git a/misc/fonts/.hgignore b/misc/fonts/.hgignore deleted file mode 100644 index 282522db0..000000000 --- a/misc/fonts/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/po/.hgignore b/po/.hgignore deleted file mode 100644 index a57e19405..000000000 --- a/po/.hgignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -*.gmo -POTFILES diff --git a/src/.hgignore b/src/.hgignore deleted file mode 100644 index 282522db0..000000000 --- a/src/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/src/audio_out/.hgignore b/src/audio_out/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/audio_out/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/combined/.hgignore b/src/combined/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/combined/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/demuxers/.hgignore b/src/demuxers/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/demuxers/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/dxr3/.hgignore b/src/dxr3/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/dxr3/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/input/.hgignore b/src/input/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/input/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/input/dvb/.hgignore b/src/input/dvb/.hgignore deleted file mode 100644 index 282522db0..000000000 --- a/src/input/dvb/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/src/input/libdvdnav/.hgignore b/src/input/libdvdnav/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/input/libdvdnav/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/input/libreal/.hgignore b/src/input/libreal/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/input/libreal/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/input/librtsp/.hgignore b/src/input/librtsp/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/input/librtsp/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/input/vcd/.hgignore b/src/input/vcd/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/input/vcd/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/input/vcd/libcdio/.hgignore b/src/input/vcd/libcdio/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/input/vcd/libcdio/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/input/vcd/libcdio/MSWindows/.hgignore b/src/input/vcd/libcdio/MSWindows/.hgignore deleted file mode 100644 index 282522db0..000000000 --- a/src/input/vcd/libcdio/MSWindows/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/src/input/vcd/libcdio/cdio/.hgignore b/src/input/vcd/libcdio/cdio/.hgignore deleted file mode 100644 index 282522db0..000000000 --- a/src/input/vcd/libcdio/cdio/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/src/input/vcd/libcdio/image/.hgignore b/src/input/vcd/libcdio/image/.hgignore deleted file mode 100644 index 282522db0..000000000 --- a/src/input/vcd/libcdio/image/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/src/input/vcd/libvcd/.hgignore b/src/input/vcd/libvcd/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/input/vcd/libvcd/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/input/vcd/libvcd/libvcd/.hgignore b/src/input/vcd/libvcd/libvcd/.hgignore deleted file mode 100644 index 282522db0..000000000 --- a/src/input/vcd/libvcd/libvcd/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/src/liba52/.hgignore b/src/liba52/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/liba52/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libdts/.hgignore b/src/libdts/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libdts/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libfaad/.hgignore b/src/libfaad/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libfaad/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libfaad/codebook/.hgignore b/src/libfaad/codebook/.hgignore deleted file mode 100644 index 282522db0..000000000 --- a/src/libfaad/codebook/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/src/libffmpeg/.hgignore b/src/libffmpeg/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libffmpeg/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libffmpeg/libavcodec/.hgignore b/src/libffmpeg/libavcodec/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libffmpeg/libavcodec/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libffmpeg/libavcodec/alpha/.hgignore b/src/libffmpeg/libavcodec/alpha/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libffmpeg/libavcodec/alpha/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libffmpeg/libavcodec/armv4l/.hgignore b/src/libffmpeg/libavcodec/armv4l/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libffmpeg/libavcodec/armv4l/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libffmpeg/libavcodec/i386/.hgignore b/src/libffmpeg/libavcodec/i386/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libffmpeg/libavcodec/i386/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libffmpeg/libavcodec/libpostproc/.hgignore b/src/libffmpeg/libavcodec/libpostproc/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libffmpeg/libavcodec/libpostproc/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libffmpeg/libavcodec/mlib/.hgignore b/src/libffmpeg/libavcodec/mlib/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libffmpeg/libavcodec/mlib/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libffmpeg/libavcodec/ppc/.hgignore b/src/libffmpeg/libavcodec/ppc/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libffmpeg/libavcodec/ppc/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libffmpeg/libavcodec/sparc/.hgignore b/src/libffmpeg/libavcodec/sparc/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libffmpeg/libavcodec/sparc/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libffmpeg/libavutil/.hgignore b/src/libffmpeg/libavutil/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libffmpeg/libavutil/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libflac/.hgignore b/src/libflac/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libflac/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/liblpcm/.hgignore b/src/liblpcm/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/liblpcm/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libmad/.hgignore b/src/libmad/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libmad/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libmpeg2/.hgignore b/src/libmpeg2/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libmpeg2/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libmpeg2new/.hgignore b/src/libmpeg2new/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libmpeg2new/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libmpeg2new/include/.hgignore b/src/libmpeg2new/include/.hgignore deleted file mode 100644 index 282522db0..000000000 --- a/src/libmpeg2new/include/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/src/libmpeg2new/libmpeg2/.hgignore b/src/libmpeg2new/libmpeg2/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libmpeg2new/libmpeg2/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libmusepack/.hgignore b/src/libmusepack/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libmusepack/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libmusepack/musepack/.hgignore b/src/libmusepack/musepack/.hgignore deleted file mode 100644 index 282522db0..000000000 --- a/src/libmusepack/musepack/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/src/libreal/.hgignore b/src/libreal/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libreal/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libspeex/.hgignore b/src/libspeex/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libspeex/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libspucc/.hgignore b/src/libspucc/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libspucc/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libspucmml/.hgignore b/src/libspucmml/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libspucmml/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libspudec/.hgignore b/src/libspudec/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libspudec/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libspudvb/.hgignore b/src/libspudvb/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libspudvb/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libsputext/.hgignore b/src/libsputext/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libsputext/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libtheora/.hgignore b/src/libtheora/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libtheora/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libvorbis/.hgignore b/src/libvorbis/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libvorbis/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libw32dll/.hgignore b/src/libw32dll/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libw32dll/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libw32dll/DirectShow/.hgignore b/src/libw32dll/DirectShow/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libw32dll/DirectShow/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libw32dll/dmo/.hgignore b/src/libw32dll/dmo/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libw32dll/dmo/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libw32dll/qtx/.hgignore b/src/libw32dll/qtx/.hgignore deleted file mode 100644 index 22a4e7292..000000000 --- a/src/libw32dll/qtx/.hgignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -Makefile.in - diff --git a/src/libw32dll/qtx/qtxsdk/.hgignore b/src/libw32dll/qtx/qtxsdk/.hgignore deleted file mode 100644 index 282522db0..000000000 --- a/src/libw32dll/qtx/qtxsdk/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/src/libw32dll/wine/.hgignore b/src/libw32dll/wine/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libw32dll/wine/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libxineadec/.hgignore b/src/libxineadec/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libxineadec/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libxineadec/gsm610/.hgignore b/src/libxineadec/gsm610/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libxineadec/gsm610/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libxineadec/nosefart/.hgignore b/src/libxineadec/nosefart/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libxineadec/nosefart/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/libxinevdec/.hgignore b/src/libxinevdec/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/libxinevdec/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/post/.hgignore b/src/post/.hgignore deleted file mode 100644 index 282522db0..000000000 --- a/src/post/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/src/post/audio/.hgignore b/src/post/audio/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/post/audio/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/post/deinterlace/.hgignore b/src/post/deinterlace/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/post/deinterlace/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/post/deinterlace/plugins/.hgignore b/src/post/deinterlace/plugins/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/post/deinterlace/plugins/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/post/goom/.hgignore b/src/post/goom/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/post/goom/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/post/mosaico/.hgignore b/src/post/mosaico/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/post/mosaico/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/post/planar/.hgignore b/src/post/planar/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/post/planar/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/post/visualizations/.hgignore b/src/post/visualizations/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/post/visualizations/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/video_out/.hgignore b/src/video_out/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/video_out/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/video_out/libdha/.hgignore b/src/video_out/libdha/.hgignore index ac32e12c7..7b5ba91fb 100644 --- a/src/video_out/libdha/.hgignore +++ b/src/video_out/libdha/.hgignore @@ -1,5 +1,3 @@ -Makefile -Makefile.in .libs .deps *.lo diff --git a/src/video_out/libdha/bin/.hgignore b/src/video_out/libdha/bin/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/video_out/libdha/bin/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/video_out/libdha/kernelhelper/.hgignore b/src/video_out/libdha/kernelhelper/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/video_out/libdha/kernelhelper/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/video_out/libdha/oth/.hgignore b/src/video_out/libdha/oth/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/video_out/libdha/oth/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/video_out/libdha/sysdep/.hgignore b/src/video_out/libdha/sysdep/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/video_out/libdha/sysdep/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/video_out/macosx/.hgignore b/src/video_out/macosx/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/video_out/macosx/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/video_out/vidix/.hgignore b/src/video_out/vidix/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/video_out/vidix/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/video_out/vidix/drivers/.hgignore b/src/video_out/vidix/drivers/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/video_out/vidix/drivers/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/xine-engine/.hgignore b/src/xine-engine/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/xine-engine/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/xine-utils/.hgignore b/src/xine-utils/.hgignore deleted file mode 100644 index 7d926a554..000000000 --- a/src/xine-utils/.hgignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.libs -.deps -*.lo -*.la diff --git a/src/xine-utils/monitor.c b/src/xine-utils/monitor.c index 6d7cba367..1a348087c 100644 --- a/src/xine-utils/monitor.c +++ b/src/xine-utils/monitor.c @@ -33,7 +33,7 @@ #define MAX_ID 10 -#ifdef DEBUG +#ifndef NDEBUG static long long int profiler_times[MAX_ID] ; static long long int profiler_start[MAX_ID] ; @@ -74,8 +74,7 @@ __inline__ unsigned long long int rdtsc(void) #endif void xine_profiler_start_count (int id) { - - if ((unsigned)id >= MAX_ID) return; + if ( id >= MAX_ID || id < 0 ) return; #if defined(ARCH_X86) || defined(ARCH_X86_64) profiler_start[id] = rdtsc(); @@ -83,8 +82,7 @@ void xine_profiler_start_count (int id) { } void xine_profiler_stop_count (int id) { - - if ((unsigned)id >= MAX_ID) return; + if ( id >= MAX_ID || id < 0 ) return; #if defined(ARCH_X86) || defined(ARCH_X86_64) profiler_times[id] += rdtsc() - profiler_start[id]; diff --git a/win32/.hgignore b/win32/.hgignore index 33987bccc..bb52c885e 100644 --- a/win32/.hgignore +++ b/win32/.hgignore @@ -1,4 +1,2 @@ -Makefile -Makefile.in *.plg *.ncb diff --git a/win32/include/.hgignore b/win32/include/.hgignore deleted file mode 100644 index 282522db0..000000000 --- a/win32/include/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in |