Index: MOVED =================================================================== --- MOVED +++ MOVED @@ -4631,7 +4631,6 @@ multimedia/k9copy||2013-07-26|Has expired: Depends on Qt 3.x multimedia/kdemultimedia3||2013-07-26|Has expired: Depends on Qt 3.x multimedia/kmenc15||2013-07-26|Has expired: Depends on Qt 3.x -multimedia/kmplayer||2013-07-26|Has expired: Depends on Qt 3.x multimedia/konverter||2013-07-26|Has expired: Depends on Qt 3.x multimedia/kplayer||2013-07-26|Has expired: Depends on Qt 3.x multimedia/ksubeditor||2013-07-26|Has expired: Depends on Qt 3.x @@ -10920,3 +10919,4 @@ graphics/gdk-pixbuf||2018-12-21|Has expired: Uses obsolete glib12 x11-toolkits/gtk12||2018-12-21|Has expired: Uses obsolete glib12 multimedia/gstreamer-plugins-buzztard||2018-12-22|Has expired: Unused in the ports tree and unmaintained upstream +multimedia/kmplayer-kde4|multimedia/kmplayer|2018-12-31|Moved to KF5 based version Index: multimedia/Makefile =================================================================== --- multimedia/Makefile +++ multimedia/Makefile @@ -182,7 +182,7 @@ SUBDIR += kdenlive-kde4 SUBDIR += kf5-kmediaplayer SUBDIR += kissdx - SUBDIR += kmplayer-kde4 + SUBDIR += kmplayer SUBDIR += kodi SUBDIR += kodi-addon-peripheral-joystick SUBDIR += kodi-addon-pvr-hts Index: multimedia/kmplayer-kde4/Makefile =================================================================== --- multimedia/kmplayer-kde4/Makefile +++ multimedia/kmplayer-kde4/Makefile @@ -1,42 +0,0 @@ -# Created by: Kris Moore -# $FreeBSD$ - -PORTNAME= kmplayer -PORTVERSION= 0.11.5b -PORTREVISION= 3 -PORTEPOCH= 3 -CATEGORIES= multimedia audio kde -PKGNAMESUFFIX= -kde4 - -MAINTAINER= jhale@FreeBSD.org -COMMENT= KDE frontend to Phonon / KDE4 - -LICENSE= GPLv2 LGPL21 -LICENSE_COMB= multi - -DEPRECATED= KDE4 is EOL upstream -EXPIRATION_DATE= 2018-12-31 - -NOT_FOR_ARCHS= aarch64 -NOT_FOR_ARCHS_REASON= prcpucfg.h:764:2: error: "Unknown CPU architecture" - -LIB_DEPENDS= libdbus-1.so:devel/dbus \ - libdbus-glib-1.so:devel/dbus-glib \ - libphonon.so:multimedia/phonon@qt4 \ - libfreetype.so:print/freetype2 \ - libfontconfig.so:x11-fonts/fontconfig -RUN_DEPENDS= mplayer:multimedia/mplayer - -USES= cmake:outsource gettext-runtime kde:4 pkgconfig qt:4 -USE_GNOME= cairo gdkpixbuf2 gtk20 -USE_QT= corelib dbus gui network svg xml \ - moc_build qmake_build rcc_build uic_build -USE_KDE= automoc4 kdelibs soprano -USE_XORG= x11 - -USE_GITHUB= yes -GH_ACCOUNT= KDE - -PORTSCOUT= limit:^0.11. - -.include Index: multimedia/kmplayer-kde4/distinfo =================================================================== --- multimedia/kmplayer-kde4/distinfo +++ multimedia/kmplayer-kde4/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1477445530 -SHA256 (KDE-kmplayer-0.11.5b_GH0.tar.gz) = 4082572271ebad159ac650fe4d63057449a69be7ef71a36b883be7f059ac1051 -SIZE (KDE-kmplayer-0.11.5b_GH0.tar.gz) = 504150 Index: multimedia/kmplayer-kde4/pkg-descr =================================================================== --- multimedia/kmplayer-kde4/pkg-descr +++ multimedia/kmplayer-kde4/pkg-descr @@ -1,3 +0,0 @@ -KMPlayer, a simple frontend for MPlayer/FFMpeg/Phonon. - -WWW: http://kmplayer.kde.org/ Index: multimedia/kmplayer-kde4/pkg-plist =================================================================== --- multimedia/kmplayer-kde4/pkg-plist +++ multimedia/kmplayer-kde4/pkg-plist @@ -1,28 +0,0 @@ -bin/kmplayer -bin/knpplayer -bin/kphononplayer -lib/kde4/libkmplayerpart.so -lib/libkdeinit4_kmplayer.so -lib/libkmplayercommon.so -share/applications/kde4/kmplayer.desktop -share/apps/kmplayer/blip-api.xsl -share/apps/kmplayer/bookmarks.xml -share/apps/kmplayer/find-media.sh -share/apps/kmplayer/generators/blip-tv.xml -share/apps/kmplayer/generators/find-media.xml -share/apps/kmplayer/generators/shoutcast.xml -share/apps/kmplayer/generators/youtube-query.xml -share/apps/kmplayer/kmplayerpartui.rc -share/apps/kmplayer/kmplayerui.rc -share/apps/kmplayer/pluginsinfo -share/apps/kmplayer/shoutcast.xsl -share/apps/kmplayer/youtube.xsl -share/config/kmplayerrc -share/icons/hicolor/128x128/apps/kmplayer.png -share/icons/hicolor/16x16/apps/kmplayer.png -share/icons/hicolor/22x22/apps/kmplayer.png -share/icons/hicolor/32x32/apps/kmplayer.png -share/icons/hicolor/48x48/apps/kmplayer.png -share/icons/hicolor/64x64/apps/kmplayer.png -share/icons/hicolor/scalable/apps/kmplayer.svgz -share/kde4/services/kmplayer_part.desktop Index: multimedia/kmplayer/Makefile =================================================================== --- multimedia/kmplayer/Makefile +++ multimedia/kmplayer/Makefile @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= kmplayer -PORTVERSION= 0.11.5b -PORTREVISION= 3 +DISTVERSION= 0.12.0b PORTEPOCH= 3 CATEGORIES= multimedia audio kde -PKGNAMESUFFIX= -kde4 MAINTAINER= jhale@FreeBSD.org COMMENT= KDE frontend to Phonon / KDE4 @@ -14,29 +12,31 @@ LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -DEPRECATED= KDE4 is EOL upstream -EXPIRATION_DATE= 2018-12-31 - NOT_FOR_ARCHS= aarch64 NOT_FOR_ARCHS_REASON= prcpucfg.h:764:2: error: "Unknown CPU architecture" LIB_DEPENDS= libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ - libphonon.so:multimedia/phonon@qt4 \ libfreetype.so:print/freetype2 \ - libfontconfig.so:x11-fonts/fontconfig + libfontconfig.so:x11-fonts/fontconfig \ + libxcb-cursor.so:x11/xcb-util-cursor \ + libxcb-ewmh.so:x11/xcb-util-wm \ + libxcb-icccm.so:x11/xcb-util-wm \ + libxcb-image.so:x11/xcb-util-image \ + libxcb-keysyms.so:x11/xcb-util-keysyms \ + libxcb-render-util.so:x11/xcb-util-renderutil \ + libxcb-util.so:x11/xcb-util RUN_DEPENDS= mplayer:multimedia/mplayer -USES= cmake:outsource gettext-runtime kde:4 pkgconfig qt:4 +USES= cmake:outsource desktop-file-utils gettext-runtime \ + kde:5 pkgconfig qt:5 USE_GNOME= cairo gdkpixbuf2 gtk20 -USE_QT= corelib dbus gui network svg xml \ - moc_build qmake_build rcc_build uic_build -USE_KDE= automoc4 kdelibs soprano -USE_XORG= x11 - +USE_QT= concurrent core dbus gui network phonon4 printsupport \ + svg widgets x11extras xml \ + buildtools_build qmake_build +USE_KDE= auth bookmarks codecs completion config configwidgets coreaddons crash ecm guiaddons i18n iconthemes itemviews jobwidgets mediaplayer notifications parts service textwidgets unitconversion widgetsaddons windowsystem xmlgui kdelibs4support kio solid sonnet +USE_XORG= x11 xcb USE_GITHUB= yes GH_ACCOUNT= KDE - -PORTSCOUT= limit:^0.11. .include Index: multimedia/kmplayer/distinfo =================================================================== --- multimedia/kmplayer/distinfo +++ multimedia/kmplayer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1477445530 -SHA256 (KDE-kmplayer-0.11.5b_GH0.tar.gz) = 4082572271ebad159ac650fe4d63057449a69be7ef71a36b883be7f059ac1051 -SIZE (KDE-kmplayer-0.11.5b_GH0.tar.gz) = 504150 +TIMESTAMP = 1545506944 +SHA256 (KDE-kmplayer-0.12.0b_GH0.tar.gz) = 2d80ece8bb2387363a3369c8de045830e0be8543fa5455774415b67bf84e2ebf +SIZE (KDE-kmplayer-0.12.0b_GH0.tar.gz) = 507574 Index: multimedia/kmplayer/files/patch-git_2126d7 =================================================================== --- /dev/null +++ multimedia/kmplayer/files/patch-git_2126d7 @@ -0,0 +1,24 @@ +From 2126d76b8f16381e576de779b94b5b4555e562c2 Mon Sep 17 00:00:00 2001 +From: Luigi Toscano +Date: Sat, 13 May 2017 21:13:43 +0200 +Subject: Fix .desktop: Qt5 apps accept qwindowtitle, not caption + +--- + src/org.kde.kmplayer.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/org.kde.kmplayer.desktop b/src/org.kde.kmplayer.desktop +index fcc5255..2b5435c 100644 +--- src/kmplayer.desktop ++++ src/kmplayer.desktop +@@ -1,6 +1,6 @@ + [Desktop Entry] + Type=Application +-Exec=kmplayer -caption %c %i %U ++Exec=kmplayer -qwindowtitle %c %i %U + Icon=kmplayer + X-DocPath=kmplayer/index.html + Comment=KDE interface for MPlayer +-- +cgit v1.1 + Index: multimedia/kmplayer/files/patch-git_3def65 =================================================================== --- /dev/null +++ multimedia/kmplayer/files/patch-git_3def65 @@ -0,0 +1,42 @@ +From 3def65075c09af4961cd399e8e78ed78cca72e65 Mon Sep 17 00:00:00 2001 +From: Wolfgang Bauer +Date: Wed, 11 Oct 2017 22:16:02 +0200 +Subject: Fix build with Qt 5.9 + +Summary: +moc 5.9 errors out when building: +Error: Plugin Metadata file "" could not be opened: file to open is a directory + +Same issue and fix as https://phabricator.kde.org/D5392 for khtml. + +CCBUG: 377490 + +Test Plan: builds fine now with Qt 5.9.0rc and also earlier versions. + +Reviewers: vriezen, pino + +Reviewed By: pino + +Subscribers: pino + +Differential Revision: https://phabricator.kde.org/D5985 +--- + src/kmplayer_part.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/kmplayer_part.h b/src/kmplayer_part.h +index f90f85d..0fddbaa 100644 +--- src/kmplayer_part.h ++++ src/kmplayer_part.h +@@ -36,7 +36,7 @@ namespace KMPlayer { + + class KMPlayerFactory : public KPluginFactory { + Q_OBJECT +- Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory" FILE "") ++ Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory") + Q_INTERFACES(KPluginFactory) + public: + KMPlayerFactory(); +-- +cgit v1.1 + Index: multimedia/kmplayer/files/patch-git_7dafda =================================================================== --- /dev/null +++ multimedia/kmplayer/files/patch-git_7dafda @@ -0,0 +1,34 @@ +From 7dafda636033d23436ea72c45967af78f54d76fb Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Tue, 17 Apr 2018 12:07:04 +0200 +Subject: Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) + +Test Plan: Built fine with Qt 5.11_beta3. + +Reviewers: pino, vriezen + +Differential Revision: https://phabricator.kde.org/D12272 +--- + src/CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index f675d9a..57af1ed 100644 +--- src/CMakeLists.txt ++++ src/CMakeLists.txt +@@ -161,9 +161,9 @@ qt5_add_dbus_adaptor(kphononplayer_SRCS org.kde.kmplayer.streamslave.xml + + add_executable(kphononplayer ${kphononplayer_SRCS}) + +-qt5_use_modules(kphononplayer Core DBus Widgets X11Extras) +- +-target_link_libraries(kphononplayer Phonon::phonon4qt5 ${XCB_LIBRARIES}) ++target_link_libraries(kphononplayer Phonon::phonon4qt5 ${XCB_LIBRARIES} ++ Qt5::Core Qt5::DBus Qt5::Widgets Qt5::X11Extras ++) + + install(TARGETS kphononplayer ${INSTALL_TARGETS_DEFAULT_ARGS}) + +-- +cgit v1.1 + Index: multimedia/kmplayer/files/patch-src_viewarea.cpp =================================================================== --- /dev/null +++ multimedia/kmplayer/files/patch-src_viewarea.cpp @@ -0,0 +1,11 @@ +--- src/viewarea.cpp.orig 2018-12-22 19:33:17 UTC ++++ src/viewarea.cpp +@@ -2535,7 +2535,7 @@ void VideoOutput::useIndirectWidget (bool inderect) { + if (!m_plain_window) { + xcb_screen_t* scr = m_view->viewArea()->d->screen_of_display(connection, QX11Info::appScreen()); + m_plain_window = xcb_generate_id(connection); +- uint32_t values[] = { scr->black_pixel, m_input_mask }; ++ uint32_t values[] = { scr->black_pixel, static_cast(m_input_mask) }; + #if QT_VERSION >= 0x050600 + int devicew = (int)(width() * devicePixelRatioF()); + int deviceh = (int)(height() * devicePixelRatioF()); Index: multimedia/kmplayer/pkg-plist =================================================================== --- multimedia/kmplayer/pkg-plist +++ multimedia/kmplayer/pkg-plist @@ -1,23 +1,11 @@ bin/kmplayer bin/knpplayer bin/kphononplayer -lib/kde4/libkmplayerpart.so -lib/libkdeinit4_kmplayer.so +etc/xdg/kmplayerrc +lib/libkdeinit5_kmplayer.so lib/libkmplayercommon.so -share/applications/kde4/kmplayer.desktop -share/apps/kmplayer/blip-api.xsl -share/apps/kmplayer/bookmarks.xml -share/apps/kmplayer/find-media.sh -share/apps/kmplayer/generators/blip-tv.xml -share/apps/kmplayer/generators/find-media.xml -share/apps/kmplayer/generators/shoutcast.xml -share/apps/kmplayer/generators/youtube-query.xml -share/apps/kmplayer/kmplayerpartui.rc -share/apps/kmplayer/kmplayerui.rc -share/apps/kmplayer/pluginsinfo -share/apps/kmplayer/shoutcast.xsl -share/apps/kmplayer/youtube.xsl -share/config/kmplayerrc +%%QT_PLUGINDIR%%/kmplayerpart.so +share/applications/kmplayer.desktop share/icons/hicolor/128x128/apps/kmplayer.png share/icons/hicolor/16x16/apps/kmplayer.png share/icons/hicolor/22x22/apps/kmplayer.png @@ -25,4 +13,16 @@ share/icons/hicolor/48x48/apps/kmplayer.png share/icons/hicolor/64x64/apps/kmplayer.png share/icons/hicolor/scalable/apps/kmplayer.svgz -share/kde4/services/kmplayer_part.desktop +%%DATADIR%%/blip-api.xsl +%%DATADIR%%/bookmarks.xml +%%DATADIR%%/find-media.sh +%%DATADIR%%/generators/blip-tv.xml +%%DATADIR%%/generators/find-media.xml +%%DATADIR%%/generators/shoutcast.xml +%%DATADIR%%/generators/youtube-query.xml +%%DATADIR%%/pluginsinfo +%%DATADIR%%/shoutcast.xsl +%%DATADIR%%/youtube.xsl +share/kservices5/kmplayer_part.desktop +share/kxmlgui5/kmplayer/kmplayerpartui.rc +share/kxmlgui5/kmplayer/kmplayerui.rc