Browse Source

Drop automake build support.

Add basic cmake build instructions.
Delete empty file NEWS.
Rework of the README and the English help page files.
Update some cmake files with latest macros.
libXv and libXext are handled by cmake intern modules through X11 variables.
Few cosmetics.

Signed-off-by: gregory guy <gregory-tde@laposte.net>
pull/6/head
gregory guy 2 months ago
parent
commit
95a6a36403
No known key found for this signature in database GPG Key ID: 2CC84A1CC6823AF8
  1. 3
      .gitmodules
  2. 2
      CMakeLists.txt
  3. 215
      ConfigureChecks.cmake
  4. 209
      INSTALL
  5. 16
      Makefile.am
  6. 0
      NEWS
  7. 94
      README
  8. 11834
      acinclude.m4
  9. 1050
      aclocal.m4
  10. 1
      admin
  11. 48
      conf.diff
  12. 264
      config.h.in
  13. 2
      configure.files
  14. 309
      configure.in.in
  15. 38
      doc/CMakeLists.txt
  16. 1
      doc/Makefile.am
  17. 5
      doc/da/Makefile.am
  18. 5
      doc/de/Makefile.am
  19. 5
      doc/en/Makefile.am
  20. 11
      doc/en/index.docbook
  21. 5
      doc/es/Makefile.am
  22. 5
      doc/et/Makefile.am
  23. 5
      doc/fr/Makefile.am
  24. 5
      doc/it/Makefile.am
  25. 5
      doc/nl/Makefile.am
  26. 5
      doc/pt/Makefile.am
  27. 5
      doc/ru/Makefile.am
  28. 5
      doc/sv/Makefile.am
  29. 3
      icons/Makefile.am
  30. 7032
      libtool
  31. 5
      mimetypes/Makefile.am
  32. 4
      mimetypes/application/Makefile.am
  33. 4
      mimetypes/audio/Makefile.am
  34. 9
      mimetypes/video/Makefile.am
  35. 4
      mimetypes/video/trinity1/Makefile.am
  36. 28
      mplayer_vo_x11.diff
  37. 1
      po/Makefile.am
  38. 2
      protocols/Makefile.am
  39. 39
      src/CMakeLists.txt
  40. 18
      src/ConfigureChecks.cmake
  41. 87
      src/Makefile.am
  42. 0
      stamp-h.in
  43. 6
      subdirs

3
.gitmodules

@ -1,6 +1,3 @@
[submodule "admin"]
path = admin
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
[submodule "cmake"]
path = cmake
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake

2
CMakeLists.txt

@ -51,7 +51,7 @@ option( WITH_XTEST "Enable support for XTest"
##### user requested modules
option( BUILD_ALL "Build all" OFF )
option( BUILD_ALL "Build all" ON )
option( BUILD_KXINEPLAYER "Build kxineplayer" ${BUILD_ALL} )
option( BUILD_KXVPLAYER "Build kxvplayer" ${BUILD_ALL} )
option( BUILD_KGSTPLAYER "Build kgstplayer" ${BUILD_ALL} )

215
ConfigureChecks.cmake

@ -31,146 +31,159 @@ endif( WITH_GCC_VISIBILITY )
find_package( X11 )
##### check for XShm, Xv
if( X11_FOUND )
elseif( NOT X11_XShm_FOUND )
tde_message_fatal( "libXext is required, but was not found on your system." )
elseif( NOT X11_Xv_FOUND )
tde_message_fatal( "libXv is required, but was not found on your system." )
endif()
##### check for cairo
if( WITH_CAIRO )
pkg_search_module( CAIRO cairo )
pkg_search_module( CAIRO cairo )
if( CAIRO_FOUND )
set( HAVE_CAIRO 1 )
else()
tde_message_fatal( "Cairo support has been requested but cairo was not found on your system." )
endif()
if( CAIRO_FOUND )
set( HAVE_CAIRO 1 )
else()
tde_message_fatal( "Cairo support has been requested but cairo was not found on your system." )
endif()
endif( WITH_CAIRO )
##### check for expat
if( WITH_EXPAT )
find_package( EXPAT )
find_package( EXPAT )
if( EXPAT_FOUND )
set( HAVE_EXPAT 1 )
else()
tde_message_fatal( "Expat support has been requested but expat was not found on your system." )
endif()
if( EXPAT_FOUND )
set( HAVE_EXPAT 1 )
else()
tde_message_fatal( "Expat support has been requested but expat was not found on your system." )
endif()
endif( WITH_EXPAT )
##### check for XTest
if( WITH_XTEST )
pkg_search_module( X11_XTEST xtst )
if( X11_XTest_FOUND )
set( HAVE_XTEST 1 )
else()
tde_message_fatal( "XTest support has been requested but xtest was not found on your system." )
endif()
pkg_search_module( X11_XTEST xtst )
if( X11_XTest_FOUND )
set( HAVE_XTEST 1 )
else()
tde_message_fatal( "XTest support has been requested but xtest was not found on your system." )
endif()
endif( WITH_XTEST )
##### check for npplayer
if ( BUILD_KNPPLAYER )
pkg_search_module( DBUS dbus-1 )
pkg_search_module( DBUS-TQT dbus-tqt )
pkg_search_module( NSPR nspr )
pkg_search_module( GTK2 gtk+-2.0 )
pkg_search_module( GLIB2 glib-2.0 )
pkg_search_module( GDK2 gdk-x11-2.0 )
pkg_search_module( GTHREAD gthread-2.0 )
pkg_search_module( GMODULE2 gmodule-2.0 )
pkg_search_module( DBUS-GLIB dbus-glib-1 )
if( DBUS_FOUND AND DBUS-TQT_FOUND )
set( HAVE_DBUS 1 )
else()
tde_message_fatal( "Dbus is required but dbus was not found on your system." )
endif()
if( NSPR_FOUND )
set( HAVE_NSPR 1 )
else()
tde_message_fatal( "Nspr support has been requested but nspr was not found on your system." )
endif()
if( NOT GTK2_FOUND )
tde_message_fatal( "GTK2 support is required but was not found on your system." )
endif()
if( NOT GLIB2_FOUND )
tde_message_fatal( "GLIB2 support is required but was not found on your system." )
endif()
if( NOT GDK2_FOUND )
tde_message_fatal( "GDK2 support is required but was not found on your system." )
endif()
if( NOT GTHREAD_FOUND )
tde_message_fatal( "GTHREAD support is required but was not found on your system." )
endif()
if( NOT GMODULE2_FOUND )
tde_message_fatal( "GMODULE2 support is required but was not found on your system." )
endif()
if( NOT DBUS-GLIB_FOUND )
tde_message_fatal( "DBUS-GLIB support is required but was not found on your system." )
endif()
pkg_search_module( DBUS dbus-1 )
pkg_search_module( DBUS-TQT dbus-tqt )
pkg_search_module( NSPR nspr )
pkg_search_module( GTK2 gtk+-2.0 )
pkg_search_module( GLIB2 glib-2.0 )
pkg_search_module( GDK2 gdk-x11-2.0 )
pkg_search_module( GTHREAD gthread-2.0 )
pkg_search_module( GMODULE2 gmodule-2.0 )
pkg_search_module( DBUS-GLIB dbus-glib-1 )
if( DBUS_FOUND AND DBUS-TQT_FOUND )
set( HAVE_DBUS 1 )
else()
tde_message_fatal( "Dbus is required but dbus was not found on your system." )
endif()
if( NSPR_FOUND )
set( HAVE_NSPR 1 )
else()
tde_message_fatal( "Nspr support has been requested but nspr was not found on your system." )
endif()
if( NOT GTK2_FOUND )
tde_message_fatal( "GTK2 support is required but was not found on your system." )
endif()
if( NOT GLIB2_FOUND )
tde_message_fatal( "GLIB2 support is required but was not found on your system." )
endif()
if( NOT GDK2_FOUND )
tde_message_fatal( "GDK2 support is required but was not found on your system." )
endif()
if( NOT GTHREAD_FOUND )
tde_message_fatal( "GTHREAD support is required but was not found on your system." )
endif()
if( NOT GMODULE2_FOUND )
tde_message_fatal( "GMODULE2 support is required but was not found on your system." )
endif()
if( NOT DBUS-GLIB_FOUND )
tde_message_fatal( "DBUS-GLIB support is required but was not found on your system." )
endif()
endif( BUILD_KNPPLAYER )
##### check for xine-engine
if( BUILD_KXINEPLAYER )
pkg_search_module( XINE libxine )
if( XINE_FOUND )
set( HAVE_XINE 1 )
else()
tde_message_fatal( "Xine support has been requested but libxine was not found on your system." )
endif()
pkg_search_module( XINE libxine )
if( XINE_FOUND )
set( HAVE_XINE 1 )
else()
tde_message_fatal( "Xine support has been requested but libxine was not found on your system." )
endif()
endif( BUILD_KXINEPLAYER )
##### check for gstreamer
if( BUILD_KGSTPLAYER )
pkg_search_module( GSTREAMER gstreamer-1.0>=1.0.0 gstreamer-0.10>=0.10.0 )
if( GSTREAMER_FOUND )
set( HAVE_GSTREAMER 1 )
else()
tde_message_fatal( "Gstreamer support has been requested but gstreamer was not found on your system." )
endif()
if( ${GSTREAMER_VERSION} GREATER "0.11.0" )
pkg_search_module( GSTREAMER_VIDEO gstreamer-video-1.0 )
pkg_search_module( GSTREAMER_PLUGIN gstreamer-plugins-base-1.0 )
else()
pkg_search_module( GSTREAMER_VIDEO gstreamer-interfaces-0.10 )
pkg_search_module( GSTREAMER_PLUGIN gstreamer-plugins-base-0.10 )
endif()
message( STATUS "gstreamer version: ${GSTREAMER_VERSION}" )
message( STATUS "gstreamer video version: ${GSTREAMER_VIDEO_VERSION}" )
message( STATUS "gstreamer plugins version: ${GSTREAMER_PLUGIN_VERSION}" )
pkg_search_module( GSTREAMER gstreamer-1.0>=1.0.0 gstreamer-0.10>=0.10.0 )
if( GSTREAMER_FOUND )
set( HAVE_GSTREAMER 1 )
else()
tde_message_fatal( "Gstreamer support has been requested but gstreamer was not found on your system." )
endif()
if( ${GSTREAMER_VERSION} GREATER "0.11.0" )
pkg_search_module( GSTREAMER_VIDEO gstreamer-video-1.0 )
pkg_search_module( GSTREAMER_PLUGIN gstreamer-plugins-base-1.0 )
else()
pkg_search_module( GSTREAMER_VIDEO gstreamer-interfaces-0.10 )
pkg_search_module( GSTREAMER_PLUGIN gstreamer-plugins-base-0.10 )
endif()
message( STATUS "gstreamer version: ${GSTREAMER_VERSION}" )
message( STATUS "gstreamer video version: ${GSTREAMER_VIDEO_VERSION}" )
message( STATUS "gstreamer plugins version: ${GSTREAMER_PLUGIN_VERSION}" )
endif( BUILD_KGSTPLAYER )
##### check for koffice-plugin
if( BUILD_KOFFICE_PLUGIN )
find_path( KOFFICE_INCLUDE_DIR
NAMES KoDocument.h
HINTS
${TQT_INCLUDE_DIRS}
${TDE_INCLUDE_DIR}
${TDE_INCLUDE_DIR}/tde
)
if( "${KOFFICE_INCLUDE_DIR}" STREQUAL "KOFFICE_INCLUDE_DIR-NOTFOUND" )
tde_message_fatal( "KOffice plugin is requested but KOffice headers were not found on your system." )
endif( )
set( HAVE_KOFFICE 1 CACHE INTERNAL "" )
set( KOFFICE_LIBRARIES kofficecore kofficeui )
find_path( KOFFICE_INCLUDE_DIR NAMES KoDocument.h
HINTS
${TQT_INCLUDE_DIRS}
${TDE_INCLUDE_DIR}
${TDE_INCLUDE_DIR}/tde
)
if( "${KOFFICE_INCLUDE_DIR}" STREQUAL "KOFFICE_INCLUDE_DIR-NOTFOUND" )
tde_message_fatal( "KOffice plugin is requested but KOffice headers were not found on your system." )
endif()
set( HAVE_KOFFICE 1 CACHE INTERNAL "" )
set( KOFFICE_LIBRARIES kofficecore kofficeui )
endif( BUILD_KOFFICE_PLUGIN )

209
INSTALL

@ -1,167 +1,52 @@
Basic Installation
==================
These are generic installation instructions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, a file
`config.cache' that saves the results of its tests to speed up
reconfiguring, and a file `config.log' containing compiler output
(useful mainly for debugging `configure').
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
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If at some point `config.cache'
contains results you don't want to keep, you may remove or edit it.
The file `configure.in' is used to create `configure' by a program
called `autoconf'. You only need `configure.in' 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.
Running `configure' takes a while. While running, it prints some
messages telling which features it is checking for.
2. Type `make' to compile the package.
3. Type `make install' to install the programs and any data files and
documentation.
4. You can remove the program binaries and object files from the
source code directory by typing `make clean'.
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that
the `configure' script does not know about. You can give `configure'
initial values for variables by setting them in the environment. Using
a Bourne-compatible shell, you can do that on the command line like
this:
CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
Or on systems that have the `env' program, you can do it like this:
env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
Compiling For Multiple Architectures
====================================
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
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 supports 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.
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'.
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.
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
kmplayer relies on cmake to build.
Here are suggested default options:
-DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
-DCMAKE_INSTALL_PREFIX="/opt/trinity" \
-DCONFIG_INSTALL_DIR="/etc/trinity" \
-DSYSCONF_INSTALL_DIR="/etc/trinity" \
-DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_VERBOSE_MAKEFILE="ON" \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON" \
-DWITH_ALL_OPTIONS="ON"
Requirements:
=============
- xine-lib
- libXext
- libXv
- libX11
- dbus-1
- dbus-tqt
- dbus-glib-1
- nspr
- gtk+-2.0
- glib-2.0
- gdk-x11-2.0
- gthread-2.0
- gmodule-2.0
Optional:
=========
- XTest
- expat
- cairo
- koffice
Optional backend:
=================
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
`README' should mention any `--enable-' and `--with-' options that the
package recognizes.
For packages that use the X Window System, `configure' can usually
find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Specifying the System Type
==========================
There may be some features `configure' can not figure out
automatically, but needs to determine by the type of host the package
will run on. Usually `configure' can figure that out, but if it prints
a message saying it can not guess the host type, give it the
`--host=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name with three fields:
CPU-COMPANY-SYSTEM
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
need to know the host type.
If you are building compiler tools for cross-compiling, you can also
use the `--target=TYPE' option to select the type of system they will
produce code for and the `--build=TYPE' option to select the type of
system on which you are compiling the package.
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'.
`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.
A warning: not all `configure' scripts look for a site script.
Operation Controls
==================
`configure' recognizes the following options to control how it
operates.
`--cache-file=FILE'
Use and save the results of the tests in FILE instead of
`./config.cache'. Set FILE to `/dev/null' to disable caching, for
debugging `configure'.
`--help'
Print a summary of the options to `configure', and exit.
`--quiet'
`--silent'
`-q'
Do not print messages saying which checks are being made.
`--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
`--version'
Print the version of Autoconf used to generate the `configure'
script, and exit.
`configure' also accepts some other, not widely useful, options.
- gstreamer >= 0.10.0
- MPlayer
- ffmpeg (with xawtv)

16
Makefile.am

@ -1,16 +0,0 @@
if need_trinity3_compatibility
KDE33PROTOCOLS = protocols
endif
SUBDIRS = mimetypes $(KDE33PROTOCOLS) src icons doc po
EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
$(top_srcdir)/subdirs:
cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in
@cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4

0
NEWS

94
README

@ -1,53 +1,43 @@
KMPlayer, a simple frontend for MPlayer/FFMpeg/Xine.
It can play DVD/VCD movies, from file or url and from a video device.
If setup right, KMPlayer can embed inside konqueror. Which means if you click
on a movie file, the movie is played inside konqueror.
It can also embed inside tdehtml, enabling movie playback inside a html page.
Movie recording using mencoder (part of the mplayer package). No video during recording, but you can always open a new window and play it there.
Broadcasting, http streaming, by using ffserver/ffmpeg. For TV sources, you need v4lctl (part of the xawtv package).
KMPlayer needs KDE3.1 and a working mplayer/mencoder somewhere in you PATH.
Additonally, for broadcasting, ffserver/ffmpeg/v4lctl also.
For DVD navigation Xine is used. MPlayer has broken dvdnav support. DVDNav is included in libxine and works fine.
Unless you reconfigure kmplayer, both mplayer and ffmpeg should be compiled with liblame for mp3.
Quickly installing MPlayer
Download the sources from http://www.mplayerhq.hu/homepage/.
If you want quicktime support, also download the quicktime dll's
(http://www.mplayerhq.hu/MPlayer/releases/codecs/qt6dlls.tar.bz2) and unpack
them and copy the files to /usr/lib/win32 (make this dir if it doesn't exist).
Or download the 'All in one' package and have even more codecs.
Untar the mplayer source package (tar xfj MPlayer-0.90.tar.bz2), change to
that directory. Make sure $TDEDIR/bin is in you path (check if you can run
'artsplay').
Now run configure (./configure) and make ('make'). Install it as root ('su -c "make install"').
Finally you must setup the config files in ~/.mplayer ('mkdir ~/.mplayer').
Copy the files, from the mplayer sources, etc/codecs.conf and etc/example.conf as codecs.conf and config resp
('cp etc/codecs.conf ~/.mplayer; cp etc/example.conf ~/.mplayer/config').
Next change ~/.mplayer/config with an editor and change the video driver (vo=xv) and audio driver (ao=arts) and remove the last line.
Quickly installing Xine
Download the sources for libxine (xine-lib-1-beta12.tar.gz) from http://xinehq.de. Unpack it (tar xfz xine-lib-1-beta12.tar.gz) and change to this directory (cd xine-lib-1-beta12). Now run configure (./configure) and make ('make'). Install it as root ('su -c "make install"').
Recommended, for encrypted DVDs, install libdvdcss from http://developers.videolan.org/libdvdcss too.
Xine can use the codecs for MPlayer in /usr/lib/win32, however it can't find
the real codecs in there. Eg run
$ strings /usr/local/lib/xine/plugins/1.0.0/xineplug_decode_real.so |grep drv
after installing to see where it looks for the Real codecs. Either copy or
symlink for Xine to find them.
Quickly installing ffmpeg/ffserver
Download the sources from http://ffmpeg.sourceforge.net/. If the current version is 0.4.6, I recommend using a more recent CVS snapshot because it uses less CPU when grabbing a TV device.
Untar the source package, run './configure --enable-mp3lame' and 'make'. Install as root 'su -c "make install"'.
KMPlayer doesn't work with all the video drivers that mplayer supports.
I tested only xv (X Video Extension) and x11 (Image/Shm). If none work, you
might try the patch for the x11 driver and see if that works for you (not needed anymore for mplayer version >= 0.90-rc4).
You might need to change mimetype settings (Control Center | TDE Components | File Associations) to make sure KMPlayer (or 'Embedded MPlayer for TDE' in embedded tab) is set for all the formats you want to play with KMPlayer.
Also make sure in the 'Embedding' tab 'Show file in embedded viewer' is set.
If you run an older versio of MPlayer (0.9x), set 'Post MPlayer 0.90=false' in
.kde/share/config/kmplayer.rc under group [MPlayer]. It will change some of the
mencoder arguments (for recording).
Enjoy!
KMPlayer - a simple media player for TDE.
KMPlayer is a GUI for several backends, namely:
- Mplayer
- Xine
- Gstreamer
- ffmpeg
It can play DVD/VCD movies, from file or url and from a video device.
Features:
=========
* can act as a browser plugin for Konqueror
* can embed into a KOffice document.
* play DVD (DVDNav only with the Xine player)
* play VCD
* let the backend players play from a pipe (read from stdin)
* play from a TV device (experimental)
* show backend player's console output
* launch ffserver when viewing from a v4l device
* DCOP KMediaPlayer interface support
* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard TDE
shortcut configure window
* Lots of configurable shortcuts. Highly recommended for the VDR keys
and volume increase/decrease
* Broadcaste http streaming by using ffserver/ffmpeg
CONTRIBUTING
==============
If you wish to contribute to kmplayer, you might do so:
- TDE Gitea Workspace (TGW) collaboration tool.
https://mirror.git.trinitydesktop.org/gitea
- TDE Weblate Translation Workspace (TWTW) collaboration tool.
https://mirror.git.trinitydesktop.org/weblate

11834
acinclude.m4
File diff suppressed because it is too large
View File

1050
aclocal.m4
File diff suppressed because it is too large
View File

1
admin

@ -1 +0,0 @@
Subproject commit 8c7e0d40de084fe5d54e173918756639e0d4d63e

48
conf.diff

@ -1,48 +0,0 @@
--- configure.in.in 2007-10-06 12:25:00.851848655 +0200
+++ configure.in.in 2007-09-29 00:20:22.000000000 +0200
@@ -132,16 +137,16 @@
AM_CONDITIONAL(include_kgstplayer, [test "x$have_gst" = "xyes" && test "x$have_gst_plugins" = "xyes"])
-buildnpp=yes
+hasnspr=yes
LIBNSPR_LIBS=""
LIBNSPR_CFLAGS=""
LIBTQTDBUS=""
LIBDBUS_CFLAGS=""
AC_ARG_ENABLE(nspr, [ --enable-npplayer Enables building with npp support],
[if test "x$enableval" == "xno"; then
- buildnpp=no
+ hasnspr=no
fi])
-if test "$buildnpp" = "yes"; then
+if test "$hasnspr" = "yes"; then
if test "$PKGCONFIGFOUND" = "yes" ; then
DBUS_REQ=1.0.0
PKG_CHECK_MODULES(DBUS, dbus-1 >= $DBUS_REQ,
@@ -150,9 +155,22 @@
AC_DEFINE(HAVE_DBUS, 1, [have DBus])
LIBTQTDBUS="`$PKG_CONFIG --libs dbus-1` -ldbus-qt-1"
LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-1`"
- AC_DEFINE(HAVE_NSPR, 1, [build Netscape plugin loader])
- LIBNSPR_LIBS="`$PKG_CONFIG --libs gtk+-x11-2.0` `$PKG_CONFIG --libs dbus-glib-1`"
- LIBNSPR_CFLAGS="`$PKG_CONFIG --cflags gtk+-x11-2.0` `$PKG_CONFIG --cflags dbus-glib-1`"
+ PKG_CHECK_MODULES(NSPR, nspr >= 1.8.0,
+ have_nspr=yes,have_nspr=no)
+ if test "x$have_nspr" = "xno"; then
+ AC_CHECK_PROG(NSPRCONFIGFOUND, nspr-config,[yes])
+ if test $NSPRCONFIGFOUND; then
+ have_nspr=yes
+ NSPR_CFG=nspr-config
+ fi
+ else
+ NSPR_CFG=pkg-config nspr
+ fi
+ if test "x$have_nspr" = "xyes"; then
+ AC_DEFINE(HAVE_NSPR, 1, [have Netscape Portable Runtime])
+ LIBNSPR_LIBS="`$PKG_CONFIG --libs gtk+-x11-2.0` `$PKG_CONFIG --libs dbus-glib-1` `$NSPR_CFG --libs`"
+ LIBNSPR_CFLAGS="`$PKG_CONFIG --cflags gtk+-x11-2.0` `$PKG_CONFIG --cflags dbus-glib-1` `$NSPR_CFG --cflags`"
+ fi
fi
fi
fi

264
config.h.in

@ -1,264 +0,0 @@
/* config.h.in. Generated from configure.in by autoheader. */
/* Defines if your system has the cairo library */
#undef HAVE_CAIRO
/* Define to 1 if you have the <Carbon/Carbon.h> header file. */
#undef HAVE_CARBON_CARBON_H
/* Define if you have the CoreAudio API */
#undef HAVE_COREAUDIO
/* Define to 1 if you have the <crt_externs.h> header file. */
#undef HAVE_CRT_EXTERNS_H
/* Defines if your system has the crypt function */
#undef HAVE_CRYPT
/* have DBus */
#undef HAVE_DBUS
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* If libexpat is installed */
#undef HAVE_EXPAT
/* have GStreamer */
#undef HAVE_GSTREAMER
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* If we have koffice installed */
#undef HAVE_KOFFICE
/* Define if you have libjpeg */
#undef HAVE_LIBJPEG
/* Define if you have libpng */
#undef HAVE_LIBPNG
/* Define if you have a working libpthread (will enable threaded code) */
#undef HAVE_LIBPTHREAD
/* Define if you have libz */
#undef HAVE_LIBZ
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define if your system needs _NSGetEnviron to set up the environment */
#undef HAVE_NSGETENVIRON
/* build Netscape plugin loader */
#undef HAVE_NSPR
/* Define if you have res_init */
#undef HAVE_RES_INIT
/* Define if you have the res_init prototype */
#undef HAVE_RES_INIT_PROTO
/* Define if you have a STL implementation by SGI */
#undef HAVE_SGI_STL
/* Define to 1 if you have the `snprintf' function. */
#undef HAVE_SNPRINTF
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define if you have strlcat */
#undef HAVE_STRLCAT
/* Define if you have the strlcat prototype */
#undef HAVE_STRLCAT_PROTO
/* Define if you have strlcpy */
#undef HAVE_STRLCPY
/* Define if you have the strlcpy prototype */
#undef HAVE_STRLCPY_PROTO
/* Define to 1 if you have the <sys/bitypes.h> header file. */
#undef HAVE_SYS_BITYPES_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to 1 if you have the `vsnprintf' function. */
#undef HAVE_VSNPRINTF
/* XTest extension available */
#undef HAVE_XTEST
/* If we have libxine installed */
#undef HAVE_XINE
/* Suffix for lib directories */
#undef KDELIBSUFF
/* Name of package */
#undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* The size of `char *', as computed by sizeof. */
#undef SIZEOF_CHAR_P
/* The size of `int', as computed by sizeof. */
#undef SIZEOF_INT
/* The size of `long', as computed by sizeof. */
#undef SIZEOF_LONG
/* The size of `short', as computed by sizeof. */
#undef SIZEOF_SHORT
/* The size of `size_t', as computed by sizeof. */
#undef SIZEOF_SIZE_T
/* The size of `unsigned long', as computed by sizeof. */
#undef SIZEOF_UNSIGNED_LONG
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Version number of package */
#undef VERSION
/* Defined if compiling without arts */
#undef WITHOUT_ARTS
/*
* jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
* headers and I'm too lazy to write a configure test as long as only
* unixware is related
*/
#ifdef _UNIXWARE
#define HAVE_BOOLEAN
#endif
/*
* AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
* that defines bzero.
*/
#if defined(_AIX)
#include <strings.h>
#endif
#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
# include <sys/time.h>
# include <crt_externs.h>
# define environ (*_NSGetEnviron())
#endif
#if !defined(HAVE_RES_INIT_PROTO)
#ifdef __cplusplus
extern "C" {
#endif
int res_init(void);
#ifdef __cplusplus
}
#endif
#endif
#if !defined(HAVE_STRLCAT_PROTO)
#ifdef __cplusplus
extern "C" {
#endif
unsigned long strlcat(char*, const char*, unsigned long);
#ifdef __cplusplus
}
#endif
#endif
#if !defined(HAVE_STRLCPY_PROTO)
#ifdef __cplusplus
extern "C" {
#endif
unsigned long strlcpy(char*, const char*, unsigned long);
#ifdef __cplusplus
}
#endif
#endif
/*
* On HP-UX, the declaration of vsnprintf() is needed every time !
*/
#if !defined(HAVE_VSNPRINTF) || defined(hpux)
#if __STDC__
#include <stdarg.h>
#include <stdlib.h>
#else
#include <varargs.h>
#endif
#ifdef __cplusplus
extern "C"
#endif
int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
#ifdef __cplusplus
extern "C"
#endif
int snprintf(char *str, size_t n, char const *fmt, ...);
#endif
/* define to 1 if -fvisibility is supported */
#undef __KDE_HAVE_GCC_VISIBILITY
#if defined(__SVR4) && !defined(__svr4__)
#define __svr4__ 1
#endif
/* type to use in place of socklen_t if not defined */
#undef kde_socklen_t
/* type to use in place of socklen_t if not defined (deprecated, use
kde_socklen_t) */
#undef ksize_t

2
configure.files

@ -1,2 +0,0 @@
./admin/configure.in.min
configure.in.in

309
configure.in.in

@ -1,309 +0,0 @@
#MIN_CONFIG(3)
AM_INIT_AUTOMAKE(kmplayer,0.10.0c)
KDE_ENABLE_HIDDEN_VISIBILITY
AM_MAINTAINER_MODE
AC_ARG_VAR(PKGCONFIGFOUND, [Path to pkg-config])
AC_ARG_VAR(NSPRCONFIGFOUND, [Path to nspr-config])
AC_CHECK_PROG(PKGCONFIGFOUND, pkg-config,[yes])
AC_MSG_CHECKING(if koffice-plugin support is wanted)
AC_ARG_ENABLE(koffice-plugin,
[ --enable-koffice-plugin enable koffice plugin],
[if test "$enableval" = yes; then
AC_MSG_RESULT(yes)
want_koffice_plugin="yes"
else
AC_MSG_RESULT(no)
fi], [AC_MSG_RESULT(no); want_koffice_plugin="no"])
KDE_CHECK_HEADER(KoDocument.h,
have_koffice=yes,
have_koffice=no)
AC_MSG_CHECKING([if kmplayer can be compiled with koffice support])
AC_MSG_RESULT($have_koffice)
AM_CONDITIONAL(include_koffice_support, test "$want_koffice_plugin" = "yes" -a "$have_koffice" = "yes")
if test "$want_koffice_plugin" = "yes" -a "$have_koffice" = "yes"; then
AC_DEFINE(HAVE_KOFFICE, 1, [If we have koffice installed])
LIB_KOFFICE="-lkofficecore -lkofficeui"
AC_SUBST(LIB_KOFFICE)
fi
AC_MSG_CHECKING(if expat XML parsing is wanted)
AC_ARG_ENABLE(expat,
[ --enable-expat use expat libs],
[if test "$enableval" = yes; then
AC_MSG_RESULT(yes)
want_expat="yes"
else
AC_MSG_RESULT(no)
fi], [AC_MSG_RESULT(no); want_expat="no"])
KDE_CHECK_HEADER(expat.h,
have_expat=yes,
have_expat=no)
AC_MSG_CHECKING([if kmplayer can use expat its XML parser])
AC_MSG_RESULT($have_expat)
AM_CONDITIONAL(include_expat_support, test "$want_expat" = "yes" -a "$have_expat" = "yes")
if test x$have_expat = xyes -a x$want_expat = xyes; then
AC_DEFINE(HAVE_EXPAT, 1, [If libexpat is installed])
LIB_EXPAT="-lexpat"
AC_SUBST(LIB_EXPAT)
fi
dnl -------------------------
dnl check for XTest extension
dnl -------------------------
AC_ARG_WITH([xtest], [AS_HELP_STRING([--without-xtest], [build without XTest support])],,
[with_xtest=yes])
CFLAGS_XTEST=""
LIB_XTEST=""
if test "$with_xtest" != "no" ; then
AC_MSG_CHECKING([for XTest extension])
if "$PKG_CONFIG" --exists xtst ; then
with_xtest=yes
CFLAGS_XTEST=`"$PKG_CONFIG" --cflags xtst`
LIB_XTEST=`"$PKG_CONFIG" --libs xtst`
AC_DEFINE([HAVE_XTEST],,[XTest extension available])
AC_MSG_RESULT([yes])
else
with_xtest=no
AC_MSG_RESULT([no])
fi
fi
AC_SUBST([CFLAGS_XTEST])
AC_SUBST([LIB_XTEST])
KDE_CHECK_HEADER(xine.h,
have_xine=yes,
have_xine=no)
AC_MSG_CHECKING([if kxineplayer can be compiled])
AC_MSG_RESULT($have_xine)
AC_ARG_WITH(xine,
AC_HELP_STRING([--without-xine],[build KMPlayer without Xine [default=with]]),
[build_xine=$withval],
[build_xine=yes]
)
if test "$build_xine" != "no"; then
if test "$have_xine" = "yes"; then
dnl In xine >= 1.2.8 xine-config is no longer available
vers=`pkg-config --modversion libxine 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
if test -n "$vers" && test "$vers" -ge 1000000
then
AC_DEFINE(HAVE_XINE, 1, [If we have libxine installed])
LIB_XINE="`pkg-config --libs libxine`"
AC_SUBST(LIB_XINE)
CFLAGS_XINE="`pkg-config --cflags libxine`"
AC_SUBST(CFLAGS_XINE)
else
dnl Use xine-config if an older version of xine is installed
vers=`xine-config --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
if test -n "$vers" && test "$vers" -ge 1000000
then
AC_DEFINE(HAVE_XINE, 1, [If we have libxine installed])
LIB_XINE="`xine-config --libs`"
AC_SUBST(LIB_XINE)
CFLAGS_XINE="`xine-config --cflags`"
AC_SUBST(CFLAGS_XINE)
else
have_xine="no"
AC_MSG_WARN([Your xine installation is too old (1.0.0 or later required)])
fi
fi
fi
else
have_xine="no"
fi
AM_CONDITIONAL(include_kxineplayer, test "$have_xine" = "yes")
AC_ARG_WITH(gstreamer,
AC_HELP_STRING([--without-gstreamer],[build KMPlayer without GStreamer [default=with]]),
[build_gstreamer=$withval],
[build_gstreamer=yes]
)
if test "$build_gstreamer" != "no"; then
if test "$PKGCONFIGFOUND" = "yes" ; then
# check for GStreamer
dnl Now we're ready to ask for gstreamer libs and cflags
dnl And we can also ask for the right version of gstreamer
LIB_GST=""
CFLAGS_GST=""
LIB_GST_PLUGINS=""
LIB_GST_OVERLAY=""
PKG_CHECK_MODULES(GST_1, gstreamer-1.0, have_gst=yes, have_gst=no)
PKG_CHECK_MODULES(GST_1_PLUGINS, gstreamer-plugins-base-1.0, have_gst_plugins=yes, have_gst_plugins=no)
if test "x$have_gst" = "xyes"; then
dnl We have GStreamer 1.0
LIB_GST=$GST_1_LIBS
CFLAGS_GST=$GST_1_CFLAGS
LIB_GST_PLUGINS=$GST_1_PLUGINS_LIBS
LIB_GST_OVERLAY="-lgstvideo-1.0"
else
PKG_CHECK_MODULES(GST, gstreamer-0.10, have_gst=yes, have_gst=no)
PKG_CHECK_MODULES(GST_PLUGINS, gstreamer-plugins-base-0.10, have_gst_plugins=yes, have_gst_plugins=no)
if test "x$have_gst" = "xyes"; then
dnl We have GStreamer 0.10
LIB_GST=$GST_LIBS
CFLAGS_GST=$GST_CFLAGS
LIB_GST_PLUGINS=$GST_PLUGINS_LIBS
LIB_GST_OVERLAY="-lgstinterfaces-0.10"
fi
fi
AC_SUBST(LIB_GST)
AC_SUBST(CFLAGS_GST)
AC_SUBST(LIB_GST_PLUGINS)
AC_SUBST(LIB_GST_OVERLAY)
fi
fi
AC_MSG_CHECKING([if kgstplayer can be compiled])
if test "x$have_gst" = "xyes" && test "x$have_gst_plugins" = "xyes"; then
AC_DEFINE(HAVE_GSTREAMER, 1, [have GStreamer])
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
AM_CONDITIONAL(include_kgstplayer, [test "x$have_gst" = "xyes" && test "x$have_gst_plugins" = "xyes"])
buildnpp=yes
LIBNSPR_LIBS=""
LIBNSPR_CFLAGS=""
LIBTQTDBUS=""
LIBDBUS_CFLAGS=""
AC_ARG_ENABLE(nspr, [ --enable-npplayer Enables building with npp support],
[if test "x$enableval" == "xno"; then
buildnpp=no
fi])
if test "$buildnpp" = "yes"; then
if test "$PKGCONFIGFOUND" = "yes" ; then
DBUS_REQ=1.0.0
PKG_CHECK_MODULES(DBUS, [dbus-tqt dbus-1 >= $DBUS_REQ],
have_dbus=yes,have_dbus=no)
if test "x$have_dbus" = "xyes"; then
have_nspr=yes
AC_DEFINE(HAVE_DBUS, 1, [have DBus])
LIBTQTDBUS="`$PKG_CONFIG --libs dbus-tqt`"
LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-tqt`"
AC_DEFINE(HAVE_NSPR, 1, [build Netscape plugin loader])
LIBNSPR_LIBS="`$PKG_CONFIG --libs gtk+-x11-2.0` `$PKG_CONFIG --libs dbus-glib-1` `$PKG_CONFIG --libs gthread-2.0`"
LIBNSPR_CFLAGS="`$PKG_CONFIG --cflags gtk+-x11-2.0` `$PKG_CONFIG --cflags dbus-glib-1`"
fi
fi
fi
AC_SUBST(LIBNSPR_LIBS)
AC_SUBST(LIBNSPR_CFLAGS)
AC_SUBST(LIBTQTDBUS)
AC_SUBST(LIBDBUS_CFLAGS)
AM_CONDITIONAL(include_knpplayer, test "$have_nspr" = "yes")
hascairo=yes
LIBCAIRO_LIBS=""
LIBCAIRO_CFLAGS=""
AC_ARG_ENABLE(cairo, [ --enable-cairo Enables building with cairo support],
[if test "x$enableval" == "xno"; then
hascairo=no
fi])
if test $hascairo = yes; then
AC_MSG_CHECKING([Checking for cairo with pkg-config])
hascairo=no
if test -n "$PKG_CONFIG"; then
LIBCAIRO_LIBS="`$PKG_CONFIG cairo --libs`"
LIBCAIRO_CFLAGS="`$PKG_CONFIG cairo --cflags`"
if test -n "$LIBCAIRO_LIBS" || test -n "$LIBCAIRO_CFLAGS"; then
AC_MSG_RESULT([found])
hascairo=yes
else
AC_MSG_RESULT([not found])
fi
else
AC_MSG_RESULT([failed: pkg-config not found])
fi
if test $hascairo = yes; then
AC_DEFINE_UNQUOTED(HAVE_CAIRO, 1, [Defines if your system has the cairo library])
else
AC_MSG_WARN([Couldn't find a usable cairo])
fi
fi
AC_SUBST(LIBCAIRO_LIBS)
AC_SUBST(LIBCAIRO_CFLAGS)
KDE_CHECK_BINUTILS
AC_MSG_CHECKING([for KDE version])
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
tdeversion_save_CXXFLAGS="$CXXFLAGS"
tdeversion_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
CXXFLAGS="$CXXFLAGS $all_includes"
AC_COMPILE_IFELSE([
#include <tdeversion.h>
#if ! ( KDE_IS_VERSION( 3, 3, 91 ) )
#error KDE 3.3
#endif
],
need_trinity3_compat="no"
,
need_trinity3_compat="yes"
)
AC_COMPILE_IFELSE([
#include <tdeversion.h>
#if ! ( KDE_IS_VERSION( 3, 2, 90 ) )
#error KDE 3.2
#endif
],
need_trinity2_compat="no"
,
need_trinity2_compat="yes"
)
AC_COMPILE_IFELSE([
#include <tdeversion.h>
#if ! ( KDE_IS_VERSION( 3, 1, 90 ) )
#error KDE 3.1
#endif
],
need_trinity1_compat="no"
,
need_trinity1_compat="yes"
)
CXXFLAGS="$tdeversion_save_CXXFLAGS"
LIBS="$tdeversion_safe_LIBS"
AC_LANG_RESTORE
if test "$need_trinity2_compat" = "yes"; then
AC_MSG_RESULT([KDE 3.2.x])
fi
if test "$need_trinity1_compat" = "yes"; then
AC_MSG_RESULT([KDE 3.1.x])
fi
AM_CONDITIONAL(need_trinity3_compatibility, test "$need_trinity3_compat" = "yes")
AM_CONDITIONAL(need_trinity2_compatibility, test "$need_trinity2_compat" = "yes")
AM_CONDITIONAL(need_trinity1_compatibility, test "$need_trinity1_compat" = "yes")

38
doc/CMakeLists.txt

@ -1,14 +1,34 @@
file( GLOB _dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} * )
list( REMOVE_ITEM _dirs html man )
string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" )
foreach( _dir ${_dirs} )
if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_dir} AND
EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_dir}/CMakeLists.txt )
if( "${_dir}" STREQUAL "en" OR
"${_dir}" STREQUAL "man" OR
"${_linguas}" MATCHES "^;*$" OR
";${_linguas};" MATCHES ";${_dir};" )
add_subdirectory( ${_dir} )
endif( )
foreach( _dir IN LISTS _dirs )
if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_dir}
AND ( "${_dir}" STREQUAL "en" OR
"${_linguas}" MATCHES "^;*$" OR
";${_linguas};" MATCHES ";${_dir};" ))
file( GLOB _doc_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${_dir} ${_dir}/*.docbook )
if( _doc_files )
list( FIND _doc_files "index.docbook" _find_index )
if( -1 EQUAL _find_index )
set( _noindex "NOINDEX" )
else()
unset( _noindex )
endif()
tde_create_handbook(
SOURCE_BASEDIR ${_dir}
${_noindex}
LANG ${_dir}
DESTINATION ${PROJECT_NAME}
)
endif()
endif()
endforeach()
if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/html/CMakeLists.txt )
add_subdirectory( html )
endif()
if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/man/CMakeLists.txt )
add_subdirectory( man )
endif()

1
doc/Makefile.am

@ -1 +0,0 @@
SUBDIRS = da de en es et fr it nl pt ru sv

5
doc/da/Makefile.am

@ -1,5 +0,0 @@
EXTRA_DIST = index.docbook
KDE_LANG = da
KDE_DOCS = kmplayer

5
doc/de/Makefile.am

@ -1,5 +0,0 @@
EXTRA_DIST = index.docbook
KDE_LANG = de
KDE_DOCS = kmplayer

5
doc/en/Makefile.am

@ -1,5 +0,0 @@
EXTRA_DIST = index.docbook
KDE_LANG = en
KDE_DOCS = kmplayer

11
doc/en/index.docbook

@ -45,7 +45,7 @@
<abstract>
<para>
&kmplayer; is an application that is a &kde; frontend to <application>MPlayer</application>, <application>Xine</application> and <application>GStreamer</application>.
&kmplayer; is an application that is a TDE frontend to <application>MPlayer</application>, <application>Xine</application> and <application>GStreamer</application>.
</para>
</abstract>
@ -72,13 +72,12 @@ supports as well as watching from <acronym>DVD</acronym>,
<acronym>VCD</acronym> or <acronym>TV</acronym> and <acronym>camera</acronym>.
</para>
<para>
The documentation for &kappname; was not finished when &kde; was
installed on this computer.</para> <para>If you need more help, please
check <ulink url="http://www.kde.org">The KDE Website</ulink> for
The documentation for &kappname; has yet to be completed.
</para>
<para>If you need more help, please check <ulink url="http://trinitydesktop.org">The TDE Website</ulink> for
updates, or by submitting your question to
<ulink url="mailto:kde-user@kde.org">The &kde; User Mailing list</ulink>.
<ulink url="http://trinitydesktop.org/mailinglist.php">The TDE User Mailing list</ulink>.
</para>
<para><emphasis>The &kde; Team</emphasis></para>
</chapter>
<chapter id="gui">

5
doc/es/Makefile.am

@ -1,5 +0,0 @@
EXTRA_DIST = index.docbook
KDE_LANG = es
KDE_DOCS = kmplayer

5
doc/et/Makefile.am

@ -1,5 +0,0 @@
EXTRA_DIST = index.docbook
KDE_LANG = et
KDE_DOCS = kmplayer

5
doc/fr/Makefile.am

@ -1,5 +0,0 @@
EXTRA_DIST = index.docbook
KDE_LANG = fr
KDE_DOCS = kmplayer

5
doc/it/Makefile.am

@ -1,5 +0,0 @@
EXTRA_DIST = index.docbook
KDE_LANG = it
KDE_DOCS = kmplayer

5
doc/nl/Makefile.am

@ -1,5 +0,0 @@
EXTRA_DIST = index.docbook
KDE_LANG = nl
KDE_DOCS = kmplayer

5
doc/pt/Makefile.am

@ -1,5 +0,0 @@
EXTRA_DIST = index.docbook
KDE_LANG = pt
KDE_DOCS = kmplayer

5
doc/ru/Makefile.am

@ -1,5 +0,0 @@
EXTRA_DIST = index.docbook
KDE_LANG = ru
KDE_DOCS = kmplayer

5
doc/sv/Makefile.am

@ -1,5 +0,0 @@
EXTRA_DIST = index.docbook
KDE_LANG = sv
KDE_DOCS = kmplayer

3
icons/Makefile.am

@ -1,3 +0,0 @@
INCLUDES = $(all_includes)
METASOURCES = AUTO
KDE_ICON = AUTO

7032
libtool
File diff suppressed because it is too large
View File

5
mimetypes/Makefile.am

@ -1,5 +0,0 @@
if need_trinity2_compatibility
KDE32MIMEDIR = audio
endif
SUBDIRS = application video $(KDE32MIMEDIR)

4
mimetypes/application/Makefile.am

@ -1,4 +0,0 @@
mime_DATA = x-mplayer2.desktop x-kmplayer.desktop
mimedir = $(kde_mimedir)/application
EXTRA_DIST = $(mime_DATA)

4
mimetypes/audio/Makefile.am

@ -1,4 +0,0 @@
mime_DATA =x-ms-wma.desktop
mimedir = $(kde_mimedir)/audio

9
mimetypes/video/Makefile.am

@ -1,9 +0,0 @@
if need_trinity1_compatibility
KDE31MIMEDIR = trinity1
endif
SUBDIRS = . $(KDE31MIMEDIR)
mime_DATA = x-ms-wmp.desktop
mimedir = $(kde_mimedir)/video

4
mimetypes/video/trinity1/Makefile.am

@ -1,4 +0,0 @@
mime_DATA =x-ms-wmv.desktop
mimedir = $(kde_mimedir)/video

28
mplayer_vo_x11.diff

@ -1,28 +0,0 @@
--- libvo/vo_x11.c.orig Thu Dec 26 18:18:31 2002
+++ libvo/vo_x11.c Thu Dec 26 19:58:49 2002
@@ -294,12 +294,12 @@
bg=WhitePixel( mDisplay,mScreen );
fg=BlackPixel( mDisplay,mScreen );
- theCmap=vo_x11_create_colormap(&vinfo);
+ //theCmap=vo_x11_create_colormap(&vinfo);
xswa.background_pixel=0;
xswa.border_pixel=0;
- xswa.colormap=theCmap;
- xswamask=CWBackPixel | CWBorderPixel | CWColormap;
+ //xswa.colormap=theCmap;
+ xswamask=CWBackPixel | CWBorderPixel;// | CWColormap;
#ifdef HAVE_XF86VM
if ( vm )
@@ -321,6 +321,9 @@
}
else
{
+ theCmap=vo_x11_create_colormap(&vinfo);
+ xswa.colormap=theCmap;
+ xswamask=CWBackPixel | CWBorderPixel | CWColormap;
if ( vo_window == None )
{
vo_window=XCreateWindow( mDisplay,mRootWin,

1
po/Makefile.am

@ -1 +0,0 @@
POFILES = AUTO

2
protocols/Makefile.am

@ -1,2 +0,0 @@
protocoldir = $(kde_servicesdir)
protocol_DATA = mms.protocol rtsp.protocol pnm.protocol

39
src/CMakeLists.txt

@ -1,5 +1,3 @@
include( ConfigureChecks.cmake )
include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
@ -22,6 +20,9 @@ include_directories(
${GTK2_INCLUDE_DIRS}
${GLIB2_INCLUDE_DIRS}
${DBUS-GLIB_INCLUDE_DIRS}
${X11_XShm_INCLUDE_PATH}
${X11_Xv_INCLUDE_PATH}
${X11_Xutil_INCLUDE_PATH}
)
link_directories(
@ -61,14 +62,13 @@ tde_add_library( kmplayercommon SHARED AUTOMOC
kmplayer_rss.cpp kmplayer_atom.cpp
kmplayer_xspf.cpp triestring.cpp
kmplayerpartbase.skel
VERSION 1.0.0
LINK
tdecore-shared
tdeui-shared
tdeio-shared
tdeparts-shared
tdeutils-shared
tdemediaplayer
tdemediaplayer-shared
${CAIRO_LIBRARIES}
${EXPAT_LIBRARIES}
${XINE_LIBRARIES}
@ -79,6 +79,8 @@ tde_add_library( kmplayercommon SHARED AUTOMOC
${GSTREAMER_LIBRARIES}
${DBUS-TQT_LIBRARIES}
VERSION 1.0.0
DESTINATION ${LIB_INSTALL_DIR}
)
@ -136,7 +138,7 @@ tde_add_executable( kxineplayer AUTOMOC
tdeio-shared
kmplayerbackend-static
${XINE_LIBRARIES}
${XEXT_LIBRARIES}
${X11_Xext_LIB}
DESTINATION ${BIN_INSTALL_DIR}
)
@ -157,6 +159,7 @@ tde_add_executable( kxvplayer AUTOMOC
tdeio-shared
kmplayerbackend-static
${X11_Xv_LIB}
${X11_Xext_LIB}
DESTINATION ${BIN_INSTALL_DIR}
)
@ -189,7 +192,7 @@ endif()
if( BUILD_KNPPLAYER )
tde_add_executable( knpplayer AUTOMOC
tde_add_executable( knpplayer
SOURCES
npplayer.c
@ -228,34 +231,26 @@ endif()
##### other data
install(
FILES
bookmarks.xml
pluginsinfo
noise.gif
kmplayerui.rc
kmplayerpartui.rc
DESTINATION ${DATA_INSTALL_DIR}/kmplayer
FILES bookmarks.xml pluginsinfo noise.gif
kmplayerui.rc kmplayerpartui.rc
DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}
)
install(
FILES ${PROJECT_NAME}.desktop
DESTINATION ${XDG_APPS_INSTALL_DIR}
)
tde_create_translated_desktop( ${PROJECT_NAME}.desktop )
install(
FILES kmplayerrc
DESTINATION ${CONFIG_INSTALL_DIR}
)
install(
FILES kmplayer_part.desktop
tde_create_translated_desktop(
SOURCE kmplayer_part.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
if( BUILD_KOFFICE_PLUGIN )
install(
FILES kmplayer_koffice.desktop
tde_create_translated_desktop(
SOURCE kmplayer_koffice.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
endif()

18
src/ConfigureChecks.cmake

@ -1,18 +0,0 @@
#################################################
#
# (C) 2020 Michele Calgaro
# michele (DOT) calgaro (AT) yahoo (DOT) it
#
# Improvements and feedback are welcome
#
# This file is released under GPL >= 2
#
#################################################
## test for libXext
pkg_search_module( XEXT xext )
if( XEXT_FOUND )
check_include_file( "X11/extensions/shape.h" HAVE_X11_EXTENSIONS_SHAPE_H )
else( )
tde_message_fatal( "Xext is required, but was not found on your system." )
endif( )

87
src/Makefile.am

@ -1,87 +0,0 @@
AM_CPPFLAGS= -I$(kde_includes)/tdeio $(CFLAGS_GST) $(all_includes) $(LIBCAIRO_CFLAGS) $(LIBNSPR_CFLAGS) $(LIBDBUS_CFLAGS)
METASOURCES= AUTO
lib_LTLIBRARIES= libkmplayercommon.la
libkmplayercommon_la_SOURCES = viewarea.cpp kmplayerview.cpp playlistview.cpp kmplayercontrolpanel.cpp kmplayerconfig.cpp pref.cpp kmplayerprocess.cpp kmplayer_callback.skel kmplayer_backend.stub kmplayerpartbase.cpp kmplayerplaylist.cpp kmplayer_asx.cpp kmplayer_smil.cpp kmplayer_rp.cpp kmplayer_rss.cpp kmplayer_atom.cpp kmplayer_xspf.cpp triestring.cpp kmplayerpartbase.skel
libkmplayercommon_la_LDFLAGS = -avoid-version $(all_libraries) $(CFLAGS_XTEST)
libkmplayercommon_la_LIBADD = -ltdemediaplayer $(LIB_TDEPARTS) $(LIB_TDEUTILS) $(LIB_EXPAT) -lm $(LIBCAIRO_LIBS) $(LIBTQTDBUS) $(LIB_TQT) -lDCOP $(LIB_TDECORE) -ltdefx $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_XTEST)
if include_koffice_support
kofficeplugin_lib= libkmplayerkofficepart.la
SERVICES_KOFFICE = kmplayer_koffice.desktop
endif
kde_module_LTLIBRARIES= libkmplayerpart.la $(kofficeplugin_lib)
libkmplayerpart_la_SOURCES= kmplayer_part.cpp
libkmplayerpart_la_LDFLAGS= -avoid-version $(all_libraries) $(KDE_RPATH)
libkmplayerpart_la_LIBADD= libkmplayercommon.la
libkmplayerkofficepart_la_SOURCES=kmplayer_koffice_part.cpp
libkmplayerkofficepart_la_LDFLAGS= -avoid-version $(all_libraries) $(KDE_RPATH)
libkmplayerkofficepart_la_LIBADD= libkmplayercommon.la $(LIB_KOFFICE)
tdeinit_LTLIBRARIES=kmplayer.la
kmplayer_la_SOURCES= main.cpp kmplayerapp.cpp kmplayertvsource.cpp kmplayerbroadcast.cpp kmplayervdr.cpp
kmplayer_la_LIBADD= libkmplayercommon.la $(LIB_XTEST)
kmplayer_la_LDFLAGS= -module $(KDE_PLUGIN) $(LIB_TQT)
kmplayer_la_COMPILE_FIRST= kmplayer_backend_stub.h
EXTRA_PROGRAMS = kxineplayer kxvplayer kgstplayer
if inclu