diff options
| author | gregory guy <gregory-tde@laposte.net> | 2021-03-07 16:01:25 +0100 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2021-03-10 10:28:56 +0900 |
| commit | 78db2c39a44c6d20258aaf8201df919c2801717f (patch) | |
| tree | 0db56173644950c2fe347ec6eade54c58de2a971 | |
| parent | 2282a88c84b4ce02b0e8b0fc831d70992256fa23 (diff) | |
| download | kaffeine-78db2c39.tar.gz kaffeine-78db2c39.zip | |
Drop automake build support.
Add basic cmake build instructions.
Some doc files have moved at the root of the module.
Rework of the README and help page.
Deleted file BUGS.
Update some cmake files with latest macros.
Few cosmetics.
Signed-off-by: gregory guy <gregory-tde@laposte.net>
(cherry picked from commit d1e1f1777ffed5c45cd8e6db02721c8010125f47)
69 files changed, 226 insertions, 1772 deletions
diff --git a/.gitmodules b/.gitmodules index bdec8fc..69dd7b2 100644 --- a/.gitmodules +++ b/.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 @@ -7,3 +7,68 @@ Christoph Pfister <christophpfister@gmail.com> Jurgen Kofler <kaffeine@gmx.net> (Original author) + + + + *************************** + * KAFFEINE CONTRIBUTORS: * + * (alphabetical) * + *************************** + +Adrian Schroeter <adrian@suse.de> +- fix for position changes in paused mode +- help with xfree crash + +Alex Young <a.d.y@btinternet.com> +- fix for volume slider + +Assaf Gillat <gillata@gmail.com> +- alternate encoding for meta-tags; tons of patches + +Bryan Allen <theoiper@yahoo.com> +- quit options for end of playback + +Carlo Miotto <cmiotto@interfree.it> +- automatic resize + +Christopher Martin <christopher.martin@utoronto.ca> +- a lot of patches + +Gav Wood <gav@kde.org> +- lirc profile +- dcop + +Giorgos Gousios <gousiosg@cs.man.ac.uk> +- subtitle file handling + +Gustavo Pichorim Boiko <gustavo.boiko@kdemail.net>) +- mouse wheel events for system tray icon + +James Stembridge <jstembridge@fastmail.fm> +- toolbar fix +- cvsignore files + +Jeroen Wijnhout <Jeroen.Wijnhout@kdemail.net> +- shortcut configuration + +Laurent Montel <montel@kde.org> +- mem leak fixes +- speed improvements + +Michael Rolf <mi.rolf@gmx.net> +- M3U import fix +- tester + +Miguel Freitas <miguel@cetuc.puc-rio.br> +- made xine's unscaled osd working for Kaffeine +- xine aclocal flags patch +- position slider fix +- improved post plugin handling + +Steffen Schoenwiese <ss310636@inf.tu-dresden.de> +- save volume +- file dialogs remembers last directory + +Zack Cerza <zcerza@coe.neu.edu> +- english manpages +- debian build diff --git a/CMakeLists.txt b/CMakeLists.txt index da881f3..70489a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,21 +43,20 @@ tde_setup_paths( ) option( WITH_ALL_OPTIONS "Enable all optional support" OFF ) option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) - -option( WITH_DPMS "Enable support for dpms" ${WITH_ALL_OPTIONS} ) -option( WITH_XTEST "Enable support for XTest" ${WITH_ALL_OPTIONS} ) -option( WITH_XINERAMA "Enable support for xinerama" ${WITH_ALL_OPTIONS} ) -option( WITH_XCB "Enable support for xcb" ${WITH_ALL_OPTIONS} ) -option( WITH_GSTREAMER "Enable support for gstreamer backend" ${WITH_ALL_OPTIONS} ) -option( WITH_OGGVORBIS "Enable support for oggvorbis" ${WITH_ALL_OPTIONS} ) -option( WITH_LAME "Enable support for lame" ${WITH_ALL_OPTIONS} ) -option( WITH_DVB "Enable support for dvb" ${WITH_ALL_OPTIONS} ) -option( USE_TQT_ONLY "Build with tqt support only" OFF ) -option( WITH_XINIT_WORKAROUND "Enable support for xinit workaround" OFF ) +option( WITH_DPMS "Enable support for dpms" ${WITH_ALL_OPTIONS} ) +option( WITH_XTEST "Enable support for XTest" ${WITH_ALL_OPTIONS} ) +option( WITH_XINERAMA "Enable support for xinerama" ${WITH_ALL_OPTIONS} ) +option( WITH_XCB "Enable support for xcb" ${WITH_ALL_OPTIONS} ) +option( WITH_GSTREAMER "Enable support for gstreamer backend" ${WITH_ALL_OPTIONS} ) +option( WITH_OGGVORBIS "Enable support for oggvorbis" ${WITH_ALL_OPTIONS} ) +option( WITH_LAME "Enable support for lame" ${WITH_ALL_OPTIONS} ) +option( WITH_DVB "Enable support for dvb" ${WITH_ALL_OPTIONS} ) +option( USE_TQT_ONLY "Build with tqt support only" OFF ) +option( WITH_XINIT_WORKAROUND "Enable support for xinit workaround" OFF ) ##### user requested modules -option( BUILD_ALL "Build all" OFF ) +option( BUILD_ALL "Build all" OFF ) option( BUILD_DOC "Build documentation" ${BUILD_ALL} ) option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} ) @@ -79,7 +78,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" ##### directories add_subdirectory( ${PROJECT_NAME} ) -tde_conditional_add_subdirectory( BUILD_DOC doc ) +tde_conditional_add_subdirectory( BUILD_DOC doc ) tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po ) diff --git a/kaffeine/COPYING-DOCS b/COPYING-DOCS index 4a0fe1c..4a0fe1c 100644 --- a/kaffeine/COPYING-DOCS +++ b/COPYING-DOCS diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 5781cf7..b3becf2 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -44,11 +44,11 @@ endif() ##### check for libcdio vs cdparanoia -pkg_search_module( CDIO_CDDA libcdio_cdda ) +pkg_search_module( CDIO_CDDA libcdio_cdda ) pkg_search_module( CDIO_PARANOIA libcdio_paranoia ) - check_include_file( "cdio/paranoia/cdda.h" HAVE_LIBCDIO_090 ) check_include_file( "cdio/cdda.h" HAVE_CDPARANOIA ) + if( (NOT HAVE_LIBCDIO_090) AND (NOT HAVE_CDPARANOIA) ) tde_message_fatal( "libcdio >= 0.90 or cdparanoia are required but were not found on your system." ) endif() @@ -63,7 +63,7 @@ if( XINE_FOUND ) set( XINE_PARAM_GAPLESS_SWITCH 1 ) set( XINE_PARAM_EARLY_FINISHED_EVENT 1 ) endif() - else() + else() tde_message_fatal( "Xine support has been requested but libxine was not found on your system." ) endif() @@ -71,94 +71,94 @@ endif() ##### check for xinerama if( WITH_XINERAMA ) -if( X11_Xinerama_FOUND ) - set( HAVE_XINERAMA 1) - else() - tde_message_fatal( "Xinerama support has been requested but was not found on your system." ) -endif() + if( X11_Xinerama_FOUND ) + set( HAVE_XINERAMA 1) + else() + tde_message_fatal( "Xinerama support has been requested but was not found on your system." ) + endif() endif( WITH_XINERAMA ) ##### check for xcb if( WITH_XCB ) -pkg_search_module( XCB xcb ) + pkg_search_module( XCB xcb ) -if( XCB_FOUND ) - set( HAVE_XCB 1 ) - else() - tde_message_fatal( "Xcb support has been requested but was not found on your system." ) -endif() + if( XCB_FOUND ) + set( HAVE_XCB 1 ) + else() + tde_message_fatal( "Xcb support has been requested but was not found on your system." ) + endif() endif( WITH_XCB ) ##### check for dpms(X11) if( WITH_DPMS ) -if( X11_dpms_FOUND ) - set( HAVE_DPMS 1 ) - else() - tde_message_fatal( "Dpms support has been requested but was not found on your system." ) -endif() + if( X11_dpms_FOUND ) + set( HAVE_DPMS 1 ) + else() + tde_message_fatal( "Dpms support has been requested but was not found on your system." ) + endif() endif( WITH_DPMS ) ##### check for XTest if( WITH_XTEST ) -if( X11_XTest_FOUND ) - set( HAVE_XTEST 1 ) - else() - tde_message_fatal( "XTest support has been requested but was not found on your system." ) -endif() + if( X11_XTest_FOUND ) + set( HAVE_XTEST 1 ) + else() + tde_message_fatal( "XTest support has been requested but was not found on your system." ) + endif() endif( WITH_XTEST ) ##### check for gstreamer if( WITH_GSTREAMER ) -pkg_search_module( GST gstreamer-1.0>=1.0.0 gstreamer-0.10>=0.10.0 ) -if( NOT GST_FOUND ) - tde_message_fatal( "gstreamer support has been requested but neither gstreamer-1.0 or gstreamer-0.10 were found on your system." ) -endif() + pkg_search_module( GST gstreamer-1.0>=1.0.0 gstreamer-0.10>=0.10.0 ) + if( NOT GST_FOUND ) + tde_message_fatal( "gstreamer support has been requested but neither gstreamer-1.0 or gstreamer-0.10 were found on your system." ) + endif() -if( ${GST_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() + if( ${GST_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: ${GST_VERSION}" ) -message( STATUS "gstreamer video version: ${GSTREAMER_VIDEO_VERSION}" ) -message( STATUS "gstreamer plugins version: ${GSTREAMER_PLUGIN_VERSION}" ) + message( STATUS "gstreamer version: ${GST_VERSION}" ) + message( STATUS "gstreamer video version: ${GSTREAMER_VIDEO_VERSION}" ) + message( STATUS "gstreamer plugins version: ${GSTREAMER_PLUGIN_VERSION}" ) endif( WITH_GSTREAMER ) ##### check for lame if( WITH_LAME ) -find_path( LAME_INCLUDE_DIR "lame/lame.h" ) -find_library( LAME_LIBRARIES mp3lame ) -message( STATUS "Found Lame includes directory: ${LAME_INCLUDE_DIR}" ) + find_path( LAME_INCLUDE_DIR "lame/lame.h" ) + find_library( LAME_LIBRARIES mp3lame ) + message( STATUS "Found Lame includes directory: ${LAME_INCLUDE_DIR}" ) -if( NOT LAME_INCLUDE_DIR OR NOT LAME_LIBRARIES ) - tde_message_fatal( "Lame support has been requested but lame was not found on your system." ) -endif() + if( NOT LAME_INCLUDE_DIR OR NOT LAME_LIBRARIES ) + tde_message_fatal( "Lame support has been requested but lame was not found on your system." ) + endif() endif( WITH_LAME ) ##### check for ogg and vorbis if( WITH_OGGVORBIS ) -pkg_search_module( OGG ogg ) -pkg_search_module( VORBIS vorbis ) -pkg_search_module( VORBISENC vorbisenc ) + pkg_search_module( OGG ogg ) + pkg_search_module( VORBIS vorbis ) + pkg_search_module( VORBISENC vorbisenc ) -if( (NOT VORBISENC_FOUND) OR (NOT OGG_FOUND) ) - tde_message_fatal( "oggvorbis support has been requested but neither ogg or vorbis were not found on your system" ) -endif() + if( (NOT VORBISENC_FOUND) OR (NOT OGG_FOUND) ) + tde_message_fatal( "oggvorbis support has been requested but neither ogg or vorbis were not found on your system" ) + endif() endif( WITH_OGGVORBIS ) @@ -0,0 +1,2 @@ + +If Kaffeine hangs on start recompile/reinstall with cmake option -D WITH_XINIT_WORKAROUND="ON" . @@ -1,167 +1,45 @@ Basic Installation ================== - These are generic installation instructions. +kaffeine relies on cmake to build. - 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'). +Here are suggested default options: - 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. + -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" - 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: +Requirements: +============= - 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. +- xine-lib +- libcdio +- libcdio-paranoia +- cdparanoia - 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. +Optional: +========= - 3. Type `make install' to install the programs and any data files and - documentation. +- XTest +- Linux kernel headers (dvb) +- xineramaproto +- libxcb +- xextproto +- libogg +- libvorbis +- lame (mp3) - 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 +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 diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 2369f25..0000000 --- a/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.6.1 - -include admin/deps.am -include admin/Doxyfile.am -SUBDIRS=$(TOPSUBDIRS) diff --git a/Makefile.am.in b/Makefile.am.in deleted file mode 100644 index e46b27c..0000000 --- a/Makefile.am.in +++ /dev/null @@ -1,4 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.6.1 - -include admin/deps.am -include admin/Doxyfile.am @@ -1,86 +1,30 @@ -******************************* -* Kaffeine 0.8.x README * -******************************* + kaffeine - a media player for TDE. ------------------------------------------------------- -!! HAVE A LOOK AT KAFFEINE HANDBOOK !! ------------------------------------------------------- -!!!!!!!!!! IMPORTANT !!!!!!! -Live DVB only works with the xine backend (XinePart). -Depending on your distro, this package could be called kaffeine-xine. -Install it, start Kaffeine and change the backend in menu->settings->engine, then restart Kaffeine. -Note that this is only needed for live playback. All other features (recording, broadcasting..) do not depend on the backend. -Anyway, I strongly recommend the xine engine even if you don't have a DVB device. All others are incomplete and/or buggy. -Also note that for licensing reasons, some distro (kubuntu, suse) comes with "restricted" media libraries (xine, gstreamer), -so you won't be able to play some media files (in fact the most common ones:(). -You will have to install an "unrestricted" version in order to play all your media files. -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +While Kaffeine supports gstreamer and xine as media player engines, its +default engine is Xine, giving Kaffeine a wide variety of supported +media types and letting Kaffeine access CDs, DVDs, as well as network +streams. -Latest Kaffeine version is available on http://trinitydesktop.org +Features: +========= +* drag and drop +* an editable playlist +* a bookmark system +* Konqueror plugin (kaffeine-mozilla) +* OSD -MINIMUM REQUIREMENTS: ---------------------- - *) xine-lib 1.0.2 (we recommend 1.1.1) (http://www.xinehq.de) - *) TDE >= 3.2 (http://trinitydesktop.org) +CONTRIBUTING +============= - *) for DVB support: see README.dvb - *) for the gstreamer player-part: see README.gstreamer +If you wish to contribute to kaffeine, you might do so: -RECOMMENDED: ------------- - - *) WIN32 Codecs (http://www.mplayerhq.hu) - *) libdvdcss (http://developers.videolan.org/libdvdcss) - - -INSTALLATION: -------------- - -In order to compile and install Kaffeine on your system, type the following in the base -directory of the Kaffeine distribution: - - 1.) ./configure --prefix=TDEDIR --mandir=MANPAGE_DIR (e.g. for SuSE: --prefix=/opt/trinity --mandir=/usr/share/man) - (use ./configure --help for more options) - - 2,) make - - 3.) make install - - -On the download page you'll find RPM's for most distributions. - -Problems? Post to the kaffeine-user mailing-list: kaffeine-user@lists.sourceforge.net - -INSTALLATION FROM SVN: ----------------------- - -See http://kaffeine.sourceforge.net/index.php?page=developers - - -IMPORTANT CONFIGURE FLAGS: --------------------------- - - --with-xorg : use this ONLY(!) in the case Kaffeine hangs at startup - --without-dvb : disables DVB support (may accelerate startup) - --without-gstreamer: disables build of the gstreamer based player-part - - -TROUBLESHOOTING: ----------------- - -*) Fedora Users: If make aborts with '/usr/bin/ld: cannot find -lselinux' install - the libselinux-devel package or disable selinux. - -*) If Kaffeine hangs on start run 'configure --with-xinit-workaround' and recompile/reinstall. - - -LICENCE: --------- -This programm is distributed under the terms of the GPL v2. You can find a copy of the -licence in the file COPYING +- 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 diff --git a/kaffeine/README.atsc b/README.atsc index 5782e82..5782e82 100644 --- a/kaffeine/README.atsc +++ b/README.atsc diff --git a/kaffeine/README.dvb b/README.dvb index 2889192..2889192 100644 --- a/kaffeine/README.dvb +++ b/README.dvb diff --git a/kaffeine/README.gstreamer b/README.gstreamer index 04bf70a..04bf70a 100644 --- a/kaffeine/README.gstreamer +++ b/README.gstreamer diff --git a/admin b/admin deleted file mode 160000 -Subproject 709ea75c2c6bc299ad0469b9f5e0fb27dd300f8 diff --git a/config.h.in b/config.h.in deleted file mode 100644 index 88dc36a..0000000 --- a/config.h.in +++ /dev/null @@ -1,286 +0,0 @@ -/* config.h.in. Generated from configure.in by autoheader. */ - -/* Define if building universal (internal helper macro) */ -#undef AC_APPLE_UNIVERSAL_BUILD - -/* 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 - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - -/* DPMS extension available */ -#undef HAVE_DPMS - -/* DVB headers installed */ -#undef HAVE_DVB - -/* Define to 1 if you have the <inttypes.h> header file. */ -#undef HAVE_INTTYPES_H - -/* have libcdio >= 0.90 */ -#undef HAVE_LIBCDIO_090 - -/* 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 - -/* 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 - -/* xcb available */ -#undef HAVE_XCB - -/* Xinerama extension available */ -#undef HAVE_XINERAMA - -/* XTest extension available */ -#undef HAVE_XTEST - -/* Suffix for lib directories */ -#undef KDELIBSUFF - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* 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 home page for this package. */ -#undef PACKAGE_URL - -/* 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 - -/* If we use arts volume */ -#undef USE_ARTS - -/* Version number of package */ -#undef VERSION - -/* Defined if compiling without arts */ -#undef WITHOUT_ARTS - -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -# undef WORDS_BIGENDIAN -# endif -#endif - -/* workaround buggy X server */ -#undef XINIT_WKRND - -/* - * 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 diff --git a/configure.files b/configure.files deleted file mode 100644 index cb9328a..0000000 --- a/configure.files +++ /dev/null @@ -1,4 +0,0 @@ -./admin/configure.in.min -configure.in.in -./kaffeine/configure.in.bot -./kaffeine/configure.in.in diff --git a/configure.in.in b/configure.in.in deleted file mode 100644 index 9751e7c..0000000 --- a/configure.in.in +++ /dev/null @@ -1,14 +0,0 @@ -#MIN_CONFIG(3.3) - -AM_INIT_AUTOMAKE(kaffeine, 0.8.8) - -CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" - -if test "$build_arts" = "yes"; then - AC_DEFINE(USE_ARTS, 1, [If we use arts volume]) - LIB_ARTS="-lartskde" - AC_SUBST(LIB_ARTS) -fi - -KDE_INIT_DOXYGEN([The API Reference], [Version $VERSION]) - diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 6812bd2..0000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ - -KDE_LANG = en -KDE_DOCS = AUTO -SUBDIRS = $(AUTODIRS) - diff --git a/doc/kaffeine/Makefile.am b/doc/kaffeine/Makefile.am deleted file mode 100644 index 220b1f5..0000000 --- a/doc/kaffeine/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ - -KDE_LANG = en -KDE_DOCS = kaffeine - - diff --git a/doc/kaffeine/index.docbook b/doc/kaffeine/index.docbook index e07a53b..79a8152 100644 --- a/doc/kaffeine/index.docbook +++ b/doc/kaffeine/index.docbook @@ -65,7 +65,7 @@ Do NOT change these in the translation. --> <abstract> <para> -A Media Player for KDE. <ulink url="http://kaffeine.sourceforge.net">http://kaffeine.sourceforge.net</ulink> +A Media Player for TDE. Kaffeine source at <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kaffeine">https://mirror.git.trinitydesktop.org/gitea/TDE/kaffeine</ulink> </para> </abstract> @@ -388,8 +388,8 @@ consistent documentation style across all KDE apps. --> xine is a free multimedia player. It plays back CDs, DVDs, and VCDs. It also decodes multimedia files like AVI, MOV, WMV, and MP3 from local disk drives, and displays multimedia streamed over the Internet. It interprets many of the most common multimedia formats available - and some of the most uncommon formats, too. - Detailed info about xine features: <ulink url="http://www.xinehq.de"> -http://www.xinehq.de</ulink> + Detailed info about xine features: <ulink url="http://xine.sourceforge.net"> +http://xine.sourceforge.net</ulink> </para> </sect2> @@ -699,17 +699,14 @@ or from command line with <command>dcop kaffeine KaffeineIface openURL best_song <chapter id="faq"> <title>Questions and Answers</title> - <para> -<ulink url="http://kaffeine.sourceforge.net/index.php?page=faq">Kaffeine-FAQ</ulink> +If Kaffeine hangs on start recompile/reinstall with cmake option -D WITH_XINIT_WORKAROUND="ON". </para> <para> -<ulink url="http://xinehq.de/index.php/faq">xine-FAQ</ulink> +You may have a look at the xine FAQ at <ulink url="http://xine.sourceforge.net/faq">http://xine.sourceforge.net/faq</ulink>. </para> -<para>For Questions use the <ulink url="http://lists.sourceforge.net/lists/listinfo/kaffeine-user">kaffeine-user mailinglist</ulink>. -(First check the <ulink url="http://sourceforge.net/mailarchive/forum.php?forum_id=34875">archive</ulink> - if the question is still answered.) +<para>For Questions use the <ulink url="http://trinitydesktop.org/mailinglist.php">TrinityDesktop users mailinglist</ulink>. </para> @@ -720,20 +717,19 @@ or from command line with <command>dcop kaffeine KaffeineIface openURL best_song <para> Before you report a bug, please first make sure the bug has not been reported -yet in the bug tracking system at <ulink url="http://www.sourceforge.net/projects/kaffeine">http://www.sourceforge.net/projects/kaffeine</ulink>. -Also have a look into the mailinglist <ulink url="http://sourceforge.net/mailarchive/forum.php?forum_id=34875">archive</ulink>. +yet in the (former) bug tracking system at <ulink url="https://bugs.trinitydesktop.org">https://bugs.trinitydesktop.org</ulink>. +Also have a look into the mailinglist archives at <ulink url="https://mail.trinitydesktop.org/mailman3/hyperkitty/list/users@trinitydesktop.org/">https://mail.trinitydesktop.org/mailman3/hyperkitty/list/users@trinitydesktop.org/</ulink>. </para> <para> -Please use only the tracking system on sourceforge for reporting bugs and log in before -submitting (if you've a sourceforge account). +To report bugs/issues, please use the upstream development place at the <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kaffeine">TDE Gitea Workspace for Kaffeine</ulink>. </para> <para> When you submit a bug, please include all of the following information: <itemizedlist> -<listitem><para>versions of Kaffeine, xine, KDE, X11</para></listitem> +<listitem><para>versions of Kaffeine, xine, TDE, X11</para></listitem> <listitem><para>the backtrace from KDE's Crash Manager</para></listitem> <listitem><para>console output (you can use --verbose to get more)</para></listitem> </itemizedlist> diff --git a/kaffeine/BUGS b/kaffeine/BUGS deleted file mode 100644 index 238c6ad..0000000 --- a/kaffeine/BUGS +++ /dev/null @@ -1,19 +0,0 @@ - - -****************************** -* Reporting Kaffeine BUGS * -****************************** - -Before you report a bug, please first make sure the bug has not been reported -yet in the bug tracking system at http://sourceforge.net/tracker/?atid=581406&group_id=86937&func=browse -Also look into the kaffeine-user archive: http://sourceforge.net/mailarchive/forum.php?forum_id=34875 - -Please use only the tracking system on sourceforge for reporting bugs and log in before -submitting (if you've a sourceforge account). - - -When you submit a bug, please include all of the following information: - - - versions of Kaffeine, xine, KDE, X11 - - the backtrace from KDE's Crash Manager - - console output diff --git a/kaffeine/CREDITS b/kaffeine/CREDITS deleted file mode 100644 index f2e8c64..0000000 --- a/kaffeine/CREDITS +++ /dev/null @@ -1,66 +0,0 @@ - - *************************** - * KAFFEINE CONTRIBUTORS: * - * (alphabetical) * - *************************** - -Adrian Schroeter <adrian@suse.de> -- fix for position changes in paused mode -- help with xfree crash - -Alex Young <a.d.y@btinternet.com> -- fix for volume slider - -Assaf Gillat <gillata@gmail.com> -- alternate encoding for meta-tags; tons of patches - -Bryan Allen <theoiper@yahoo.com> -- quit options for end of playback - -Carlo Miotto <cmiotto@interfree.it> -- automatic resize - -Christopher Martin <christopher.martin@utoronto.ca> -- a lot of patches - -Gav Wood <gav@kde.org> -- lirc profile -- dcop - -Giorgos Gousios <gousiosg@cs.man.ac.uk> -- subtitle file handling - -Gustavo Pichorim Boiko <gustavo.boiko@kdemail.net>) -- mouse wheel events for system tray icon - -James Stembridge <jstembridge@fastmail.fm> -- toolbar fix -- cvsignore files - -Jeroen Wijnhout <Jeroen.Wijnhout@kdemail.net> -- shortcut configuration - -Laurent Montel <montel@kde.org> -- mem leak fixes -- speed improvements - -Michael Rolf <mi.rolf@gmx.net> -- M3U import fix -- tester - -Miguel Freitas <miguel@cetuc.puc-rio.br> -- made xine's unscaled osd working for Kaffeine -- xine aclocal flags patch -- position slider fix -- improved post plugin handling - -Steffen Schoenwiese <ss310636@inf.tu-dresden.de> -- save volume -- file dialogs remembers last directory - -Zack Cerza <zcerza@coe.neu.edu> -- english manpages -- debian build - -If you miss yourself here, send me a short mail: kaffeine@gmx.net - diff --git a/kaffeine/Makefile.am b/kaffeine/Makefile.am deleted file mode 100644 index 2b92808..0000000 --- a/kaffeine/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = src images mimetypes protocols servicemenus dvbdata diff --git a/kaffeine/configure.in.bot b/kaffeine/configure.in.bot deleted file mode 100644 index af431f7..0000000 --- a/kaffeine/configure.in.bot +++ /dev/null @@ -1,54 +0,0 @@ -echo "" -echo "-------------------------------------------------------" -echo "Kaffeine configure results:" -echo "" - -if test "$with_xcb" = "yes" ; then - echo "Build with xcb support: yes" -else - echo "Build with xcb support: no" - echo "IMPORTANT: this is strongly discouraged" -fi - -if test "$with_dpms" = "yes" ; then - echo "Build with DPMS support: yes" -else - echo "Build with DPMS support: no" -fi - -if test "$with_xtest" = "yes" ; then - echo "Build with XTest support: yes" -else - echo "Build with XTest support: no" -fi - -if test "$with_xinerama" = "yes" ; then - echo "Build with Xinerama support: yes" -else - echo "Build with Xinerama support: no" -fi - -if test "$with_dvb" = "yes" ; then - echo "Build with DVB support: yes" -else - echo "Build with DVB support: no" -fi - -if test "$with_gstreamer" = "yes" ; then - echo "Build GStreamer player part: yes" - echo "IMPORTANT: the GStreamer player part is experimental" -else - echo "Build GStreamer player-part: no" -fi - -if test "$with_oggvorbis" = "yes" ; then - echo "Build Ogg Vorbis encoder plugin: yes" -else - echo "Build Ogg Vorbis encoder plugin: no" -fi - -if test "$with_lame" = "yes" ; then - echo "Build LAME encoder plugin: yes" -else - echo "Build LAME encoder plugin: no" -fi diff --git a/kaffeine/configure.in.in b/kaffeine/configure.in.in deleted file mode 100644 index 001ba9a..0000000 --- a/kaffeine/configure.in.in +++ /dev/null @@ -1,306 +0,0 @@ -dnl ----------- -dnl basic stuff -dnl ----------- - -KDE_ENABLE_HIDDEN_VISIBILITY - -AC_ARG_VAR([PKG_CONFIG], [Path to pkg-config]) - -if test -z "$PKG_CONFIG" ; then - PKG_CONFIG="pkg-config" -fi - -AC_MSG_CHECKING([for pkg-config]) - -if ! "$PKG_CONFIG" --version ; then - echo "" - echo "---------------------------------------------------------------------" - echo "ERROR: Could not find pkg-config. Make sure it is in your path or set" - echo "the PKG_CONFIG environment variable to the full path to pkg-config." - echo "---------------------------------------------------------------------" - echo "" - AC_MSG_ERROR([could not find pkg-config]) -fi - -AC_ARG_WITH([xinit-workaround], - [AS_HELP_STRING([--with-xinit-workaround], - [use this flag if Kaffeine hangs at startup and you are using XFree86 4.4 or X.Org 6.7.0])],, - [with_xinit_workaround=no]) - -if test "$with_xinit_workaround" = "yes" ; then - AC_DEFINE([XINIT_WKRND],,[workaround buggy X server]) -fi - -dnl ------------------------ -dnl check for DPMS extension -dnl ------------------------ - -AC_ARG_WITH([dpms], [AS_HELP_STRING([--without-dpms], [build without DPMS support])],, - [with_dpms=yes]) - -CFLAGS_DPMS="" -LIB_DPMS="" - -if test "$with_dpms" != "no" ; then - AC_MSG_CHECKING([for DPMS extension]) - - if "$PKG_CONFIG" --exists xext ; then - with_dpms=yes - CFLAGS_DPMS=`"$PKG_CONFIG" --cflags xext` - LIB_DPMS=`"$PKG_CONFIG" --libs xext` - AC_DEFINE([HAVE_DPMS],,[DPMS extension available]) - AC_MSG_RESULT([yes]) - else - with_dpms=no - AC_MSG_RESULT([no]) - fi -fi - -AC_SUBST([CFLAGS_DPMS]) -AC_SUBST([LIB_DPMS]) - -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]) - -dnl ---------------------------- -dnl check for Xinerama extension -dnl ---------------------------- - -AC_ARG_WITH([xinerama], [AS_HELP_STRING([--without-xinerama], [build without Xinerama support])],, - [with_xinerama=yes]) - -CFLAGS_XINERAMA="" -LIB_XINERAMA="" - -if test "$with_xinerama" != "no" ; then - AC_MSG_CHECKING([for Xinerama extension]) - - if "$PKG_CONFIG" --exists xinerama ; then - with_xinerama=yes - CFLAGS_XINERAMA=`"$PKG_CONFIG" --cflags xinerama` - LIB_XINERAMA=`"$PKG_CONFIG" --libs xinerama` - AC_DEFINE([HAVE_XINERAMA],,[Xinerama extension available]) - AC_MSG_RESULT([yes]) - else - with_xinerama=no - AC_MSG_RESULT([no]) - fi -fi - -AC_SUBST([CFLAGS_XINERAMA]) -AC_SUBST([LIB_XINERAMA]) - -dnl ------------------ -dnl check for xine-lib -dnl ------------------ - -AC_MSG_CHECKING([for xine-lib]) - -CFLAGS_XINE="" -LIB_XINE="" - -if "$PKG_CONFIG" --exists "libxine >= 1.1.9" ; then - CFLAGS_XINE=`"$PKG_CONFIG" --cflags libxine` - LIB_XINE=`"$PKG_CONFIG" --libs libxine` - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) - - echo "" - echo "---------------------------------------" - echo "ERROR: Could not find xine-lib >= 1.1.9" - echo "---------------------------------------" - echo "" - - AC_MSG_ERROR([could not find xine-lib]) -fi - -AC_SUBST([CFLAGS_XINE]) -AC_SUBST([LIB_XINE]) - -dnl ------------- -dnl check for xcb -dnl ------------- - -AC_ARG_WITH([xcb], [AS_HELP_STRING([--without-xcb], [disable xcb support (not recommended)])],, - [with_xcb=yes]) - -AC_MSG_CHECKING([for xcb and xine-lib >= 1.1.9]) - -CFLAGS_XCB="" -LIB_XCB="" - -if test "$with_xcb" != "no" ; then - if "$PKG_CONFIG" --exists "xcb >= 1.0" ; then - with_xcb=yes - CFLAGS_XCB=`"$PKG_CONFIG" --cflags xcb` - LIB_XCB=`"$PKG_CONFIG" --libs xcb` - AC_DEFINE([HAVE_XCB],,[xcb available]) - AC_MSG_RESULT([yes]) - else - with_xcb=no - AC_MSG_RESULT([no]) - fi -fi - -AC_SUBST([CFLAGS_XCB]) -AC_SUBST([LIB_XCB]) - -AM_CONDITIONAL([with_xcb], [test "$with_xcb" = "yes"]) - -dnl --------------------- -dnl check for DVB headers -dnl --------------------- - -AC_ARG_WITH([dvb], [AS_HELP_STRING([--without-dvb], [build without DVB support])],, - [with_dvb=yes]) - -if test "$with_dvb" != "no" ; then - KDE_CHECK_HEADER([linux/dvb/frontend.h], [with_dvb=yes] - [AC_DEFINE([HAVE_DVB],,[DVB headers installed])], [with_dvb=no]) -fi - -AM_CONDITIONAL([with_dvb], [test "$with_dvb" = "yes"]) - -dnl ------------------- -dnl check for gstreamer -dnl ------------------- - -AC_ARG_WITH([gstreamer], [AS_HELP_STRING([--without-gstreamer], [disable GStreamer player part])],, - [with_gstreamer=yes]) - -CFLAGS_GSTREAMER="" -LIB_GSTREAMER="" - -if test "$with_gstreamer" != "no" ; then - AC_MSG_CHECKING([for GStreamer]) - - if "$PKG_CONFIG" --exists "gstreamer-1.0 gstreamer-plugins-base-1.0"; then - with_gstreamer=yes - CFLAGS_GSTREAMER=`"$PKG_CONFIG" --cflags gstreamer-1.0 gstreamer-plugins-base-1.0` - LIB_GSTREAMER=`"$PKG_CONFIG" --libs gstreamer-1.0 gstreamer-plugins-base-1.0` - LIB_GSTOVERLAY='-lgstvideo-1.0' - AC_MSG_RESULT([yes]) - else - if "$PKG_CONFIG" --exists "gstreamer-0.10 gstreamer-plugins-base-0.10"; then - with_gstreamer=yes - CFLAGS_GSTREAMER=`"$PKG_CONFIG" --cflags gstreamer-0.10 gstreamer-plugins-base-0.10` - LIB_GSTREAMER=`"$PKG_CONFIG" --libs gstreamer-0.10 gstreamer-plugins-base-0.10` - LIB_GSTOVERLAY='-lgstinterfaces-0.10' - AC_MSG_RESULT([yes]) - else - with_gstreamer=no - AC_MSG_RESULT([no]) - fi - fi -fi - -AC_SUBST([CFLAGS_GSTREAMER]) -AC_SUBST([LIB_GSTREAMER]) -AC_SUBST([LIB_GSTOVERLAY]) - -AM_CONDITIONAL([with_gstreamer], [test "$with_gstreamer" = "yes"]) - -dnl -------------------- -dnl check for cdparanoia -dnl -------------------- - -KDE_CHECK_HEADER([cdio/paranoia/cdda.h], [have_libcdio_090=yes; with_cdparanoia=yes], [have_libcdio_090=no]) -if test "x$have_libcdio_090" = "xyes"; then - AC_DEFINE(HAVE_LIBCDIO_090, 1, [have libcdio >= 0.90]) -else - KDE_CHECK_HEADER([cdio/cdda.h], [with_cdparanoia=yes], [with_cdparanoia=no]) -fi - - -if test "$with_cdparanoia" != "yes" ; then - echo "" - echo "-----------------------------------------" - echo "ERROR: Could not find cdparanoia headers." - echo "-----------------------------------------" - echo "" - - AC_MSG_ERROR([could not find cdparanoia headers]) -fi - -dnl ---------------------------- -dnl check for Ogg Vorbis encoder -dnl ---------------------------- - -AC_ARG_WITH([oggvorbis], [AS_HELP_STRING([--without-oggvorbis], [build without Ogg Vorbis support])],, - [with_oggvorbis=yes]) - -CFLAGS_OGGVORBIS="" -LIB_OGGVORBIS="" - -if test "$with_oggvorbis" != "no" ; then - AC_MSG_CHECKING([for Ogg/Vorbis encoder]) - - if "$PKG_CONFIG" --exists vorbisenc vorbis ogg ; then - with_oggvorbis=yes - CFLAGS_OGGVORBIS=`"$PKG_CONFIG" --cflags vorbisenc vorbis ogg` - LIB_OGGVORBIS=`"$PKG_CONFIG" --libs vorbisenc vorbis ogg` - AC_MSG_RESULT([yes]) - else - if "$PKG_CONFIG" --exists vorbisenc ; then - with_oggvorbis=yes - CFLAGS_OGGVORBIS=`"$PKG_CONFIG" --cflags vorbisenc` - LIB_OGGVORBIS=`"$PKG_CONFIG" --libs vorbisenc` - AC_MSG_RESULT([yes]) - else - with_oggvorbis=no - AC_MSG_RESULT([no]) - fi - fi -fi - -AC_SUBST([CFLAGS_OGGVORBIS]) -AC_SUBST([LIB_OGGVORBIS]) - -AM_CONDITIONAL([with_oggvorbis], [test "$with_oggvorbis" = "yes"]) - -dnl -------------- -dnl check for LAME -dnl -------------- - -AC_ARG_WITH([lame], [AS_HELP_STRING([--without-lame], [build without LAME support])],, - [with_lame=yes]) - -LIB_LAME="" - -if test "$with_lame" != "no" ; then - KDE_CHECK_HEADER([lame/lame.h], [with_lame=yes], [with_lame=no]) -fi - -if test "$with_lame" = "yes" ; then - KDE_CHECK_LIB([mp3lame], [lame_init], [LIB_LAME="-lmp3lame"], [with_lame=no], [-lm]) -fi - -AC_SUBST([LIB_LAME]) - -AM_CONDITIONAL([with_lame], [test "$with_lame" = "yes"]) diff --git a/kaffeine/dvbdata/Makefile.am b/kaffeine/dvbdata/Makefile.am deleted file mode 100644 index 13f606b..0000000 --- a/kaffeine/dvbdata/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -EXTRA_DIST = dvbdata.tar.gz - -dvbdata.tar.gz: atsc dvb-c dvb-s dvb-t - tar --create --gzip --file $@ $(^F) - -install-data-local: dvbdata.tar.gz - $(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kaffeine/ - $(INSTALL_DATA) $(srcdir)/dvbdata.tar.gz $(DESTDIR)$(kde_datadir)/kaffeine/dvbdata.tar.gz - -uninstall-local: - -rm -f $(DESTDIR)$(kde_datadir)/kaffeine/dvbdata.tar.gz diff --git a/kaffeine/images/Makefile.am b/kaffeine/images/Makefile.am deleted file mode 100644 index 00450c8..0000000 --- a/kaffeine/images/Makefile.am +++ /dev/null @@ -1,82 +0,0 @@ -EXTRA_DIST = hi16-app-kaffeine.png hi22-app-kaffeine.png hi32-app-kaffeine.png \ - hi48-app-kaffeine.png hi64-app-kaffeine.png logo.mpg logo.avi hi128-app-kaffeine.png \ - hi32-app-kaffeine-play.png hi32-app-kaffeine-pause.png hi32-app-kaffeine-record.png \ - hi22-action-player_record.png hi16-action-player_record.png hi16-mime-mime_kaffeine.png \ - hi32-mime-mime_kaffeine.png hi48-mime-mime_kaffeine.png hi16-action-player_mute.png \ - hi22-action-player_mute.png hi32-action-player_mute.png hi16-app-kdvbtv.png hi16-app-kdvbtvc.png \ - hi16-app-kdvbra.png hi16-app-kdvbrac.png nocover.png hi16-app-kilogram.png \ - hi22-app-kilogram22x22.png hi32-app-kilogram.png hi16-action-player_record.png - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ - $(INSTALL_DATA) $(srcdir)/hi16-app-kaffeine.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kaffeine.png - $(INSTALL_DATA) $(srcdir)/hi16-app-kdvbtv.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdvbtv.png - $(INSTALL_DATA) $(srcdir)/hi16-app-kdvbtvc.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdvbtvc.png - $(INSTALL_DATA) $(srcdir)/hi16-app-kdvbra.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdvbra.png - $(INSTALL_DATA) $(srcdir)/hi16-app-kdvbrac.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdvbrac.png - $(INSTALL_DATA) $(srcdir)/hi16-app-kilogram.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kilogram.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/mimetypes/ - $(INSTALL_DATA) $(srcdir)/hi16-mime-mime_kaffeine.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/mimetypes/mime_kaffeine.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/ - $(INSTALL_DATA) $(srcdir)/hi16-action-player_record.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/player_record.png - $(INSTALL_DATA) $(srcdir)/hi16-action-player_mute.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/player_mute.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ - $(INSTALL_DATA) $(srcdir)/hi22-app-kaffeine.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kaffeine.png - $(INSTALL_DATA) $(srcdir)/hi22-app-kilogram.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kilogram.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/ - $(INSTALL_DATA) $(srcdir)/hi22-action-player_record.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/player_record.png - $(INSTALL_DATA) $(srcdir)/hi22-action-player_mute.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/player_mute.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ - $(INSTALL_DATA) $(srcdir)/hi32-app-kaffeine-play.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kaffeine-play.png - $(INSTALL_DATA) $(srcdir)/hi32-app-kaffeine-pause.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kaffeine-pause.png - $(INSTALL_DATA) $(srcdir)/hi32-app-kaffeine-record.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kaffeine-record.png - $(INSTALL_DATA) $(srcdir)/hi32-app-kaffeine.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kaffeine.png - $(INSTALL_DATA) $(srcdir)/hi32-app-kilogram.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kilogram.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/mimetypes/ - $(INSTALL_DATA) $(srcdir)/hi32-mime-mime_kaffeine.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/mimetypes/mime_kaffeine.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/ - $(INSTALL_DATA) $(srcdir)/hi32-action-player_record.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/player_record.png - $(INSTALL_DATA) $(srcdir)/hi32-action-player_mute.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/player_mute.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ - $(INSTALL_DATA) $(srcdir)/hi48-app-kaffeine.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kaffeine.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/mimetypes/ - $(INSTALL_DATA) $(srcdir)/hi48-mime-mime_kaffeine.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/mimetypes/mime_kaffeine.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ - $(INSTALL_DATA) $(srcdir)/hi64-app-kaffeine.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kaffeine.png - $(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kaffeine/ - $(INSTALL_DATA) $(srcdir)/logo.mpg $(DESTDIR)$(kde_datadir)/kaffeine/logo.mpg - $(INSTALL_DATA) $(srcdir)/logo.avi $(DESTDIR)$(kde_datadir)/kaffeine/logo.avi - $(INSTALL_DATA) $(srcdir)/logo $(DESTDIR)$(kde_datadir)/kaffeine/logo - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ - $(INSTALL_DATA) $(srcdir)/hi128-app-kaffeine.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kaffeine.png - $(INSTALL_DATA) $(srcdir)/nocover.png $(DESTDIR)$(kde_datadir)/kaffeine/nocover.png - -uninstall-local: - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kilogram.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kilogram.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kilogram.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kaffeine.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdvbtv.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdvbtvc.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdvbra.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdvbrac.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/player_record.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/player_mute.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kaffeine.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kaffeine-play.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kaffeine-pause.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x2/apps/player_record.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/player_mute.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kaffeine.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/player_record.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/player_mute.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kaffeine.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kaffeine.png - -rm -f $(DESTDIR)$(kde_datadir)/kaffeine/logo.mpg - -rm -f $(DESTDIR)$(kde_datadir)/kaffeine/logo.avi - -rm -f $(DESTDIR)$(kde_datadir)/kaffeine/logo - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kaffeine.png - -rm -f $(DESTDIR)$(kde_datadir)/kaffeine/nocover.png - -pics_DATA = playing.png -picsdir = $(kde_datadir)/kaffeine/pics diff --git a/kaffeine/mimetypes/Makefile.am b/kaffeine/mimetypes/Makefile.am deleted file mode 100644 index dfd6a7b..0000000 --- a/kaffeine/mimetypes/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ - -SUBDIRS = application diff --git a/kaffeine/mimetypes/application/CMakeLists.txt b/kaffeine/mimetypes/application/CMakeLists.txt index 4a7b430..5645fa6 100644 --- a/kaffeine/mimetypes/application/CMakeLists.txt +++ b/kaffeine/mimetypes/application/CMakeLists.txt @@ -1,6 +1,6 @@ ##### other data -install( - FILES x-kaffeine.desktop +tde_create_translated_desktop( + SOURCE x-kaffeine.desktop DESTINATION ${MIME_INSTALL_DIR}/application ) diff --git a/kaffeine/mimetypes/application/Makefile.am b/kaffeine/mimetypes/application/Makefile.am deleted file mode 100644 index ec74682..0000000 --- a/kaffeine/mimetypes/application/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ - - -mime_DATA = x-kaffeine.desktop x-mplayer2.desktop -mimedir = $(kde_mimedir)/application - -EXTRA_DIST = $(mime_DATA) diff --git a/kaffeine/protocols/Makefile.am b/kaffeine/protocols/Makefile.am deleted file mode 100644 index 86a624e..0000000 --- a/kaffeine/protocols/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ - - -EXTRA_DIST = mms.protocol rtsp.protocol - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kaffeine - $(INSTALL_DATA) $(srcdir)/mms.protocol $(DESTDIR)$(kde_datadir)/kaffeine/mms.protocol - $(INSTALL_DATA) $(srcdir)/rtsp.protocol $(DESTDIR)$(kde_datadir)/kaffeine/rtsp.protocol - -uninstall-local: - -rm -f $(DESTDIR)$(kde_datadir)/kaffeine/mms.protocol - -rm -f $(DESTDIR)$(kde_datadir)/kaffeine/rtsp.protocol - - diff --git a/kaffeine/servicemenus/CMakeLists.txt b/kaffeine/servicemenus/CMakeLists.txt index f4123e3..7bdb851 100644 --- a/kaffeine/servicemenus/CMakeLists.txt +++ b/kaffeine/servicemenus/CMakeLists.txt @@ -1,12 +1,8 @@ -install( - FILES - kaffeine_append_file.desktop - kaffeine_open_directory.desktop - kaffeine_play_audiocd.desktop - kaffeine_play_dvd.desktop - kaffeine_play_vcd.desktop - +##### other data + +tde_create_translated_desktop( + SOURCE kaffeine_append_file.desktop kaffeine_open_directory.desktop + kaffeine_play_audiocd.desktop kaffeine_play_dvd.desktop + kaffeine_play_vcd.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus ) - - diff --git a/kaffeine/servicemenus/Makefile.am b/kaffeine/servicemenus/Makefile.am deleted file mode 100644 index 555cdb3..0000000 --- a/kaffeine/servicemenus/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ - - -EXTRA_DIST = kaffeine_open_directory.desktop kaffeine_append_file.desktop kaffeine_play_audiocd.desktop kaffeine_play_dvd.desktop kaffeine_play_vcd.desktop - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(kde_datadir)/konqueror/servicemenus - $(INSTALL_DATA) $(srcdir)/kaffeine_open_directory.desktop $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/kaffeine_open_directory.desktop - $(INSTALL_DATA) $(srcdir)/kaffeine_append_file.desktop $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/kaffeine_append_file.desktop - $(INSTALL_DATA) $(srcdir)/kaffeine_play_audiocd.desktop $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/kaffeine_play_audiocd.desktop - $(INSTALL_DATA) $(srcdir)/kaffeine_play_dvd.desktop $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/kaffeine_play_dvd.desktop - $(INSTALL_DATA) $(srcdir)/kaffeine_play_vcd.desktop $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/kaffeine_play_vcd.desktop - -uninstall-local: - -rm -f $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/kaffeine_open_directory.desktop - -rm -f $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/kaffeine_append_file.desktop - -rm -f $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/kaffeine_play_audiocd.desktop - -rm -f $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/kaffeine_play_dvd.desktop - -rm -f $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/kaffeine_play_vcd.desktop - diff --git a/kaffeine/src/CMakeLists.txt b/kaffeine/src/CMakeLists.txt index f77334f..7dbe0d2 100644 --- a/kaffeine/src/CMakeLists.txt +++ b/kaffeine/src/CMakeLists.txt @@ -66,11 +66,11 @@ install( ) install( - FILES kaffeine.profile.xml + FILES ${PROJECT_NAME}.profile.xml DESTINATION ${DATA_INSTALL_DIR}/profiles ) -install( - FILES kaffeine.desktop kaffeine-iso.desktop +tde_create_translated_desktop( + SOURCE ${PROJECT_NAME}.desktop ${PROJECT_NAME}-iso.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) diff --git a/kaffeine/src/Makefile.am b/kaffeine/src/Makefile.am deleted file mode 100644 index 952b4ed..0000000 --- a/kaffeine/src/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -SUBDIRS = player-parts input - -bin_PROGRAMS = kaffeine - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/ \ - -I$(top_srcdir)/kaffeine/src/input/dvb/ \ - -I$(top_builddir)/kaffeine/src/input/dvb/plugins/epg \ - -I$(top_srcdir)/kaffeine/src/input/dvb/plugins/epg \ - -I$(top_builddir)/kaffeine/src/input/dvb/ \ - -I$(top_builddir)/kaffeine/src/input/disc/ \ - -I$(top_srcdir)/kaffeine/src/input/disc/ \ - -I$(top_srcdir)/kaffeine/src/input/disc/plugins \ - -I$(top_srcdir)/kaffeine/src/player-parts/kaffeine-part \ - -I$(top_srcdir)/kaffeine/src/input/dvbclient/ \ - -I$(top_srcdir)/kaffeine/src/input/audiobrowser/ \ - $(all_includes) $(CFLAGS_DPMS) $(CFLAGS_XTEST) - -METASOURCES = AUTO - -kaffeine_SOURCES = main.cpp \ - kaffeine.cpp \ - startwindow.cpp \ - pref.cpp \ - kaffeineiface.skel \ - systemtray.cpp \ - instwizard.cpp\ - tdemultitabbar.cpp \ - inputmanager.cpp - -kaffeine_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor - -if with_dvb - DVBLIB = input/dvb/libkaffeinedvb.la -endif - -kaffeine_LDADD = $(LIB_TDEPARTS) \ - player-parts/kaffeine-part/libkaffeinepart.la \ - input/dvbclient/libkaffeinedvbclient.la \ - input/audiobrowser/libkaffeineaudiobrowser.la \ - input/disc/libkaffeinedisc.la \ - $(DVBLIB) $(LIB_DPMS) $(LIB_XTEST) - -# this is where the desktop file will go -shelldesktopdir = $(xdg_appsdir) -shelldesktop_DATA = kaffeine.desktop - -# this is where the XML-GUI resource file goes -shellrcdir = $(kde_datadir)/kaffeine -shellrc_DATA = kaffeineui.rc - -# this is where profile file for KDE-LIRC goes -profiledata_DATA = kaffeine.profile.xml -profiledatadir = $(kde_datadir)/profiles diff --git a/kaffeine/src/input/Makefile.am b/kaffeine/src/input/Makefile.am deleted file mode 100644 index 75b2ab7..0000000 --- a/kaffeine/src/input/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -noinst_LTLIBRARIES = libkaffeineinput.la - -if with_dvb - DVB_SUBDIR = dvb -endif - -SUBDIRS = . dvbclient audiobrowser disc $(DVB_SUBDIR) - -INCLUDES = -I$(top_srcdir)/kaffeine/src \ - -I$(top_srcdir)/kaffeine/src/player-parts/kaffeine-part $(all_includes) - -noinst_HEADERS = kaffeineinput.h - -METASOURCES = AUTO - -libkaffeineinput_la_SOURCES = kaffeineinput.cpp - -libkaffeineinput_la_LDFLAGS = $(KDE_RPATH) \ - $(all_libraries) - -libkaffeineinput_la_LIBADD = $(top_builddir)/kaffeine/src/player-parts/kaffeine-part/libkaffeinepart.la diff --git a/kaffeine/src/input/audiobrowser/Makefile.am b/kaffeine/src/input/audiobrowser/Makefile.am deleted file mode 100644 index 451ff96..0000000 --- a/kaffeine/src/input/audiobrowser/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -METASOURCES = AUTO - -noinst_LTLIBRARIES = libkaffeineaudiobrowser.la - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/ \ - -I$(top_srcdir)/kaffeine/src/ \ - $(all_includes) \ - -I$(top_srcdir)/kaffeine/src/player-parts/kaffeine-part - -libkaffeineaudiobrowser_la_SOURCES = playlist.cpp \ - playlistitem.cpp \ - urllistview.cpp \ - googlefetcher.cpp \ - googlefetcherdialog.cpp - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) - -libkaffeineaudiobrowser_la_LDFLAGS = $(KDE_RPATH) \ - $(all_libraries) \ - -L$(top_srcdir)/kaffeine/src/input - -libkaffeineaudiobrowser_la_LIBADD = $(top_builddir)/kaffeine/src/input/libkaffeineinput.la \ - $(top_builddir)/kaffeine/src/player-parts/kaffeine-part/libkaffeinepart.la \ - $(LIB_TDEHTML) - -# this is where the XML-GUI resource file goes -shellrcdir = $(kde_datadir)/kaffeine -shellrc_DATA = kaffeineplaylist.rc diff --git a/kaffeine/src/input/disc/Makefile.am b/kaffeine/src/input/disc/Makefile.am deleted file mode 100644 index fe91515..0000000 --- a/kaffeine/src/input/disc/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -METASOURCES = AUTO - -SUBDIRS = plugins . - -noinst_LTLIBRARIES = libkaffeinedisc.la - -noinst_HEADERS = cddb.h \ - disc.h \ - paranoia.h - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/ \ - -I$(top_builddir)/kaffeine/src/input/ \ - -I$(top_srcdir)/kaffeine/src/ \ - -I$(top_srcdir)/kaffeine/src/player-parts/kaffeine-part \ - -I$(top_srcdir)/kaffeine/src/input/disc/plugins \ - $(all_includes) - -libkaffeinedisc_la_SOURCES = disc.cpp \ - cddb.cpp \ - paranoia.cpp \ - paranoiasettings.ui - -libkaffeinedisc_la_LDFLAGS = $(KDE_RPATH) \ - $(all_libraries) \ - -L$(top_srcdir)/kaffeine/src/input \ - -L$(top_srcdir)/kaffeine/src/input/disc/plugins - -libkaffeinedisc_la_LIBADD = $(top_builddir)/kaffeine/src/input/libkaffeineinput.la \ - $(top_builddir)/kaffeine/src/player-parts/kaffeine-part/libkaffeinepart.la \ - $(top_builddir)/kaffeine/src/input/disc/plugins/libkaffeineaudioencoder.la \ - -lcdio_cdda -lcdio_paranoia - -# this is where the XML-GUI resource file goes -shellrcdir = $(kde_datadir)/kaffeine -shellrc_DATA = kaffeinedisc.rc - diff --git a/kaffeine/src/input/disc/plugins/CMakeLists.txt b/kaffeine/src/input/disc/plugins/CMakeLists.txt index 3efdd45..81e4656 100644 --- a/kaffeine/src/input/disc/plugins/CMakeLists.txt +++ b/kaffeine/src/input/disc/plugins/CMakeLists.txt @@ -47,8 +47,8 @@ install( DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME} ) -install( - FILES kaffeineaudioencoder.desktop +tde_create_translated_desktop( + SOURCE kaffeineaudioencoder.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) diff --git a/kaffeine/src/input/disc/plugins/Makefile.am b/kaffeine/src/input/disc/plugins/Makefile.am deleted file mode 100644 index dab8353..0000000 --- a/kaffeine/src/input/disc/plugins/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -if with_lame - LAME_SUBDIR = mp3lame -endif - -if with_oggvorbis - OGGVORBIS_SUBDIR = oggvorbis -endif - -lib_LTLIBRARIES = libkaffeineaudioencoder.la - -METASOURCES = AUTO - -SUBDIRS = . $(LAME_SUBDIR) $(OGGVORBIS_SUBDIR) - -INCLUDES = -I$(top_srcdir)/kaffeine/src $(all_includes) - -kaffeineincludedir = $(includedir)/kaffeine -kaffeineinclude_HEADERS = kaffeineaudioencoder.h - -libkaffeineaudioencoder_la_SOURCES = kaffeineaudioencoder.cpp -libkaffeineaudioencoder_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) $(LIB_OGGVORBIS) -libkaffeineaudioencoder_la_LDFLAGS = $(all_libraries) -version-info 0:1:0 -no-undefined - -kde_servicetypes_DATA = kaffeineaudioencoder.desktop diff --git a/kaffeine/src/input/disc/plugins/mp3lame/CMakeLists.txt b/kaffeine/src/input/disc/plugins/mp3lame/CMakeLists.txt index e696f4f..30968f2 100644 --- a/kaffeine/src/input/disc/plugins/mp3lame/CMakeLists.txt +++ b/kaffeine/src/input/disc/plugins/mp3lame/CMakeLists.txt @@ -33,7 +33,7 @@ tde_add_kpart( libkaffeinemp3lame AUTOMOC ##### other data -install( - FILES kaffeinemp3lame.desktop +tde_create_translated_desktop( + SOURCE kaffeinemp3lame.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) diff --git a/kaffeine/src/input/disc/plugins/mp3lame/Makefile.am b/kaffeine/src/input/disc/plugins/mp3lame/Makefile.am deleted file mode 100644 index 4b05e2e..0000000 --- a/kaffeine/src/input/disc/plugins/mp3lame/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -kde_module_LTLIBRARIES = libkaffeinemp3lame.la - -INCLUDES = -I$(top_srcdir)/kaffeine/src/ -I$(top_srcdir)/kaffeine/src/input/disc/plugins/ $(all_includes) - -METASOURCES = AUTO - -kaffeineincludedir = $(includedir)/kaffeine - -noinst_HEADERS = klameenc.h - -libkaffeinemp3lame_la_SOURCES = klameenc.cpp lameconfig.ui -libkaffeinemp3lame_la_LIBADD = ../libkaffeineaudioencoder.la $(LIB_LAME) $(LIB_TDECORE) -libkaffeinemp3lame_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -avoid-version -no-undefined - -# this is where the desktop file will go -partdesktopdir = $(kde_servicesdir) -partdesktop_DATA = kaffeinemp3lame.desktop diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/CMakeLists.txt b/kaffeine/src/input/disc/plugins/oggvorbis/CMakeLists.txt index 2659f4e..1aeae20 100644 --- a/kaffeine/src/input/disc/plugins/oggvorbis/CMakeLists.txt +++ b/kaffeine/src/input/disc/plugins/oggvorbis/CMakeLists.txt @@ -38,7 +38,7 @@ tde_add_kpart( libkaffeineoggvorbis AUTOMOC ##### other data -install( - FILES kaffeineoggvorbis.desktop +tde_create_translated_desktop( + SOURCE kaffeineoggvorbis.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am b/kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am deleted file mode 100644 index 90e8338..0000000 --- a/kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -kde_module_LTLIBRARIES = libkaffeineoggvorbis.la - -INCLUDES = -I$(top_srcdir)/kaffeine/src/ -I$(top_srcdir)/kaffeine/src/input/disc/plugins/ $(all_includes) $(CFLAGS_OGGVORBIS) - -METASOURCES = AUTO - -kaffeineincludedir = $(includedir)/kaffeine - -noinst_HEADERS = koggenc.h - -libkaffeineoggvorbis_la_SOURCES = koggenc.cpp oggconfig.ui -libkaffeineoggvorbis_la_LIBADD = ../libkaffeineaudioencoder.la $(LIB_OGGVORBIS) -libkaffeineoggvorbis_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -avoid-version -no-undefined - -# this is where the desktop file will go -partdesktopdir = $(kde_servicesdir) -partdesktop_DATA = kaffeineoggvorbis.desktop diff --git a/kaffeine/src/input/dvb/Makefile.am b/kaffeine/src/input/dvb/Makefile.am deleted file mode 100644 index d5b1035..0000000 --- a/kaffeine/src/input/dvb/Makefile.am +++ /dev/null @@ -1,83 +0,0 @@ -SUBDIRS = lib plugins . - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/ \ - -I$(top_srcdir)/kaffeine/src/input/dvb/lib \ - -I$(top_srcdir)/kaffeine/src/input/dvb/plugins/stream \ - -I$(top_srcdir)/kaffeine/src/input/dvb/plugins/epg \ - -I$(top_srcdir)/kaffeine/src \ - $(all_includes) - -METASOURCES = AUTO - -noinst_LTLIBRARIES = libkaffeinedvb.la - -libkaffeinedvb_la_SOURCES = audioeditor.cpp \ - audioeditor.h \ - audioeditorui.ui \ - channeldesc.cpp \ - channeldesc.h \ - channeleditor.cpp \ - channeleditor.h \ - channeleditorui.ui \ - dvbconfig.cpp \ - dvbconfig.h \ - dvbevents.cpp \ - dvbevents.h \ - dvbout.cpp \ - dvbout.h \ - dvbpanel.cpp \ - dvbpanel.h \ - dvbsection.h \ - dvbsi.cpp \ - dvbsi.h \ - camdialog.ui \ - cammenudialog.ui \ - dvbstream.cpp \ - dvbstream.h \ - gdvb.h \ - kevents.cpp \ - kevents.h \ - kgradprogress.cpp \ - kgradprogress.h \ - krecord.cpp \ - krecord.h \ - ktimereditor.cpp \ - ktimereditor.h \ - scandialog.cpp \ - scandialog.h \ - scandialogui.ui \ - sender.cpp \ - sender.h \ - ts2rtp.cpp \ - ts2rtp.h \ - subeditorui.ui \ - subeditor.cpp \ - subeditor.h \ - broadcasteditorui.ui \ - broadcasteditor.cpp \ - broadcasteditor.h \ - cleaner.cpp \ - cleaner.h \ - crontimerui.ui \ - crontimer.cpp \ - crontimer.h \ - dvbcam.cpp \ - dvbcam.h - -libkaffeinedvb_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ - -L$(top_srcdir)/kaffeine/src/input \ - -L$(top_srcdir)/kaffeine/src/input/dvb/plugins/stream \ - -L$(top_srcdir)/kaffeine/src/input/dvb/plugins/epg \ - ./lib/libdvbapi \ - ./lib/libdvben50221 \ - ./lib/libucsi - -libkaffeinedvb_la_LIBADD = \ - $(top_builddir)/kaffeine/src/input/dvb/plugins/stream/libkaffeinedvbplugin.la \ - $(top_builddir)/kaffeine/src/input/dvb/plugins/epg/libkaffeineepgplugin.la \ - $(top_builddir)/kaffeine/src/input/libkaffeineinput.la \ - ./lib/libdvbapi/libdvbapi.la ./lib/libdvben50221/libdvben50221.la ./lib/libucsi/libucsi.la - -# this is where the XML-GUI resource file goes -shellrcdir = $(kde_datadir)/kaffeine -shellrc_DATA = kaffeinedvb.rc diff --git a/kaffeine/src/input/dvb/lib/Makefile.am b/kaffeine/src/input/dvb/lib/Makefile.am deleted file mode 100644 index aa4701c..0000000 --- a/kaffeine/src/input/dvb/lib/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = libdvbapi libdvben50221 libucsi diff --git a/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am b/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am deleted file mode 100644 index 9963cd4..0000000 --- a/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -noinst_LTLIBRARIES = libdvbapi.la - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/dvb/lib - -libdvbapi_la_SOURCES = dvbaudio.c \ - dvbca.c \ - dvbdemux.c \ - dvbfe.c \ - dvbnet.c \ - dvbvideo.c - -CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC diff --git a/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am b/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am deleted file mode 100644 index 6942c02..0000000 --- a/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -noinst_LTLIBRARIES = libdvben50221.la - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/dvb/lib - -libdvben50221_la_SOURCES = asn_1.c \ - en50221_app_ai.c \ - en50221_app_auth.c \ - en50221_app_ca.c \ - en50221_app_datetime.c \ - en50221_app_dvb.c \ - en50221_app_epg.c \ - en50221_app_lowspeed.c \ - en50221_app_mmi.c \ - en50221_app_rm.c \ - en50221_app_smartcard.c \ - en50221_app_teletext.c \ - en50221_app_utils.c \ - en50221_session.c \ - en50221_transport.c \ - en50221_stdcam.c \ - en50221_stdcam_llci.c \ - en50221_stdcam_hlci.c - -CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC diff --git a/kaffeine/src/input/dvb/lib/libucsi/Makefile.am b/kaffeine/src/input/dvb/lib/libucsi/Makefile.am deleted file mode 100644 index 36f905e..0000000 --- a/kaffeine/src/input/dvb/lib/libucsi/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -noinst_LTLIBRARIES = libucsi.la - -SUBDIRS = dvb mpeg atsc . - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/dvb/lib - -libucsi_la_SOURCES = crc32.c \ - section_buf.c \ - transport_packet.c - -libucsi_la_LDFLAGS = ./mpeg \ - ./dvb \ - /atsc - -libucsi_la_LIBADD = ./mpeg/libdvbmpeg.la \ - ./dvb/libdvbdvb.la \ - ./atsc/libdvbatsc.la - -CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC diff --git a/kaffeine/src/input/dvb/lib/libucsi/atsc/Makefile.am b/kaffeine/src/input/dvb/lib/libucsi/atsc/Makefile.am deleted file mode 100644 index 2df5d3b..0000000 --- a/kaffeine/src/input/dvb/lib/libucsi/atsc/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -noinst_LTLIBRARIES = libdvbatsc.la - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/dvb/lib - -libdvbatsc_la_SOURCES = atsc_text.c \ - cvct_section.c \ - dccsct_section.c \ - dcct_section.c \ - eit_section.c \ - ett_section.c \ - mgt_section.c \ - rrt_section.c \ - stt_section.c \ - tvct_section.c \ - types.c - -CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC diff --git a/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am b/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am deleted file mode 100644 index b358273..0000000 --- a/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -noinst_LTLIBRARIES = libdvbdvb.la - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/dvb/lib - -libdvbdvb_la_SOURCES = bat_section.c \ - dit_section.c \ - eit_section.c \ - int_section.c \ - nit_section.c \ - rst_section.c \ - sdt_section.c \ - sit_section.c \ - st_section.c \ - tdt_section.c \ - tot_section.c \ - tva_container_section.c \ - types.c - -CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC diff --git a/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am b/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am deleted file mode 100644 index a8d0c32..0000000 --- a/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -noinst_LTLIBRARIES = libdvbmpeg.la - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/dvb/lib - -libdvbmpeg_la_SOURCES = cat_section.c \ - metadata_section.c \ - odsmt_section.c \ - pat_section.c \ - pmt_section.c \ - tsdt_section.c - -CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC diff --git a/kaffeine/src/input/dvb/plugins/Makefile.am b/kaffeine/src/input/dvb/plugins/Makefile.am deleted file mode 100644 index 63f5318..0000000 --- a/kaffeine/src/input/dvb/plugins/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = epg stream
\ No newline at end of file diff --git a/kaffeine/src/input/dvb/plugins/epg/CMakeLists.txt b/kaffeine/src/input/dvb/plugins/epg/CMakeLists.txt index 6b36d4c..de6e320 100644 --- a/kaffeine/src/input/dvb/plugins/epg/CMakeLists.txt +++ b/kaffeine/src/input/dvb/plugins/epg/CMakeLists.txt @@ -34,8 +34,8 @@ tde_add_library( kaffeineepgplugin SHARED AUTOMOC ##### other data -install( - FILES kaffeineepgplugin.desktop +tde_create_translated_desktop( + SOURCE kaffeineepgplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) diff --git a/kaffeine/src/input/dvb/plugins/epg/Makefile.am b/kaffeine/src/input/dvb/plugins/epg/Makefile.am deleted file mode 100644 index 33babab..0000000 --- a/kaffeine/src/input/dvb/plugins/epg/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -lib_LTLIBRARIES = libkaffeineepgplugin.la - -METASOURCES = AUTO - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/dvb \ - -I$(top_srcdir)/kaffeine/src \ - $(all_includes) - -kaffeineincludedir = $(includedir)/kaffeine -kaffeineinclude_HEADERS = kaffeinedvbevents.h kaffeinedvbsection.h - -libkaffeineepgplugin_la_SOURCES = kaffeinedvbevents.cpp kaffeinedvbsection.cpp -libkaffeineepgplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) -libkaffeineepgplugin_la_LDFLAGS = $(all_libraries) -version-info 0:1:0 -no-undefined - -kde_servicetypes_DATA = kaffeineepgplugin.desktop diff --git a/kaffeine/src/input/dvb/plugins/stream/CMakeLists.txt b/kaffeine/src/input/dvb/plugins/stream/CMakeLists.txt index 6c669cb..e5b49ae 100644 --- a/kaffeine/src/input/dvb/plugins/stream/CMakeLists.txt +++ b/kaffeine/src/input/dvb/plugins/stream/CMakeLists.txt @@ -33,8 +33,8 @@ tde_add_library( kaffeinedvbplugin SHARED AUTOMOC ##### other data -install( - FILES kaffeinedvbplugin.desktop +tde_create_translated_desktop( + SOURCE kaffeinedvbplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) diff --git a/kaffeine/src/input/dvb/plugins/stream/Makefile.am b/kaffeine/src/input/dvb/plugins/stream/Makefile.am deleted file mode 100644 index 033d4b8..0000000 --- a/kaffeine/src/input/dvb/plugins/stream/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -lib_LTLIBRARIES = libkaffeinedvbplugin.la - -METASOURCES = AUTO - -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/dvb \ - -I$(top_srcdir)/kaffeine/src \ - $(all_includes) - -kaffeineincludedir = $(includedir)/kaffeine -kaffeineinclude_HEADERS = kaffeinedvbplugin.h - -libkaffeinedvbplugin_la_SOURCES = kaffeinedvbplugin.cpp -libkaffeinedvbplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) -libkaffeinedvbplugin_la_LDFLAGS = $(all_libraries) -version-info 0:1:0 -no-undefined - -kde_servicetypes_DATA = kaffeinedvbplugin.desktop diff --git a/kaffeine/src/input/dvbclient/Makefile.am b/kaffeine/src/input/dvbclient/Makefile.am deleted file mode 100644 index fb4a110..0000000 --- a/kaffeine/src/input/dvbclient/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDES = -I$(top_srcdir)/kaffeine/src/input/ \ - $(all_includes) - -METASOURCES = AUTO - -noinst_LTLIBRARIES = libkaffeinedvbclient.la - -libkaffeinedvbclient_la_SOURCES = cdchannel.cpp \ - cdchannel.h \ - cdwidget.cpp \ - cdwidget.h \ - cddump.cpp \ - cddump.h \ - cdlisten.cpp \ - cdlisten.h \ - cdcleaner.cpp \ - cdcleaner.h - -libkaffeinedvbclient_la_LDFLAGS = $(KDE_RPATH) \ - $(all_libraries) \ - -L$(top_srcdir)/kaffeine/src/input - -libkaffeinedvbclient_la_LIBADD = $(top_builddir)/kaffeine/src/input/libkaffeineinput.la diff --git a/kaffeine/src/player-parts/Makefile.am b/kaffeine/src/player-parts/Makefile.am deleted file mode 100644 index 81311d2..0000000 --- a/kaffeine/src/player-parts/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -if with_gstreamer - GST_SUBDIR = gstreamer-part -endif - -SUBDIRS = kaffeine-part xine-part $(GST_SUBDIR) diff --git a/kaffeine/src/player-parts/dummy-part/Makefile.am b/kaffeine/src/player-parts/dummy-part/Makefile.am deleted file mode 100644 index 5df27f0..0000000 --- a/kaffeine/src/player-parts/dummy-part/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ - -kde_module_LTLIBRARIES = libdummypart.la - -INCLUDES = -I$(top_srcdir)/kaffeine/src/player-parts/ $(all_includes) - -METASOURCES = AUTO - -noinst_HEADERS = dummy_part.h - -libdummypart_la_SOURCES = dummy_part.cpp -libdummypart_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEFILE) ../libkaffeinepart.la -libdummypart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -avoid-version -no-undefined - -# this is where the desktop file will go -partdesktopdir = $(kde_servicesdir) -partdesktop_DATA = dummy_part.desktop - -# this is where the part's XML-GUI resource file goes -partrcdir = $(kde_datadir)/dummypart -partrc_DATA = dummy_part.rc
\ No newline at end of file diff --git a/kaffeine/src/player-parts/gstreamer-part/CMakeLists.txt b/kaffeine/src/player-parts/gstreamer-part/CMakeLists.txt index 1834a02..4058068 100644 --- a/kaffeine/src/player-parts/gstreamer-part/CMakeLists.txt +++ b/kaffeine/src/player-parts/gstreamer-part/CMakeLists.txt @@ -46,8 +46,8 @@ tde_add_kpart( libgstreamerpart AUTOMOC ##### other data -install( - FILES gstreamer_part.desktop +tde_create_translated_desktop( + SOURCE gstreamer_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) @@ -60,4 +60,3 @@ install( FILES gstreamer.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/16x16/apps ) - diff --git a/kaffeine/src/player-parts/gstreamer-part/Makefile.am b/kaffeine/src/player-parts/gstreamer-part/Makefile.am deleted file mode 100644 index 16cbbbd..0000000 --- a/kaffeine/src/player-parts/gstreamer-part/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -kde_module_LTLIBRARIES = libgstreamerpart.la - -INCLUDES = -I$(top_srcdir)/kaffeine/src/player-parts/kaffeine-part -I$(top_srcdir)/kaffeine/src/ $(all_includes) $(CFLAGS_GSTREAMER) - -METASOURCES = AUTO - -noinst_HEADERS = gstreamer_part.h timer.h video.h videosettings.h gstreamerconfig.h - -libgstreamerpart_la_SOURCES = gstreamer_part.cpp video.cpp timer.cpp videosettings.cpp gstreamerconfig.cpp -libgstreamerpart_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEFILE) ../kaffeine-part/libkaffeinepart.la -libgstreamerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_GSTREAMER) $(LIB_GSTOVERLAY) $(all_libraries) -avoid-version -no-undefined - -# this is where the desktop file will go -partdesktopdir = $(kde_servicesdir) -partdesktop_DATA = gstreamer_part.desktop - -# this is where the part's XML-GUI resource file goes -partrcdir = $(kde_datadir)/gstreamerpart -partrc_DATA = gstreamer_part.rc - -icondir = $(kde_icondir)/hicolor/16x16/apps/ -icon_DATA = gstreamer.png diff --git a/kaffeine/src/player-parts/kaffeine-part/Makefile.am b/kaffeine/src/player-parts/kaffeine-part/Makefile.am deleted file mode 100644 index 7555424..0000000 --- a/kaffeine/src/player-parts/kaffeine-part/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -lib_LTLIBRARIES = libkaffeinepart.la - -INCLUDES = $(all_includes) - -kaffeineincludedir = $(includedir)/kaffeine -kaffeineinclude_HEADERS = kaffeinepart.h mrl.h - -METASOURCES = AUTO - -libkaffeinepart_la_SOURCES = kaffeinepart.cpp mrl.cpp playlistimport.cpp -libkaffeinepart_la_LIBADD = $(LIB_TDEPARTS) $(all_libraries) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) -libkaffeinepart_la_LDFLAGS = -no-undefined -avoid-version diff --git a/kaffeine/src/player-parts/xine-part/CMakeLists.txt b/kaffeine/src/player-parts/xine-part/CMakeLists.txt index 09e8d53..2683a2a 100644 --- a/kaffeine/src/player-parts/xine-part/CMakeLists.txt +++ b/kaffeine/src/player-parts/xine-part/CMakeLists.txt @@ -49,8 +49,8 @@ tde_add_kpart( libxinepart AUTOMOC ##### other data -install( - FILES xine_part.desktop +tde_create_translated_desktop( + SOURCE xine_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) diff --git a/kaffeine/src/player-parts/xine-part/Makefile.am b/kaffeine/src/player-parts/xine-part/Makefile.am deleted file mode 100644 index b87656b..0000000 --- a/kaffeine/src/player-parts/xine-part/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -kde_module_LTLIBRARIES = libxinepart.la - -INCLUDES = -I$(top_srcdir)/kaffeine/src/ -I$(top_srcdir)/kaffeine/src/player-parts/kaffeine-part $(all_includes) $(CFLAGS_XINERAMA) $(CFLAGS_XINE) $(CFLAGS_XCB) - -METASOURCES = AUTO - -kaffeineincludedir = $(includedir)/kaffeine -kaffeineinclude_HEADERS = xine_part.h xine_part_iface.h - -noinst_HEADERS = xine_part_iface.h kxinewidget.h postfilter.h deinterlacequality.h videosettings.h \ - filterdialog.h screenshotpreview.h xineconfig.h positionslider.h equalizer.h - -libxinepart_la_SOURCES = xine_part.cpp kxinewidget.cpp postfilter.cpp deinterlacequality.cpp \ - videosettings.cpp filterdialog.cpp screenshotpreview.cpp xineconfig.cpp positionslider.cpp \ - equalizer.cpp xine_part_iface.skel -libxinepart_la_LIBADD = $(LIB_XINERAMA) $(LIB_XINE) $(LIB_XCB) ../kaffeine-part/libkaffeinepart.la -libxinepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPRINT) -avoid-version -no-undefined - - -# this is where the desktop file will go -partdesktopdir = $(kde_servicesdir) -partdesktop_DATA = xine_part.desktop - -# this is where the part's XML-GUI resource file goes -partrcdir = $(kde_datadir)/kaffeine -partrc_DATA = xine_part.rc diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index f6c1842..75c89f8 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -1,5 +1,14 @@ -file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po ) +file( GLOB_RECURSE po_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po ) +string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" ) -if( _srcs ) - tde_create_translation( LANG auto OUTPUT_NAME ${PROJECT_NAME} ) -endif() +foreach( _po ${po_files} ) + get_filename_component( _lang ${_po} NAME_WE ) + if( "${_linguas}" MATCHES "^;*$" OR ";${_linguas};" MATCHES ";${_lang};" ) + if( "${_po}" MATCHES "^([^/]*)/.*" ) + string( REGEX REPLACE "^([^/]*)/.*" "\\1" _component "${_po}" ) + else( ) + set( _component "${PROJECT_NAME}" ) + endif( ) + tde_create_translation( FILES ${_po} LANG ${_lang} OUTPUT_NAME ${_component} ) + endif( ) +endforeach( ) diff --git a/po/Makefile.am b/po/Makefile.am deleted file mode 100644 index 0fa209c..0000000 --- a/po/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -POFILES = AUTO diff --git a/stamp-h.in b/stamp-h.in deleted file mode 100644 index e69de29..0000000 --- a/stamp-h.in +++ /dev/null diff --git a/subdirs b/subdirs deleted file mode 100644 index 404cfe4..0000000 --- a/subdirs +++ /dev/null @@ -1,3 +0,0 @@ -doc -kaffeine -po |