svn commit: r478960 - in head: multimedia/vdr multimedia/vdr-plugin-eepg multimedia/vdr-plugin-epgsearch multimedia/vdr-plugin-extrecmenu multimedia/vdr-plugin-osdpip multimedia/vdr-plugin-sleeptim...

Tobias Kortkamp tobik at FreeBSD.org
Tue Sep 4 13:42:16 UTC 2018 

Author: tobik
Date: Tue Sep  4 13:42:13 2018
New Revision: 478960
URL: https://svnweb.freebsd.org/changeset/ports/478960

Log:
  */vdr-plugin-*: Attempt to fix build with Clang 6

Modified:
  head/multimedia/vdr-plugin-eepg/Makefile
  head/multimedia/vdr-plugin-epgsearch/Makefile
  head/multimedia/vdr-plugin-extrecmenu/Makefile
  head/multimedia/vdr-plugin-osdpip/Makefile
  head/multimedia/vdr-plugin-sleeptimer/Makefile
  head/multimedia/vdr-plugin-ttxtsubs/Makefile
  head/multimedia/vdr-plugin-vdrmanager/Makefile
  head/multimedia/vdr-plugin-vnsiserver/Makefile
  head/multimedia/vdr-plugin-xineliboutput/Makefile
  head/multimedia/vdr/Makefile.plugins
  head/www/vdr-plugin-live/Makefile
  head/www/vdr-plugin-live/files/patch-libcxx

Modified: head/multimedia/vdr-plugin-eepg/Makefile
==============================================================================
--- head/multimedia/vdr-plugin-eepg/Makefile	Tue Sep  4 13:35:09 2018	(r478959)
+++ head/multimedia/vdr-plugin-eepg/Makefile	Tue Sep  4 13:42:13 2018	(r478960)
@@ -14,7 +14,6 @@ COMMENT=	Video Disk Recorder - extended EPG plugin
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_FreeBSD_12=	does not build with newer clang
 GITHASH=	e7383ed
 PATCH_STRIP=	-p1
 WRKSRC=		${WRKDIR}/${PORTNAME}-${GITHASH}

Modified: head/multimedia/vdr-plugin-epgsearch/Makefile
==============================================================================
--- head/multimedia/vdr-plugin-epgsearch/Makefile	Tue Sep  4 13:35:09 2018	(r478959)
+++ head/multimedia/vdr-plugin-epgsearch/Makefile	Tue Sep  4 13:42:13 2018	(r478960)
@@ -18,7 +18,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libtre.so:textproc/libtre
 
-BROKEN_FreeBSD_12=	does not build with newer clang
 USES=		pkgconfig tar:bzip2
 PATCH_STRIP=	-p1
 WRKSRC=		${WRKDIR}/vdr-plugin-${PLUGIN}

Modified: head/multimedia/vdr-plugin-extrecmenu/Makefile
==============================================================================
--- head/multimedia/vdr-plugin-extrecmenu/Makefile	Tue Sep  4 13:35:09 2018	(r478959)
+++ head/multimedia/vdr-plugin-extrecmenu/Makefile	Tue Sep  4 13:42:13 2018	(r478960)
@@ -14,7 +14,6 @@ COMMENT=	Video Disk Recorder - extended recordings men
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_FreeBSD_12=	does not build with newer clang
 USES=		tar:tgz
 PATCH_STRIP=	-p1
 WRKSRC=		${WRKDIR}/${PLUGIN}-${PORTVERSION}

Modified: head/multimedia/vdr-plugin-osdpip/Makefile
==============================================================================
--- head/multimedia/vdr-plugin-osdpip/Makefile	Tue Sep  4 13:35:09 2018	(r478959)
+++ head/multimedia/vdr-plugin-osdpip/Makefile	Tue Sep  4 13:42:13 2018	(r478960)
@@ -17,7 +17,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS+=	libavcodec.so:multimedia/ffmpeg
 
-BROKEN_FreeBSD_12=	does not build with newer clang
 USES=		pkgconfig tar:tgz
 HAVE_CONFIGURE=	yes
 PORTDOCS=	COPYING README HISTORY

Modified: head/multimedia/vdr-plugin-sleeptimer/Makefile
==============================================================================
--- head/multimedia/vdr-plugin-sleeptimer/Makefile	Tue Sep  4 13:35:09 2018	(r478959)
+++ head/multimedia/vdr-plugin-sleeptimer/Makefile	Tue Sep  4 13:42:13 2018	(r478960)
@@ -13,8 +13,6 @@ COMMENT=	Video Disk Recorder - sleep timer plugin
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_FreeBSD_12=	does not build with newer clang
-
 USES=		tar:tgz
 PATCH_STRIP=	-p1
 WRKSRC=		${WRKDIR}/${PLUGIN}-${PORTVERSION}

Modified: head/multimedia/vdr-plugin-ttxtsubs/Makefile
==============================================================================
--- head/multimedia/vdr-plugin-ttxtsubs/Makefile	Tue Sep  4 13:35:09 2018	(r478959)
+++ head/multimedia/vdr-plugin-ttxtsubs/Makefile	Tue Sep  4 13:42:13 2018	(r478960)
@@ -14,7 +14,6 @@ COMMENT=	Video Disk Recorder - teletext subtitle plugi
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_FreeBSD_12= does not build with newer clang
 PATCH_STRIP=	-p1
 WRKSRC=		${WRKDIR}/${PLUGIN}-${DISTVERSION}
 

Modified: head/multimedia/vdr-plugin-vdrmanager/Makefile
==============================================================================
--- head/multimedia/vdr-plugin-vdrmanager/Makefile	Tue Sep  4 13:35:09 2018	(r478959)
+++ head/multimedia/vdr-plugin-vdrmanager/Makefile	Tue Sep  4 13:42:13 2018	(r478960)
@@ -14,7 +14,6 @@ COMMENT=	Video Disk Recorder - VDR-Manager server plug
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_FreeBSD_12= does not build with newer clang6
 PATCH_STRIP=	-p1
 
 PORTDOCS=	README HISTORY

Modified: head/multimedia/vdr-plugin-vnsiserver/Makefile
==============================================================================
--- head/multimedia/vdr-plugin-vnsiserver/Makefile	Tue Sep  4 13:35:09 2018	(r478959)
+++ head/multimedia/vdr-plugin-vnsiserver/Makefile	Tue Sep  4 13:42:13 2018	(r478960)
@@ -12,7 +12,6 @@ COMMENT=	Video Disk Recorder - VNSI server plugin
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_FreeBSD_12=	does not build with newer clang
 USE_GITHUB=	yes
 GH_ACCOUNT=	FernetMenta
 GH_TAGNAME=	36e2b61

Modified: head/multimedia/vdr-plugin-xineliboutput/Makefile
==============================================================================
--- head/multimedia/vdr-plugin-xineliboutput/Makefile	Tue Sep  4 13:35:09 2018	(r478959)
+++ head/multimedia/vdr-plugin-xineliboutput/Makefile	Tue Sep  4 13:42:13 2018	(r478960)
@@ -20,7 +20,6 @@ LIB_DEPENDS=	libxine.so:multimedia/libxine \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libvdpau.so:multimedia/libvdpau
 
-BROKEN_FreeBSD_12=	does not build with newer clang
 PATCH_STRIP=	-p1
 USES=		pkgconfig tar:bzip2
 USE_XORG=	xrandr xrender

Modified: head/multimedia/vdr/Makefile.plugins
==============================================================================
--- head/multimedia/vdr/Makefile.plugins	Tue Sep  4 13:35:09 2018	(r478959)
+++ head/multimedia/vdr/Makefile.plugins	Tue Sep  4 13:42:13 2018	(r478960)
@@ -14,8 +14,10 @@ USES+=		gettext gmake
 VDRDIR=		${LOCALBASE}/include/vdr
 VDRINCDIR=	${LOCALBASE}/include
 USE_CSTD?=	gnu89
+USE_CXXSTD?=	gnu++98
 MAKE_ARGS+=	CC="${CC}"
 MAKE_ARGS+=	CXX="${CXX}"
+MAKE_ARGS+=	CXXFLAGS="${CXXFLAGS} -fPIC"
 MAKE_ARGS+=	DVBDIR=${LOCALBASE}/include
 MAKE_ARGS+=	VDRDIR=${VDRDIR}
 MAKE_ARGS+=	VDR_USER=${VDR_USER}

Modified: head/www/vdr-plugin-live/Makefile
==============================================================================
--- head/www/vdr-plugin-live/Makefile	Tue Sep  4 13:35:09 2018	(r478959)
+++ head/www/vdr-plugin-live/Makefile	Tue Sep  4 13:42:13 2018	(r478960)
@@ -22,7 +22,8 @@ WRKSRC=		${WRKDIR}/${PLUGIN}-${PORTVERSION}
 VDR_PLUGIN_MAKEFILES=	${WRKSRC}/httpd/Makefile ${WRKSRC}/pages/Makefile
 MAKE_ARGS+=	INCLUDES="-I${LOCALBASE}/include -I${WRKSRC}"
 MAKE_ARGS+=	PREFIX="${PREFIX}"
-USES=		compiler:features
+USES=		compiler:c++11-lang
+USE_CXXSTD=	c++11
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/www/vdr-plugin-live/files/patch-libcxx
==============================================================================
--- head/www/vdr-plugin-live/files/patch-libcxx	Tue Sep  4 13:35:09 2018	(r478959)
+++ head/www/vdr-plugin-live/files/patch-libcxx	Tue Sep  4 13:42:13 2018	(r478960)
@@ -219,7 +219,7 @@
  #include <vdr/channels.h>
  #include <vdr/i18n.h>
  #include <vdr/menu.h>
-@@ -14,8 +14,12 @@
+@@ -14,8 +15,12 @@
  namespace vdrlive {
  
  using namespace std;
@@ -232,6 +232,17 @@
  
  const char* NowReplaying()
  {
+@@ -253,8 +258,8 @@ void TaskManager::DoScheduledTasks()
+ 		current->Action();
+ 		m_taskQueue.pop_front();
+ 	}*/
+-	for_each( m_taskQueue.begin(), m_taskQueue.end(), bind( &Task::Action, _1 ) );
+-	for_each( m_stickyTasks.begin(), m_stickyTasks.end(), bind( &Task::Action, _1 ) );
++	for_each( m_taskQueue.begin(), m_taskQueue.end(), std::bind( &Task::Action, _1 ) );
++	for_each( m_stickyTasks.begin(), m_stickyTasks.end(), std::bind( &Task::Action, _1 ) );
+ 	m_taskQueue.clear();
+ 	m_scheduleWait.Broadcast();
+ }
 --- a/timerconflict.h
 +++ b/timerconflict.h
 @@ -65,7 +65,11 @@ namespace vdrlive {

More information about the svn-ports-all mailing list