Index: head/multimedia/vdr/Makefile.plugins =================================================================== --- head/multimedia/vdr/Makefile.plugins (revision 478959) +++ head/multimedia/vdr/Makefile.plugins (revision 478960) @@ -1,58 +1,60 @@ # this is to be included by vdr plugin ports # # $FreeBSD$ BUILD_DEPENDS+= ${LOCALBASE}/include/linux/dvb/frontend.h:multimedia/v4l_compat BUILD_DEPENDS+= vdr:multimedia/vdr RUN_DEPENDS+= vdr:multimedia/vdr APIVERSION= 1.7.29 DIST_SUBDIR= vdr PATCH_SUBDIR= vdr 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} MAKE_ARGS+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" MAKE_ARGS+= OSTYPE=FreeBSD MAKE_ARGS+= PREFIX=${PREFIX} PLUGIN?= ${PORTNAME:S/^vdr-plugin-//} CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} MAKE_ENV+= LOCALBASE=${LOCALBASE} VDR_USER= vdr VDR_GROUP= vdr PLIST_SUB+= VDR_USER=${VDR_USER} PLIST_SUB+= VDR_GROUP=${VDR_GROUP} PLIST_SUB+= APIVERSION=${APIVERSION} .include .if ${PORT_OPTIONS:MNLS} PLIST_SUB+= NLS="" .else PLIST_SUB+= NLS="@comment " .endif localeplist: @${FIND} ${WRKDIR}/locale -type f -print |${SED} 's|^.*locale/|%%NLS%%share/locale/|' post-patch-plugin: @${MKDIR} ${WRKDIR}/lib ${WRKDIR}/locale @${REINPLACE_CMD} -e 's/^\(LIBDIR[[:space:]]*\)[?]*\(=[[:space:]]*\).*/\1\2..\/lib/;' \ -e 's/^\(LOCALEDIR[[:space:]]*\)[?]*\(=[[:space:]]*\).*/\1\2..\/locale/;' \ -e 's/^\(VDRDIR[[:space:]]*\)[?]*\(=[[:space:]]*\).*/\1\2'"${VDRDIR:S-/-\\\\/-g}/;" \ -e 's/^\(VDRINCDIR[[:space:]]*\)[?]*\(=[[:space:]]*\).*/\1\2'"${VDRINCDIR:S-/-\\\\/-g}/;" \ -e 's/^\(BINDIR[[:space:]]*\)[?]*\(=[[:space:]]*\).*/\1\2'"${PREFIX:S-/-\\\\/-g}\/bin/;" \ -e '/^MAKEDEP.*-MM/s/-MG[[:space:]]*$$/# -MG/' \ ${WRKSRC}/Makefile ${VDR_PLUGIN_MAKEFILES} post-install-pluginlocales: .if ${PORT_OPTIONS:MNLS} @(cd ${WRKDIR} && ${COPYTREE_SHARE} locale ${STAGEDIR}${PREFIX}/share/) .endif Index: head/multimedia/vdr-plugin-eepg/Makefile =================================================================== --- head/multimedia/vdr-plugin-eepg/Makefile (revision 478959) +++ head/multimedia/vdr-plugin-eepg/Makefile (revision 478960) @@ -1,42 +1,41 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= vdr-plugin-eepg PORTVERSION= 0.0.6p2011071921 PORTREVISION= 6 CATEGORIES= multimedia MASTER_SITES= LOCAL/nox/ DISTNAME= ${PORTNAME}-${PORTVERSION:C/p.*/pre/}-0-g${GITHASH} MAINTAINER= ports@FreeBSD.org 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} PORTDOCS= README HISTORY OPTIONS_DEFINE= DOCS .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN} ${INSTALL_DATA} ${WRKSRC}/eepg.equiv.IT ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN} ${INSTALL_DATA} ${WRKSRC}/eepg.equiv.IT ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/eepg.equiv.sample post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include Index: head/multimedia/vdr-plugin-epgsearch/Makefile =================================================================== --- head/multimedia/vdr-plugin-epgsearch/Makefile (revision 478959) +++ head/multimedia/vdr-plugin-epgsearch/Makefile (revision 478960) @@ -1,47 +1,46 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= vdr-plugin-epgsearch PORTVERSION= 1.0.1s20120322 PORTREVISION= 6 CATEGORIES= multimedia MASTER_SITES= http://winni.vdr-developer.org/epgsearch/downloads/beta/:beta \ LOCAL/nox/:snapshot DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:snapshot MAINTAINER= ports@FreeBSD.org COMMENT= Video Disk Recorder - EPG search plugin LICENSE= GPLv2+ 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} MAKE_ARGS= INCLUDES="-I${LOCALBASE}/include -I${LOCALBASE}/include/vdr -I${WRKSRC}" PORTDOCS= README HISTORY OPTIONS_DEFINE= DOCS NLS .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin @${REINPLACE_CMD} -e 's/^#\(HAVE_PCREPOSIX=\)/\1/;' \ -e 's/^#\(HAVE_LIBTRE=\)/\1/;' \ ${WRKSRC}/Makefile pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr post-install: post-install-pluginlocales post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include Index: head/multimedia/vdr-plugin-extrecmenu/Makefile =================================================================== --- head/multimedia/vdr-plugin-extrecmenu/Makefile (revision 478959) +++ head/multimedia/vdr-plugin-extrecmenu/Makefile (revision 478960) @@ -1,39 +1,38 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= vdr-plugin-extrecmenu PORTVERSION= 1.2.2 PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/936/ DISTNAME= vdr-${PLUGIN}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Video Disk Recorder - extended recordings menu 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} PORTDOCS= README HISTORY OPTIONS_DEFINE= DOCS NLS .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr post-install: post-install-pluginlocales post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include Index: head/multimedia/vdr-plugin-osdpip/Makefile =================================================================== --- head/multimedia/vdr-plugin-osdpip/Makefile (revision 478959) +++ head/multimedia/vdr-plugin-osdpip/Makefile (revision 478960) @@ -1,41 +1,40 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= vdr-plugin-osdpip PORTVERSION= 0.1.2 PORTREVISION= 5 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/961/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} DIST_SUBDIR= vdr MAINTAINER= ports@FreeBSD.org COMMENT= Video Disk Recorder - picture-in-picture plugin LICENSE= GPLv2 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 WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION} OPTIONS_DEFINE= DOCS .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr post-install: post-install-pluginlocales post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include Index: head/multimedia/vdr-plugin-sleeptimer/Makefile =================================================================== --- head/multimedia/vdr-plugin-sleeptimer/Makefile (revision 478959) +++ head/multimedia/vdr-plugin-sleeptimer/Makefile (revision 478960) @@ -1,39 +1,37 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= vdr-plugin-sleeptimer PORTVERSION= 0.8.2 PORTREVISION= 6 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/652/ MAINTAINER= ports@FreeBSD.org 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} PORTDOCS= README HISTORY OPTIONS_DEFINE= DOCS NLS .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr post-install: post-install-pluginlocales post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include Index: head/multimedia/vdr-plugin-ttxtsubs/Makefile =================================================================== --- head/multimedia/vdr-plugin-ttxtsubs/Makefile (revision 478959) +++ head/multimedia/vdr-plugin-ttxtsubs/Makefile (revision 478960) @@ -1,38 +1,37 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= vdr-plugin-ttxtsubs PORTVERSION= 0.2.4 PORTREVISION= 5 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/725/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} MAINTAINER= ports@FreeBSD.org COMMENT= Video Disk Recorder - teletext subtitle plugin LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_12= does not build with newer clang PATCH_STRIP= -p1 WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION} PORTDOCS= README HISTORY OPTIONS_DEFINE= DOCS NLS .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr post-install: post-install-pluginlocales post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include Index: head/multimedia/vdr-plugin-vdrmanager/Makefile =================================================================== --- head/multimedia/vdr-plugin-vdrmanager/Makefile (revision 478959) +++ head/multimedia/vdr-plugin-vdrmanager/Makefile (revision 478960) @@ -1,40 +1,39 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= vdr-plugin-vdrmanager PORTVERSION= 0.6 PORTREVISION= 5 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/828/ DISTNAME= ${PORTNAME:S/-plugin//}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Video Disk Recorder - VDR-Manager server plugin LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_12= does not build with newer clang6 PATCH_STRIP= -p1 PORTDOCS= README HISTORY OPTIONS_DEFINE= DOCS .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/vdr/plugins ${INSTALL_DATA} ${WRKSRC}/examples/plugin.vdrmanager.conf \ ${STAGEDIR}${PREFIX}/etc/vdr/plugins/plugin.vdrmanager.conf.sample post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include Index: head/multimedia/vdr-plugin-vnsiserver/Makefile =================================================================== --- head/multimedia/vdr-plugin-vnsiserver/Makefile (revision 478959) +++ head/multimedia/vdr-plugin-vnsiserver/Makefile (revision 478960) @@ -1,50 +1,49 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= vdr-plugin-vnsiserver PORTVERSION= 14.0.20150330 PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= ports@FreeBSD.org 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 USES= pkgconfig PATCH_STRIP= -p1 MAKE_ARGS= LIBDIR=${WRKDIR}/lib \ LOCDIR=${PREFIX}/share/locale \ VDRSRC=${LOCALBASE}/include/vdr \ INCLUDES=-I${LOCALBASE}/include PORTDOCS= README HISTORY OPTIONS_DEFINE= DOCS .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr @${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/de_DE/LC_MESSAGES \ ${STAGEDIR}${PREFIX}/share/locale/lt_LT/LC_MESSAGES post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN} ${INSTALL_DATA} ${WRKSRC}/${PLUGIN}/allowed_hosts.conf \ ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/allowed_hosts.conf.sample post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include Index: head/multimedia/vdr-plugin-xineliboutput/Makefile =================================================================== --- head/multimedia/vdr-plugin-xineliboutput/Makefile (revision 478959) +++ head/multimedia/vdr-plugin-xineliboutput/Makefile (revision 478960) @@ -1,68 +1,67 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= vdr-plugin-xineliboutput PORTVERSION= 1.0.90s20120511 PORTREVISION= 23 CATEGORIES= multimedia MASTER_SITES= SF/xineliboutput/files/xineliboutput/vdr-xineliboutput-${PORTVERSION}/:release \ LOCAL/nox:snapshot DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:snapshot MAINTAINER= ports@FreeBSD.org COMMENT= Video Disk Recorder - xineliboutput plugin/viewer LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libxine.so:multimedia/libxine \ libavutil.so:multimedia/ffmpeg \ 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 HAS_CONFIGURE= yes CONFIGURE_ARGS= --cc="${CC}" --cxx="${CXX}" --add-cflags=-I${VDRDIR} USE_GL= gl glu glut WRKSRC= ${WRKDIR}/vdr-${PLUGIN} XINE_PLUGINSDIR=lib/xine/plugins/2.7 PORTDOCS= README HISTORY PORTEXAMPLES= xine PLIST_SUB= XINE_PLUGINSDIR=${XINE_PLUGINSDIR} OPTIONS_DEFINE= LIBBLURAY LIBEXTRACTOR EXAMPLES DOCS LIBEXTRACTOR_LIB_DEPENDS= libextractor.so:textproc/libextractor LIBEXTRACTOR_CONFIGURE_ENABLE= libextractor LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray LIBBLURAY_CONFIGURE_ENABLE= libbluray .include "${.CURDIR}/../vdr/Makefile.plugins" post-patch: post-patch-plugin # clang doesn't know -MG ${TOUCH} -t 200001010000 ${WRKSRC}/nosignal_720x576.c \ ${WRKSRC}/black_720x576.c ${WRKSRC}/vdrlogo_720x576.c pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr post-install: post-install-pluginlocales @${MKDIR} ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN} ${INSTALL_DATA} ${WRKSRC}/examples/allowed_hosts.conf \ ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/allowed_hosts.conf.sample post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/xine ${INSTALL_DATA} ${FILESDIR}/keymap ${STAGEDIR}${EXAMPLESDIR}/xine post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include Index: head/www/vdr-plugin-live/Makefile =================================================================== --- head/www/vdr-plugin-live/Makefile (revision 478959) +++ head/www/vdr-plugin-live/Makefile (revision 478960) @@ -1,52 +1,53 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= vdr-plugin-live PORTVERSION= 0.3.0 PORTREVISION= 3 CATEGORIES= www multimedia MASTER_SITES= http://live.vdr-developer.org/downloads/:release \ LOCAL/nox/:snapshot DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:release MAINTAINER= ports@FreeBSD.org COMMENT= Video Disk Recorder - live web plugin LIB_DEPENDS+= libtntnet.so:www/tntnet \ libpcre.so:devel/pcre PATCH_STRIP= -p1 PORTDOCS= COPYING README HISTORY 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 .include "${.CURDIR}/../../multimedia/vdr/Makefile.plugins" .include .if ${COMPILER_FEATURES:Mlibc++} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libcxx EXTRA_PATCH_STRIP= -p1 .endif post-patch: post-patch-plugin ${CP} ${FILESDIR}/gen_version_suffix.h ${WRKSRC} pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr post-install: post-install-pluginlocales (cd ${WRKSRC}/${PLUGIN} && ${COPYTREE_SHARE} \* \ ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN} ) .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .endif .include Index: head/www/vdr-plugin-live/files/patch-libcxx =================================================================== --- head/www/vdr-plugin-live/files/patch-libcxx (revision 478959) +++ head/www/vdr-plugin-live/files/patch-libcxx (revision 478960) @@ -1,248 +1,259 @@ --- a/cache.h +++ b/cache.h @@ -25,7 +25,11 @@ class cache public: typedef TKey key_type; typedef TValue mapped_type; +#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L + typedef std::shared_ptr< mapped_type > ptr_type; +#else typedef std::tr1::shared_ptr< mapped_type > ptr_type; +#endif private: /*struct Value --- a/epg_events.h +++ b/epg_events.h @@ -18,7 +18,11 @@ namespace vdrlive class EpgInfo; +#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L + typedef std::shared_ptr EpgInfoPtr; +#else typedef std::tr1::shared_ptr EpgInfoPtr; +#endif // ------------------------------------------------------------------------- --- a/pages/epginfo.ecpp +++ b/pages/epginfo.ecpp @@ -23,7 +23,11 @@ namespace vdrlive { cSchedulesLock m_schedulesLock; }; +#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L + typedef std::shared_ptr SchedulesLockPtr; +#else typedef std::tr1::shared_ptr SchedulesLockPtr; +#endif } using namespace vdrlive; --- a/recman.h +++ b/recman.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include "stdext.h" @@ -12,7 +13,11 @@ namespace vdrlive { // Forward declations from epg_events.h class EpgInfo; +#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L + typedef std::shared_ptr EpgInfoPtr; +#else typedef std::tr1::shared_ptr EpgInfoPtr; +#endif /** * Some forward declarations @@ -26,9 +31,15 @@ namespace vdrlive { class DirectoryListPtr; class RecordingsItem; +#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L + typedef std::shared_ptr< RecordingsManager > RecordingsManagerPtr; + typedef std::shared_ptr< RecordingsItem > RecordingsItemPtr; + typedef std::weak_ptr< RecordingsItem > RecordingsItemWeakPtr; +#else typedef std::tr1::shared_ptr< RecordingsManager > RecordingsManagerPtr; typedef std::tr1::shared_ptr< RecordingsItem > RecordingsItemPtr; typedef std::tr1::weak_ptr< RecordingsItem > RecordingsItemWeakPtr; +#endif typedef std::multimap< std::string, RecordingsItemPtr > RecordingsMap; @@ -121,10 +132,17 @@ namespace vdrlive { static RecordingsManagerPtr EnsureValidData(); +#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L + static std::weak_ptr< RecordingsManager > m_recMan; + static std::shared_ptr< RecordingsTree > m_recTree; + static std::shared_ptr< RecordingsList > m_recList; + static std::shared_ptr< DirectoryList > m_recDirs; +#else static std::tr1::weak_ptr< RecordingsManager > m_recMan; static std::tr1::shared_ptr< RecordingsTree > m_recTree; static std::tr1::shared_ptr< RecordingsList > m_recList; static std::tr1::shared_ptr< DirectoryList > m_recDirs; +#endif static int m_recordingsState; cThreadLock m_recordingsLock; @@ -257,12 +275,20 @@ namespace vdrlive { * A smart pointer to a recordings tree. As long as an instance of this * exists the recordings are locked in the vdr. */ +#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L + class RecordingsTreePtr : public std::shared_ptr< RecordingsTree > +#else class RecordingsTreePtr : public std::tr1::shared_ptr< RecordingsTree > +#endif { friend class RecordingsManager; private: +#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L + RecordingsTreePtr(RecordingsManagerPtr recManPtr, std::shared_ptr< RecordingsTree > recTree); +#else RecordingsTreePtr(RecordingsManagerPtr recManPtr, std::tr1::shared_ptr< RecordingsTree > recTree); +#endif public: RecordingsTreePtr(); @@ -286,8 +312,13 @@ namespace vdrlive { private: RecordingsList(RecordingsTreePtr recTree); +#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L + RecordingsList(std::shared_ptr< RecordingsList > recList, bool ascending); + RecordingsList(std::shared_ptr< RecordingsList > recList, time_t begin, time_t end, bool ascending); +#else RecordingsList(std::tr1::shared_ptr< RecordingsList > recList, bool ascending); RecordingsList(std::tr1::shared_ptr< RecordingsList > recList, time_t begin, time_t end, bool ascending); +#endif public: typedef std::vector< RecordingsItemPtr > RecVecType; @@ -333,12 +364,20 @@ namespace vdrlive { * A smart pointer to a recordings list. As long as an instance of this * exists the recordings are locked in the vdr. */ +#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L + class RecordingsListPtr : public std::shared_ptr< RecordingsList > +#else class RecordingsListPtr : public std::tr1::shared_ptr< RecordingsList > +#endif { friend class RecordingsManager; private: +#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L + RecordingsListPtr(RecordingsManagerPtr recManPtr, std::shared_ptr< RecordingsList > recList); +#else RecordingsListPtr(RecordingsManagerPtr recManPtr, std::tr1::shared_ptr< RecordingsList > recList); +#endif public: virtual ~RecordingsListPtr(); @@ -378,12 +417,20 @@ namespace vdrlive { * A smart pointer to a directory list. As long as an instance of this * exists the recordings are locked in the vdr. */ +#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L + class DirectoryListPtr : public std::shared_ptr< DirectoryList > +#else class DirectoryListPtr : public std::tr1::shared_ptr< DirectoryList > +#endif { friend class RecordingsManager; private: +#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L + DirectoryListPtr(RecordingsManagerPtr recManPtr, std::shared_ptr< DirectoryList > recDirs); +#else DirectoryListPtr(RecordingsManagerPtr recManPtr, std::tr1::shared_ptr< DirectoryList > recDirs); +#endif public: virtual ~DirectoryListPtr(); --- a/recman.cpp +++ b/recman.cpp @@ -14,7 +14,9 @@ #define INDEXFILESUFFIX "/index.vdr" #define LENGTHFILESUFFIX "/length.vdr" +#if !defined(_LIBCPP_VERSION) && __cplusplus < 201103L using namespace std::tr1; +#endif using namespace std; namespace vdrlive { @@ -548,7 +550,11 @@ namespace vdrlive { { } +#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L + RecordingsTreePtr::RecordingsTreePtr(RecordingsManagerPtr recManPtr, std::shared_ptr< RecordingsTree > recTree) : +#else RecordingsTreePtr::RecordingsTreePtr(RecordingsManagerPtr recManPtr, std::tr1::shared_ptr< RecordingsTree > recTree) : +#endif shared_ptr(recTree), m_recManPtr(recManPtr) { --- a/grab.h +++ b/grab.h @@ -6,7 +6,11 @@ namespace vdrlive { +#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L +typedef std::shared_ptr< char > GrabImagePtr; +#else typedef std::tr1::shared_ptr< char > GrabImagePtr; +#endif typedef std::pair< GrabImagePtr, int > GrabImageInfo; class GrabImageTask; --- a/tasks.cpp +++ a/tasks.cpp @@ -1,4 +1,5 @@ #include +#include #include #include #include -@@ -14,8 +14,12 @@ +@@ -14,8 +15,12 @@ namespace vdrlive { using namespace std; +#if !defined(_LIBCPP_VERSION) && __cplusplus < 201103L using namespace std::tr1; using namespace std::tr1::placeholders; +#else +using namespace std::placeholders; +#endif 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 { class TimerConflictNotifier { public: +#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L + typedef std::shared_ptr TimerConflictsPtr; +#else typedef std::tr1::shared_ptr TimerConflictsPtr; +#endif TimerConflictNotifier(); virtual ~TimerConflictNotifier();