diff --git a/x11/kmplayer/Makefile b/x11/kmplayer/Makefile index 0dd9e2811eb..412424d155c 100644 --- a/x11/kmplayer/Makefile +++ b/x11/kmplayer/Makefile @@ -1,13 +1,11 @@ -# $OpenBSD: Makefile,v 1.12 2011/09/16 12:29:16 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2013/01/17 11:35:43 zhuk Exp $ - -BROKEN= Need to resolve various issues -COMMENT= front-end/embeddable kpart for mplayer -CATEGORIES= x11 x11/kde +COMMENT= front-end/embeddable KPart for MPlayer +CATEGORIES= x11 x11/kde DISTNAME= kmplayer-0.6.4 EXTRACT_SUFX= .tar.bz2 -REVISION= 2 +REVISION= 3 SHARED_LIBS= kparts_kmplayer 0.0 \ kdeinit_kmplayer 0.0 @@ -31,21 +29,24 @@ MAKE_ENV= ${CONFIGURE_ENV} MAKE_FLAGS+= ${MODKDE_MAKE_FLAGS} -# GPL +# GPLv2+ PERMIT_PACKAGE_FTP=Yes PERMIT_PACKAGE_CDROM=Yes PERMIT_DISTFILES_FTP=Yes PERMIT_DISTFILES_CDROM=Yes WANTLIB= ICE SM X11 Xext Xrender art_lgpl_2 artsflow artsflow_idl \ - audiofile c esd glib-2.0.0.0 gmodule-2.0.0.0 gthread-2.0.0.0 \ - jpeg kmedia2_idl kwalletclient m mad mcop ogg \ - ossaudio png pthread qtmcop soundserver_idl stdc++ util vorbis \ + audiofile c \ + kmedia2_idl kwalletclient m mad mcop ogg \ + png pthread qtmcop soundserver_idl stdc++ util vorbis \ vorbisenc vorbisfile z kdecore DCOP kdefx kdesu kdeui kio \ kmediaplayer kparts artskde +WANTLIB += Xfixes Xt expat fam fontconfig freetype glib-2.0 gmodule-2.0 +WANTLIB += gthread-2.0 idn pcre sndio xcb LIB_DEPENDS=x11/kde/libs3 -RUN_DEPENDS=x11/mplayer +RUN_DEPENDS= devel/desktop-file-utils \ + x11/mplayer SEPARATE_BUILD=flavored diff --git a/x11/kmplayer/patches/patch-kmplayer_kmplayer_part_cpp b/x11/kmplayer/patches/patch-kmplayer_kmplayer_part_cpp new file mode 100644 index 00000000000..2b54fb007fd --- /dev/null +++ b/x11/kmplayer/patches/patch-kmplayer_kmplayer_part_cpp @@ -0,0 +1,12 @@ +$OpenBSD: patch-kmplayer_kmplayer_part_cpp,v 1.1 2013/01/17 11:35:43 zhuk Exp $ +--- kmplayer/kmplayer_part.cpp.orig Fri Nov 23 00:07:30 2012 ++++ kmplayer/kmplayer_part.cpp Fri Nov 23 00:07:38 2012 +@@ -42,7 +42,7 @@ + #include "kmplayerconfig.h" + + +-K_EXPORT_COMPONENT_FACTORY (kparts_kmplayer, KMPlayerFactory); ++K_EXPORT_COMPONENT_FACTORY (kparts_kmplayer, KMPlayerFactory) + + KInstance *KMPlayerFactory::s_instance = 0; + diff --git a/x11/kmplayer/patches/patch-kmplayer_main_cpp b/x11/kmplayer/patches/patch-kmplayer_main_cpp new file mode 100644 index 00000000000..09ee38e5bfe --- /dev/null +++ b/x11/kmplayer/patches/patch-kmplayer_main_cpp @@ -0,0 +1,11 @@ +$OpenBSD: patch-kmplayer_main_cpp,v 1.1 2013/01/17 11:35:43 zhuk Exp $ +--- kmplayer/main.cpp.orig Wed Jan 16 21:17:11 2013 ++++ kmplayer/main.cpp Wed Jan 16 21:17:21 2013 +@@ -69,7 +69,5 @@ int main (int argc, char *argv[]) + app.dcopClient()->attach(); + int retvalue = app.exec (); + +- delete kmplayer; +- + return retvalue; + } diff --git a/x11/kmplayer/pkg/DESCR b/x11/kmplayer/pkg/DESCR index e179183dd72..7918d0697b8 100644 --- a/x11/kmplayer/pkg/DESCR +++ b/x11/kmplayer/pkg/DESCR @@ -1,15 +1,2 @@ -kmplayer is a front-end for mplayer, together with -desktop files to embed it in konqueror. - -The front-end is not very useful, but the embeddable -part means lots of windows video sites suddenly start -working in konqueror. - -Care must be taken for the audio output. You can either: -- install an sdl with arts support and use an mplayer with sdl audio output, -- use an mplayer with direct arts support, -- disable arts audio output in kde entirely -(control panel, multimedia, sound io, no output) - -The last option is possibly preferable, as kde arts does not yield real time -performance. +KMPlayer is a front-end for MPlayer, together with +desktop files to embed it in Konqueror. diff --git a/x11/kmplayer/pkg/PLIST b/x11/kmplayer/pkg/PLIST index a6559536d5a..fef97f1bda1 100644 --- a/x11/kmplayer/pkg/PLIST +++ b/x11/kmplayer/pkg/PLIST @@ -1,37 +1,27 @@ -@comment $OpenBSD: PLIST,v 1.4 2004/09/15 19:26:29 espie Exp $ -bin/kmplayer -${KDE}/ +@comment $OpenBSD: PLIST,v 1.5 2013/01/17 11:35:43 zhuk Exp $ +@bin bin/kmplayer ${KDE}/kparts_kmplayer.la +@lib ${KDE}/libkparts_kmplayer.so.${LIBkparts_kmplayer_VERSION} lib/kdeinit_kmplayer.la +@lib lib/libkdeinit_kmplayer.so.${LIBkdeinit_kmplayer_VERSION} share/applnk/ share/applnk/Multimedia/ share/applnk/Multimedia/More/ share/applnk/Multimedia/More/kmplayer.desktop share/applnk/Multimedia/kmplayer.desktop -share/apps/ share/apps/kmplayer/ share/apps/kmplayer/kmplayerpartui.rc share/apps/kmplayer/kmplayerui.rc -share/config/ share/config/kmplayerrc -share/doc/HTML/ -share/doc/HTML/en/ share/doc/HTML/en/kmplayer/ share/doc/HTML/en/kmplayer/common share/doc/HTML/en/kmplayer/index.cache.bz2 share/doc/HTML/en/kmplayer/index.docbook -share/locale/ -share/locale/hu/ -share/locale/hu/LC_MESSAGES/ share/locale/hu/LC_MESSAGES/kmplayer.mo -share/mimelnk/ -share/mimelnk/application/ -share/mimelnk/application/x-applix.desktop -share/mimelnk/application/x-mplayer2.desktop -share/mimelnk/video/ -share/mimelnk/video/x-ms-asf.desktop -share/mimelnk/video/x-ms-wmv.desktop -share/services/ +@comment share/mimelnk/application/x-applix.desktop +@comment share/mimelnk/application/x-mplayer2.desktop +@comment share/mimelnk/video/x-ms-asf.desktop +@comment share/mimelnk/video/x-ms-wmv.desktop share/services/kmplayer_component.desktop -@exec echo "This port may require careful setup. See pkg_info kmplayer" -%%SHARED%% +@exec %D/bin/update-desktop-database +@unexec-delete %D/bin/update-desktop-database