From owner-svn-ports-head@freebsd.org Tue Sep 4 13:42:16 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4DE46FEF467; Tue, 4 Sep 2018 13:42:16 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 01EF197DE3; Tue, 4 Sep 2018 13:42:16 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F10D717CB7; Tue, 4 Sep 2018 13:42:15 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w84DgFZM001250; Tue, 4 Sep 2018 13:42:15 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w84DgDHq001236; Tue, 4 Sep 2018 13:42:13 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201809041342.w84DgDHq001236@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Tue, 4 Sep 2018 13:42:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: 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... X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head: multimedia/vdr multimedia/vdr-plugin-eepg multimedia/vdr-plugin-epgsearch multimedia/vdr-plugin-extrecmenu multimedia/vdr-plugin-osdpip multimedia/vdr-plugin-sleeptimer multimedia/vdr-plugin-... X-SVN-Commit-Revision: 478960 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Sep 2018 13:42:16 -0000 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 #include #include -@@ -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 {