svn commit: r361178 - in head/multimedia/kplayer-kde4: . files

[John Marino]

Author: marino
Date: Tue Jul  8 06:21:34 2014
New Revision: 361178
URL: http://svnweb.freebsd.org/changeset/ports/361178
QAT: https://qat.redports.org/buildarchive/r361178/

Log:
  multimedia/kplayer-kde4: Stage, fix on F10+, use explicit linking
  
  Apparently the clang parser was having trouble with the nested ternary
  operator on C++ which was the cause of the FreeBSD 10+ failures. Expanding
  it to a condition ladder pleased clang.
  
  A couple of libraries were used but not explicitly specified to the
  linker before: libsolid and libX11, so let's correct that too.

Added:
  head/multimedia/kplayer-kde4/files/patch-kplayer_kplayernode.cpp   (contents, props changed)
Modified:
  head/multimedia/kplayer-kde4/Makefile

Modified: head/multimedia/kplayer-kde4/Makefile
==============================================================================
--- head/multimedia/kplayer-kde4/Makefile	Tue Jul  8 06:21:32 2014	(r361177)
+++ head/multimedia/kplayer-kde4/Makefile	Tue Jul  8 06:21:34 2014	(r361178)
@@ -3,23 +3,22 @@
 
 PORTNAME=	kplayer
 PORTVERSION=	0.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia kde
 MASTER_SITES=	SF
 
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Movie player based on mplayer
 
 RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
 
 LATEST_LINK=	${PORTNAME}-kde4
 
-USE_BZIP2=	yes
-USES=		cmake gettext
+USES=		cmake gettext tar:bzip2
 USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 USE_KDE4=	kdehier kdeprefix kdelibs automoc4
+LDFLAGS+=	-L${LOCALBASE}/lib -lX11 -L${LOCALBASE}/kde4/lib -lsolid
 
-NO_STAGE=	yes
 post-patch:
 .for lang in da en es it pt sv
 	${REINPLACE_CMD} -e "s,HTML_INSTALL_DIR},HTML_INSTALL_DIR}/${lang} SUBDIR kplayer,g" \

Added: head/multimedia/kplayer-kde4/files/patch-kplayer_kplayernode.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/kplayer-kde4/files/patch-kplayer_kplayernode.cpp	Tue Jul  8 06:21:34 2014	(r361178)
@@ -0,0 +1,15 @@
+--- kplayer/kplayernode.cpp.orig	2008-01-11 13:27:11.000000000 +0000
++++ kplayer/kplayernode.cpp
+@@ -2397,8 +2397,10 @@ KPlayerContainerNode* KPlayerDevicesNode
+ {
+   QMap<QString, QString>::ConstIterator iterator = m_type_map.find (id);
+   QString type (iterator == m_type_map.end() ? media() -> type (id) : iterator.value());
+-  KPlayerDeviceNode* node = type == "TV" ? (KPlayerDeviceNode*) new KPlayerTVNode
+-    : type == "DVB" ? (KPlayerDeviceNode*) new KPlayerDVBNode : (KPlayerDeviceNode*) new KPlayerDiskNode;
++  KPlayerDeviceNode* node;
++       if (type == "TV")  { node = (KPlayerDeviceNode*) new KPlayerTVNode; }
++  else if (type == "DVB") { node = (KPlayerDeviceNode*) new KPlayerDVBNode; } 
++  else                    { node = (KPlayerDeviceNode*) new KPlayerDiskNode; }
+   node -> setup (this, id, origin);
+   return node;
+ }