From 95a6a36403a289814bb252cd5496e4d67d331b11 Mon Sep 17 00:00:00 2001 From: gregory guy Date: Tue, 2 Mar 2021 13:57:11 +0100 Subject: 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 --- src/CMakeLists.txt | 39 +++++++++------------ src/ConfigureChecks.cmake | 18 ---------- src/Makefile.am | 87 ----------------------------------------------- 3 files changed, 17 insertions(+), 127 deletions(-) delete mode 100644 src/ConfigureChecks.cmake delete mode 100644 src/Makefile.am (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b2aa267..e88a792 100644 --- a/src/CMakeLists.txt +++ b/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() diff --git a/src/ConfigureChecks.cmake b/src/ConfigureChecks.cmake deleted file mode 100644 index 5be8176..0000000 --- a/src/ConfigureChecks.cmake +++ /dev/null @@ -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( ) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 00f31c5..0000000 --- a/src/Makefile.am +++ /dev/null @@ -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 include_kxineplayer -kxineplayer_app = kxineplayer -endif -if include_kgstplayer -kgstplayer_app = kgstplayer -endif -if include_knpplayer -knpplayer_app = knpplayer -endif - -bin_PROGRAMS= $(kxineplayer_app) kxvplayer $(kgstplayer_app) $(knpplayer_app) - -noinst_LTLIBRARIES = libkmplayerbackend.la -libkmplayerbackend_la_SOURCES = kmplayer_backend.skel kmplayer_callback.stub - -kxineplayer_LDADD= libkmplayerbackend.la $(LIB_XINE) -lDCOP -kxineplayer_CFLAGS= $(CFLAGS_XINE) -kxineplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -kxineplayer_SOURCES= xineplayer.cpp -kxineplayer_COMPILE_FIRST= kmplayer_callback_stub.h - -kxvplayer_LDADD= libkmplayerbackend.la -lDCOP -lXv -kxvplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -kxvplayer_SOURCES= xvplayer.cpp -kxvplayer_COMPILE_FIRST= kmplayer_callback_stub.h - -kgstplayer_LDADD= libkmplayerbackend.la $(LIB_GST) $(LIB_GST_PLUGINS) $(LIB_GST_OVERLAY) -lDCOP -kgstplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -kgstplayer_SOURCES= gstplayer.cpp -kgstplayer_COMPILE_FIRST= kmplayer_callback_stub.h - -knpplayer_LDADD= $(LIBNSPR_LIBS) -knpplayer_LDFLAGS= -lX11 -lgmodule-2.0 -knpplayer_SOURCES= npplayer.c - -xdg_apps_DATA = kmplayer.desktop - -kde_services_DATA = kmplayer_part.desktop $(SERVICES_KOFFICE) - -rc_DATA = kmplayerui.rc kmplayerpartui.rc -rcdir = $(kde_datadir)/kmplayer - -conf_DATA = kmplayerrc -confdir = $(kde_confdir) - -appsdatadir=$(kde_datadir)/kmplayer -appsdata_DATA= bookmarks.xml pluginsinfo noise.gif - -dummy.cpp: - echo > dummy.cpp - -messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kmplayer.pot - -.NOTPARALLEL: -- cgit v1.2.1