Index: Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- Makefile 12 Oct 2011 21:15:56 -0000 1.13 +++ Makefile 14 Dec 2011 19:41:41 -0000 @@ -6,13 +6,14 @@ # PORTNAME= xbmc -PORTVERSION= 10.1 -PORTREVISION= 3 +PORTVERSION= 57 CATEGORIES= multimedia -MASTER_SITES= http://mirrors.xbmc.org/releases/source/ +MASTER_SITES= LOCAL/nox +PKGNAMESUFFIX= -pvr-ppa-odk +DISTNAME= opdenkamp-${PORTNAME}${PKGNAMESUFFIX}${PORTVERSION}-0-g${GITHASH} -MAINTAINER= mickael.maillot@gmail.com -COMMENT= XBMC is an award winning media center application +MAINTAINER= nox@FreeBSD.org +COMMENT= XBMC is an award winning media center application - PVR branch LICENSE= GPLv2 @@ -50,7 +51,10 @@ LIB_DEPENDS= asound.2:${PORTSDIR}/audio/ smbclient.0:${PORTSDIR}/net/samba-libsmbclient \ sqlite3.8:${PORTSDIR}/databases/sqlite3 \ vorbis.4:${PORTSDIR}/audio/libvorbis \ - wavpack.2:${PORTSDIR}/audio/wavpack + ass.5:${PORTSDIR}/multimedia/libass \ + wavpack.2:${PORTSDIR}/audio/wavpack \ + yajl:${PORTSDIR}/devel/yajl \ + plist:${PORTSDIR}/devel/libplist RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins \ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ @@ -58,6 +62,8 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/l ${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \ xdpyinfo:${PORTSDIR}/x11/xdpyinfo +GITHASH= d967ec3 +WRKSRC= ${WRKDIR}/opdenkamp-${PORTNAME}-${GITHASH} FETCH_ARGS= -Fpr USE_GMAKE= yes USE_GNOME= pkgconfig @@ -75,8 +81,8 @@ ONLY_FOR_ARCHS= i386 amd64 USE_LDCONFIG= ${PREFIX}/lib/xbmc/system \ ${PREFIX}/lib/xbmc/system/players/dvdplayer \ ${PREFIX}/lib/xbmc/system/players/paplayer +CONFLICTS_INSTALL= xbmc-[0-9]* -USE_DOS2UNIX= xbmc/lib/libid3tag/libid3tag/compat.gperf PLIST_SUB+= PYVER="${PYTHON_VERSION:S/python//:S/.//g}" OPTIONS= AVAHI "Enable Avahi support" on \ @@ -205,106 +211,43 @@ PLIST_SUB+= HTTPD="@comment " post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/configure.in \ - ${WRKSRC}/lib/enca/configure \ - ${WRKSRC}/lib/freetype/builds/unix/configure \ - ${WRKSRC}/lib/fribidi/configure \ - ${WRKSRC}/lib/libcdio/configure \ - ${WRKSRC}/lib/libcdio/libcdio.pc \ - ${WRKSRC}/lib/libcdio/libcdio_cdda.pc \ - ${WRKSRC}/lib/libcdio/libiso9660.pc \ - ${WRKSRC}/lib/libiconv/Makefile.in \ - ${WRKSRC}/lib/libiconv/configure \ - ${WRKSRC}/lib/libiconv/lib/Makefile.in \ - ${WRKSRC}/lib/libiconv/libcharset/Makefile.in \ - ${WRKSRC}/lib/libiconv/libcharset/configure \ - ${WRKSRC}/lib/libiconv/libcharset/lib/Makefile.in \ - ${WRKSRC}/lib/libiconv/man/Makefile.in \ - ${WRKSRC}/lib/libiconv/preload/Makefile.in \ - ${WRKSRC}/lib/libiconv/preload/configure \ - ${WRKSRC}/lib/libiconv/src/Makefile.in \ - ${WRKSRC}/lib/liblame/configure \ - ${WRKSRC}/lib/libmicrohttpd/configure \ - ${WRKSRC}/lib/libmodplug/configure \ - ${WRKSRC}/lib/libmodplug/src/load_pat.cpp \ - ${WRKSRC}/lib/pcre/configure \ - ${WRKSRC}/xbmc/cores/dvdplayer/Codecs/ffmpeg/configure \ - ${WRKSRC}/xbmc/cores/dvdplayer/Codecs/liba52/configure \ - ${WRKSRC}/xbmc/cores/dvdplayer/Codecs/libdts/configure \ - ${WRKSRC}/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/configure.ac \ - ${WRKSRC}/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/configure2 \ - ${WRKSRC}/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/doc/doxy.conf \ - ${WRKSRC}/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/configure.ac \ - ${WRKSRC}/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/configure2 \ - ${WRKSRC}/xbmc/cores/dvdplayer/Codecs/libfaad2/configure \ - ${WRKSRC}/xbmc/cores/dvdplayer/Codecs/libmad/configure \ - ${WRKSRC}/xbmc/cores/dvdplayer/Codecs/libmpeg2/configure \ - ${WRKSRC}/xbmc/cores/dvdplayer/Codecs/libmpeg2/test/compile \ - ${WRKSRC}/xbmc/cores/paplayer/FLACCodec/flac-1.2.1/configure \ - ${WRKSRC}/xbmc/cores/paplayer/SIDCodec/libsidplay/unix/libsidplay2.pc \ - ${WRKSRC}/xbmc/cores/paplayer/asap/Makefile.in \ - ${WRKSRC}/xbmc/cores/paplayer/timidity/configure.in \ - ${WRKSRC}/xbmc/cores/paplayer/vorbisfile/libvorbis/configure \ - ${WRKSRC}/xbmc/cores/paplayer/vorbisfile/ogg/configure \ - ${WRKSRC}/xbmc/lib/UnrarXLib/pathfn.cpp \ - ${WRKSRC}/xbmc/lib/cximage-6.0/zlib/Makefile.in \ - ${WRKSRC}/xbmc/lib/cximage-6.0/zlib/configure \ - ${WRKSRC}/xbmc/lib/libPython/Python/configure.in \ - ${WRKSRC}/xbmc/lib/libPython/Python/setup.py \ - ${WRKSRC}/xbmc/lib/libUPnP/Neptune/ThirdParty/axTLS/config/config.h \ - ${WRKSRC}/xbmc/lib/libapetag/configure \ - ${WRKSRC}/xbmc/lib/libid3tag/libid3tag/configure \ - ${WRKSRC}/xbmc/lib/libid3tag/zlib/Makefile \ - ${WRKSRC}/xbmc/lib/libid3tag/zlib/Makefile.in \ - ${WRKSRC}/xbmc/lib/libid3tag/zlib/configure \ - ${WRKSRC}/xbmc/lib/libmms/glib-2.20.4/glib/gutils.c \ - ${WRKSRC}/xbmc/lib/libsamplerate/configure \ - ${WRKSRC}/xbmc/lib/libsquish/config \ - ${WRKSRC}/xbmc/screensavers/rsxs-0.9/configure \ - ${WRKSRC}/xbmc/visualizations/Goom/goom2k4-0/configure \ - ${WRKSRC}/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure - @${REINPLACE_CMD} -e "s;python2\.6;${PYTHON_VERSION};" \ - -e "s;HAVE_LIBPYTHON2_6;HAVE_LIB${PYTHON_VERSION:U:S/./_/g};" \ - ${WRKSRC}/xbmc/lib/libPython/XBPyThread.cpp \ - ${WRKSRC}/xbmc/lib/libPython/XBPyThread.h \ - ${WRKSRC}/xbmc/lib/libPython/XBPythonDll.cpp \ - ${WRKSRC}/xbmc/lib/libPython/XBPythonDllFuncs.S \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/PythonAddon.h \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/action.h \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/control.h \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlimage.cpp \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controllabel.cpp \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controllist.cpp \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlslider.cpp \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlspin.cpp \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/dialog.cpp \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/dialog.h \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/infotagmusic.h \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/infotagvideo.h \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/keyboard.h \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/listitem.cpp \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/listitem.h \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/player.h \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/pyplaylist.h \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/pyutil.h \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/window.h \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/winxml.cpp \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/winxml.h \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp \ - ${WRKSRC}/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp + ${WRKSRC}/lib/asap/Makefile.in \ + ${WRKSRC}/lib/libdvd/libdvdnav/configure.ac \ + ${WRKSRC}/lib/libdvd/libdvdnav/configure2 \ + ${WRKSRC}/lib/libdvd/libdvdread/configure.ac \ + ${WRKSRC}/lib/libdvd/libdvdread/configure2 \ + ${WRKSRC}/lib/libsidplay2/libsidplay/unix/my_macros.m4 \ + ${WRKSRC}/lib/timidity/configure.in \ + ${WRKSRC}/xbmc/screensavers/rsxs-0.9/acinclude.m4 + ${RM} ${WRKSRC}/addons/library.xbmc.addon/libXBMC_addon.h.orig + ${RM} ${WRKSRC}/addons/library.xbmc.gui/libXBMC_gui.h.orig + ${RM} ${WRKSRC}/addons/library.xbmc.pvr/libXBMC_pvr.h.orig +# XXX somehow there are still references to linux libraries, if you find +# where they come from please tell us! +.if ${ARCH} == "amd64" + ${LN} -s libXBMC_addon-x86_64-freebsd.so ${WRKSRC}/addons/library.xbmc.addon/libXBMC_addon-x86_64-linux.so + ${LN} -s libXBMC_gui-x86_64-freebsd.so ${WRKSRC}/addons/library.xbmc.gui/libXBMC_gui-x86_64-linux.so + ${LN} -s libXBMC_pvr-x86_64-freebsd.so ${WRKSRC}/addons/library.xbmc.pvr/libXBMC_pvr-x86_64-linux.so +.else + ${LN} -s libXBMC_addon-i386-freebsd.so ${WRKSRC}/addons/library.xbmc.addon/libXBMC_addon-i486-linux.so + ${LN} -s libXBMC_gui-i386-freebsd.so ${WRKSRC}/addons/library.xbmc.gui/libXBMC_gui-i486-linux.so + ${LN} -s libXBMC_pvr-i386-freebsd.so ${WRKSRC}/addons/library.xbmc.pvr/libXBMC_pvr-i486-linux.so +.endif pre-configure: cd ${WRKSRC} && ./bootstrap +post-install: +# XXX somehow there are still references to linux libraries, if you find +# where they come from please tell us! +.if ${ARCH} == "amd64" + ${LN} -s libXBMC_addon-x86_64-freebsd.so ${PREFIX}/lib/xbmc/addons/library.xbmc.addon/libXBMC_addon-x86_64-linux.so + ${LN} -s libXBMC_gui-x86_64-freebsd.so ${PREFIX}/lib/xbmc/addons/library.xbmc.gui/libXBMC_gui-x86_64-linux.so + ${LN} -s libXBMC_pvr-x86_64-freebsd.so ${PREFIX}/lib/xbmc/addons/library.xbmc.pvr/libXBMC_pvr-x86_64-linux.so +.else + ${LN} -s libXBMC_addon-i386-freebsd.so ${PREFIX}/lib/xbmc/addons/library.xbmc.addon/libXBMC_addon-i486-linux.so + ${LN} -s libXBMC_gui-i386-freebsd.so ${PREFIX}/lib/xbmc/addons/library.xbmc.gui/libXBMC_gui-i486-linux.so + ${LN} -s libXBMC_pvr-i386-freebsd.so ${PREFIX}/lib/xbmc/addons/library.xbmc.pvr/libXBMC_pvr-i486-linux.so +.endif + .include Index: distinfo =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 16 Mar 2011 13:03:07 -0000 1.2 +++ distinfo 14 Dec 2011 19:47:04 -0000 @@ -1,2 +1,2 @@ -SHA256 (xbmc-10.1.tar.gz) = 3403195b7eb1d076523f2394793b7f050df00743892b031f6fea86b998559d8a -SIZE (xbmc-10.1.tar.gz) = 130187822 +SHA256 (opdenkamp-xbmc-pvr-ppa-odk57-0-gd967ec3.tar.gz) = 291937b30f203608e255482d304ad6af36939a3544d3144e4cdaec2c6a3638f2 +SIZE (opdenkamp-xbmc-pvr-ppa-odk57-0-gd967ec3.tar.gz) = 57863915 Index: pkg-descr =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/pkg-descr,v retrieving revision 1.2 diff -u -p -r1.2 pkg-descr --- pkg-descr 16 Mar 2011 13:03:07 -0000 1.2 +++ pkg-descr 14 Dec 2011 20:33:31 -0000 @@ -2,4 +2,11 @@ XBMC Media Center (formerly named "XBox is a free and open source cross-platform media-player and entertainment hub. +This is a tagged release of the XBMC pvr-ppa-odk branch that adds +PVR functionality using tvheadend (not ported to FreeBSD yet but +can be used over the network), MythTV (currently broken), or VDR +(via external plugins), and is located at: + +https://github.com/opdenkamp/xbmc + WWW: http://xbmc.org/ Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/pkg-plist,v retrieving revision 1.4 diff -u -p -r1.4 pkg-plist --- pkg-plist 16 Mar 2011 13:03:07 -0000 1.4 +++ pkg-plist 14 Oct 2011 18:44:51 -0000 @@ -1,19 +1,27 @@ -bin/xbmc-standalone bin/xbmc +bin/xbmc-standalone +lib/xbmc/addons/library.xbmc.addon/libXBMC_addon-%%ARCH%%-freebsd.so +lib/xbmc/addons/library.xbmc.gui/libXBMC_gui-%%ARCH%%-freebsd.so +lib/xbmc/addons/library.xbmc.pvr/libXBMC_pvr-%%ARCH%%-freebsd.so +lib/xbmc/addons/library.xbmc.addon/libXBMC_addon-%%ARCH%%-linux.so +lib/xbmc/addons/library.xbmc.gui/libXBMC_gui-%%ARCH%%-linux.so +lib/xbmc/addons/library.xbmc.pvr/libXBMC_pvr-%%ARCH%%-linux.so +lib/xbmc/addons/pvr.hts/XBMC_Tvheadend.pvr +lib/xbmc/addons/pvr.mythtv/XBMC_Mythtv.pvr +lib/xbmc/addons/pvr.team-mediaportal.tvserver/XBMC_MPTV.pvr +lib/xbmc/addons/pvr.vdr.vnsi/XBMC_VDR_vnsi.pvr lib/xbmc/addons/screensaver.rsxs.euphoria/Euphoria.xbs lib/xbmc/addons/screensaver.rsxs.plasma/Plasma.xbs lib/xbmc/addons/screensaver.rsxs.solarwinds/Solarwinds.xbs -lib/xbmc/addons/script.module.pil/addon.xml -lib/xbmc/addons/script.module.pysqlite/addon.xml lib/xbmc/addons/visualization.glspectrum/opengl_spectrum.vis lib/xbmc/addons/visualization.projectm/projectM.vis lib/xbmc/addons/visualization.waveform/Waveform.vis lib/xbmc/system/ImageLib-%%ARCH%%-freebsd.so lib/xbmc/system/hdhomerun-%%ARCH%%-freebsd.so +lib/xbmc/system/libcmyth-%%ARCH%%-freebsd.so lib/xbmc/system/libcpluff-%%ARCH%%-freebsd.so lib/xbmc/system/libexif-%%ARCH%%-freebsd.so lib/xbmc/system/libid3tag-%%ARCH%%-freebsd.so -lib/xbmc/system/players/dvdplayer/libass-%%ARCH%%-freebsd.so lib/xbmc/system/players/dvdplayer/libdvdcss-%%ARCH%%-freebsd.so lib/xbmc/system/players/dvdplayer/libdvdnav-%%ARCH%%-freebsd.so lib/xbmc/system/players/paplayer/adpcm-%%ARCH%%-freebsd.so @@ -22,7 +30,6 @@ lib/xbmc/system/players/paplayer/nosefar lib/xbmc/system/players/paplayer/stsoundlibrary-%%ARCH%%-freebsd.so lib/xbmc/system/players/paplayer/timidity-%%ARCH%%-freebsd.so lib/xbmc/system/players/paplayer/vgmstream-%%ARCH%%-freebsd.so -lib/xbmc/system/python/python%%PYVER%%-%%ARCH%%-freebsd.so lib/xbmc/xbmc-xrandr lib/xbmc/xbmc.bin %%DOCSDIR%%/LICENSE.GPL @@ -32,6 +39,11 @@ lib/xbmc/xbmc.bin share/icons/hicolor/256x256/apps/xbmc.png share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/FEH.py +%%DATADIR%%/addons/library.xbmc.addon/dlfcn-win32.cpp +%%DATADIR%%/addons/library.xbmc.addon/dlfcn-win32.h +%%DATADIR%%/addons/library.xbmc.addon/libXBMC_addon.h +%%DATADIR%%/addons/library.xbmc.gui/libXBMC_gui.h +%%DATADIR%%/addons/library.xbmc.pvr/libXBMC_pvr.h %%DATADIR%%/addons/metadata.albums.allmusic.com/addon.xml %%DATADIR%%/addons/metadata.albums.allmusic.com/allmusic.xml %%DATADIR%%/addons/metadata.albums.allmusic.com/icon.png @@ -46,7 +58,6 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Korean/strings.xml %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Polish/strings.xml %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Portuguese/strings.xml -%%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Romanian/strings.xml %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Russian/strings.xml %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Spanish/strings.xml %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Swedish/strings.xml @@ -65,7 +76,6 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Korean/strings.xml %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Polish/strings.xml %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Portuguese/strings.xml -%%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Romanian/strings.xml %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Russian/strings.xml %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Spanish/strings.xml %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Swedish/strings.xml @@ -83,9 +93,6 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/metadata.common.last.fm/lastfm.xml %%DATADIR%%/addons/metadata.common.themoviedb.org/addon.xml %%DATADIR%%/addons/metadata.common.themoviedb.org/tmdb.xml -%%DATADIR%%/addons/metadata.mtv.com/addon.xml -%%DATADIR%%/addons/metadata.mtv.com/icon.png -%%DATADIR%%/addons/metadata.mtv.com/mtv.xml %%DATADIR%%/addons/metadata.themoviedb.org/addon.xml %%DATADIR%%/addons/metadata.themoviedb.org/changelog.txt %%DATADIR%%/addons/metadata.themoviedb.org/icon.png @@ -118,12 +125,52 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/metadata.tvdb.com/resources/language/Korean/strings.xml %%DATADIR%%/addons/metadata.tvdb.com/resources/language/Polish/strings.xml %%DATADIR%%/addons/metadata.tvdb.com/resources/language/Portuguese/strings.xml -%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Romanian/strings.xml %%DATADIR%%/addons/metadata.tvdb.com/resources/language/Russian/strings.xml %%DATADIR%%/addons/metadata.tvdb.com/resources/language/Spanish/strings.xml %%DATADIR%%/addons/metadata.tvdb.com/resources/language/Swedish/strings.xml %%DATADIR%%/addons/metadata.tvdb.com/resources/settings.xml %%DATADIR%%/addons/metadata.tvdb.com/tvdb.xml +%%DATADIR%%/addons/metadata.yahoomusic.com/addon.xml +%%DATADIR%%/addons/metadata.yahoomusic.com/icon.png +%%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Dutch/strings.xml +%%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/English/strings.xml +%%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Hungarian/strings.xml +%%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Korean/strings.xml +%%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Polish/strings.xml +%%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Portuguese/strings.xml +%%DATADIR%%/addons/metadata.yahoomusic.com/resources/settings.xml +%%DATADIR%%/addons/metadata.yahoomusic.com/yahoomusic.xml +%%DATADIR%%/addons/pvr.hts/addon.xml +%%DATADIR%%/addons/pvr.hts/icon.png +%%DATADIR%%/addons/pvr.hts/resources/language/Dutch/strings.xml +%%DATADIR%%/addons/pvr.hts/resources/language/English/strings.xml +%%DATADIR%%/addons/pvr.hts/resources/language/Finnish/strings.xml +%%DATADIR%%/addons/pvr.hts/resources/language/German/strings.xml +%%DATADIR%%/addons/pvr.hts/resources/settings.xml +%%DATADIR%%/addons/pvr.mythtv/addon.xml +%%DATADIR%%/addons/pvr.mythtv/icon.png +%%DATADIR%%/addons/pvr.mythtv/resources/language/English/strings.xml +%%DATADIR%%/addons/pvr.mythtv/resources/language/Finnish/strings.xml +%%DATADIR%%/addons/pvr.mythtv/resources/language/German/strings.xml +%%DATADIR%%/addons/pvr.mythtv/resources/settings.xml +%%DATADIR%%/addons/pvr.team-mediaportal.tvserver/LICENSE.txt +%%DATADIR%%/addons/pvr.team-mediaportal.tvserver/addon.xml +%%DATADIR%%/addons/pvr.team-mediaportal.tvserver/changelog.txt +%%DATADIR%%/addons/pvr.team-mediaportal.tvserver/icon.png +%%DATADIR%%/addons/pvr.team-mediaportal.tvserver/resources/genre_translation.xml +%%DATADIR%%/addons/pvr.team-mediaportal.tvserver/resources/language/Dutch/strings.xml +%%DATADIR%%/addons/pvr.team-mediaportal.tvserver/resources/language/English/strings.xml +%%DATADIR%%/addons/pvr.team-mediaportal.tvserver/resources/language/Finnish/strings.xml +%%DATADIR%%/addons/pvr.team-mediaportal.tvserver/resources/language/German/strings.xml +%%DATADIR%%/addons/pvr.team-mediaportal.tvserver/resources/settings.xml +%%DATADIR%%/addons/pvr.vdr.vnsi/addon.xml +%%DATADIR%%/addons/pvr.vdr.vnsi/icon.png +%%DATADIR%%/addons/pvr.vdr.vnsi/resources/language/Dutch/strings.xml +%%DATADIR%%/addons/pvr.vdr.vnsi/resources/language/English/strings.xml +%%DATADIR%%/addons/pvr.vdr.vnsi/resources/language/Finnish/strings.xml +%%DATADIR%%/addons/pvr.vdr.vnsi/resources/language/German/strings.xml +%%DATADIR%%/addons/pvr.vdr.vnsi/resources/settings.xml +%%DATADIR%%/addons/pvr.vdr.vnsi/resources/skins/Confluence/720p/ChannelScan.xml %%DATADIR%%/addons/repository.xbmc.org/addon.xml %%DATADIR%%/addons/repository.xbmc.org/icon.png %%DATADIR%%/addons/screensaver.rsxs.euphoria/addon.xml @@ -148,6 +195,8 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Polish/strings.xml %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Portuguese/strings.xml %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Russian/strings.xml +%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Slovenian/strings.xml +%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Spanish/strings.xml %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Swedish/strings.xml %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/settings.xml %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/addon.xml @@ -162,35 +211,13 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Korean/strings.xml %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Polish/strings.xml %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Russian/strings.xml +%%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Slovenian/strings.xml +%%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Spanish/strings.xml %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Swedish/strings.xml %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/settings.xml -%%DATADIR%%/addons/script.recentlyadded/LICENSE.txt -%%DATADIR%%/addons/script.recentlyadded/RecentlyAdded.py -%%DATADIR%%/addons/script.recentlyadded/addon.xml -%%DATADIR%%/addons/script.recentlyadded/changelog.txt -%%DATADIR%%/addons/script.rss.editor/LICENSE.txt -%%DATADIR%%/addons/script.rss.editor/addon.xml -%%DATADIR%%/addons/script.rss.editor/default.py -%%DATADIR%%/addons/script.rss.editor/icon.png -%%DATADIR%%/addons/script.rss.editor/resources/__init__.py -%%DATADIR%%/addons/script.rss.editor/resources/language/English/strings.xml -%%DATADIR%%/addons/script.rss.editor/resources/language/Finnish/strings.xml -%%DATADIR%%/addons/script.rss.editor/resources/language/German/strings.xml -%%DATADIR%%/addons/script.rss.editor/resources/language/Hungarian/strings.xml -%%DATADIR%%/addons/script.rss.editor/resources/lib/__init__.py -%%DATADIR%%/addons/script.rss.editor/resources/lib/rssEditor.py -%%DATADIR%%/addons/script.rss.editor/resources/lib/setEditor.py -%%DATADIR%%/addons/script.rss.editor/resources/lib/xmlParser.py -%%DATADIR%%/addons/script.rss.editor/resources/skins/default/720p/script-RSS_Editor-rssEditor.xml -%%DATADIR%%/addons/script.rss.editor/resources/skins/default/720p/script-RSS_Editor-setEditor.xml -%%DATADIR%%/addons/script.rss.editor/resources/skins/default/PAL/script-RSS_Editor-rssEditor.xml -%%DATADIR%%/addons/script.rss.editor/resources/skins/default/PAL/script-RSS_Editor-setEditor.xml -%%DATADIR%%/addons/script.rss.editor/resources/skins/default/media/black.png -%%DATADIR%%/addons/script.rss.editor/resources/skins/default/media/dialog-panel2.png -%%DATADIR%%/addons/script.rss.editor/resources/skins/default/media/input-focus.png -%%DATADIR%%/addons/script.rss.editor/resources/skins/default/media/input-nofocus.png -%%DATADIR%%/addons/script.rss.editor/resources/skins/default/media/keyboard-btn-backspace-focus.png -%%DATADIR%%/addons/script.rss.editor/resources/skins/default/media/keyboard-btn-backspace.png +%%DATADIR%%/addons/script.module.pil/addon.xml +%%DATADIR%%/addons/script.module.pysqlite/addon.xml +%%DATADIR%%/addons/script.module.pysqlite/lib/pysqlite2/__init__.py %%DATADIR%%/addons/skin.confluence/720p/AddonBrowser.xml %%DATADIR%%/addons/skin.confluence/720p/DialogAddonInfo.xml %%DATADIR%%/addons/skin.confluence/720p/DialogAddonSettings.xml @@ -199,9 +226,9 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/720p/DialogButtonMenu.xml %%DATADIR%%/addons/skin.confluence/720p/DialogContentSettings.xml %%DATADIR%%/addons/skin.confluence/720p/DialogContextMenu.xml +%%DATADIR%%/addons/skin.confluence/720p/DialogExtendedProgressBar.xml %%DATADIR%%/addons/skin.confluence/720p/DialogFavourites.xml %%DATADIR%%/addons/skin.confluence/720p/DialogFileStacking.xml -%%DATADIR%%/addons/skin.confluence/720p/DialogFullScreenInfo.xml %%DATADIR%%/addons/skin.confluence/720p/DialogGamepad.xml %%DATADIR%%/addons/skin.confluence/720p/DialogKaiToast.xml %%DATADIR%%/addons/skin.confluence/720p/DialogKaraokeSongSelector.xml @@ -213,6 +240,16 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/720p/DialogNetworkSetup.xml %%DATADIR%%/addons/skin.confluence/720p/DialogNumeric.xml %%DATADIR%%/addons/skin.confluence/720p/DialogOK.xml +%%DATADIR%%/addons/skin.confluence/720p/DialogPVRChannelManager.xml +%%DATADIR%%/addons/skin.confluence/720p/DialogPVRChannelsOSD.xml +%%DATADIR%%/addons/skin.confluence/720p/DialogPVRGroupManager.xml +%%DATADIR%%/addons/skin.confluence/720p/DialogPVRGuideInfo.xml +%%DATADIR%%/addons/skin.confluence/720p/DialogPVRGuideOSD.xml +%%DATADIR%%/addons/skin.confluence/720p/DialogPVRGuideSearch.xml +%%DATADIR%%/addons/skin.confluence/720p/DialogPVRRecordingInfo.xml +%%DATADIR%%/addons/skin.confluence/720p/DialogPVRTimerSettings.xml +%%DATADIR%%/addons/skin.confluence/720p/DialogPeripheralManager.xml +%%DATADIR%%/addons/skin.confluence/720p/DialogPeripheralSettings.xml %%DATADIR%%/addons/skin.confluence/720p/DialogPictureInfo.xml %%DATADIR%%/addons/skin.confluence/720p/DialogProgress.xml %%DATADIR%%/addons/skin.confluence/720p/DialogSeekBar.xml @@ -228,7 +265,9 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/720p/FileManager.xml %%DATADIR%%/addons/skin.confluence/720p/Font.xml %%DATADIR%%/addons/skin.confluence/720p/Home.xml +%%DATADIR%%/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml %%DATADIR%%/addons/skin.confluence/720p/IncludesCodecFlagging.xml +%%DATADIR%%/addons/skin.confluence/720p/IncludesHomeMenuItems.xml %%DATADIR%%/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml %%DATADIR%%/addons/skin.confluence/720p/LockSettings.xml %%DATADIR%%/addons/skin.confluence/720p/LoginScreen.xml @@ -240,9 +279,9 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/720p/MyMusicPlaylist.xml %%DATADIR%%/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml %%DATADIR%%/addons/skin.confluence/720p/MyMusicSongs.xml +%%DATADIR%%/addons/skin.confluence/720p/MyPVR.xml %%DATADIR%%/addons/skin.confluence/720p/MyPics.xml %%DATADIR%%/addons/skin.confluence/720p/MyPrograms.xml -%%DATADIR%%/addons/skin.confluence/720p/MyVideo.xml %%DATADIR%%/addons/skin.confluence/720p/MyVideoNav.xml %%DATADIR%%/addons/skin.confluence/720p/MyVideoPlaylist.xml %%DATADIR%%/addons/skin.confluence/720p/MyWeather.xml @@ -267,35 +306,34 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/720p/ViewsFileMode.xml %%DATADIR%%/addons/skin.confluence/720p/ViewsLiveTV.xml %%DATADIR%%/addons/skin.confluence/720p/ViewsMusicLibrary.xml +%%DATADIR%%/addons/skin.confluence/720p/ViewsPVR.xml %%DATADIR%%/addons/skin.confluence/720p/ViewsPictures.xml %%DATADIR%%/addons/skin.confluence/720p/ViewsVideoLibrary.xml %%DATADIR%%/addons/skin.confluence/720p/VisualisationPresetList.xml -%%DATADIR%%/addons/skin.confluence/720p/custom_DiscDialog_1113.xml %%DATADIR%%/addons/skin.confluence/720p/custom_SkinSetting_1111.xml %%DATADIR%%/addons/skin.confluence/720p/defaults.xml %%DATADIR%%/addons/skin.confluence/720p/includes.xml -%%DATADIR%%/addons/skin.confluence/720p/script-Apple_Movie_Trailers-chooser.xml -%%DATADIR%%/addons/skin.confluence/720p/script-Apple_Movie_Trailers-context.xml -%%DATADIR%%/addons/skin.confluence/720p/script-Apple_Movie_Trailers-main.xml -%%DATADIR%%/addons/skin.confluence/720p/script-Apple_Movie_Trailers-search.xml -%%DATADIR%%/addons/skin.confluence/720p/script-Apple_Movie_Trailers-settings.xml -%%DATADIR%%/addons/skin.confluence/720p/script-Apple_Movie_Trailers-showtimes.xml %%DATADIR%%/addons/skin.confluence/720p/script-RSS_Editor-rssEditor.xml %%DATADIR%%/addons/skin.confluence/720p/script-RSS_Editor-setEditor.xml %%DATADIR%%/addons/skin.confluence/720p/script-XBMC_Lyrics-main.xml -%%DATADIR%%/addons/skin.confluence/720p/script-XBMC_Lyrics-settings.xml +%%DATADIR%%/addons/skin.confluence/720p/weather+/10DayForecast.xml +%%DATADIR%%/addons/skin.confluence/720p/weather+/36HourForecast.xml +%%DATADIR%%/addons/skin.confluence/720p/weather+/HourlyForecast.xml +%%DATADIR%%/addons/skin.confluence/720p/weather+/MapsVideo.xml +%%DATADIR%%/addons/skin.confluence/720p/weather+/WeekendForecast.xml %%DATADIR%%/addons/skin.confluence/addon.xml %%DATADIR%%/addons/skin.confluence/backgrounds/addons.jpg -%%DATADIR%%/addons/skin.confluence/backgrounds/amt.jpg %%DATADIR%%/addons/skin.confluence/backgrounds/appearance.jpg %%DATADIR%%/addons/skin.confluence/backgrounds/media-overlay.png %%DATADIR%%/addons/skin.confluence/backgrounds/music.jpg %%DATADIR%%/addons/skin.confluence/backgrounds/network.jpg %%DATADIR%%/addons/skin.confluence/backgrounds/pictures.jpg +%%DATADIR%%/addons/skin.confluence/backgrounds/playdisc.jpg %%DATADIR%%/addons/skin.confluence/backgrounds/programs.jpg %%DATADIR%%/addons/skin.confluence/backgrounds/settings.jpg %%DATADIR%%/addons/skin.confluence/backgrounds/skinsetting.jpg %%DATADIR%%/addons/skin.confluence/backgrounds/system.jpg +%%DATADIR%%/addons/skin.confluence/backgrounds/tv.jpg %%DATADIR%%/addons/skin.confluence/backgrounds/videos.jpg %%DATADIR%%/addons/skin.confluence/backgrounds/weather.jpg %%DATADIR%%/addons/skin.confluence/build.bat @@ -306,7 +344,9 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/fonts/DejaVuSans-Bold.ttf %%DATADIR%%/addons/skin.confluence/fonts/DejaVuSans.ttf %%DATADIR%%/addons/skin.confluence/icon.png +%%DATADIR%%/addons/skin.confluence/language/Afrikaans/strings.xml %%DATADIR%%/addons/skin.confluence/language/Bulgarian/strings.xml +%%DATADIR%%/addons/skin.confluence/language/Catalan/strings.xml %%DATADIR%%/addons/skin.confluence/language/Chinese (Simple)/strings.xml %%DATADIR%%/addons/skin.confluence/language/Chinese (Traditional)/strings.xml %%DATADIR%%/addons/skin.confluence/language/Czech/strings.xml @@ -320,6 +360,7 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/language/Hungarian/strings.xml %%DATADIR%%/addons/skin.confluence/language/Icelandic/strings.xml %%DATADIR%%/addons/skin.confluence/language/Italian/strings.xml +%%DATADIR%%/addons/skin.confluence/language/Japanese/strings.xml %%DATADIR%%/addons/skin.confluence/language/Korean/strings.xml %%DATADIR%%/addons/skin.confluence/language/Norwegian/strings.xml %%DATADIR%%/addons/skin.confluence/language/Polish/strings.xml @@ -329,32 +370,13 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/language/Russian/strings.xml %%DATADIR%%/addons/skin.confluence/language/Serbian (Cyrillic)/strings.xml %%DATADIR%%/addons/skin.confluence/language/Serbian/strings.xml +%%DATADIR%%/addons/skin.confluence/language/Slovak/strings.xml +%%DATADIR%%/addons/skin.confluence/language/Slovenian/strings.xml %%DATADIR%%/addons/skin.confluence/language/Spanish/strings.xml %%DATADIR%%/addons/skin.confluence/language/Swedish/strings.xml %%DATADIR%%/addons/skin.confluence/language/Turkish/strings.xml -%%DATADIR%%/addons/skin.confluence/media/Apple Movie Trailers/G.png -%%DATADIR%%/addons/skin.confluence/media/Apple Movie Trailers/NC-17.png -%%DATADIR%%/addons/skin.confluence/media/Apple Movie Trailers/NR.png -%%DATADIR%%/addons/skin.confluence/media/Apple Movie Trailers/PG-13.png -%%DATADIR%%/addons/skin.confluence/media/Apple Movie Trailers/PG.png -%%DATADIR%%/addons/skin.confluence/media/Apple Movie Trailers/R.png -%%DATADIR%%/addons/skin.confluence/media/AppleLogo.png %%DATADIR%%/addons/skin.confluence/media/ArrowDown.png %%DATADIR%%/addons/skin.confluence/media/ArrowUp.png -%%DATADIR%%/addons/skin.confluence/media/ButtonMenuExitFO.png -%%DATADIR%%/addons/skin.confluence/media/ButtonMenuExitNF.png -%%DATADIR%%/addons/skin.confluence/media/ButtonMenuLogOffFO.png -%%DATADIR%%/addons/skin.confluence/media/ButtonMenuLogOffNF.png -%%DATADIR%%/addons/skin.confluence/media/ButtonMenuMasterFO.png -%%DATADIR%%/addons/skin.confluence/media/ButtonMenuMasterNF.png -%%DATADIR%%/addons/skin.confluence/media/ButtonMenuNoMasterFO.png -%%DATADIR%%/addons/skin.confluence/media/ButtonMenuNoMasterNF.png -%%DATADIR%%/addons/skin.confluence/media/ButtonMenuRestartFO.png -%%DATADIR%%/addons/skin.confluence/media/ButtonMenuRestartNF.png -%%DATADIR%%/addons/skin.confluence/media/ButtonMenuShutdownFO.png -%%DATADIR%%/addons/skin.confluence/media/ButtonMenuShutdownNF.png -%%DATADIR%%/addons/skin.confluence/media/ButtonMenuSleepFO.png -%%DATADIR%%/addons/skin.confluence/media/ButtonMenuSleepNF.png %%DATADIR%%/addons/skin.confluence/media/CalibrateBottomRight.png %%DATADIR%%/addons/skin.confluence/media/CalibratePixelRatio.png %%DATADIR%%/addons/skin.confluence/media/CalibrateSubtitles.png @@ -367,8 +389,7 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/media/CenterRating/rating5.png %%DATADIR%%/addons/skin.confluence/media/Confluence_Logo.png %%DATADIR%%/addons/skin.confluence/media/ContentPanel.png -%%DATADIR%%/addons/skin.confluence/media/ContentPanel2.png -%%DATADIR%%/addons/skin.confluence/media/ContentPanel4.png +%%DATADIR%%/addons/skin.confluence/media/ContentPanelMirror.png %%DATADIR%%/addons/skin.confluence/media/DefaultActor.png %%DATADIR%%/addons/skin.confluence/media/DefaultAddSource.png %%DATADIR%%/addons/skin.confluence/media/DefaultAddon.png @@ -383,6 +404,7 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/media/DefaultAddonProgram.png %%DATADIR%%/addons/skin.confluence/media/DefaultAddonRepository.png %%DATADIR%%/addons/skin.confluence/media/DefaultAddonScreensaver.png +%%DATADIR%%/addons/skin.confluence/media/DefaultAddonService.png %%DATADIR%%/addons/skin.confluence/media/DefaultAddonSkin.png %%DATADIR%%/addons/skin.confluence/media/DefaultAddonSubtitles.png %%DATADIR%%/addons/skin.confluence/media/DefaultAddonTvInfo.png @@ -429,28 +451,29 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/media/DefaultVideoPlaylists.png %%DATADIR%%/addons/skin.confluence/media/DefaultVideoPlugins.png %%DATADIR%%/addons/skin.confluence/media/DialogBack.png +%%DATADIR%%/addons/skin.confluence/media/DialogBack2.png %%DATADIR%%/addons/skin.confluence/media/DialogCloseButton-focus.png %%DATADIR%%/addons/skin.confluence/media/DialogCloseButton.png %%DATADIR%%/addons/skin.confluence/media/DialogContextBottom.png %%DATADIR%%/addons/skin.confluence/media/DialogContextMiddle.png %%DATADIR%%/addons/skin.confluence/media/DialogContextTop.png -%%DATADIR%%/addons/skin.confluence/media/Fanart_Diffuse.png %%DATADIR%%/addons/skin.confluence/media/Fanart_Fallback_Music_Small.jpg %%DATADIR%%/addons/skin.confluence/media/Fanart_Fallback_Small.jpg %%DATADIR%%/addons/skin.confluence/media/GlassOverlay.png %%DATADIR%%/addons/skin.confluence/media/GlassTitleBar.png -%%DATADIR%%/addons/skin.confluence/media/HomeBlade.png +%%DATADIR%%/addons/skin.confluence/media/GoFullscreen.png +%%DATADIR%%/addons/skin.confluence/media/HasSub.png +%%DATADIR%%/addons/skin.confluence/media/HomeBack.png %%DATADIR%%/addons/skin.confluence/media/HomeBladeSub.png -%%DATADIR%%/addons/skin.confluence/media/HomeBladeSub_Part1.png -%%DATADIR%%/addons/skin.confluence/media/HomeBladeSub_Part2.png -%%DATADIR%%/addons/skin.confluence/media/HomeBlade_bottom.png -%%DATADIR%%/addons/skin.confluence/media/HomeBlade_middle.png -%%DATADIR%%/addons/skin.confluence/media/HomeBlade_top.png %%DATADIR%%/addons/skin.confluence/media/HomeButtonsBack.png -%%DATADIR%%/addons/skin.confluence/media/HomeHasSub.png %%DATADIR%%/addons/skin.confluence/media/HomeIcon-Focus.png %%DATADIR%%/addons/skin.confluence/media/HomeIcon.png %%DATADIR%%/addons/skin.confluence/media/HomeNowPlayingBack.png +%%DATADIR%%/addons/skin.confluence/media/HomeOverlay1.png +%%DATADIR%%/addons/skin.confluence/media/HomeSeperator.png +%%DATADIR%%/addons/skin.confluence/media/HomeSubEnd.png +%%DATADIR%%/addons/skin.confluence/media/HomeSubFO.png +%%DATADIR%%/addons/skin.confluence/media/HomeSubNF.png %%DATADIR%%/addons/skin.confluence/media/InfoMessagePanel.png %%DATADIR%%/addons/skin.confluence/media/KeyboardCornerBottom.png %%DATADIR%%/addons/skin.confluence/media/KeyboardCornerBottomNF.png @@ -466,16 +489,12 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/media/LeftRating/rating4.png %%DATADIR%%/addons/skin.confluence/media/LeftRating/rating5.png %%DATADIR%%/addons/skin.confluence/media/Makefile +%%DATADIR%%/addons/skin.confluence/media/Makefile.in %%DATADIR%%/addons/skin.confluence/media/MediaBladeSub.png -%%DATADIR%%/addons/skin.confluence/media/MediaBladeSub_Part1.png -%%DATADIR%%/addons/skin.confluence/media/MediaBladeSub_Part2.png -%%DATADIR%%/addons/skin.confluence/media/MediaInfoBackLower.png -%%DATADIR%%/addons/skin.confluence/media/MediaInfoBackUpper.png %%DATADIR%%/addons/skin.confluence/media/MediaItemDetailBG.png -%%DATADIR%%/addons/skin.confluence/media/MediaSubSet.png -%%DATADIR%%/addons/skin.confluence/media/MediaSubSetNF.png %%DATADIR%%/addons/skin.confluence/media/MenuItemFO.png %%DATADIR%%/addons/skin.confluence/media/MenuItemNF.png +%%DATADIR%%/addons/skin.confluence/media/NowPlayingIcon.png %%DATADIR%%/addons/skin.confluence/media/OSD16x.png %%DATADIR%%/addons/skin.confluence/media/OSD2x.png %%DATADIR%%/addons/skin.confluence/media/OSD32x.png @@ -485,6 +504,12 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/media/OSDAudioNF.png %%DATADIR%%/addons/skin.confluence/media/OSDBookmarksFO.png %%DATADIR%%/addons/skin.confluence/media/OSDBookmarksNF.png +%%DATADIR%%/addons/skin.confluence/media/OSDChannelDownFO.png +%%DATADIR%%/addons/skin.confluence/media/OSDChannelDownNF.png +%%DATADIR%%/addons/skin.confluence/media/OSDChannelListFO.png +%%DATADIR%%/addons/skin.confluence/media/OSDChannelListNF.png +%%DATADIR%%/addons/skin.confluence/media/OSDChannelUPFO.png +%%DATADIR%%/addons/skin.confluence/media/OSDChannelUPNF.png %%DATADIR%%/addons/skin.confluence/media/OSDDvdFO.png %%DATADIR%%/addons/skin.confluence/media/OSDDvdNF.png %%DATADIR%%/addons/skin.confluence/media/OSDForwardFO.png @@ -509,14 +534,15 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/media/OSDPrevTrackNF.png %%DATADIR%%/addons/skin.confluence/media/OSDProgressBack.png %%DATADIR%%/addons/skin.confluence/media/OSDProgressMid.png +%%DATADIR%%/addons/skin.confluence/media/OSDProgressMidLight.png %%DATADIR%%/addons/skin.confluence/media/OSDRandomOffFO.png %%DATADIR%%/addons/skin.confluence/media/OSDRandomOffNF.png %%DATADIR%%/addons/skin.confluence/media/OSDRandomOnFO.png %%DATADIR%%/addons/skin.confluence/media/OSDRandomOnNF.png -%%DATADIR%%/addons/skin.confluence/media/OSDRecord2.png -%%DATADIR%%/addons/skin.confluence/media/OSDRecordFO.png -%%DATADIR%%/addons/skin.confluence/media/OSDRecordNF.png -%%DATADIR%%/addons/skin.confluence/media/OSDRecordOff.png +%%DATADIR%%/addons/skin.confluence/media/OSDRecordOffFO.png +%%DATADIR%%/addons/skin.confluence/media/OSDRecordOffNF.png +%%DATADIR%%/addons/skin.confluence/media/OSDRecordOnFO.png +%%DATADIR%%/addons/skin.confluence/media/OSDRecordOnNF.png %%DATADIR%%/addons/skin.confluence/media/OSDRepeatAllFO.png %%DATADIR%%/addons/skin.confluence/media/OSDRepeatAllNF.png %%DATADIR%%/addons/skin.confluence/media/OSDRepeatFO.png @@ -532,19 +558,22 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/media/OSDStopNF.png %%DATADIR%%/addons/skin.confluence/media/OSDSubtitlesFO.png %%DATADIR%%/addons/skin.confluence/media/OSDSubtitlesNF.png +%%DATADIR%%/addons/skin.confluence/media/OSDTeleTextFO.png +%%DATADIR%%/addons/skin.confluence/media/OSDTeleTextNF.png %%DATADIR%%/addons/skin.confluence/media/OSDVideoFO.png %%DATADIR%%/addons/skin.confluence/media/OSDVideoNF.png %%DATADIR%%/addons/skin.confluence/media/OSDVizFO.png %%DATADIR%%/addons/skin.confluence/media/OSDVizNF.png +%%DATADIR%%/addons/skin.confluence/media/OSDepgFO.png +%%DATADIR%%/addons/skin.confluence/media/OSDepgNF.png %%DATADIR%%/addons/skin.confluence/media/OverlayDialogBackground.png %%DATADIR%%/addons/skin.confluence/media/OverlayHD.png %%DATADIR%%/addons/skin.confluence/media/OverlayLocked.png %%DATADIR%%/addons/skin.confluence/media/OverlayRAR.png %%DATADIR%%/addons/skin.confluence/media/OverlayWatched.png -%%DATADIR%%/addons/skin.confluence/media/RecentAddedFO.png -%%DATADIR%%/addons/skin.confluence/media/RecentAddedNF.png -%%DATADIR%%/addons/skin.confluence/media/Rss_Back.png -%%DATADIR%%/addons/skin.confluence/media/Rss_Back_Overlay.png +%%DATADIR%%/addons/skin.confluence/media/PVR-HasTimer.png +%%DATADIR%%/addons/skin.confluence/media/PVR-IsRecording.png +%%DATADIR%%/addons/skin.confluence/media/RecentAddedBack.png %%DATADIR%%/addons/skin.confluence/media/ScrollBarH.png %%DATADIR%%/addons/skin.confluence/media/ScrollBarH_bar.png %%DATADIR%%/addons/skin.confluence/media/ScrollBarH_bar_focus.png @@ -552,36 +581,44 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/media/ScrollBarV.png %%DATADIR%%/addons/skin.confluence/media/ScrollBarV_bar.png %%DATADIR%%/addons/skin.confluence/media/ScrollBarV_bar_focus.png +%%DATADIR%%/addons/skin.confluence/media/ShutdownButtonFocus.png +%%DATADIR%%/addons/skin.confluence/media/ShutdownButtonNoFocus.png +%%DATADIR%%/addons/skin.confluence/media/SideFade.png %%DATADIR%%/addons/skin.confluence/media/StackFO.png %%DATADIR%%/addons/skin.confluence/media/StackNF.png %%DATADIR%%/addons/skin.confluence/media/Textures.xbt %%DATADIR%%/addons/skin.confluence/media/ThumbBG.png %%DATADIR%%/addons/skin.confluence/media/ThumbBorder.png %%DATADIR%%/addons/skin.confluence/media/ThumbShadow.png -%%DATADIR%%/addons/skin.confluence/media/VisOsdPanel.png %%DATADIR%%/addons/skin.confluence/media/VolumeIcon-Mute.png %%DATADIR%%/addons/skin.confluence/media/VolumeIcon.png -%%DATADIR%%/addons/skin.confluence/media/XBMC_Logo.png -%%DATADIR%%/addons/skin.confluence/media/amt-blank-poster.png -%%DATADIR%%/addons/skin.confluence/media/amt-generic-actor.png -%%DATADIR%%/addons/skin.confluence/media/amt-generic-genre-i.png -%%DATADIR%%/addons/skin.confluence/media/amt-generic-genre.png -%%DATADIR%%/addons/skin.confluence/media/amt-generic-noactor.png -%%DATADIR%%/addons/skin.confluence/media/amt-generic-studio.png -%%DATADIR%%/addons/skin.confluence/media/amt-generic-trailer-w.png -%%DATADIR%%/addons/skin.confluence/media/amt-generic-trailer.png -%%DATADIR%%/addons/skin.confluence/media/amt-overlay-favorite.png -%%DATADIR%%/addons/skin.confluence/media/amt-overlay-saved.png -%%DATADIR%%/addons/skin.confluence/media/amt-overlay-watched.png %%DATADIR%%/addons/skin.confluence/media/black-back.png %%DATADIR%%/addons/skin.confluence/media/black-back2.png %%DATADIR%%/addons/skin.confluence/media/busy.png %%DATADIR%%/addons/skin.confluence/media/button-focus.png +%%DATADIR%%/addons/skin.confluence/media/button-focus2.png %%DATADIR%%/addons/skin.confluence/media/button-nofocus.png %%DATADIR%%/addons/skin.confluence/media/defaultDVDFull.png -%%DATADIR%%/addons/skin.confluence/media/diffuse_mirror.png +%%DATADIR%%/addons/skin.confluence/media/dialogheader.png %%DATADIR%%/addons/skin.confluence/media/diffuse_mirror2.png %%DATADIR%%/addons/skin.confluence/media/diffuse_mirror3.png +%%DATADIR%%/addons/skin.confluence/media/epg-genres/0.png +%%DATADIR%%/addons/skin.confluence/media/epg-genres/112.png +%%DATADIR%%/addons/skin.confluence/media/epg-genres/128.png +%%DATADIR%%/addons/skin.confluence/media/epg-genres/144.png +%%DATADIR%%/addons/skin.confluence/media/epg-genres/16.png +%%DATADIR%%/addons/skin.confluence/media/epg-genres/160.png +%%DATADIR%%/addons/skin.confluence/media/epg-genres/176.png +%%DATADIR%%/addons/skin.confluence/media/epg-genres/192.png +%%DATADIR%%/addons/skin.confluence/media/epg-genres/208.png +%%DATADIR%%/addons/skin.confluence/media/epg-genres/224.png +%%DATADIR%%/addons/skin.confluence/media/epg-genres/240.png +%%DATADIR%%/addons/skin.confluence/media/epg-genres/32.png +%%DATADIR%%/addons/skin.confluence/media/epg-genres/48.png +%%DATADIR%%/addons/skin.confluence/media/epg-genres/64.png +%%DATADIR%%/addons/skin.confluence/media/epg-genres/80.png +%%DATADIR%%/addons/skin.confluence/media/epg-genres/96.png +%%DATADIR%%/addons/skin.confluence/media/epg-genres/genre-numbers.txt %%DATADIR%%/addons/skin.confluence/media/flagging/aspectratio/1.33.png %%DATADIR%%/addons/skin.confluence/media/flagging/aspectratio/1.66.png %%DATADIR%%/addons/skin.confluence/media/flagging/aspectratio/1.78.png @@ -590,31 +627,46 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/media/flagging/aspectratio/2.35.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/0.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/1.png +%%DATADIR%%/addons/skin.confluence/media/flagging/audio/10.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/2.png +%%DATADIR%%/addons/skin.confluence/media/flagging/audio/3.png +%%DATADIR%%/addons/skin.confluence/media/flagging/audio/4.png +%%DATADIR%%/addons/skin.confluence/media/flagging/audio/5.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/6.png +%%DATADIR%%/addons/skin.confluence/media/flagging/audio/7.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/8.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/aac.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/ac3.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/aif.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/aifc.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/aiff.png +%%DATADIR%%/addons/skin.confluence/media/flagging/audio/alac.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/ape.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/avc.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/cdda.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/dca.png -%%DATADIR%%/addons/skin.confluence/media/flagging/audio/dolbydigital.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/dts.png +%%DATADIR%%/addons/skin.confluence/media/flagging/audio/dtshd_hra.png +%%DATADIR%%/addons/skin.confluence/media/flagging/audio/dtshd_ma.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/eac3.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/flac.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/mp1.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/mp2.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/mp3.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/ogg.png +%%DATADIR%%/addons/skin.confluence/media/flagging/audio/pcm_bluray.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/truehd.png +%%DATADIR%%/addons/skin.confluence/media/flagging/audio/wav.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/wavpack.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/wma.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/wmapro.png %%DATADIR%%/addons/skin.confluence/media/flagging/audio/wmav2.png +%%DATADIR%%/addons/skin.confluence/media/flagging/blank.png +%%DATADIR%%/addons/skin.confluence/media/flagging/lists/1080.png +%%DATADIR%%/addons/skin.confluence/media/flagging/lists/480.png +%%DATADIR%%/addons/skin.confluence/media/flagging/lists/540.png +%%DATADIR%%/addons/skin.confluence/media/flagging/lists/576.png +%%DATADIR%%/addons/skin.confluence/media/flagging/lists/720.png %%DATADIR%%/addons/skin.confluence/media/flagging/ratings/mpaa_general.png %%DATADIR%%/addons/skin.confluence/media/flagging/ratings/mpaa_nc17.png %%DATADIR%%/addons/skin.confluence/media/flagging/ratings/mpaa_notrated.png @@ -635,22 +687,26 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/media/flagging/video/hddvd.png %%DATADIR%%/addons/skin.confluence/media/flagging/video/mpeg1video.png %%DATADIR%%/addons/skin.confluence/media/flagging/video/mpeg2video.png -%%DATADIR%%/addons/skin.confluence/media/flagging/video/sd.png %%DATADIR%%/addons/skin.confluence/media/flagging/video/tv.png %%DATADIR%%/addons/skin.confluence/media/flagging/video/vc-1.png %%DATADIR%%/addons/skin.confluence/media/flagging/video/vhs.png +%%DATADIR%%/addons/skin.confluence/media/flagging/video/vp8.png %%DATADIR%%/addons/skin.confluence/media/flagging/video/wvc1.png %%DATADIR%%/addons/skin.confluence/media/flagging/video/xvid.png %%DATADIR%%/addons/skin.confluence/media/floor.png %%DATADIR%%/addons/skin.confluence/media/folder-focus.png +%%DATADIR%%/addons/skin.confluence/media/gradient.png %%DATADIR%%/addons/skin.confluence/media/header.png %%DATADIR%%/addons/skin.confluence/media/home-favourites-FO.png %%DATADIR%%/addons/skin.confluence/media/home-favourites.png -%%DATADIR%%/addons/skin.confluence/media/home-playmedia-FO.png -%%DATADIR%%/addons/skin.confluence/media/home-playmedia.png %%DATADIR%%/addons/skin.confluence/media/home-power-FO.png +%%DATADIR%%/addons/skin.confluence/media/home-power-inhibit-FO.png +%%DATADIR%%/addons/skin.confluence/media/home-power-inhibit.png %%DATADIR%%/addons/skin.confluence/media/home-power.png %%DATADIR%%/addons/skin.confluence/media/icon-mute.png +%%DATADIR%%/addons/skin.confluence/media/icon-rss.png +%%DATADIR%%/addons/skin.confluence/media/icon-video.png +%%DATADIR%%/addons/skin.confluence/media/icon-weather.png %%DATADIR%%/addons/skin.confluence/media/lastfm-hate-focus.png %%DATADIR%%/addons/skin.confluence/media/lastfm-hate-nofocus.png %%DATADIR%%/addons/skin.confluence/media/lastfm-love-focus.png @@ -678,11 +734,12 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/media/scroll-up-focus.png %%DATADIR%%/addons/skin.confluence/media/scroll-up.png %%DATADIR%%/addons/skin.confluence/media/seekslider.png +%%DATADIR%%/addons/skin.confluence/media/seekslider2.png %%DATADIR%%/addons/skin.confluence/media/separator.png %%DATADIR%%/addons/skin.confluence/media/separator2.png %%DATADIR%%/addons/skin.confluence/media/separator_vertical.png -%%DATADIR%%/addons/skin.confluence/media/twc-logo.png %%DATADIR%%/addons/skin.confluence/media/unknown-user.png +%%DATADIR%%/addons/skin.confluence/media/xbmc-logo.png %%DATADIR%%/addons/skin.confluence/sounds/back.wav %%DATADIR%%/addons/skin.confluence/sounds/click.wav %%DATADIR%%/addons/skin.confluence/sounds/cursor.wav @@ -704,6 +761,8 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Polish/strings.xml %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Portuguese/strings.xml %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Romanian/strings.xml +%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Slovenian/strings.xml +%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Spanish/strings.xml %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Swedish/strings.xml %%DATADIR%%/addons/visualization.dxspectrum/resources/settings.xml %%DATADIR%%/addons/visualization.glspectrum/addon.xml @@ -719,6 +778,8 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/visualization.glspectrum/resources/language/Korean/strings.xml %%DATADIR%%/addons/visualization.glspectrum/resources/language/Polish/strings.xml %%DATADIR%%/addons/visualization.glspectrum/resources/language/Russian/strings.xml +%%DATADIR%%/addons/visualization.glspectrum/resources/language/Slovenian/strings.xml +%%DATADIR%%/addons/visualization.glspectrum/resources/language/Spanish/strings.xml %%DATADIR%%/addons/visualization.glspectrum/resources/language/Swedish/strings.xml %%DATADIR%%/addons/visualization.glspectrum/resources/settings.xml %%DATADIR%%/addons/visualization.itunes/addon.xml @@ -739,7 +800,10 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/visualization.milkdrop/resources/language/Portuguese/strings.xml %%DATADIR%%/addons/visualization.milkdrop/resources/language/Romanian/strings.xml %%DATADIR%%/addons/visualization.milkdrop/resources/language/Russian/strings.xml +%%DATADIR%%/addons/visualization.milkdrop/resources/language/Slovenian/strings.xml +%%DATADIR%%/addons/visualization.milkdrop/resources/language/Spanish/strings.xml %%DATADIR%%/addons/visualization.milkdrop/resources/language/Swedish/strings.xml +%%DATADIR%%/addons/visualization.milkdrop/resources/settings.xml %%DATADIR%%/addons/visualization.projectm/addon.xml %%DATADIR%%/addons/visualization.projectm/icon.png %%DATADIR%%/addons/visualization.projectm/resources/language/Bulgarian/strings.xml @@ -754,12 +818,22 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/visualization.projectm/resources/language/Polish/strings.xml %%DATADIR%%/addons/visualization.projectm/resources/language/Portuguese/strings.xml %%DATADIR%%/addons/visualization.projectm/resources/language/Russian/strings.xml +%%DATADIR%%/addons/visualization.projectm/resources/language/Slovenian/strings.xml +%%DATADIR%%/addons/visualization.projectm/resources/language/Spanish/strings.xml %%DATADIR%%/addons/visualization.projectm/resources/language/Swedish/strings.xml %%DATADIR%%/addons/visualization.projectm/resources/presets.zip +%%DATADIR%%/addons/visualization.projectm/resources/settings.xml %%DATADIR%%/addons/visualization.waveform/addon.xml %%DATADIR%%/addons/visualization.waveform/icon.png -%%DATADIR%%/addons/weather.xbmc.builtin/addon.xml -%%DATADIR%%/addons/weather.xbmc.builtin/icon.png +%%DATADIR%%/addons/weather.wunderground/LICENSE.txt +%%DATADIR%%/addons/weather.wunderground/addon.xml +%%DATADIR%%/addons/weather.wunderground/changelog.txt +%%DATADIR%%/addons/weather.wunderground/default.py +%%DATADIR%%/addons/weather.wunderground/icon.png +%%DATADIR%%/addons/weather.wunderground/resources/language/English/strings.xml +%%DATADIR%%/addons/weather.wunderground/resources/language/German/strings.xml +%%DATADIR%%/addons/weather.wunderground/resources/lib/utilities.py +%%DATADIR%%/addons/weather.wunderground/resources/settings.xml %%DATADIR%%/addons/webinterface.default/addon.xml %%DATADIR%%/addons/webinterface.default/css/core.css %%DATADIR%%/addons/webinterface.default/css/ipad.css @@ -769,14 +843,15 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/webinterface.default/images/DefaultVideo.png %%DATADIR%%/addons/webinterface.default/images/ajax-loader.gif %%DATADIR%%/addons/webinterface.default/images/close-button.png +%%DATADIR%%/addons/webinterface.default/images/remote.jpg %%DATADIR%%/addons/webinterface.default/index.html %%DATADIR%%/addons/webinterface.default/js/Core.js %%DATADIR%%/addons/webinterface.default/js/Launcher.js %%DATADIR%%/addons/webinterface.default/js/MediaLibrary.js %%DATADIR%%/addons/webinterface.default/js/NowPlayingManager.js %%DATADIR%%/addons/webinterface.default/js/iscroll-min.js -%%DATADIR%%/addons/webinterface.default/js/jquery-1.4.2.js -%%DATADIR%%/addons/webinterface.default/js/jquery-1.4.2.min.js +%%DATADIR%%/addons/webinterface.default/js/jquery-1.5.2.js +%%DATADIR%%/addons/webinterface.default/js/jquery-1.5.2.min.js %%DATADIR%%/addons/webinterface.default/js/jquery.lazyload.js %%DATADIR%%/addons/xbmc.addon/addon.xml %%DATADIR%%/addons/xbmc.addon/metadata.xsd @@ -784,11 +859,18 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/xbmc.core/addon.xml %%DATADIR%%/addons/xbmc.gui/addon.xml %%DATADIR%%/addons/xbmc.gui/skin.xsd +%%DATADIR%%/addons/xbmc.json/addon.xml %%DATADIR%%/addons/xbmc.metadata/addon.xml %%DATADIR%%/addons/xbmc.metadata/scraper.xsd %%DATADIR%%/addons/xbmc.python/addon.xml %%DATADIR%%/addons/xbmc.python/pluginsource.xsd %%DATADIR%%/addons/xbmc.python/script.xsd +%%DATADIR%%/language/Afrikaans/langinfo.xml +%%DATADIR%%/language/Afrikaans/strings.xml +%%DATADIR%%/language/Basque/langinfo.xml +%%DATADIR%%/language/Basque/strings.xml +%%DATADIR%%/language/Bosnian/langinfo.xml +%%DATADIR%%/language/Bosnian/strings.xml %%DATADIR%%/language/Bulgarian/langinfo.xml %%DATADIR%%/language/Bulgarian/strings.xml %%DATADIR%%/language/Catalan/langinfo.xml @@ -822,6 +904,8 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/language/Greek/strings.xml %%DATADIR%%/language/Hebrew/langinfo.xml %%DATADIR%%/language/Hebrew/strings.xml +%%DATADIR%%/language/Hindi (Devanagiri)/langinfo.xml +%%DATADIR%%/language/Hindi (Devanagiri)/strings.xml %%DATADIR%%/language/Hungarian/langinfo.xml %%DATADIR%%/language/Hungarian/strings.xml %%DATADIR%%/language/Icelandic/langinfo.xml @@ -882,6 +966,7 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/system/X10-Lola-IRSSmap.xml %%DATADIR%%/system/asound.conf %%DATADIR%%/system/colors.xml +%%DATADIR%%/system/keymaps/appcommand.xml %%DATADIR%%/system/keymaps/gamepad.xml %%DATADIR%%/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml %%DATADIR%%/system/keymaps/joystick.AppleRemote.xml @@ -894,7 +979,10 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml %%DATADIR%%/system/keymaps/joystick.WiiRemote.xml %%DATADIR%%/system/keymaps/keyboard.xml +%%DATADIR%%/system/keymaps/mouse.xml +%%DATADIR%%/system/keymaps/nyxboard/keyboard.xml %%DATADIR%%/system/keymaps/remote.xml +%%DATADIR%%/system/peripherals.xml %%DATADIR%%/system/playercorefactory.xml %%DATADIR%%/system/players/dvdplayer/etc/fonts/conf.avail/10-autohint.conf %%DATADIR%%/system/players/dvdplayer/etc/fonts/conf.avail/10-no-sub-pixel.conf @@ -939,28 +1027,20 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/system/players/dvdplayer/etc/fonts/fonts.conf %%DATADIR%%/system/players/dvdplayer/etc/fonts/fonts.dtd %%DATADIR%%/system/python/readme.txt -%%DATADIR%%/system/scrapers/video/AdultFilmdatabase.gif -%%DATADIR%%/system/scrapers/video/Excalibur.jpg -%%DATADIR%%/system/scrapers/video/Excalibur.xml -%%DATADIR%%/system/scrapers/video/adultcdmovies.jpg -%%DATADIR%%/system/scrapers/video/adultcdmovies.xml -%%DATADIR%%/system/scrapers/video/adultdvdempire.jpg -%%DATADIR%%/system/scrapers/video/adultdvdempire.xml -%%DATADIR%%/system/scrapers/video/adultfilmdatabase.xml -%%DATADIR%%/system/scrapers/video/jaded.jpg -%%DATADIR%%/system/scrapers/video/jadedVideo.xml -%%DATADIR%%/system/scrapers/video/tlaraw.png -%%DATADIR%%/system/scrapers/video/tlaraw.xml %%DATADIR%%/system/shaders/convolution-4x4.glsl %%DATADIR%%/system/shaders/convolution-4x4_d3d.fx %%DATADIR%%/system/shaders/convolution-6x6.glsl %%DATADIR%%/system/shaders/convolution-6x6_d3d.fx -%%DATADIR%%/system/shaders/guishader_frag.glsl -%%DATADIR%%/system/shaders/guishader_frag0.glsl -%%DATADIR%%/system/shaders/guishader_frag1.glsl -%%DATADIR%%/system/shaders/guishader_frag2.glsl -%%DATADIR%%/system/shaders/guishader_frag3.glsl -%%DATADIR%%/system/shaders/guishader_frag4.glsl +%%DATADIR%%/system/shaders/convolutionsep-4x4_d3d.fx +%%DATADIR%%/system/shaders/convolutionsep-6x6_d3d.fx +%%DATADIR%%/system/shaders/guishader_frag_default.glsl +%%DATADIR%%/system/shaders/guishader_frag_fonts.glsl +%%DATADIR%%/system/shaders/guishader_frag_multi.glsl +%%DATADIR%%/system/shaders/guishader_frag_multi_blendcolor.glsl +%%DATADIR%%/system/shaders/guishader_frag_rgba.glsl +%%DATADIR%%/system/shaders/guishader_frag_rgba_blendcolor.glsl +%%DATADIR%%/system/shaders/guishader_frag_texture.glsl +%%DATADIR%%/system/shaders/guishader_frag_texture_noblend.glsl %%DATADIR%%/system/shaders/guishader_vert.glsl %%DATADIR%%/system/shaders/stretch.glsl %%DATADIR%%/system/shaders/testshader.fx @@ -985,12 +1065,36 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/userdata/RssFeeds.xml share/xsessions/XBMC.desktop @dirrmtry share/xsessions +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor/256x256/apps +@dirrmtry share/icons/hicolor/256x256 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons +@dirrm lib/xbmc/system/players/paplayer +@dirrm lib/xbmc/system/players/dvdplayer +@dirrm lib/xbmc/system/players +@dirrm lib/xbmc/system +@dirrm lib/xbmc/addons/visualization.waveform +@dirrm lib/xbmc/addons/visualization.projectm +@dirrm lib/xbmc/addons/visualization.glspectrum +@dirrm lib/xbmc/addons/screensaver.rsxs.solarwinds +@dirrm lib/xbmc/addons/screensaver.rsxs.plasma +@dirrm lib/xbmc/addons/screensaver.rsxs.euphoria +@dirrm lib/xbmc/addons/pvr.vdr.vnsi +@dirrm lib/xbmc/addons/pvr.team-mediaportal.tvserver +@dirrm lib/xbmc/addons/pvr.mythtv +@dirrm lib/xbmc/addons/pvr.hts +@dirrm lib/xbmc/addons/library.xbmc.pvr +@dirrm lib/xbmc/addons/library.xbmc.gui +@dirrm lib/xbmc/addons/library.xbmc.addon +@dirrm lib/xbmc/addons +@dirrm lib/xbmc +@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/userdata/PictureIcon/Picon @dirrm %%DATADIR%%/userdata/PictureIcon @dirrm %%DATADIR%%/userdata @dirrm %%DATADIR%%/system/shaders -@dirrm %%DATADIR%%/system/scrapers/video -@dirrm %%DATADIR%%/system/scrapers @dirrm %%DATADIR%%/system/python @dirrm %%DATADIR%%/system/players/dvdplayer/etc/fonts/conf.d @dirrm %%DATADIR%%/system/players/dvdplayer/etc/fonts/conf.avail @@ -998,6 +1102,7 @@ share/xsessions/XBMC.desktop @dirrm %%DATADIR%%/system/players/dvdplayer/etc @dirrm %%DATADIR%%/system/players/dvdplayer @dirrm %%DATADIR%%/system/players +@dirrm %%DATADIR%%/system/keymaps/nyxboard @dirrm %%DATADIR%%/system/keymaps @dirrm %%DATADIR%%/system @dirrm %%DATADIR%%/sounds/Bursting Bubbles @@ -1027,6 +1132,7 @@ share/xsessions/XBMC.desktop @dirrm %%DATADIR%%/language/Indonesian @dirrm %%DATADIR%%/language/Icelandic @dirrm %%DATADIR%%/language/Hungarian +@dirrm %%DATADIR%%/language/Hindi (Devanagiri) @dirrm %%DATADIR%%/language/Hebrew @dirrm %%DATADIR%%/language/Greek @dirrm %%DATADIR%%/language/German @@ -1043,9 +1149,13 @@ share/xsessions/XBMC.desktop @dirrm %%DATADIR%%/language/Chinese (Simple) @dirrm %%DATADIR%%/language/Catalan @dirrm %%DATADIR%%/language/Bulgarian +@dirrm %%DATADIR%%/language/Bosnian +@dirrm %%DATADIR%%/language/Basque +@dirrm %%DATADIR%%/language/Afrikaans @dirrm %%DATADIR%%/language @dirrm %%DATADIR%%/addons/xbmc.python @dirrm %%DATADIR%%/addons/xbmc.metadata +@dirrm %%DATADIR%%/addons/xbmc.json @dirrm %%DATADIR%%/addons/xbmc.gui @dirrm %%DATADIR%%/addons/xbmc.core @dirrm %%DATADIR%%/addons/xbmc.addon @@ -1053,9 +1163,16 @@ share/xsessions/XBMC.desktop @dirrm %%DATADIR%%/addons/webinterface.default/images @dirrm %%DATADIR%%/addons/webinterface.default/css @dirrm %%DATADIR%%/addons/webinterface.default -@dirrm %%DATADIR%%/addons/weather.xbmc.builtin +@dirrm %%DATADIR%%/addons/weather.wunderground/resources/lib +@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/German +@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/English +@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language +@dirrm %%DATADIR%%/addons/weather.wunderground/resources +@dirrm %%DATADIR%%/addons/weather.wunderground @dirrm %%DATADIR%%/addons/visualization.waveform @dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Swedish +@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Spanish +@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Slovenian @dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Russian @dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Portuguese @dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Polish @@ -1072,6 +1189,8 @@ share/xsessions/XBMC.desktop @dirrm %%DATADIR%%/addons/visualization.projectm/resources @dirrm %%DATADIR%%/addons/visualization.projectm @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Swedish +@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Spanish +@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Slovenian @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Russian @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Romanian @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Portuguese @@ -1091,6 +1210,8 @@ share/xsessions/XBMC.desktop @dirrm %%DATADIR%%/addons/visualization.milkdrop @dirrm %%DATADIR%%/addons/visualization.itunes @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Swedish +@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Spanish +@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Slovenian @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Russian @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Polish @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Korean @@ -1106,6 +1227,8 @@ share/xsessions/XBMC.desktop @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources @dirrm %%DATADIR%%/addons/visualization.glspectrum @dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Swedish +@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Spanish +@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Slovenian @dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Romanian @dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Portuguese @dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Polish @@ -1124,16 +1247,19 @@ share/xsessions/XBMC.desktop @dirrm %%DATADIR%%/addons/skin.confluence/sounds @dirrm %%DATADIR%%/addons/skin.confluence/media/flagging/video @dirrm %%DATADIR%%/addons/skin.confluence/media/flagging/ratings +@dirrm %%DATADIR%%/addons/skin.confluence/media/flagging/lists @dirrm %%DATADIR%%/addons/skin.confluence/media/flagging/audio @dirrm %%DATADIR%%/addons/skin.confluence/media/flagging/aspectratio @dirrm %%DATADIR%%/addons/skin.confluence/media/flagging +@dirrm %%DATADIR%%/addons/skin.confluence/media/epg-genres @dirrm %%DATADIR%%/addons/skin.confluence/media/LeftRating @dirrm %%DATADIR%%/addons/skin.confluence/media/CenterRating -@dirrm %%DATADIR%%/addons/skin.confluence/media/Apple Movie Trailers @dirrm %%DATADIR%%/addons/skin.confluence/media @dirrm %%DATADIR%%/addons/skin.confluence/language/Turkish @dirrm %%DATADIR%%/addons/skin.confluence/language/Swedish @dirrm %%DATADIR%%/addons/skin.confluence/language/Spanish +@dirrm %%DATADIR%%/addons/skin.confluence/language/Slovenian +@dirrm %%DATADIR%%/addons/skin.confluence/language/Slovak @dirrm %%DATADIR%%/addons/skin.confluence/language/Serbian (Cyrillic) @dirrm %%DATADIR%%/addons/skin.confluence/language/Serbian @dirrm %%DATADIR%%/addons/skin.confluence/language/Russian @@ -1143,6 +1269,7 @@ share/xsessions/XBMC.desktop @dirrm %%DATADIR%%/addons/skin.confluence/language/Polish @dirrm %%DATADIR%%/addons/skin.confluence/language/Norwegian @dirrm %%DATADIR%%/addons/skin.confluence/language/Korean +@dirrm %%DATADIR%%/addons/skin.confluence/language/Japanese @dirrm %%DATADIR%%/addons/skin.confluence/language/Italian @dirrm %%DATADIR%%/addons/skin.confluence/language/Icelandic @dirrm %%DATADIR%%/addons/skin.confluence/language/Hungarian @@ -1156,28 +1283,23 @@ share/xsessions/XBMC.desktop @dirrm %%DATADIR%%/addons/skin.confluence/language/Czech @dirrm %%DATADIR%%/addons/skin.confluence/language/Chinese (Traditional) @dirrm %%DATADIR%%/addons/skin.confluence/language/Chinese (Simple) +@dirrm %%DATADIR%%/addons/skin.confluence/language/Catalan @dirrm %%DATADIR%%/addons/skin.confluence/language/Bulgarian +@dirrm %%DATADIR%%/addons/skin.confluence/language/Afrikaans @dirrm %%DATADIR%%/addons/skin.confluence/language @dirrm %%DATADIR%%/addons/skin.confluence/fonts @dirrm %%DATADIR%%/addons/skin.confluence/colors @dirrm %%DATADIR%%/addons/skin.confluence/backgrounds +@dirrm %%DATADIR%%/addons/skin.confluence/720p/weather+ @dirrm %%DATADIR%%/addons/skin.confluence/720p @dirrm %%DATADIR%%/addons/skin.confluence -@dirrm %%DATADIR%%/addons/script.rss.editor/resources/skins/default/media -@dirrm %%DATADIR%%/addons/script.rss.editor/resources/skins/default/PAL -@dirrm %%DATADIR%%/addons/script.rss.editor/resources/skins/default/720p -@dirrm %%DATADIR%%/addons/script.rss.editor/resources/skins/default -@dirrm %%DATADIR%%/addons/script.rss.editor/resources/skins -@dirrm %%DATADIR%%/addons/script.rss.editor/resources/lib -@dirrm %%DATADIR%%/addons/script.rss.editor/resources/language/Hungarian -@dirrm %%DATADIR%%/addons/script.rss.editor/resources/language/German -@dirrm %%DATADIR%%/addons/script.rss.editor/resources/language/Finnish -@dirrm %%DATADIR%%/addons/script.rss.editor/resources/language/English -@dirrm %%DATADIR%%/addons/script.rss.editor/resources/language -@dirrm %%DATADIR%%/addons/script.rss.editor/resources -@dirrm %%DATADIR%%/addons/script.rss.editor -@dirrm %%DATADIR%%/addons/script.recentlyadded +@dirrm %%DATADIR%%/addons/script.module.pysqlite/lib/pysqlite2 +@dirrm %%DATADIR%%/addons/script.module.pysqlite/lib +@dirrm %%DATADIR%%/addons/script.module.pysqlite +@dirrm %%DATADIR%%/addons/script.module.pil @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Swedish +@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Spanish +@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Slovenian @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Russian @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Polish @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Korean @@ -1192,6 +1314,8 @@ share/xsessions/XBMC.desktop @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Swedish +@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Spanish +@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Slovenian @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Russian @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Portuguese @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Polish @@ -1212,10 +1336,48 @@ share/xsessions/XBMC.desktop @dirrm %%DATADIR%%/addons/screensaver.rsxs.plasma @dirrm %%DATADIR%%/addons/screensaver.rsxs.euphoria @dirrm %%DATADIR%%/addons/repository.xbmc.org +@dirrm %%DATADIR%%/addons/pvr.vdr.vnsi/resources/skins/Confluence/720p +@dirrm %%DATADIR%%/addons/pvr.vdr.vnsi/resources/skins/Confluence +@dirrm %%DATADIR%%/addons/pvr.vdr.vnsi/resources/skins +@dirrm %%DATADIR%%/addons/pvr.vdr.vnsi/resources/language/German +@dirrm %%DATADIR%%/addons/pvr.vdr.vnsi/resources/language/Finnish +@dirrm %%DATADIR%%/addons/pvr.vdr.vnsi/resources/language/English +@dirrm %%DATADIR%%/addons/pvr.vdr.vnsi/resources/language/Dutch +@dirrm %%DATADIR%%/addons/pvr.vdr.vnsi/resources/language +@dirrm %%DATADIR%%/addons/pvr.vdr.vnsi/resources +@dirrm %%DATADIR%%/addons/pvr.vdr.vnsi +@dirrm %%DATADIR%%/addons/pvr.team-mediaportal.tvserver/resources/language/German +@dirrm %%DATADIR%%/addons/pvr.team-mediaportal.tvserver/resources/language/Finnish +@dirrm %%DATADIR%%/addons/pvr.team-mediaportal.tvserver/resources/language/English +@dirrm %%DATADIR%%/addons/pvr.team-mediaportal.tvserver/resources/language/Dutch +@dirrm %%DATADIR%%/addons/pvr.team-mediaportal.tvserver/resources/language +@dirrm %%DATADIR%%/addons/pvr.team-mediaportal.tvserver/resources +@dirrm %%DATADIR%%/addons/pvr.team-mediaportal.tvserver +@dirrm %%DATADIR%%/addons/pvr.mythtv/resources/language/German +@dirrm %%DATADIR%%/addons/pvr.mythtv/resources/language/Finnish +@dirrm %%DATADIR%%/addons/pvr.mythtv/resources/language/English +@dirrm %%DATADIR%%/addons/pvr.mythtv/resources/language +@dirrm %%DATADIR%%/addons/pvr.mythtv/resources +@dirrm %%DATADIR%%/addons/pvr.mythtv +@dirrm %%DATADIR%%/addons/pvr.hts/resources/language/German +@dirrm %%DATADIR%%/addons/pvr.hts/resources/language/Finnish +@dirrm %%DATADIR%%/addons/pvr.hts/resources/language/English +@dirrm %%DATADIR%%/addons/pvr.hts/resources/language/Dutch +@dirrm %%DATADIR%%/addons/pvr.hts/resources/language +@dirrm %%DATADIR%%/addons/pvr.hts/resources +@dirrm %%DATADIR%%/addons/pvr.hts +@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Portuguese +@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Polish +@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Korean +@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Hungarian +@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/English +@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Dutch +@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language +@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources +@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com @dirrm %%DATADIR%%/addons/metadata.tvdb.com/resources/language/Swedish @dirrm %%DATADIR%%/addons/metadata.tvdb.com/resources/language/Spanish @dirrm %%DATADIR%%/addons/metadata.tvdb.com/resources/language/Russian -@dirrm %%DATADIR%%/addons/metadata.tvdb.com/resources/language/Romanian @dirrm %%DATADIR%%/addons/metadata.tvdb.com/resources/language/Portuguese @dirrm %%DATADIR%%/addons/metadata.tvdb.com/resources/language/Polish @dirrm %%DATADIR%%/addons/metadata.tvdb.com/resources/language/Korean @@ -1246,7 +1408,6 @@ share/xsessions/XBMC.desktop @dirrm %%DATADIR%%/addons/metadata.themoviedb.org/resources/language @dirrm %%DATADIR%%/addons/metadata.themoviedb.org/resources @dirrm %%DATADIR%%/addons/metadata.themoviedb.org -@dirrm %%DATADIR%%/addons/metadata.mtv.com @dirrm %%DATADIR%%/addons/metadata.common.themoviedb.org @dirrm %%DATADIR%%/addons/metadata.common.last.fm @dirrm %%DATADIR%%/addons/metadata.common.imdb.com @@ -1256,7 +1417,6 @@ share/xsessions/XBMC.desktop @dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Swedish @dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Spanish @dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Russian -@dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Romanian @dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Portuguese @dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Polish @dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Korean @@ -1274,7 +1434,6 @@ share/xsessions/XBMC.desktop @dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Swedish @dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Spanish @dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Russian -@dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Romanian @dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Portuguese @dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Polish @dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Korean @@ -1289,29 +1448,8 @@ share/xsessions/XBMC.desktop @dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language @dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources @dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com -@dirrm %%DATADIR%%/addons -@dirrm share/xbmc -@dirrmtry share/icons/hicolor/48x48/apps -@dirrmtry share/icons/hicolor/48x48 -@dirrmtry share/icons/hicolor/256x256/apps -@dirrmtry share/icons/hicolor/256x256 -@dirrmtry share/icons/hicolor -@dirrmtry share/icons -@dirrm %%DOCSDIR%% -@dirrmtry share/doc -@dirrmtry share/applications -@dirrm lib/xbmc/system/players/dvdplayer -@dirrm lib/xbmc/system/players/paplayer -@dirrm lib/xbmc/system/players -@dirrm lib/xbmc/system/python -@dirrm lib/xbmc/system -@dirrm lib/xbmc/addons/visualization.waveform -@dirrm lib/xbmc/addons/visualization.projectm -@dirrm lib/xbmc/addons/visualization.glspectrum -@dirrm lib/xbmc/addons/script.module.pysqlite -@dirrm lib/xbmc/addons/script.module.pil -@dirrm lib/xbmc/addons/screensaver.rsxs.solarwinds -@dirrm lib/xbmc/addons/screensaver.rsxs.plasma -@dirrm lib/xbmc/addons/screensaver.rsxs.euphoria -@dirrm lib/xbmc/addons -@dirrm lib/xbmc +@dirrm %%DATADIR%%/addons/library.xbmc.pvr +@dirrm %%DATADIR%%/addons/library.xbmc.gui +@dirrm %%DATADIR%%/addons/library.xbmc.addon +@dirrmtry %%DATADIR%%/addons +@dirrmtry %%DATADIR%% Index: files/patch-Makefile.in =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-Makefile.in,v retrieving revision 1.2 diff -u -p -r1.2 patch-Makefile.in --- files/patch-Makefile.in 2 Mar 2011 21:07:09 -0000 1.2 +++ files/patch-Makefile.in 14 Oct 2011 18:44:51 -0000 @@ -1,141 +1,20 @@ ---- Makefile.in.orig 2010-12-17 07:17:41.000000000 +0100 -+++ Makefile.in 2011-02-23 22:22:13.000000000 +0100 -@@ -71,7 +71,6 @@ - xbmc/cores/paplayer/timidity \ - xbmc/cores/paplayer/SIDCodec \ - xbmc/cores/paplayer/YMCodec/StSoundLibrary \ -- xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU \ - xbmc/cores/paplayer/vgmstream \ +--- Makefile.in.orig ++++ Makefile.in +@@ -127,7 +127,6 @@ PAPCODECS_DIRS= \ + lib/timidity \ + lib/libsidplay2 \ + lib/stsound/StSoundLibrary \ +- lib/snesapu/SNES/SNESAPU \ + lib/vgmstream - ifeq (@USE_INTERNAL_LIBA52@,1) -@@ -363,9 +362,6 @@ + ifeq (@USE_ASAP_CODEC@,1) +@@ -463,9 +462,6 @@ ifeq (@USE_ASAP_CODEC@,1) endif endif - $(MAKE) -C xbmc/cores/paplayer/YMCodec/StSoundLibrary --ifeq ($(or $(findstring powerpc,$(ARCH)),$(findstring x86_64-linux,$(ARCH)),$(findstring arm, $(ARCH))),) -- $(MAKE) -C xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU + $(MAKE) -C lib/stsound/StSoundLibrary +-ifeq ($(or $(findstring powerpc,@ARCH@),$(findstring x86_64-linux,@ARCH@),$(findstring arm, @ARCH@)),) +- $(MAKE) -C lib/snesapu/SNES/SNESAPU -endif imagelib: dllloader - $(MAKE) -C xbmc/lib/cximage-6.0 + $(MAKE) -C lib/cximage-6.0 -@@ -502,7 +498,8 @@ - $(MAKE) -C tools/XBMCLive - - install-bin: xbmc.bin # developement convenience target -- sudo install -D xbmc.bin $(DESTDIR)$(libdir)/xbmc -+ sudo install -d $(DESTDIR)$(libdir) -+ sudo install xbmc.bin $(DESTDIR)$(libdir)/xbmc - - ifeq ($(findstring osx,$(ARCH)), osx) - # TODO: add osx install -@@ -511,45 +508,93 @@ - - install-binaries: install-scripts - @echo "Copying XBMC binary to $(DESTDIR)$(libdir)/xbmc/xbmc.bin" -- @install -D xbmc.bin $(DESTDIR)$(libdir)/xbmc/xbmc.bin -- @install -D xbmc-xrandr $(DESTDIR)$(libdir)/xbmc/xbmc-xrandr -+ @install -d $(DESTDIR)$(libdir)/xbmc -+ @install xbmc.bin $(DESTDIR)$(libdir)/xbmc/xbmc.bin -+ @install xbmc-xrandr $(DESTDIR)$(libdir)/xbmc/xbmc-xrandr - @echo "You can run XBMC with the command 'xbmc'" - endif - - install-arch: - @# Arch dependent files -+ifeq ($(findstring bsd,$(ARCH)), bsd) -+ @find -E system addons -type f -not -iregex ".*svn.*|.*script\.module\..*" \ -+ -iregex ".*$(ARCH).*|.*\.vis|.*\.xbs|.*python.*\.zip" \ -+ -exec sh -c "install -d \"$(DESTDIR)$(libdir)/xbmc/\`dirname '{}'\`\"" \; \ -+ -and \ -+ -exec install "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; \ -+ -exec printf " -- %-75.75s\r" "{}" \; -+else -+ifeq ($(findstring osx,$(ARCH)), osx) -+ @find -E system addons -type f -not -iregex ".*svn.*|.*script\.module\..*" \ -+ -iregex ".*$(ARCH).*|.*\.vis|.*\.xbs|.*python.*\.zip" \ -+ -exec sh -c "install -d \"$(DESTDIR)$(libdir)/xbmc/\`dirname '{}'\`\"" \; \ -+ -and \ -+ -exec install "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; \ -+ -exec printf " -- %-75.75s\r" "{}" \; -+else - @find system addons -regextype posix-extended -type f -not -iregex ".*svn.*|.*script\.module\..*" -iregex ".*$(ARCH).*|.*\.vis|.*\.xbs|.*python.*\.zip" -exec install -D "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r" -+endif -+endif -+ @install -d $(DESTDIR)$(libdir)/xbmc/addons - @cp -r addons/script.module.pil $(DESTDIR)$(libdir)/xbmc/addons/ - @cp -r addons/script.module.pysqlite $(DESTDIR)$(libdir)/xbmc/addons/ - - install-scripts: -- @install -D tools/Linux/xbmc.sh $(DESTDIR)$(bindir)/xbmc -- @install -D tools/Linux/xbmc-standalone.sh $(DESTDIR)$(bindir)/xbmc-standalone -- @install -D -m 0644 tools/Linux/FEH.py $(DESTDIR)$(datarootdir)/xbmc/FEH.py -- @install -D -m 0644 tools/Linux/xbmc-xsession.desktop $(DESTDIR)$(datarootdir)/xsessions/XBMC.desktop -+ @install -d $(DESTDIR)$(bindir) -+ @install tools/Linux/xbmc.sh $(DESTDIR)$(bindir)/xbmc -+ @install tools/Linux/xbmc-standalone.sh $(DESTDIR)$(bindir)/xbmc-standalone -+ @install -d $(DESTDIR)$(datarootdir)/xbmc -+ @install -m 0644 tools/Linux/FEH.py $(DESTDIR)$(datarootdir)/xbmc/FEH.py -+ @install -d $(DESTDIR)$(datarootdir)/xsessions -+ @install -m 0644 tools/Linux/xbmc-xsession.desktop $(DESTDIR)$(datarootdir)/xsessions/XBMC.desktop - - install-datas: install-scripts - @echo "Copying support and legal files..." -+ @install -d $(DESTDIR)$(docdir) - @for FILE in `ls README.linux LICENSE.GPL *.txt`; do \ -- install -D -m 0644 "$$FILE" "$(DESTDIR)$(docdir)/$$FILE"; done -+ install -m 0644 "$$FILE" "$(DESTDIR)$(docdir)/$$FILE"; done - @echo "Done!" - @echo "Copying system files to $(DESTDIR)$(datarootdir)/xbmc" -+ @install -d $(DESTDIR)$(datarootdir)/xbmc - @# Arch independent files -- @find addons language media sounds userdata system -regextype posix-extended -type f -not -iregex ".*script\.module\..*|.*$(ARCH).*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python.*\.zip" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; -printf " -- %-75.75f\r" -+ifeq ($(findstring bsd,$(ARCH)), bsd) -+ @find -E addons language media sounds userdata system -type f \ -+ -not -iregex ".*script\.module\..*|.*$(ARCH).*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python.*\.zip" \ -+ -exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/xbmc/\`dirname '{}'\`\"" \; \ -+ -and \ -+ -exec install -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; \ -+ -exec printf " -- %-75.75s\r" "{}" \; -+else -+ifeq ($(findstring osx,$(ARCH)), osx) -+ @find -E addons language media sounds userdata system -type f \ -+ -not -iregex ".*script\.module\..*|.*$(ARCH).*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python.*\.zip" \ -+ -exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/xbmc/\`dirname '{}'\`\"" \; \ -+ -and \ -+ -exec install -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; \ -+ -exec printf " -- %-75.75s\r" "{}" \; -+else -+ @find addons language media sounds userdata system -regextype posix-extended -type f \ -+ -not -iregex ".*script\.module\..*|.*$(ARCH).*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python.*\.zip" \ -+ -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; \ -+ -printf " -- %-75.75f\r" -+endif -+endif - @# Icons and links -- @mkdir -p $(DESTDIR)$(datarootdir)/applications -- @cp -a tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/ -- @install -D -m 0644 tools/Linux/xbmc-48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png -- @install -D -m 0644 media/icon.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/xbmc.png -+ @install -d $(DESTDIR)$(datarootdir)/applications -+ @install tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop -+ @install -d $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps -+ @install -m 0644 tools/Linux/xbmc-48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png -+ @install -d $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps -+ @install -m 0644 media/icon.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/xbmc.png - @test -z "$(DESTDIR)" && gtk-update-icon-cache -f -q -t $(datadir)/icons/hicolor || : - - install-livedatas: livedatas - @echo "Install Live CD datas..." -- @mkdir -p $(DESTDIR)$(bindir) -- @install -D tools/XBMCLive/diskmounter $(DESTDIR)$(bindir)/diskmounter -- @install -D tools/XBMCLive/installXBMC $(DESTDIR)$(bindir)/installXBMC -- @install -D tools/XBMCLive/runXBMC $(DESTDIR)$(bindir)/runXBMC -- @install -D tools/XBMCLive/setAlsaVolumes $(DESTDIR)$(bindir)/setAlsaVolumes -+ @install -d $(DESTDIR)$(bindir) -+ @install tools/XBMCLive/diskmounter $(DESTDIR)$(bindir)/diskmounter -+ @install tools/XBMCLive/installXBMC $(DESTDIR)$(bindir)/installXBMC -+ @install tools/XBMCLive/runXBMC $(DESTDIR)$(bindir)/runXBMC -+ @install tools/XBMCLive/setAlsaVolumes $(DESTDIR)$(bindir)/setAlsaVolumes - - uninstall: - @echo "Removing XBMC..." Index: files/patch-Makefile.include.in =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-Makefile.include.in,v retrieving revision 1.1 diff -u -p -r1.1 patch-Makefile.include.in --- files/patch-Makefile.include.in 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-Makefile.include.in 14 Oct 2011 18:44:51 -0000 @@ -1,11 +0,0 @@ ---- ./Makefile.include.in.orig 2010-07-12 00:23:28.000000000 +0200 -+++ ./Makefile.include.in 2010-12-01 12:17:34.287118766 +0100 -@@ -1,7 +1,7 @@ - AR=ar - ARFLAGS=crus - RM=rm -rf --SHELL=/bin/bash -+SHELL=/bin/sh - ARCH=@ARCH@ - abs_top_srcdir=@abs_top_srcdir@ - prefix=@prefix@ Index: files/patch-configure.in =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-configure.in,v retrieving revision 1.3 diff -u -p -r1.3 patch-configure.in --- files/patch-configure.in 9 Mar 2011 14:11:24 -0000 1.3 +++ files/patch-configure.in 16 Oct 2011 14:54:36 -0000 @@ -1,21 +1,17 @@ ---- configure.in.orig 2010-12-17 07:17:41.000000000 +0100 -+++ configure.in 2011-03-08 15:10:52.000000000 +0100 -@@ -19,10 +19,10 @@ +--- configure.in.orig ++++ configure.in +@@ -20,7 +20,7 @@ AC_DEFUN([XB_FIND_SONAME], [ if [[ "$host_vendor" != "apple" ]]; then AC_MSG_CHECKING([for lib$2 soname]) -- $1_SONAME=$( $CC -print-file-name=lib$2.so | \ -+ $1_SONAME=$( LIBRARY_PATH=/usr/local/lib $CC -print-file-name=lib$2.so | \ - while read output; do objdump -p $output | \ - grep "SONAME" | \ -- sed -e 's/ \+SONAME \+//'; done 2> /dev/null ) -+ sed -e 's/ *SONAME *//'; done 2> /dev/null ) - else - AC_MSG_CHECKING([for lib$2 dylib]) - gcc_lib_path=[`$CC -print-search-dirs 2>/dev/null | fgrep libraries: | sed 's/[^=]*=\(.*\)/\1/' | sed 's/:/ /g'`] -@@ -294,6 +294,12 @@ - [use_libbluray=$enableval], - [use_libbluray=auto]) +- $1_FILENAME=$($CC -nostdlib -o /dev/null $LDFLAGS -l$2 -Wl,-M 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}') ++ $1_FILENAME=$($CC -nostdlib $LDFLAGS -l$2 -Wl,-M 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}') + if [[ ! -z $$1_FILENAME ]]; then + $1_SONAME=$(objdump -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}') + fi +@@ -377,6 +377,12 @@ AC_ARG_ENABLE([texturepacker], + [use_texturepacker=$enableval], + [use_texturepacker=auto]) +AC_ARG_ENABLE([libmms], + [AS_HELP_STRING([--enable-libmms], @@ -26,57 +22,37 @@ AC_ARG_WITH([lirc-device], [AS_HELP_STRING([--with-lirc-device=file], [specify the default LIRC device (default is /dev/lircd)])], -@@ -359,6 +365,18 @@ - x86_64-*-linux-gnu*) +@@ -445,6 +451,20 @@ case $host in ARCH="x86_64-linux" + AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") ;; + i386-*-freebsd*) + ARCH="x86-freebsd" + MAKE="gmake" -+ CFLAGS="$CFLAGS -I/usr/local/include" -+ CXXFLAGS="$CXXFLAGS -I/usr/local/include" ++ CFLAGS="$CFLAGS -I/usr/local/include" ++ CXXFLAGS="$CXXFLAGS -I/usr/local/include" ++ AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") + ;; + amd64-*-freebsd*) + ARCH="x86_64-freebsd" + MAKE="gmake" -+ CFLAGS="$CFLAGS -I/usr/local/include" -+ CXXFLAGS="$CXXFLAGS -I/usr/local/include" ++ CFLAGS="$CFLAGS -I/usr/local/include" ++ CXXFLAGS="$CXXFLAGS -I/usr/local/include" ++ AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") + ;; - i386-apple-darwin*) - ARCH="x86-osx" - # define i386 or x86_64, cannot use $HOSTTYPE as it reports x86_64 on 10.6 regardless of kernel flavor -@@ -507,6 +525,8 @@ - # Add top source directory for all builds so we can use config.h - INCLUDES="$INCLUDES -I\$(abs_top_srcdir)" + arm-apple-darwin*) + use_joystick=no + use_crystalhd=no +@@ -622,6 +642,8 @@ INCLUDES="$INCLUDES -I\$(abs_top_srcdir) + # Check inotify availability + AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[Define if we have inotify]),) +AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[""]),) + # Checks for boost headers using CXX instead of CC AC_LANG_PUSH([C++]) AC_CHECK_HEADER([boost/shared_ptr.hpp],, AC_MSG_ERROR($missing_library)) -@@ -543,7 +563,11 @@ - AC_CHECK_LIB([ass], [ass_set_message_cb],,use_external_libass="no") - AC_CHECK_LIB([bz2], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([jpeg], [main],, AC_MSG_ERROR($missing_library)) # check for cximage -+if echo "$ARCH" | grep -q freebsd; then -+AC_CHECK_LIB([pthread], [main],LIBS="-pthread $LIBS", AC_MSG_ERROR($missing_library)) -+else - AC_CHECK_LIB([pthread], [main],, AC_MSG_ERROR($missing_library)) -+fi - AC_CHECK_LIB([lzo2], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library)) -@@ -581,9 +605,6 @@ - PKG_CHECK_MODULES([SAMPLERATE], [samplerate], - [INCLUDES="$INCLUDES $SAMPLERATE_CFLAGS"; LIBS="$LIBS $SAMPLERATE_LIBS"], - AC_MSG_ERROR($missing_library)) --PKG_CHECK_MODULES([MMS], [libmms], -- [INCLUDES="$INCLUDES $MMS_CFLAGS"; LIBS="$LIBS $MMS_LIBS"], -- AC_MSG_ERROR($missing_library)) - PKG_CHECK_MODULES([FREETYPE2], [freetype2], - [INCLUDES="$INCLUDES $FREETYPE2_CFLAGS"; LIBS="$LIBS $FREETYPE2_LIBS"], - AC_MSG_ERROR($missing_library)) -@@ -620,6 +641,29 @@ +@@ -774,6 +796,29 @@ AS_CASE([x$use_libbluray], ] ) @@ -106,55 +82,19 @@ # platform dependent libraries if test "$host_vendor" = "apple" ; then AC_CHECK_LIB([iconv], [main],, AC_MSG_ERROR($missing_library)) -@@ -644,8 +688,10 @@ - AC_CHECK_HEADER([FLAC/stream_decoder.h],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([SDL_mixer], [main],, AC_MSG_ERROR($missing_library)) +@@ -783,8 +828,10 @@ if test "$host_vendor" = "apple" ; then + AC_DEFINE([HAVE_SDL],[1],["Define to 1 if using sdl"]) + fi + else + if echo "$ARCH" | grep -vq freebsd; then AC_CHECK_LIB([dl], [main],, AC_MSG_ERROR($missing_library)) AC_CHECK_LIB([resolv], [main],, AC_MSG_ERROR($missing_library)) + fi AC_CHECK_LIB([jasper], [main],, AC_MSG_ERROR($missing_library)) # check for cximage - AC_CHECK_LIB([tiff], [main],, AC_MSG_ERROR($missing_library)) AC_CHECK_LIB([rt], [clock_gettime],, AC_MSG_ERROR($missing_library)) -@@ -740,8 +786,8 @@ - AC_MSG_RESULT($faac_disabled) - else - if test "$use_faac" = "yes"; then -- AC_CHECK_LIB([faac], [main],, -- use_faac=no;AC_MSG_RESULT($faac_not_found)) -+ AC_CHECK_LIB([faac], [main], LIBS="-lfaac -lstdc++ $LIBS", -+ use_faac=no;AC_MSG_RESULT($faac_not_found), [-lstdc++]) - else - AC_MSG_RESULT($faac_disabled) - fi -@@ -919,7 +965,11 @@ - # External Python - if test "$use_external_python" = "yes"; then -- AC_CHECK_LIB([python2.6], [main], -+ AC_CHECK_LIB([python2.7], [main], -+ [AC_DEFINE([HAVE_LIBPYTHON2_7], [1], -+ [Define to 1 if you have the 'python2.7' library.]) -+ USE_PYTHON2_7=1], -+ [AC_CHECK_LIB([python2.6], [main], - [AC_DEFINE([HAVE_LIBPYTHON2_6], [1], - [Define to 1 if you have the 'python2.6' library.]) - USE_PYTHON2_6=1], -@@ -931,9 +981,10 @@ - [AC_DEFINE([HAVE_LIBPYTHON2_4], [1], - [Define to 1 if you have the 'python2.4' library.]) - USE_PYTHON2_4=1], -- [AC_MSG_ERROR($missing_library)] )] )] ) -+ [AC_MSG_ERROR($missing_library)] )] )] )] ) - - AC_MSG_NOTICE($external_python_enabled) -+ test "$USE_PYTHON2_7" && AC_MSG_NOTICE([Using Python 2.7]) - test "$USE_PYTHON2_6" && AC_MSG_NOTICE([Using Python 2.6]) - test "$USE_PYTHON2_5" && AC_MSG_NOTICE([Using Python 2.5]) - test "$USE_PYTHON2_4" && AC_MSG_NOTICE([Using Python 2.4]) -@@ -1211,6 +1262,12 @@ - final_message="$final_message\n Bluray:\tNo" +@@ -1634,6 +1681,12 @@ else + USE_TEXTUREPACKER=0 fi +if test "$use_libmms" = "yes"; then @@ -166,57 +106,11 @@ if test "$use_mid" = "yes"; then final_message="$final_message\n MID Support:\tYes" SDL_DEFINES="$SDL_DEFINES -DMID" -@@ -1418,7 +1475,6 @@ - xbmc/cores/paplayer/NSFCodec/Makefile \ - xbmc/cores/paplayer/SIDCodec/Makefile \ - xbmc/cores/paplayer/vgmstream/Makefile \ -- xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile \ - xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile \ +@@ -1837,7 +1890,6 @@ OUTPUT_FILES="Makefile \ + lib/nosefart/Makefile \ + lib/libsidplay2/Makefile \ + lib/vgmstream/Makefile \ +- lib/snesapu/SNES/SNESAPU/Makefile \ + lib/stsound/StSoundLibrary/Makefile \ xbmc/cores/playercorefactory/Makefile \ - xbmc/karaoke/Makefile \ -@@ -1491,6 +1547,7 @@ - AC_SUBST(USE_EXTERNAL_LIBMPEG2) - AC_SUBST(USE_EXTERNAL_LIBWAVPACK) - AC_SUBST(USE_EXTERNAL_PYTHON) -+AC_SUBST(USE_PYTHON2_7) - AC_SUBST(USE_PYTHON2_6) - AC_SUBST(USE_PYTHON2_5) - AC_SUBST(USE_PYTHON2_4) -@@ -1735,7 +1792,7 @@ - --enable-static \ - --disable-shared \ - --cc="$CC" && -- make dvdread-config && -+ $MAKE dvdread-config && - mkdir -p `pwd`/../includes/dvdread - cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread - else -@@ -1749,8 +1806,9 @@ - --disable-shared \ - --disable-strip \ - --disable-opts \ -+ --make=$MAKE \ - --cc="$CC" && -- make dvdread-config && -+ $MAKE dvdread-config && - mkdir -p `pwd`/../includes/dvdread - cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread - fi -@@ -1766,6 +1824,17 @@ - --enable-static \ - --disable-shared \ - --cc="$CC" -+ elif echo "$ARCH" | grep -q "freebsd" ; then -+ ./configure2 \ -+ --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I/usr/local/include" \ -+ --extra-ldflags="-L/usr/local/lib" \ -+ --host=$host_alias \ -+ --build=$build_alias \ -+ --target=$target_alias \ -+ --enable-static \ -+ --disable-shared \ -+ --make=$MAKE \ -+ --cc="$CC" - else - ./configure2 \ - --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes" \ + xbmc/music/karaoke/Makefile \ Index: files/patch-guilib__StdString.h =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-guilib__StdString.h,v retrieving revision 1.1 diff -u -p -r1.1 patch-guilib__StdString.h --- files/patch-guilib__StdString.h 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-guilib__StdString.h 14 Oct 2011 18:44:51 -0000 @@ -1,30 +0,0 @@ ---- guilib/StdString.h.orig 2009-09-25 16:12:41.000000000 +0200 -+++ guilib/StdString.h 2010-12-13 21:19:16.000000000 +0100 -@@ -2,6 +2,7 @@ - #include - #include - #include -+#include - - #if defined(_WIN32) && !defined(va_copy) - #define va_copy(dst, src) ((dst) = (src)) -@@ -864,7 +865,8 @@ - PWSTR pNextDstW = pDstW; - SSCodeCvt::result res = SSCodeCvt::ok; - const SSCodeCvt& conv = SS_USE_FACET(loc, SSCodeCvt); -- SSCodeCvt::state_type st= { 0 }; -+ SSCodeCvt::state_type st; -+ memset(&st, 0, sizeof(SSCodeCvt::state_type)); - res = conv.in(st, - pSrcA, pSrcA + nSrc, pNextSrcA, - pDstW, pDstW + nDst, pNextDstW); -@@ -907,7 +909,8 @@ - PCWSTR pNextSrcW = pSrcW; - SSCodeCvt::result res = SSCodeCvt::ok; - const SSCodeCvt& conv = SS_USE_FACET(loc, SSCodeCvt); -- SSCodeCvt::state_type st= { 0 }; -+ SSCodeCvt::state_type st; -+ memset(&st, 0, sizeof(SSCodeCvt::state_type)); - res = conv.out(st, - pSrcW, pSrcW + nSrc, pNextSrcW, - pDstA, pDstA + nDst, pNextDstA); Index: files/patch-guilib__TextureBundleXPR.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-guilib__TextureBundleXPR.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-guilib__TextureBundleXPR.cpp --- files/patch-guilib__TextureBundleXPR.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-guilib__TextureBundleXPR.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,11 +0,0 @@ ---- ./guilib/TextureBundleXPR.cpp.orig 2010-05-13 09:06:42.000000000 +0200 -+++ ./guilib/TextureBundleXPR.cpp 2010-12-01 12:17:34.307278095 +0100 -@@ -285,7 +285,7 @@ - GlobalMemoryStatus(&stat); - CLog::Log(LOGERROR, "Out of memory loading texture: %s (need %lu bytes, have %lu bytes)", name.c_str(), - file->second.UnpackedSize + file->second.PackedSize, stat.dwAvailPhys); --#elif defined(__APPLE__) -+#elif defined(__APPLE__) || defined(__FreeBSD__) - CLog::Log(LOGERROR, "Out of memory loading texture: %s (need %d bytes)", name.c_str(), - file->second.UnpackedSize + file->second.PackedSize); - #else Index: files/patch-guilib__XBTFReader.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-guilib__XBTFReader.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-guilib__XBTFReader.cpp --- files/patch-guilib__XBTFReader.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-guilib__XBTFReader.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,11 +0,0 @@ ---- ./guilib/XBTFReader.cpp.orig 2010-02-14 19:20:07.000000000 +0100 -+++ ./guilib/XBTFReader.cpp 2010-12-01 12:17:34.289131542 +0100 -@@ -187,7 +187,7 @@ - { - return false; - } --#if defined(__APPLE__) -+#if defined(__APPLE__) || defined(__FreeBSD__) - if (fseeko(m_file, (off_t)frame.GetOffset(), SEEK_SET) == -1) - #else - if (fseeko64(m_file, (off_t)frame.GetOffset(), SEEK_SET) == -1) Index: files/patch-guilib__common__LIRC.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-guilib__common__LIRC.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-guilib__common__LIRC.cpp --- files/patch-guilib__common__LIRC.cpp 9 Mar 2011 14:11:24 -0000 1.1 +++ files/patch-guilib__common__LIRC.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,67 +0,0 @@ ---- guilib/common/LIRC.cpp.orig 2011-03-07 14:16:12.000000000 +0100 -+++ guilib/common/LIRC.cpp 2011-03-07 14:11:31.000000000 +0100 -@@ -19,11 +19,14 @@ - * - */ - -+#include "config.h" - #include - #include - #include - #include -+#ifdef HAVE_INOTIFY - #include -+#endif - #include - #include - #include "LIRC.h" -@@ -92,12 +95,14 @@ - close(m_fd); - m_fd = -1; - m_file = NULL; -+#ifdef HAVE_INOTIFY - if (m_inotify_wd >= 0) { - inotify_rm_watch(m_inotify_fd, m_inotify_wd); - m_inotify_wd = -1; - } - if (m_inotify_fd >= 0) - close(m_inotify_fd); -+#endif - - m_inReply = false; - m_nrSending = 0; -@@ -148,6 +153,7 @@ - { - if ((m_file = fdopen(m_fd, "r+")) != NULL) - { -+#ifdef HAVE_INOTIFY - // Setup inotify so we can disconnect if lircd is restarted - if ((m_inotify_fd = inotify_init()) >= 0) - { -@@ -168,6 +174,10 @@ - } - } - } -+#else -+ m_bInitialized = true; -+ CLog::Log(LOGINFO, "LIRC %s: sucessfully started", __FUNCTION__); -+#endif - } - else - CLog::Log(LOGERROR, "LIRC %s: fdopen failed: %s", __FUNCTION__, strerror(errno)); -@@ -206,6 +216,7 @@ - } - - bool CRemoteControl::CheckDevice() { -+#ifdef HAVE_INOTIFY - if (m_inotify_fd < 0 || m_inotify_wd < 0) - return true; // inotify wasn't setup for some reason, assume all is well - int bufsize = sizeof(struct inotify_event) + PATH_MAX; -@@ -220,6 +231,7 @@ - } - i += sizeof(struct inotify_event)+e->len; - } -+#endif - return true; - } - Index: files/patch-guilib__system.h =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-guilib__system.h,v retrieving revision 1.2 diff -u -p -r1.2 patch-guilib__system.h --- files/patch-guilib__system.h 9 Mar 2011 14:11:24 -0000 1.2 +++ files/patch-guilib__system.h 14 Oct 2011 18:44:51 -0000 @@ -1,12 +0,0 @@ ---- ./guilib/system.h.orig 2010-11-09 20:05:35.000000000 +0100 -+++ ./guilib/system.h 2010-12-01 12:17:34.292155875 +0100 -@@ -66,7 +66,9 @@ - #define HAS_FILESYSTEM_SAP - #define HAS_FILESYSTEM_VTP - #define HAS_FILESYSTEM_HTSP -+#ifdef HAVE_LIBMMS - #define HAS_FILESYSTEM_MMS -+#endif - - /********************** - * Non-free Components Index: files/patch-tools__TexturePacker__XBMCTex.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-tools__TexturePacker__XBMCTex.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-tools__TexturePacker__XBMCTex.cpp --- files/patch-tools__TexturePacker__XBMCTex.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-tools__TexturePacker__XBMCTex.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,14 +0,0 @@ ---- ./tools/TexturePacker/XBMCTex.cpp.orig 2010-10-17 19:04:21.000000000 +0200 -+++ ./tools/TexturePacker/XBMCTex.cpp 2010-12-01 12:17:34.285107108 +0100 -@@ -40,7 +40,11 @@ - #endif - - #ifdef _LINUX -+#if defined(__FreeBSD__) -+#include -+#else /* !__FreeBSD__ */ - #include -+#endif - #else - #include "../../xbmc/lib/liblzo/LZO1X.H" - #endif Index: files/patch-xbmc__Application.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__Application.cpp,v retrieving revision 1.2 diff -u -p -r1.2 patch-xbmc__Application.cpp --- files/patch-xbmc__Application.cpp 16 Mar 2011 13:03:07 -0000 1.2 +++ files/patch-xbmc__Application.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,23 +0,0 @@ ---- ./xbmc/Application.cpp.orig 2011-03-05 04:33:37.000000000 +0100 -+++ ./xbmc/Application.cpp 2011-03-11 08:27:38.000000000 +0100 -@@ -495,6 +495,8 @@ - CLog::Log(LOGNOTICE, "-----------------------------------------------------------------------"); - #if defined(__APPLE__) - CLog::Log(LOGNOTICE, "Starting XBMC, Platform: Mac OS X (%s). Built on %s (Git:%s)", g_sysinfo.GetUnameVersion().c_str(), __DATE__, GIT_REV); -+#elif defined(__FreeBSD__) -+ CLog::Log(LOGNOTICE, "Starting XBMC, Platform: FreeBSD (%s). Built on %s (Git:%s)", g_sysinfo.GetUnameVersion().c_str(), __DATE__, GIT_REV); - #elif defined(_LINUX) - CLog::Log(LOGNOTICE, "Starting XBMC, Platform: Linux (%s, %s). Built on %s (Git:%s)", g_sysinfo.GetLinuxDistro().c_str(), g_sysinfo.GetUnameVersion().c_str(), __DATE__, GIT_REV); - #elif defined(_WIN32) -@@ -785,6 +787,11 @@ - } - } - } -+ char resolved_path[PATH_MAX]; -+ if (realpath(xbmcPath.c_str(), resolved_path)) -+ xbmcPath = resolved_path; -+ if (realpath(xbmcBinPath.c_str(), resolved_path)) -+ xbmcBinPath = resolved_path; - - /* Set some environment variables */ - setenv("XBMC_BIN_HOME", xbmcBinPath.c_str(), 0); Index: files/patch-xbmc__DetectDVDType.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__DetectDVDType.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__DetectDVDType.cpp --- files/patch-xbmc__DetectDVDType.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__DetectDVDType.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,11 +0,0 @@ ---- ./xbmc/DetectDVDType.cpp.orig 2010-10-11 17:15:33.000000000 +0200 -+++ ./xbmc/DetectDVDType.cpp 2010-12-01 12:17:34.238812978 +0100 -@@ -34,7 +34,7 @@ - #include - #include - #include --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - #include - #endif - #endif Index: files/patch-xbmc__FileSystem__CacheStrategy.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__FileSystem__CacheStrategy.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__FileSystem__CacheStrategy.cpp --- files/patch-xbmc__FileSystem__CacheStrategy.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__FileSystem__CacheStrategy.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,33 +0,0 @@ ---- ./xbmc/FileSystem/CacheStrategy.cpp.orig 2010-10-10 15:01:06.000000000 +0200 -+++ ./xbmc/FileSystem/CacheStrategy.cpp 2010-12-01 12:17:34.234788543 +0100 -@@ -93,7 +93,8 @@ - - if(m_hCacheFileWrite == INVALID_HANDLE_VALUE) - { -- CLog::Log(LOGERROR, "%s - failed to create file %s with error code %d", __FUNCTION__, fileName.c_str(), GetLastError()); -+ CLog::Log(LOGERROR, "%s - failed to create file %s with error code %d", -+ __FUNCTION__, fileName.c_str(), (int)GetLastError()); - Close(); - return CACHE_RC_ERROR; - } -@@ -107,7 +108,8 @@ - - if(m_hCacheFileRead == INVALID_HANDLE_VALUE) - { -- CLog::Log(LOGERROR, "%s - failed to open file %s with error code %d", __FUNCTION__, fileName.c_str(), GetLastError()); -+ CLog::Log(LOGERROR, "%s - failed to open file %s with error code %d", -+ __FUNCTION__, fileName.c_str(), (int)GetLastError()); - Close(); - return CACHE_RC_ERROR; - } -@@ -140,8 +142,8 @@ - DWORD iWritten=0; - if (!WriteFile(m_hCacheFileWrite, pBuffer, iSize, &iWritten, NULL)) - { -- CLog::Log(LOGERROR, "%s - failed to write to file. err: %u", -- __FUNCTION__, GetLastError()); -+ CLog::Log(LOGERROR, "%s - failed to write to file. err: %d", -+ __FUNCTION__, (int)GetLastError()); - return CACHE_RC_ERROR; - } - Index: files/patch-xbmc__FileSystem__DllLibCurl.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__FileSystem__DllLibCurl.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__FileSystem__DllLibCurl.cpp --- files/patch-xbmc__FileSystem__DllLibCurl.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__FileSystem__DllLibCurl.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,15 +0,0 @@ ---- ./xbmc/FileSystem/DllLibCurl.cpp.orig 2010-08-25 00:38:59.000000000 +0200 -+++ ./xbmc/FileSystem/DllLibCurl.cpp 2010-12-01 12:17:34.236800761 +0100 -@@ -84,6 +84,12 @@ - - void DllLibCurlGlobal::CheckIdle() - { -+ -+#if defined(__FreeBSD__) -+ /* easy_cleanup crash on freebsd with extern python */ -+ return; -+#endif -+ - /* avoid locking section here, to avoid stalling gfx thread on loads*/ - if(g_curlReferences == 0) - return; Index: files/patch-xbmc__FileSystem__SAPDirectory.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__FileSystem__SAPDirectory.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__FileSystem__SAPDirectory.cpp --- files/patch-xbmc__FileSystem__SAPDirectory.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__FileSystem__SAPDirectory.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,14 +0,0 @@ -Index: xbmc/FileSystem/SAPDirectory.cpp -=================================================================== ---- xbmc/FileSystem/SAPDirectory.cpp (revision 35575) -+++ xbmc/FileSystem/SAPDirectory.cpp (working copy) -@@ -30,6 +30,9 @@ - #ifdef __APPLE__ - #include "OSXGNUReplacements.h" // strnlen - #endif -+#ifdef __FreeBSD__ -+#include "FreeBSDGNUReplacements.h" // strnlen -+#endif - #ifdef _MSC_VER - #include - #else Index: files/patch-xbmc__GUILargeTextureManager.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__GUILargeTextureManager.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__GUILargeTextureManager.cpp --- files/patch-xbmc__GUILargeTextureManager.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__GUILargeTextureManager.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,12 +0,0 @@ ---- ./xbmc/GUILargeTextureManager.cpp.orig 2010-10-08 04:41:58.000000000 +0200 -+++ ./xbmc/GUILargeTextureManager.cpp 2010-12-01 12:17:34.238812978 +0100 -@@ -68,7 +68,8 @@ - m_texture = NULL; - } - else if (CTimeUtils::GetTimeMS() - start > 100) -- CLog::Log(LOGDEBUG, "%s - took %d ms to load %s", __FUNCTION__, CTimeUtils::GetTimeMS() - start, loadPath.c_str()); -+ CLog::Log(LOGDEBUG, "%s - took %d ms to load %s", __FUNCTION__, -+ (int)(CTimeUtils::GetTimeMS() - start), loadPath.c_str()); - } - - return true; Index: files/patch-xbmc__MusicInfoTagLoaderWMA.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__MusicInfoTagLoaderWMA.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__MusicInfoTagLoaderWMA.cpp --- files/patch-xbmc__MusicInfoTagLoaderWMA.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__MusicInfoTagLoaderWMA.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,11 +0,0 @@ ---- ./xbmc/MusicInfoTagLoaderWMA.cpp.orig 2009-10-12 11:16:56.000000000 +0200 -+++ ./xbmc/MusicInfoTagLoaderWMA.cpp 2010-12-01 12:17:34.239816992 +0100 -@@ -538,7 +538,7 @@ - "Unable to create album art for %s " - "(extension=%s, size=%u)", - tag.GetURL().c_str(), strExtension.c_str(), -- picture.dwDataLen); -+ (unsigned int)picture.dwDataLen); - } - } - } Index: files/patch-xbmc__ProgramDatabase.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__ProgramDatabase.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__ProgramDatabase.cpp --- files/patch-xbmc__ProgramDatabase.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__ProgramDatabase.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,11 +0,0 @@ ---- ./xbmc/ProgramDatabase.cpp.orig 2010-07-12 22:53:38.000000000 +0200 -+++ ./xbmc/ProgramDatabase.cpp 2010-12-01 12:17:34.231763652 +0100 -@@ -63,7 +63,7 @@ - catch (...) - { - CLog::Log(LOGERROR, "programdatabase::unable to create tables:%u", -- GetLastError()); -+ (unsigned int)GetLastError()); - return false; - } - Index: files/patch-xbmc__Util.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__Util.cpp,v retrieving revision 1.2 diff -u -p -r1.2 patch-xbmc__Util.cpp --- files/patch-xbmc__Util.cpp 2 Mar 2011 21:07:09 -0000 1.2 +++ files/patch-xbmc__Util.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,55 +0,0 @@ ---- xbmc/Util.cpp.orig 2010-12-17 07:17:41.000000000 +0100 -+++ xbmc/Util.cpp 2010-12-27 20:40:24.000000000 +0100 -@@ -27,6 +27,11 @@ - #include - #endif - -+#if defined(__FreeBSD__) -+#include -+#include -+#endif -+ - #ifdef _LINUX - #include - #include -@@ -1434,7 +1439,7 @@ - - void CUtil::CacheSubtitles(const CStdString& strMovie, CStdString& strExtensionCached, XFILE::IFileCallback *pCallback ) - { -- unsigned int startTimer = CTimeUtils::GetTimeMS(); -+ DWORD startTimer = CTimeUtils::GetTimeMS(); - CLog::Log(LOGDEBUG,"%s: START", __FUNCTION__); - - // new array for commons sub dirs -@@ -1546,7 +1551,7 @@ - strLookInPaths.push_back(strPath); - } - -- unsigned int nextTimer = CTimeUtils::GetTimeMS(); -+ DWORD nextTimer = CTimeUtils::GetTimeMS(); - CLog::Log(LOGDEBUG,"%s: Done (time: %i ms)", __FUNCTION__, (int)(nextTimer - startTimer)); - - CStdString strLExt; -@@ -3440,6 +3445,22 @@ - if (result == 0) - realpath(given_path, real_given_path); - strExecutablePath = real_given_path; -+#elif defined(__FreeBSD__) -+ char buf[PATH_MAX]; -+ size_t buflen; -+ int mib[4]; -+ -+ mib[0] = CTL_KERN; -+ mib[1] = KERN_PROC; -+ mib[2] = KERN_PROC_PATHNAME; -+ mib[3] = getpid(); -+ -+ buflen = sizeof(buf) - 1; -+ -+ if(sysctl(mib, 4, buf, &buflen, NULL, 0) < 0) -+ strExecutablePath = ""; -+ else -+ strExecutablePath = buf; - #else - /* Get our PID and build the name of the link in /proc */ - pid_t pid = getpid(); Index: files/patch-xbmc__VideoDatabase.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__VideoDatabase.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__VideoDatabase.cpp --- files/patch-xbmc__VideoDatabase.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__VideoDatabase.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,76 +0,0 @@ ---- ./xbmc/VideoDatabase.cpp.orig 2010-11-09 22:55:18.000000000 +0100 -+++ ./xbmc/VideoDatabase.cpp 2010-12-01 12:17:34.199531299 +0100 -@@ -4423,7 +4423,7 @@ - } - - CLog::Log(LOGDEBUG,"Time for actual SQL query = %d", -- CTimeUtils::GetTimeMS() - time); time = CTimeUtils::GetTimeMS(); -+ (int)(CTimeUtils::GetTimeMS() - time)); time = CTimeUtils::GetTimeMS(); - - // get data from returned rows - items.Reserve(iRowsFound); -@@ -4443,7 +4443,7 @@ - } - - CLog::Log(LOGDEBUG,"Time to retrieve movies from dataset = %d", -- CTimeUtils::GetTimeMS() - time); -+ (int)(CTimeUtils::GetTimeMS() - time)); - - // cleanup - m_pDS->close(); -@@ -4495,7 +4495,7 @@ - } - - CLog::Log(LOGDEBUG,"Time for actual SQL query = %d", -- CTimeUtils::GetTimeMS() - time); time = CTimeUtils::GetTimeMS(); -+ (int)(CTimeUtils::GetTimeMS() - time)); time = CTimeUtils::GetTimeMS(); - - // get data from returned rows - items.Reserve(iRowsFound); -@@ -4523,7 +4523,7 @@ - } - - CLog::Log(LOGDEBUG,"Time to retrieve tvshows from dataset = %d", -- CTimeUtils::GetTimeMS() - time); -+ (int)(CTimeUtils::GetTimeMS() - time)); - - CStdString order(where); - bool maintainOrder = order.ToLower().Find("order by") != -1; -@@ -4777,7 +4777,7 @@ - } - - CLog::Log(LOGDEBUG,"Time for actual SQL query = %d", -- CTimeUtils::GetTimeMS() - time); time = CTimeUtils::GetTimeMS(); -+ (int)(CTimeUtils::GetTimeMS() - time)); time = CTimeUtils::GetTimeMS(); - - // get data from returned rows - items.Reserve(iRowsFound); -@@ -4802,7 +4802,7 @@ - } - - CLog::Log(LOGDEBUG,"Time to retrieve episodes from dataset = %d", -- CTimeUtils::GetTimeMS() - time); -+ (int)(CTimeUtils::GetTimeMS() - time)); - - // cleanup - m_pDS->close(); -@@ -5600,7 +5600,8 @@ - // run query - if (!m_pDS->query(strSQL.c_str())) - return false; -- CLog::Log(LOGDEBUG, "%s time for actual SQL query = %d", __FUNCTION__, CTimeUtils::GetTimeMS() - time); time = CTimeUtils::GetTimeMS(); -+ CLog::Log(LOGDEBUG, "%s time for actual SQL query = %d", __FUNCTION__, -+ (int)(CTimeUtils::GetTimeMS() - time)); time = CTimeUtils::GetTimeMS(); - - int iRowsFound = m_pDS->num_rows(); - if (iRowsFound == 0) -@@ -5627,7 +5628,8 @@ - m_pDS->next(); - } - -- CLog::Log(LOGDEBUG, "%s time to retrieve from dataset = %d", __FUNCTION__, CTimeUtils::GetTimeMS() - time); time = CTimeUtils::GetTimeMS(); -+ CLog::Log(LOGDEBUG, "%s time to retrieve from dataset = %d", __FUNCTION__, -+ (int)(CTimeUtils::GetTimeMS() - time)); time = CTimeUtils::GetTimeMS(); - - // cleanup - m_pDS->close(); Index: files/patch-xbmc__addons__Addon.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__addons__Addon.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__addons__Addon.cpp --- files/patch-xbmc__addons__Addon.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__addons__Addon.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,14 +1,12 @@ -Index: xbmc/addons/Addon.cpp -=================================================================== ---- xbmc/addons/Addon.cpp (revision 35575) -+++ xbmc/addons/Addon.cpp (working copy) -@@ -29,6 +29,9 @@ +--- xbmc/addons/Addon.cpp.orig ++++ xbmc/addons/Addon.cpp +@@ -28,6 +28,9 @@ #ifdef __APPLE__ #include "../osx/OSXGNUReplacements.h" #endif +#ifdef __FreeBSD__ +#include "FreeBSDGNUReplacements.h" // strverscmp +#endif - #include "log.h" + #include "utils/log.h" + #include "utils/URIUtils.h" #include - #include Index: files/patch-xbmc__cores__AudioRenderers__ALSADirectSound.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__cores__AudioRenderers__ALSADirectSound.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__cores__AudioRenderers__ALSADirectSound.cpp --- files/patch-xbmc__cores__AudioRenderers__ALSADirectSound.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__cores__AudioRenderers__ALSADirectSound.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,21 +0,0 @@ ---- ./xbmc/cores/AudioRenderers/ALSADirectSound.cpp.orig 2010-10-25 16:43:36.000000000 +0200 -+++ ./xbmc/cores/AudioRenderers/ALSADirectSound.cpp 2010-12-01 12:17:34.212621188 +0100 -@@ -439,7 +439,7 @@ - { - if (!m_bIsAllocated) return 0; - -- int nSpace = snd_pcm_avail_update(m_pPlayHandle); -+ snd_pcm_sframes_t nSpace = snd_pcm_avail_update(m_pPlayHandle); - if (nSpace == 0) - { - snd_pcm_state_t state = snd_pcm_state(m_pPlayHandle); -@@ -451,7 +451,8 @@ - } - if (nSpace < 0) - { -- CLog::Log(LOGWARNING,"CALSADirectSound::GetSpace - get space failed. err: %d (%s)", nSpace, snd_strerror(nSpace)); -+ CLog::Log(LOGWARNING,"CALSADirectSound::GetSpace - get space failed. err: %ld (%s)", -+ (long)nSpace, snd_strerror(nSpace)); - nSpace = 0; - Flush(); - } Index: files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__cores__DllLoader__exports__emu_msvcrt.cpp --- files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,22 +1,31 @@ ---- ./xbmc/cores/DllLoader/exports/emu_msvcrt.cpp.orig 2010-10-04 01:33:13.000000000 +0200 -+++ ./xbmc/cores/DllLoader/exports/emu_msvcrt.cpp 2010-12-01 12:17:34.209596576 +0100 -@@ -30,6 +30,7 @@ - #include - #include +--- xbmc/cores/DllLoader/exports/emu_msvcrt.cpp.orig ++++ xbmc/cores/DllLoader/exports/emu_msvcrt.cpp +@@ -27,7 +27,7 @@ + #include + #include + #else +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include + #endif + #endif +@@ -36,6 +36,7 @@ #include + #include "system.h" // for HAS_DVD_DRIVE + #ifdef HAS_DVD_DRIVE +#if !defined(__FreeBSD__) - #ifdef _LINUX - #include - #ifndef __APPLE__ -@@ -39,6 +40,7 @@ - #include - #endif + #ifdef _LINUX + #include + #ifndef __APPLE__ +@@ -45,6 +46,7 @@ + #endif + #endif #endif +#endif #include #include #include -@@ -134,6 +136,8 @@ +@@ -139,6 +141,8 @@ extern "C" void __stdcall init_emu_envir dll_putenv("OS=darwin"); #elif defined(_LINUX) dll_putenv("OS=linux"); @@ -25,9 +34,9 @@ #else dll_putenv("OS=unknown"); #endif -@@ -141,11 +145,11 @@ - dll_putenv("PYTHONHOME=special://xbmc/system/python"); - dll_putenv("PATH=.;special://xbmc;special://xbmc/system/python"); +@@ -159,11 +163,11 @@ extern "C" void __stdcall init_emu_envir + dll_putenv(string("PATH=.;" + _P("special://xbmc") + ";" + _P("special://xbmc/system/python")).c_str()); + } //dll_putenv("PYTHONCASEOK=1"); - //dll_putenv("PYTHONDEBUG=1"); + dll_putenv("PYTHONDEBUG=1"); @@ -39,7 +48,7 @@ //dll_putenv("PYTHONMALLOCSTATS=1"); //dll_putenv("PYTHONY2K=1"); dll_putenv("TEMP=special://temp/temp"); // for python tempdir -@@ -1141,7 +1145,7 @@ +@@ -1159,7 +1163,7 @@ extern "C" FILE* dll_fopen(const char* filename, const char* mode) { FILE* file = NULL; @@ -48,7 +57,7 @@ if (strcmp(filename, MOUNTED) == 0 || strcmp(filename, MNTTAB) == 0) { -@@ -1249,7 +1253,7 @@ +@@ -1267,7 +1271,7 @@ extern "C" { // it might be something else than a file, or the file is not emulated // let the operating system handle it @@ -57,7 +66,7 @@ return fseek(stream, offset, origin); #else return fseeko64(stream, offset, origin); -@@ -1314,7 +1318,7 @@ +@@ -1332,7 +1336,7 @@ extern "C" { // it might be something else than a file, or the file is not emulated // let the operating system handle it @@ -66,7 +75,7 @@ return ftello(stream); #else return ftello64(stream); -@@ -1360,7 +1364,7 @@ +@@ -1378,7 +1382,7 @@ extern "C" CLog::Log(LOGWARNING, "msvcrt.dll: dll_telli64 called, TODO: add 'int64 -> long' type checking"); //warning #ifndef _LINUX return (__int64)tell(fd); @@ -75,7 +84,7 @@ return lseek(fd, 0, SEEK_CUR); #else return lseek64(fd, 0, SEEK_CUR); -@@ -1537,7 +1541,7 @@ +@@ -1555,7 +1559,7 @@ extern "C" int ret; ret = dll_fgetpos64(stream, &tmpPos); @@ -84,7 +93,7 @@ *pos = (fpos_t)tmpPos; #else pos->__pos = (off_t)tmpPos.__pos; -@@ -1550,7 +1554,7 @@ +@@ -1568,7 +1572,7 @@ extern "C" CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream); if (pFile != NULL) { @@ -93,7 +102,7 @@ *pos = pFile->GetPosition(); #else pos->__pos = pFile->GetPosition(); -@@ -1572,7 +1576,7 @@ +@@ -1590,7 +1594,7 @@ extern "C" int fd = g_emuFileWrapper.GetDescriptorByStream(stream); if (fd >= 0) { @@ -102,7 +111,7 @@ if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0) #else if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0) -@@ -1589,7 +1593,7 @@ +@@ -1607,7 +1611,7 @@ extern "C" { // it might be something else than a file, or the file is not emulated // let the operating system handle it @@ -111,7 +120,7 @@ return fsetpos(stream, pos); #else return fsetpos64(stream, pos); -@@ -1605,7 +1609,7 @@ +@@ -1623,7 +1627,7 @@ extern "C" if (fd >= 0) { fpos64_t tmpPos; @@ -120,7 +129,7 @@ tmpPos= *pos; #else tmpPos.__pos = (off64_t)(pos->__pos); -@@ -2079,7 +2083,7 @@ +@@ -2069,7 +2073,7 @@ extern "C" return (char***)&t; } @@ -129,11 +138,10 @@ int * __cdecl dll_errno(void) { return &errno; -@@ -2090,8 +2094,9 @@ - CFile* pFile = g_emuFileWrapper.GetFileXbmcByDescriptor(fd); - if (!pFile) +@@ -2083,7 +2087,9 @@ extern "C" return -1; -- + + #ifdef HAS_DVD_DRIVE -#ifndef __APPLE__ +#if defined(__FreeBSD__) + if (0) @@ -141,7 +149,7 @@ if(request == DVD_READ_STRUCT || request == DVD_AUTH) #else if(request == DKIOCDVDSENDKEY || request == DKIOCDVDREPORTKEY || request == DKIOCDVDREADSTRUCTURE) -@@ -2129,7 +2134,7 @@ +@@ -2125,7 +2131,7 @@ extern "C" CLog::Log(LOGERROR, "%s - getmntent is not implemented for our virtual filesystem", __FUNCTION__); return NULL; } @@ -150,7 +158,7 @@ return getmntent(fp); #else CLog::Log(LOGWARNING, "%s - unimplemented function called", __FUNCTION__); -@@ -2154,7 +2159,7 @@ +@@ -2150,7 +2156,7 @@ extern "C" else return 0; } Index: files/patch-xbmc__cores__DllLoader__exports__exports_python_linux.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__exports_python_linux.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__cores__DllLoader__exports__exports_python_linux.cpp --- files/patch-xbmc__cores__DllLoader__exports__exports_python_linux.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__cores__DllLoader__exports__exports_python_linux.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,56 +0,0 @@ ---- xbmc/cores/DllLoader/exports/exports_python_linux.cpp.orig 2010-12-17 07:17:41.000000000 +0100 -+++ xbmc/cores/DllLoader/exports/exports_python_linux.cpp 2010-12-27 20:00:59.000000000 +0100 -@@ -34,7 +34,7 @@ - #endif - #include "../DllLoaderContainer.h" - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - // - // Use pthread's built-in support for TLS, it's more portable. - // -@@ -105,7 +105,7 @@ - - char* xbp_getcwd(char *buf, int size) - { --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - // Initialize thread local storage and local thread pointer. - pthread_once(&keyOnce, MakeTlsKeys); - if (xbp_cw_dir == 0) -@@ -124,7 +124,7 @@ - - int xbp_chdir(const char *dirname) - { --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - // Initialize thread local storage and local thread pointer. - pthread_once(&keyOnce, MakeTlsKeys); - -@@ -139,7 +139,7 @@ - if (strlen(dirname) > MAX_PATH) return -1; - strcpy(xbp_cw_dir, dirname); - --#if (defined USE_EXTERNAL_PYTHON) -+#if defined(USE_EXTERNAL_PYTHON) - /* TODO: Need to figure out how to make system level Python make call to - * XBMC's chdir instead of non-threadsafe system chdir - */ -@@ -220,7 +220,7 @@ - FILE* xbp_fopen64(const char *filename, const char *mode) - { - CStdString strName = _P(filename); --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - return fopen(strName.c_str(), mode); - #else - return fopen64(strName.c_str(), mode); -@@ -233,7 +233,7 @@ - return lstat(strName.c_str(), buf); - } - --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - int xbp_lstat64(const char * path, struct stat64 * buf) - { - CStdString strName = _P(path); Index: files/patch-xbmc__cores__DllLoader__exports__util__EmuFileWrapper.h =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__util__EmuFileWrapper.h,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__cores__DllLoader__exports__util__EmuFileWrapper.h --- files/patch-xbmc__cores__DllLoader__exports__util__EmuFileWrapper.h 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__cores__DllLoader__exports__util__EmuFileWrapper.h 14 Oct 2011 18:44:51 -0000 @@ -1,11 +0,0 @@ ---- ./xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h.orig 2010-06-01 16:33:45.000000000 +0200 -+++ ./xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h 2010-12-01 12:17:34.211609073 +0100 -@@ -29,7 +29,7 @@ - - class CMutex; - --#if defined(_LINUX) && !defined(__APPLE__) -+#if defined(_LINUX) && !defined(__APPLE__) && !defined(__FreeBSD__) - #define _file _fileno - #endif - Index: files/patch-xbmc__cores__DllLoader__exports__wrapper.c =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__wrapper.c,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__cores__DllLoader__exports__wrapper.c --- files/patch-xbmc__cores__DllLoader__exports__wrapper.c 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__cores__DllLoader__exports__wrapper.c 14 Oct 2011 18:44:51 -0000 @@ -1,11 +0,0 @@ ---- ./xbmc/cores/DllLoader/exports/wrapper.c.orig 2010-05-28 21:31:42.000000000 +0200 -+++ ./xbmc/cores/DllLoader/exports/wrapper.c 2010-12-01 12:17:34.206576434 +0100 -@@ -37,7 +37,7 @@ - #include - #endif - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - typedef int64_t off64_t; - typedef off_t __off_t; - typedef off64_t __off64_t; Index: files/patch-xbmc__cores__dvdplayer__DVDAudio.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDAudio.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__cores__dvdplayer__DVDAudio.cpp --- files/patch-xbmc__cores__dvdplayer__DVDAudio.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__cores__dvdplayer__DVDAudio.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,12 +1,12 @@ ---- ./xbmc/cores/dvdplayer/DVDAudio.cpp.orig 2010-05-05 11:33:40.000000000 +0200 -+++ ./xbmc/cores/dvdplayer/DVDAudio.cpp 2010-12-01 12:17:34.200531401 +0100 -@@ -235,13 +235,14 @@ +--- xbmc/cores/dvdplayer/DVDAudio.cpp.orig ++++ xbmc/cores/dvdplayer/DVDAudio.cpp +@@ -237,14 +237,14 @@ void CDVDAudio::Finish() if(silence > 0 && m_iBufferSize > 0) { - CLog::Log(LOGDEBUG, "CDVDAudio::Drain - adding %d bytes of silence, buffer size: %d, chunk size: %d", silence, m_iBufferSize, m_dwPacketSize); -+ CLog::Log(LOGDEBUG, "CDVDAudio::Drain - adding %d bytes of silence, buffer size: %d, chunk size: %d", -+ (int)silence, (int)m_iBufferSize, (int)m_dwPacketSize); ++ CLog::Log(LOGDEBUG, "CDVDAudio::Drain - adding %d bytes of silence, buffer size: %d, chunk size: %d", (int)silence, (int)m_iBufferSize, (int)m_dwPacketSize); + m_pBuffer = (BYTE*)realloc(m_pBuffer, m_iBufferSize + silence); memset(m_pBuffer+m_iBufferSize, 0, silence); m_iBufferSize += silence; } Index: files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VDPAU.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VDPAU.cpp,v retrieving revision 1.2 diff -u -p -r1.2 patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VDPAU.cpp --- files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VDPAU.cpp 26 Apr 2011 11:11:03 -0000 1.2 +++ files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VDPAU.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,13 +0,0 @@ ---- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp.orig 2011-03-05 04:33:37.000000000 +0100 -+++ xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp 2011-04-25 19:11:54.000000000 +0200 -@@ -647,8 +647,9 @@ - - void CVDPAU::InitVDPAUProcs() - { -- char* error; -+ const char* error; - -+ (void)dlerror(); - dl_vdp_device_create_x11 = (VdpStatus (*)(Display*, int, VdpDevice*, VdpStatus (**)(VdpDevice, VdpFuncId, void**)))dlsym(dl_handle, (const char*)"vdp_device_create_x11"); - error = dlerror(); - if (error) Index: files/patch-xbmc__cores__paplayer__NSFCodec__NoseFartDLL.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__cores__paplayer__NSFCodec__NoseFartDLL.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__cores__paplayer__NSFCodec__NoseFartDLL.cpp --- files/patch-xbmc__cores__paplayer__NSFCodec__NoseFartDLL.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__cores__paplayer__NSFCodec__NoseFartDLL.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,11 +0,0 @@ ---- ./xbmc/cores/paplayer/NSFCodec/NoseFartDLL.cpp.orig 2010-10-04 19:49:31.000000000 +0200 -+++ ./xbmc/cores/paplayer/NSFCodec/NoseFartDLL.cpp 2010-12-01 12:17:34.222702947 +0100 -@@ -19,7 +19,7 @@ - * - */ - --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - #define __declspec(x) - #endif - extern "C" Index: files/patch-xbmc__cores__paplayer__PAPlayer.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__cores__paplayer__PAPlayer.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__cores__paplayer__PAPlayer.cpp --- files/patch-xbmc__cores__paplayer__PAPlayer.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__cores__paplayer__PAPlayer.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,5 +1,5 @@ ---- ./xbmc/cores/paplayer/PAPlayer.cpp.orig 2010-09-30 12:17:21.000000000 +0200 -+++ ./xbmc/cores/paplayer/PAPlayer.cpp 2010-12-01 12:17:34.224719076 +0100 +--- xbmc/cores/paplayer/PAPlayer.cpp.orig ++++ xbmc/cores/paplayer/PAPlayer.cpp @@ -341,7 +341,8 @@ if(silence > 0 && m_bufferPos[stream] > 0) @@ -10,12 +10,3 @@ memset(m_pcmBuffer[stream] + m_bufferPos[stream], 0, silence); m_bufferPos[stream] += silence; } -@@ -896,7 +897,7 @@ - { - DWORD time = CTimeUtils::GetTimeMS(); - m_timeOffset = m_decoder[m_currentDecoder].Seek(m_SeekTime); -- CLog::Log(LOGDEBUG, "Seek to time %f took %i ms", 0.001f * m_SeekTime, CTimeUtils::GetTimeMS() - time); -+ CLog::Log(LOGDEBUG, "Seek to time %f took %i ms", 0.001f * m_SeekTime, (int)(CTimeUtils::GetTimeMS() - time)); - FlushStreams(); - m_SeekTime = -1; - } Index: files/patch-xbmc__cores__paplayer__SIDCodec__Makefile.in =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__cores__paplayer__SIDCodec__Makefile.in,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__cores__paplayer__SIDCodec__Makefile.in --- files/patch-xbmc__cores__paplayer__SIDCodec__Makefile.in 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__cores__paplayer__SIDCodec__Makefile.in 14 Oct 2011 18:44:51 -0000 @@ -1,12 +0,0 @@ ---- ./xbmc/cores/paplayer/SIDCodec/Makefile.in.orig 2010-06-11 19:53:24.000000000 +0200 -+++ ./xbmc/cores/paplayer/SIDCodec/Makefile.in 2010-12-01 12:17:34.223710592 +0100 -@@ -1,7 +1,7 @@ - ARCH=@ARCH@ - --CFLAGS +=-D_LINUX -DHAVE_UNIX -DHAVE_STRCASECMP -DHAVE_STRNCASECMP -DHAVE_IOS_OPENMODE -fPIC -Ilibsidplay/win/VC -Ibuilders/resid-builder/include/sidplay/builders -Ilibsidplay/include/sidplay -Iresid -Ilibsidplay/include -I../../../linux -I../../../utils -I../../../ -I../../../../guilib/ -fPIC --CXXFLAGS += $(CFLAGS) -+CFLAGS :=-D_LINUX -DHAVE_UNIX -DHAVE_STRCASECMP -DHAVE_STRNCASECMP -DHAVE_IOS_OPENMODE -fPIC -Ilibsidplay/win/VC -Ibuilders/resid-builder/include/sidplay/builders -Ilibsidplay/include/sidplay -Iresid -Ilibsidplay/include -I../../../linux -I../../../utils -I../../../ -I../../../../guilib/ -fPIC $(CFLAGS) -+CXXFLAGS := $(CFLAGS) $(CXXFLAGS) - ifeq ($(ARCH), powerpc-osx) - BUNDLE1_O=-lbundle1.o -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1/ -lgcc - endif Index: files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__XBMCYM.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__XBMCYM.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__XBMCYM.cpp --- files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__XBMCYM.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__XBMCYM.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,11 +0,0 @@ ---- ./xbmc/cores/paplayer/YMCodec/StSoundLibrary/XBMCYM.cpp.orig 2010-10-04 19:46:47.000000000 +0200 -+++ ./xbmc/cores/paplayer/YMCodec/StSoundLibrary/XBMCYM.cpp 2010-12-01 12:17:34.217661928 +0100 -@@ -25,7 +25,7 @@ - #include - #include - --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - #define __declspec(x) - #endif - Index: files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__YmTypes.h =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__YmTypes.h,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__YmTypes.h --- files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__YmTypes.h 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__YmTypes.h 14 Oct 2011 18:44:51 -0000 @@ -1,29 +0,0 @@ ---- ./xbmc/cores/paplayer/YMCodec/StSoundLibrary/YmTypes.h.orig 2008-07-15 20:34:24.000000000 +0200 -+++ ./xbmc/cores/paplayer/YMCodec/StSoundLibrary/YmTypes.h 2010-12-01 12:17:34.219682526 +0100 -@@ -39,20 +39,20 @@ - // Platform specific stuff - //----------------------------------------------------------- - --#if defined(_WIN32) || defined(__linux__) -+#if defined(_WIN32) || defined(__linux__) || defined(__FreeBSD__) - - // These settings are ok for Windows 32bits platform. - - #ifdef YM_INTEGER_ONLY --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - #include - typedef int64_t yms64; --#else -+#else /* !__linux__ */ - typedef __int64 yms64; --#endif --#else -+#endif /* __linux__ */ -+#else /* !YM_INTEGER_ONLY */ - typedef float ymfloat; --#endif -+#endif /* YM_INTEGER_ONLY */ - - typedef signed char yms8; // 8 bits signed integer - typedef signed short yms16; // 16 bits signed integer Index: files/patch-xbmc__lib__cximage-6.0__raw__dcr.c =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__lib__cximage-6.0__raw__dcr.c,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__lib__cximage-6.0__raw__dcr.c --- files/patch-xbmc__lib__cximage-6.0__raw__dcr.c 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__lib__cximage-6.0__raw__dcr.c 14 Oct 2011 18:44:51 -0000 @@ -1,17 +0,0 @@ ---- ./xbmc/lib/cximage-6.0/raw/dcr.c.orig 2009-05-16 12:01:35.000000000 +0200 -+++ ./xbmc/lib/cximage-6.0/raw/dcr.c 2010-12-01 12:17:34.252898220 +0100 -@@ -144,8 +144,12 @@ - - //!!! set return point for error handling - if (setjmp (dcr.failure)) { -- if (fileno(dcr.obj_) > 2) (*dcr.ops_->close_)(dcr.obj_); -- if (fileno(ofp) > 2) fclose(ofp); -+#if !defined(__FreeBSD__) -+ if (fileno(dcr.obj_) > 2) -+ (*dcr.ops_->close_)(dcr.obj_); -+#endif -+ if (fileno(ofp) > 2) -+ fclose(ofp); - status = 1; - goto cleanup; - } Index: files/patch-xbmc__lib__cximage-6.0__raw__libdcr.h =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__lib__cximage-6.0__raw__libdcr.h,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__lib__cximage-6.0__raw__libdcr.h --- files/patch-xbmc__lib__cximage-6.0__raw__libdcr.h 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__lib__cximage-6.0__raw__libdcr.h 14 Oct 2011 18:44:51 -0000 @@ -1,11 +0,0 @@ ---- ./xbmc/lib/cximage-6.0/raw/libdcr.h.orig 2009-05-21 08:01:34.000000000 +0200 -+++ ./xbmc/lib/cximage-6.0/raw/libdcr.h 2010-12-01 12:17:34.248861773 +0100 -@@ -41,7 +41,7 @@ - #include - #include - #endif --#if defined(_LINUX) || defined(__APPLE__) -+#if defined(_LINUX) || defined(__APPLE__) || defined(__FreeBSD__) - #include - #include - #define _swab swab Index: files/patch-xbmc__lib__libPython__XBPython.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__lib__libPython__XBPython.cpp,v retrieving revision 1.2 diff -u -p -r1.2 patch-xbmc__lib__libPython__XBPython.cpp --- files/patch-xbmc__lib__libPython__XBPython.cpp 9 Mar 2011 14:11:24 -0000 1.2 +++ files/patch-xbmc__lib__libPython__XBPython.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,51 +0,0 @@ ---- xbmc/lib/libPython/XBPython.cpp.orig 2010-12-17 07:17:41.000000000 +0100 -+++ xbmc/lib/libPython/XBPython.cpp 2011-03-07 15:00:17.000000000 +0100 -@@ -24,7 +24,9 @@ - #include "config.h" - #endif - #if (defined USE_EXTERNAL_PYTHON) -- #if (defined HAVE_LIBPYTHON2_6) -+ #if (defined HAVE_LIBPYTHON2_7) -+ #include -+ #elif (defined HAVE_LIBPYTHON2_6) - #include - #elif (defined HAVE_LIBPYTHON2_5) - #include -@@ -60,6 +62,28 @@ - #else - #define PYTHON_DLL "special://xbmcbin/system/python/python24-x86-osx.so" - #endif -+#elif defined(__FreeBSD__) -+#if defined(__x86_64__) -+#if defined(HAVE_LIBPYTHON2_7) -+#define PYTHON_DLL "special://xbmcbin/system/python/python27-x86_64-freebsd.so" -+#elif defined(HAVE_LIBPYTHON2_6) -+#define PYTHON_DLL "special://xbmcbin/system/python/python26-x86_64-freebsd.so" -+#elif defined(HAVE_LIBPYTHON2_5) -+#define PYTHON_DLL "special://xbmcbin/system/python/python25-x86_64-freebsd.so" -+#else /* LIBPYTHON2_4 */ -+#define PYTHON_DLL "special://xbmcbin/system/python/python24-x86_64-freebsd.so" -+#endif -+#else /* !__x86_64__ */ -+#if defined(HAVE_LIBPYTHON2_7) -+#define PYTHON_DLL "special://xbmcbin/system/python/python27-x86-freebsd.so" -+#elif defined(HAVE_LIBPYTHON2_6) -+#define PYTHON_DLL "special://xbmcbin/system/python/python26-x86-freebsd.so" -+#elif defined(HAVE_LIBPYTHON2_5) -+#define PYTHON_DLL "special://xbmcbin/system/python/python25-x86-freebsd.so" -+#else /* LIBPYTHON2_4 */ -+#define PYTHON_DLL "special://xbmcbin/system/python/python24-x86-freebsd.so" -+#endif -+#endif /* __x86_64__ */ - #elif defined(__x86_64__) - #if (defined HAVE_LIBPYTHON2_6) - #define PYTHON_DLL "special://xbmcbin/system/python/python26-x86_64-linux.so" -@@ -443,7 +467,7 @@ - - // first free all dlls loaded by python, after that python24.dll (this is done by UnloadPythonDlls - DllLoaderContainer::UnloadPythonDlls(); --#ifdef _LINUX -+#if defined(_LINUX) && !defined(__FreeBSD__) - // we can't release it on windows, as this is done in UnloadPythonDlls() for win32 (see above). - // The implementation for linux and os x needs looking at - UnloadPythonDlls() currently only searches for "python24.dll" - DllLoaderContainer::ReleaseModule(m_pDll); Index: files/patch-xbmc__lib__libPython__linux__Makefile.in =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__lib__libPython__linux__Makefile.in,v retrieving revision 1.2 diff -u -p -r1.2 patch-xbmc__lib__libPython__linux__Makefile.in --- files/patch-xbmc__lib__libPython__linux__Makefile.in 9 Mar 2011 14:11:24 -0000 1.2 +++ files/patch-xbmc__lib__libPython__linux__Makefile.in 14 Oct 2011 18:44:51 -0000 @@ -1,18 +0,0 @@ ---- xbmc/lib/libPython/linux/Makefile.in.orig 2010-12-17 07:17:41.000000000 +0100 -+++ xbmc/lib/libPython/linux/Makefile.in 2011-03-07 14:55:55.000000000 +0100 -@@ -2,10 +2,13 @@ - CC=@CC@ - CFLAGS=@CFLAGS@ - LDFLAGS=@LDFLAGS@ --SHELL=/bin/bash -+SHELL=/bin/sh - SYSDIR=../../../../system/python - --ifeq (@USE_PYTHON2_6@,1) -+ifeq (@USE_PYTHON2_7@,1) -+ PYVERSION=python2.7 -+ SO=python27-$(ARCH).so -+else ifeq (@USE_PYTHON2_6@,1) - PYVERSION=python2.6 - SO=python26-$(ARCH).so - else ifeq (@USE_PYTHON2_5@,1) Index: files/patch-xbmc__lib__libPython__linux__wrapper_python.c =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__lib__libPython__linux__wrapper_python.c,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__lib__libPython__linux__wrapper_python.c --- files/patch-xbmc__lib__libPython__linux__wrapper_python.c 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__lib__libPython__linux__wrapper_python.c 14 Oct 2011 18:44:51 -0000 @@ -1,20 +0,0 @@ ---- ./xbmc/lib/libPython/linux/wrapper_python.c.orig 2010-07-17 23:26:42.000000000 +0200 -+++ ./xbmc/lib/libPython/linux/wrapper_python.c 2010-12-01 12:17:34.245845263 +0100 -@@ -40,7 +40,7 @@ - int xbp_mkdir(const char *dirname); - int xbp_open(const char *filename, int oflag, int pmode); - int xbp_lstat(const char * path, struct stat * buf); --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - int xbp_lstat64(const char * path, struct stat64 * buf); - #endif - void *xbp_dlopen(const char *filename, int flag); -@@ -98,7 +98,7 @@ - { - return xbp_lstat(path, buf); - } --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - int PYTHON_WRAP(lstat64)(const char * path, struct stat64 * buf) - { - return xbp_lstat64(path, buf); Index: files/patch-xbmc__lib__libRTV__GuideParser.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__lib__libRTV__GuideParser.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__lib__libRTV__GuideParser.cpp --- files/patch-xbmc__lib__libRTV__GuideParser.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__lib__libRTV__GuideParser.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,11 +0,0 @@ ---- ./xbmc/lib/libRTV/GuideParser.cpp.orig 2010-02-12 00:47:51.000000000 +0100 -+++ ./xbmc/lib/libRTV/GuideParser.cpp 2010-12-01 12:17:34.245845263 +0100 -@@ -130,7 +130,7 @@ - #include - #endif - --#if (defined(__unix__) || defined(__APPLE__)) && !defined(__FreeBSD__) -+#if (defined(__unix__) || defined(__APPLE__)) - #include - #endif - Index: files/patch-xbmc__lib__libXBMS__ccincludes.h =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__lib__libXBMS__ccincludes.h,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__lib__libXBMS__ccincludes.h --- files/patch-xbmc__lib__libXBMS__ccincludes.h 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__lib__libXBMS__ccincludes.h 14 Oct 2011 18:44:51 -0000 @@ -1,13 +0,0 @@ ---- ./xbmc/lib/libXBMS/ccincludes.h.orig 2010-04-18 23:05:41.000000000 +0200 -+++ ./xbmc/lib/libXBMS/ccincludes.h 2010-12-01 12:17:34.244845160 +0100 -@@ -58,6 +58,10 @@ - #define snprintf _snprintf - #endif /* _XBOX */ - -+#if defined(__FreeBSD__) -+#include -+#endif -+ - //extern int errno; - - #ifndef PATH_MAX Index: files/patch-xbmc__lib__libXDAAP__httpClient.c =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__lib__libXDAAP__httpClient.c,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__lib__libXDAAP__httpClient.c --- files/patch-xbmc__lib__libXDAAP__httpClient.c 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__lib__libXDAAP__httpClient.c 14 Oct 2011 18:44:51 -0000 @@ -1,14 +0,0 @@ ---- ./xbmc/lib/libXDAAP/httpClient.c.orig 2009-03-28 03:32:24.000000000 +0100 -+++ ./xbmc/lib/libXDAAP/httpClient.c 2010-12-01 12:17:34.243841426 +0100 -@@ -61,6 +61,11 @@ - #include - #endif - -+#if defined(__FreeBSD__) -+#include -+#include -+#endif /* __FreeBSD__ */ -+ - struct HTTP_ConnectionTAG - { - char *host; Index: files/patch-xbmc__lib__libXDAAP__ioloop.c =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__lib__libXDAAP__ioloop.c,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__lib__libXDAAP__ioloop.c --- files/patch-xbmc__lib__libXDAAP__ioloop.c 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__lib__libXDAAP__ioloop.c 14 Oct 2011 18:44:51 -0000 @@ -1,13 +0,0 @@ ---- ./xbmc/lib/libXDAAP/ioloop.c.orig 2008-08-10 17:07:47.000000000 +0200 -+++ ./xbmc/lib/libXDAAP/ioloop.c 2010-12-01 12:17:34.240824916 +0100 -@@ -122,9 +122,9 @@ - - void fd_event_reset(fd_event *event) - { -- event->signalled = 0; - char buf[1] = {0}; - int flags; -+ event->signalled = 0; - - /* set non-blocking on read pipe */ - flags = fcntl(event->pipe[0], F_GETFL, 0); Index: files/patch-xbmc__lib__libXDAAP__thread.h =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__lib__libXDAAP__thread.h,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__lib__libXDAAP__thread.h --- files/patch-xbmc__lib__libXDAAP__thread.h 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__lib__libXDAAP__thread.h 14 Oct 2011 18:44:51 -0000 @@ -1,11 +0,0 @@ ---- ./xbmc/lib/libXDAAP/thread.h.orig 2008-12-04 22:22:25.000000000 +0100 -+++ ./xbmc/lib/libXDAAP/thread.h 2010-12-01 12:17:34.243841426 +0100 -@@ -37,7 +37,7 @@ - #define ts_mutex pthread_mutex_t - #define ts_condition pthread_cond_t - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE - #endif - Index: files/patch-xbmc__lib__libXDAAP__threadpool.c =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__lib__libXDAAP__threadpool.c,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__lib__libXDAAP__threadpool.c --- files/patch-xbmc__lib__libXDAAP__threadpool.c 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__lib__libXDAAP__threadpool.c 14 Oct 2011 18:44:51 -0000 @@ -1,15 +0,0 @@ ---- ./xbmc/lib/libXDAAP/threadpool.c.orig 2008-07-19 14:45:00.000000000 +0200 -+++ ./xbmc/lib/libXDAAP/threadpool.c 2010-12-01 12:17:34.241828930 +0100 -@@ -279,10 +279,10 @@ - void CP_ThreadPool_QueueWorkItem(CP_SThreadPool *pTPThis, CP_TPfnJob pfnCallback, - void *arg1, void *arg2) - { -- ts_mutex_lock(pTPThis->mtJobQueueMutex); -- - CP_STPJobQueue *pTPJQNewJob = malloc(sizeof(CP_STPJobQueue)); - -+ ts_mutex_lock(pTPThis->mtJobQueueMutex); -+ - pTPJQNewJob->fnJobCallback = pfnCallback; - pTPJQNewJob->arg1 = arg1; - pTPJQNewJob->arg2 = arg2; Index: files/patch-xbmc__lib__libhts__net_posix.c =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__lib__libhts__net_posix.c,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__lib__libhts__net_posix.c --- files/patch-xbmc__lib__libhts__net_posix.c 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__lib__libhts__net_posix.c 14 Oct 2011 18:44:51 -0000 @@ -1,29 +0,0 @@ ---- ./xbmc/lib/libhts/net_posix.c.orig 2010-02-15 06:06:37.000000000 +0100 -+++ ./xbmc/lib/libhts/net_posix.c 2010-12-01 12:17:34.312321908 +0100 -@@ -17,12 +17,14 @@ - */ - - #include --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - /* Needed on Mac OS/X */ - #ifndef SOL_TCP - #define SOL_TCP IPPROTO_TCP - #endif -+#if defined(__APPLE__) - #include "OSXGNUReplacements.h" -+#endif - #else - #include - #endif -@@ -41,6 +43,10 @@ - - #include "net.h" - -+#if defined(__FreeBSD__) -+#include -+#endif -+ - - /** - * Index: files/patch-xbmc__linux__LinuxTimezone.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__linux__LinuxTimezone.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__linux__LinuxTimezone.cpp --- files/patch-xbmc__linux__LinuxTimezone.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__linux__LinuxTimezone.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,6 +1,6 @@ --- xbmc/linux/LinuxTimezone.cpp (revision 35637) +++ xbmc/linux/LinuxTimezone.cpp (working copy) -@@ -27,6 +27,12 @@ +@@ -28,6 +28,12 @@ #include "OSXGNUReplacements.h" #endif @@ -13,7 +13,7 @@ #include "Util.h" using namespace std; -@@ -89,7 +95,11 @@ +@@ -90,7 +96,11 @@ CLinuxTimezone::CLinuxTimezone() : m_IsD } // Load countries @@ -25,7 +25,7 @@ if (fp) { CStdString countryCode; -@@ -109,7 +119,14 @@ +@@ -110,7 +120,14 @@ CLinuxTimezone::CLinuxTimezone() : m_IsD // Search for the first non space from the 2nd character and on int i = 2; while (s[i] == ' ' || s[i] == '\t') i++; @@ -41,20 +41,20 @@ countryCode = s.Left(2); countryName = s.Mid(i); -@@ -144,7 +161,10 @@ - - void CLinuxTimezone::SetTimezone(CStdString timezoneName) - { --#ifndef __APPLE__ +@@ -156,15 +173,137 @@ void CLinuxTimezone::SetTimezone(CStdStr + + if (use_timezone) + { +#if defined(__FreeBSD__) -+ setenv("TZ", timezoneName.c_str(), 1); -+ tzset(); -+#elif !defined(__APPLE__) - static char env_var[255]; - sprintf(env_var, "TZ=:%s", timezoneName.c_str()); - putenv(env_var); -@@ -152,8 +172,125 @@ - #endif ++ setenv("TZ", timezoneName.c_str(), 1); ++ tzset(); ++#else + static char env_var[255]; + sprintf(env_var, "TZ=:%s", timezoneName.c_str()); + putenv(env_var); ++#endif + tzset(); + } } +#if defined(__FreeBSD__) @@ -177,9 +177,9 @@ + return tz; +#else char timezoneName[255]; - timezoneName[0] = 0; - FILE* fp = fopen("/etc/timezone", "r"); -@@ -165,6 +302,7 @@ + + // try Slackware approach first +@@ -191,6 +330,7 @@ CStdString CLinuxTimezone::GetOSConfigur } return timezoneName; Index: files/patch-xbmc__linux__NetworkLinux.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__linux__NetworkLinux.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__linux__NetworkLinux.cpp --- files/patch-xbmc__linux__NetworkLinux.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__linux__NetworkLinux.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,195 +0,0 @@ ---- ./xbmc/linux/NetworkLinux.cpp.orig 2010-03-06 18:18:26.000000000 +0100 -+++ ./xbmc/linux/NetworkLinux.cpp 2010-12-01 12:17:34.260943458 +0100 -@@ -23,14 +23,14 @@ - #include - #include - #include --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - #include - #include - #include - #endif - #include - #include --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - #include - #include - #include -@@ -40,6 +40,9 @@ - #include "NetworkLinux.h" - #include "Util.h" - #include "log.h" -+#if defined(__FreeBSD__) -+#include -+#endif - - using namespace std; - -@@ -61,7 +64,7 @@ - - bool CNetworkInterfaceLinux::IsWireless() - { --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - return false; - #else - struct iwreq wrq; -@@ -106,7 +109,7 @@ - { - CStdString result = ""; - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - result.Format("00:00:00:00:00:00"); - #else - struct ifreq ifr; -@@ -160,7 +163,7 @@ - { - CStdString result = ""; - --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - char essid[IW_ESSID_MAX_SIZE + 1]; - memset(&essid, 0, sizeof(essid)); - -@@ -182,7 +185,84 @@ - { - CStdString result = ""; - --#ifndef __APPLE__ -+#if defined(__FreeBSD__) -+ struct { -+ struct rt_msghdr m_rtm; -+ char m_space[512]; -+ } m_rtmsg; -+ int s, seq, l, pid, rtm_addrs, i; -+ struct sockaddr so_dst, so_mask; -+ struct rt_msghdr rtm; -+ char *cp = m_rtmsg.m_space; -+ struct sockaddr *gate = NULL, *sa; -+ struct rt_msghdr *rtm_aux; -+ -+#define ROUNDUP(a) \ -+ ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) -+ -+#define NEXTADDR(w, u) \ -+ if (rtm_addrs & (w)) {\ -+ l = ROUNDUP(u.sa_len); memmove(cp, &(u), l); cp += l;\ -+ } -+ -+#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len)) -+ -+ pid = getpid(); -+ seq = 0; -+ rtm_addrs = RTA_DST | RTA_NETMASK; -+ -+ bzero(&so_dst, sizeof(so_dst)); -+ bzero(&so_mask, sizeof(so_mask)); -+ bzero(&rtm, sizeof(struct rt_msghdr)); -+ -+ rtm.rtm_type = RTM_GET; -+ rtm.rtm_flags = RTF_UP | RTF_GATEWAY; -+ rtm.rtm_version = RTM_VERSION; -+ rtm.rtm_seq = ++seq; -+ rtm.rtm_addrs = rtm_addrs; -+ -+ so_dst.sa_family = AF_INET; -+ so_dst.sa_len = sizeof(struct sockaddr_in); -+ so_mask.sa_family = AF_INET; -+ so_mask.sa_len = sizeof(struct sockaddr_in); -+ -+ NEXTADDR(RTA_DST, so_dst); -+ NEXTADDR(RTA_NETMASK, so_mask); -+ -+ rtm.rtm_msglen = l = cp - (char *)&m_rtmsg; -+ -+ s = socket(PF_ROUTE, SOCK_RAW, 0); -+ -+ if (write(s, (char *)&m_rtmsg, l) < 0) -+ return result; -+ -+ do { -+ l = read(s, (char *)&m_rtmsg, sizeof(m_rtmsg)); -+ } while (l > 0 && (rtm.rtm_seq != seq || rtm.rtm_pid != pid)); -+ -+ close(s); -+ -+ rtm_aux = &rtm; -+ -+ cp = ((char *)(rtm_aux + 1)); -+ if (rtm_aux->rtm_addrs) { -+ for (i = 1; i; i <<= 1) -+ if (i & rtm_aux->rtm_addrs) { -+ sa = (struct sockaddr *)cp; -+ if (i == RTA_GATEWAY) -+ gate = sa; -+ ADVANCE(cp, sa); -+ } -+ } -+ else -+ return result; -+ -+ if (gate != NULL) -+ result = inet_ntoa(((struct sockaddr_in *)gate)->sin_addr); -+ -+ return result; -+ -+#elif !defined(__APPLE__) - FILE* fp = fopen("/proc/net/route", "r"); - if (!fp) - { -@@ -262,7 +342,7 @@ - { - m_interfaces.clear(); - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - - // Query the list of interfaces. - struct ifaddrs *list; -@@ -280,7 +360,6 @@ - } - - freeifaddrs(list); -- - #else - FILE* fp = fopen("/proc/net/dev", "r"); - if (!fp) -@@ -327,7 +406,7 @@ - std::vector CNetworkLinux::GetNameServers(void) - { - std::vector result; --#ifndef __APPLE__ -+#if !defined(__APPLE__) - res_init(); - - for (int i = 0; i < _res.nscount; i ++) -@@ -363,7 +442,7 @@ - if (!IsWireless()) - return result; - --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - // Query the wireless extentsions version number. It will help us when we - // parse the resulting events - struct iwreq iwr; -@@ -549,7 +628,7 @@ - encryptionMode = ENC_NONE; - assignment = NETWORK_DISABLED; - --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - FILE* fp = fopen("/etc/network/interfaces", "r"); - if (!fp) - { -@@ -625,7 +704,7 @@ - - void CNetworkInterfaceLinux::SetSettings(NetworkAssignment& assignment, CStdString& ipAddress, CStdString& networkMask, CStdString& defaultGateway, CStdString& essId, CStdString& key, EncMode& encryptionMode) - { --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - FILE* fr = fopen("/etc/network/interfaces", "r"); - if (!fr) - { Index: files/patch-xbmc__linux__PlatformDefs.h =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__linux__PlatformDefs.h,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__linux__PlatformDefs.h --- files/patch-xbmc__linux__PlatformDefs.h 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__linux__PlatformDefs.h 14 Oct 2011 18:44:51 -0000 @@ -1,6 +1,6 @@ --- ./xbmc/linux/PlatformDefs.h.orig 2010-06-09 07:05:59.000000000 +0200 +++ ./xbmc/linux/PlatformDefs.h 2010-12-01 12:17:34.264972083 +0100 -@@ -37,11 +37,15 @@ +@@ -39,11 +39,15 @@ #include #include #include @@ -27,60 +27,21 @@ #define APIENTRY WINAPI #else #define APIENTRY -@@ -190,16 +194,24 @@ - typedef void* HINSTANCE; - typedef void* HMODULE; +@@ -344,14 +360,16 @@ typedef int (*LPTHREAD_START_ROUTINE)(vo + #define _O_WRONLY O_WRONLY + #define _off_t off_t +-#if defined(__APPLE__) +#if defined(__APPLE__) || defined(__FreeBSD__) - #ifdef __APPLE__ ++#ifdef __APPLE__ + #include #include +#endif typedef int64_t off64_t; typedef off_t __off_t; typedef off64_t __off64_t; typedef fpos_t fpos64_t; -+#ifdef __APPLE__ - #include - #endif -+#endif - -+#if defined(__FreeBSD__) -+typedef unsigned long DWORD; -+#else - typedef unsigned int DWORD; -+#endif - typedef unsigned short WORD; - typedef unsigned char BYTE; - typedef char CHAR; -@@ -248,7 +260,11 @@ - typedef intptr_t (*FARPROC)(void); - - #define MAXWORD 0xffff -+#if defined(__FreeBSD__) && defined(__amd64__) -+#define MAXDWORD 0xffffffffffffffff -+#else - #define MAXDWORD 0xffffffff -+#endif - - typedef DWORD LCID; - typedef WORD* LPWORD; -@@ -303,7 +319,11 @@ - LONG DaylightBias; - } TIME_ZONE_INFORMATION, *PTIME_ZONE_INFORMATION, *LPTIME_ZONE_INFORMATION; - -+#if defined(__FreeBSD__) && defined(__amd64__) -+#define TIME_ZONE_ID_INVALID ((DWORD)0xFFFFFFFFFFFFFFFF) -+#else - #define TIME_ZONE_ID_INVALID ((DWORD)0xFFFFFFFF) -+#endif - #define TIME_ZONE_ID_UNKNOWN 0 - #define TIME_ZONE_ID_STANDARD 1 - #define TIME_ZONE_ID_DAYLIGHT 2 -@@ -357,7 +377,7 @@ - #define _O_WRONLY O_WRONLY - #define _off_t off_t - --#if defined(__APPLE__) && (MAC_OS_X_VERSION_MAX_ALLOWED < 1050) +-#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1050) +#if defined(__FreeBSD__) || (defined(__APPLE__) && (MAC_OS_X_VERSION_MAX_ALLOWED < 1050)) #define __stat64 stat #define stat64 stat Index: files/patch-xbmc__linux__PosixMountProvider.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__linux__PosixMountProvider.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__linux__PosixMountProvider.cpp --- files/patch-xbmc__linux__PosixMountProvider.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__linux__PosixMountProvider.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,11 +0,0 @@ ---- ./xbmc/linux/PosixMountProvider.cpp.orig 2010-01-09 00:47:11.000000000 +0100 -+++ ./xbmc/linux/PosixMountProvider.cpp 2010-12-01 12:17:34.257919126 +0100 -@@ -98,6 +98,8 @@ - - #ifdef __APPLE__ - FILE* pipe = popen("df -hT ufs,cd9660,hfs,udf", "r"); -+#elif defined(__FreeBSD__) -+ FILE* pipe = popen("df -h -t ufs,cd9660,hfs,udf,zfs", "r"); - #else - FILE* pipe = popen("df -hx tmpfs", "r"); - #endif Index: files/patch-xbmc__linux__XFileUtils.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__linux__XFileUtils.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__linux__XFileUtils.cpp --- files/patch-xbmc__linux__XFileUtils.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__linux__XFileUtils.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,56 +0,0 @@ ---- ./xbmc/linux/XFileUtils.cpp.orig 2010-08-21 12:04:13.000000000 +0200 -+++ ./xbmc/linux/XFileUtils.cpp 2010-12-01 12:17:34.259935534 +0100 -@@ -29,7 +29,7 @@ - #include "XHandle.h" - #include - #include --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - #include - #else - #include -@@ -60,7 +60,7 @@ - strPath.Replace("\\","/"); - - // if the file name is a directory then we add a * to look for all files in this directory --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - DIR *testDir = opendir(strPath.c_str()); - #else - DIR *testDir = opendir(szPath); -@@ -552,7 +552,7 @@ - nMode = SEEK_END; - - off64_t currOff; --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - currOff = lseek(hFile->fd, offset, nMode); - #else - currOff = lseek64(hFile->fd, offset, nMode); -@@ -598,7 +598,7 @@ - - memset(lpTimeZoneInformation, 0, sizeof(TIME_ZONE_INFORMATION)); - --#ifdef __APPLE__ -+#if defined(__APPLE__) - struct timezone tz; - gettimeofday(NULL, &tz); - lpTimeZoneInformation->Bias = tz.tz_minuteswest; -@@ -621,7 +621,7 @@ - return false; - - // get the current offset --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - off64_t currOff = lseek(hFile->fd, 0, SEEK_CUR); - #else - off64_t currOff = lseek64(hFile->fd, 0, SEEK_CUR); -@@ -649,7 +649,7 @@ - - off64_t toMove = liDistanceToMove.QuadPart; - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - off64_t currOff = lseek(hFile->fd, toMove, nMode); - #else - off64_t currOff = lseek64(hFile->fd, toMove, nMode); Index: files/patch-xbmc__linux__XRandR.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__linux__XRandR.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__linux__XRandR.cpp --- files/patch-xbmc__linux__XRandR.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__linux__XRandR.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,14 +0,0 @@ ---- ./xbmc/linux/XRandR.cpp.orig 2010-10-10 20:44:23.000000000 +0200 -+++ ./xbmc/linux/XRandR.cpp 2010-12-01 12:17:34.256914833 +0100 -@@ -29,6 +29,11 @@ - #include "tinyXML/tinyxml.h" - #include "../xbmc/utils/log.h" - -+#if defined(__FreeBSD__) -+#include -+#include -+#endif -+ - using namespace std; - - CXRandR::CXRandR(bool query) Index: files/patch-xbmc__linux__XSyncUtils.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__linux__XSyncUtils.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__linux__XSyncUtils.cpp --- files/patch-xbmc__linux__XSyncUtils.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__linux__XSyncUtils.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,61 +0,0 @@ ---- ./xbmc/linux/XSyncUtils.cpp.orig 2010-06-25 13:02:35.000000000 +0200 -+++ ./xbmc/linux/XSyncUtils.cpp 2010-12-01 12:17:34.263963880 +0100 -@@ -105,7 +105,7 @@ - return bOk; - } - --#if defined(_LINUX) && !defined(__APPLE__) -+#if defined(_LINUX) && !defined(__APPLE__) && !defined(__FreeBSD__) - static FILE* procMeminfoFP = NULL; - #endif - -@@ -117,7 +117,7 @@ - memset(lpBuffer, 0, sizeof(MEMORYSTATUS)); - lpBuffer->dwLength = sizeof(MEMORYSTATUS); - --#ifdef __APPLE__ -+#if defined(__APPLE__) - uint64_t physmem; - size_t len = sizeof physmem; - int mib[2] = { CTL_HW, HW_MEMSIZE }; -@@ -155,6 +155,40 @@ - lpBuffer->dwAvailVirtual = lpBuffer->dwAvailPhys; // FIXME. - } - } -+#elif defined(__FreeBSD__) -+ /* sysctl hw.physmem */ -+ size_t physmem = 0, mem_free = 0, pagesize = 0, swap_free = 0; -+ size_t mem_avail = 0, mem_inactive = 0, mem_cache = 0, len = 0; -+ -+ /* physmem */ -+ len = sizeof(physmem); -+ if (sysctlbyname("hw.physmem", &physmem, &len, NULL, 0) == 0) { -+ lpBuffer->dwTotalPhys = physmem; -+ lpBuffer->dwTotalVirtual = physmem; -+ } -+ /* pagesize */ -+ len = sizeof(pagesize); -+ if (sysctlbyname("hw.pagesize", &pagesize, &len, NULL, 0) != 0) -+ pagesize = 4096; -+ /* mem_inactive */ -+ len = sizeof(mem_inactive); -+ if (sysctlbyname("vm.stats.vm.v_inactive_count", &mem_inactive, &len, NULL, 0) == 0) -+ mem_inactive *= pagesize; -+ /* mem_cache */ -+ len = sizeof(mem_cache); -+ if (sysctlbyname("vm.stats.vm.v_cache_count", &mem_cache, &len, NULL, 0) == 0) -+ mem_cache *= pagesize; -+ /* mem_free */ -+ len = sizeof(mem_free); -+ if (sysctlbyname("vm.stats.vm.v_free_count", &mem_free, &len, NULL, 0) == 0) -+ mem_free *= pagesize; -+ -+ /* mem_avail = mem_inactive + mem_cache + mem_free */ -+ lpBuffer->dwAvailPhys = mem_inactive + mem_cache + mem_free; -+ lpBuffer->dwAvailVirtual = mem_inactive + mem_cache + mem_free; -+ -+ if (sysctlbyname("vm.stats.vm.v_swappgsout", &swap_free, &len, NULL, 0) == 0) -+ lpBuffer->dwAvailPageFile = swap_free * pagesize; - #else - struct sysinfo info; - char name[32]; Index: files/patch-xbmc__utils__IoSupport.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__utils__IoSupport.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__utils__IoSupport.cpp --- files/patch-xbmc__utils__IoSupport.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__utils__IoSupport.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,39 +0,0 @@ ---- xbmc/utils/IoSupport.cpp.orig 2010-07-11 22:11:12.000000000 +0200 -+++ xbmc/utils/IoSupport.cpp 2010-12-13 21:20:19.000000000 +0100 -@@ -31,7 +31,7 @@ - #include "WIN32Util.h" - #include "CharsetConverter.h" - #endif --#if defined (_LINUX) && !defined(__APPLE__) -+#if defined (_LINUX) && !defined(__APPLE__) && !defined(__FreeBSD__) - #include - #include - #include -@@ -53,6 +53,9 @@ - #include - #include - #endif -+#ifdef __FreeBSD__ -+#include -+#endif - #include "../FileSystem/cdioSupport.h" - #include "../FileSystem/iso9660.h" - #include "../MediaManager.h" -@@ -297,7 +300,7 @@ - #ifdef _XBOX - HalWriteSMBusValue(0x20, 0x0C, FALSE, 1); // close tray - #endif --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - // FIXME... - #elif defined(_LINUX) - char* dvdDevice = CLibcdio::GetInstance()->GetDeviceFileName(); -@@ -496,6 +499,8 @@ - return -1; - } - return MODE2_DATA_SIZE; -+#elif defined(__FreeBSD__) -+ // TODO - #elif defined(_LINUX) - if (hDevice->m_bCDROM) - { Index: files/patch-xbmc__utils__Semaphore.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__utils__Semaphore.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__utils__Semaphore.cpp --- files/patch-xbmc__utils__Semaphore.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__utils__Semaphore.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,29 +0,0 @@ ---- ./xbmc/utils/Semaphore.cpp.orig 2010-01-22 20:37:53.000000000 +0100 -+++ ./xbmc/utils/Semaphore.cpp 2010-12-01 12:17:34.283090420 +0100 -@@ -21,7 +21,7 @@ - */ - - #include "Semaphore.hpp" --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - #include "SemaphorePOSIX.h" - #elif defined(__APPLE__) - #include "SemaphoreDarwin.h" -@@ -30,7 +30,7 @@ - CSemaphore::CSemaphore(uint32_t initialCount/*=1*/) - : ISemaphore() - { --#ifdef _SEMAPHORE_H -+#if defined(_SEMAPHORE_H) || defined(_SEMAPHORE_H_) - m_pSemaphore = new CSemaphorePOSIX(initialCount); - #elif defined(_BSD_SEMAPHORE_H) - m_pSemaphore = new CSemaphoreDarwin(initialCount); -@@ -42,7 +42,7 @@ - CSemaphore::CSemaphore(const CSemaphore& sem) - : ISemaphore() - { --#ifdef _SEMAPHORE_H -+#if defined(_SEMAPHORE_H) || defined(_SEMAPHORE_H_) - m_pSemaphore = new CSemaphorePOSIX(sem.GetCount()); - #elif defined(_BSD_SEMAPHORE_H) - m_pSemaphore = new CSemaphoreDarwin(sem.GetCount()); Index: files/patch-xbmc__utils__Stopwatch.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__utils__Stopwatch.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__utils__Stopwatch.cpp --- files/patch-xbmc__utils__Stopwatch.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__utils__Stopwatch.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,11 +0,0 @@ ---- ./xbmc/utils/Stopwatch.cpp.orig 2010-06-25 23:43:57.000000000 +0200 -+++ ./xbmc/utils/Stopwatch.cpp 2010-12-01 12:17:34.282082217 +0100 -@@ -20,7 +20,7 @@ - */ - - #include "Stopwatch.h" --#if defined(_LINUX) && !defined(__APPLE__) -+#if defined(_LINUX) && !defined(__APPLE__) && !defined(__FreeBSD__) - #include - #endif - #include "utils/TimeUtils.h" Index: files/patch-xbmc__utils__SystemInfo.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__utils__SystemInfo.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__utils__SystemInfo.cpp --- files/patch-xbmc__utils__SystemInfo.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__utils__SystemInfo.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,21 +0,0 @@ ---- ./xbmc/utils/SystemInfo.cpp.orig 2010-06-16 03:13:48.000000000 +0200 -+++ ./xbmc/utils/SystemInfo.cpp 2010-12-01 12:17:34.279062075 +0100 -@@ -607,7 +607,7 @@ - return strRet; - } - --#if defined(_LINUX) && !defined(__APPLE__) -+#if defined(_LINUX) && !defined(__APPLE__) && !defined(__FreeBSD__) - CStdString CSysInfo::GetLinuxDistro() - { - static const char* release_file[] = { "/etc/debian_version", -@@ -674,6 +674,9 @@ - #elif defined(__APPLE__) - result += "Mac OS X; "; - result += GetUnameVersion(); -+#elif defined(__FreeBSD__) -+ result += "FreeBSD; "; -+ result += GetUnameVersion(); - #elif defined(_LINUX) - result += "Linux; "; - result += GetLinuxDistro(); Index: files/patch-xbmc__utils__SystemInfo.h =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__utils__SystemInfo.h,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__utils__SystemInfo.h --- files/patch-xbmc__utils__SystemInfo.h 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__utils__SystemInfo.h 14 Oct 2011 18:44:51 -0000 @@ -1,11 +0,0 @@ ---- ./xbmc/utils/SystemInfo.h.orig 2010-06-01 17:19:39.000000000 +0200 -+++ ./xbmc/utils/SystemInfo.h 2010-12-01 12:17:34.284098904 +0100 -@@ -87,7 +87,7 @@ - bool GetHDDInfo(CStdString& strHDDModel, CStdString& strHDDSerial,CStdString& strHDDFirmware,CStdString& strHDDpw,CStdString& strHDDLockState); - bool GetRefurbInfo(CStdString& rfi_FirstBootTime, CStdString& rfi_PowerCycleCount); - --#if defined(_LINUX) && !defined(__APPLE__) -+#if defined(_LINUX) && !defined(__APPLE__) && !defined(__FreeBSD__) - CStdString GetLinuxDistro(); - #endif - #ifdef _LINUX Index: files/patch-xbmc__utils__Thread.cpp =================================================================== RCS file: /home/pcvs/ports/multimedia/xbmc/files/patch-xbmc__utils__Thread.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xbmc__utils__Thread.cpp --- files/patch-xbmc__utils__Thread.cpp 29 Dec 2010 20:39:31 -0000 1.1 +++ files/patch-xbmc__utils__Thread.cpp 14 Oct 2011 18:44:51 -0000 @@ -1,56 +0,0 @@ ---- ./xbmc/utils/Thread.cpp.orig 2010-05-28 02:51:41.000000000 +0200 -+++ ./xbmc/utils/Thread.cpp 2010-12-01 12:17:34.281078203 +0100 -@@ -37,7 +37,7 @@ - #include "GraphicContext.h" - #include "utils/TimeUtils.h" - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - // - // Use pthread's built-in support for TLS, it's more portable. - // -@@ -60,7 +60,7 @@ - - CThread::CThread() - { --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - // Initialize thread local storage and local thread pointer. - pthread_once(&keyOnce, MakeTlsKeys); - #endif -@@ -80,7 +80,7 @@ - - CThread::CThread(IRunnable* pRunnable) - { --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - // Initialize thread local storage and local thread pointer. - pthread_once(&keyOnce, MakeTlsKeys); - #endif -@@ -111,7 +111,7 @@ - } - - #ifdef _LINUX --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - // Use pthread-based TLS. - #define LOCAL_THREAD ((CThread* )pthread_getspecific(tlsLocalThread)) - #else -@@ -152,7 +152,7 @@ - /* install win32 exception translator */ - win32_exception::install_handler(); - #else --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - pLocalThread = pThread; - #endif - struct sigaction action; -@@ -164,7 +164,7 @@ - #endif - - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - // Set the TLS. - pthread_setspecific(tlsLocalThread, (void*)pThread); - #endif Index: files/patch-addons-library.xbmc.addon-libXBMC_addon.h @@ -0,0 +1,34 @@ +--- addons/library.xbmc.addon/libXBMC_addon.h.orig ++++ addons/library.xbmc.addon/libXBMC_addon.h +@@ -40,15 +40,31 @@ + #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-x86-osx.so" + #endif + #elif defined(__x86_64__) ++#ifdef __FreeBSD__ ++#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-x86_64-freebsd.so" ++#else + #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-x86_64-linux.so" ++#endif + #elif defined(_POWERPC) ++#ifdef __FreeBSD__ ++#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-powerpc-freebsd.so" ++#else + #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-powerpc-linux.so" ++#endif + #elif defined(_POWERPC64) ++#ifdef __FreeBSD__ ++#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-powerpc64-freebsd.so" ++#else + #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-powerpc64-linux.so" ++#endif + #elif defined(_ARMEL) + #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-arm.so" + #else /* !__x86_64__ && !__powerpc__ */ ++#ifdef __FreeBSD__ ++#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-i386-freebsd.so" ++#else + #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-i486-linux.so" ++#endif + #endif /* __x86_64__ */ + #endif /* _LINUX */ + Index: files/patch-addons-library.xbmc.gui-libXBMC_gui.h @@ -0,0 +1,32 @@ +--- addons/library.xbmc.gui/libXBMC_gui.h.orig ++++ addons/library.xbmc.gui/libXBMC_gui.h +@@ -44,13 +44,29 @@ typedef void* GUIHANDLE; + #elif defined(_ARMEL) + #define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-arm.so" + #elif defined(__x86_64__) ++#ifdef __FreeBSD__ ++#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-x86_64-freebsd.so" ++#else + #define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-x86_64-linux.so" ++#endif + #elif defined(_POWERPC) ++#ifdef __FreeBSD__ ++#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-powerpc-freebsd.so" ++#else + #define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-powerpc-linux.so" ++#endif + #elif defined(_POWERPC64) ++#ifdef __FreeBSD__ ++#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-powerpc64-freebsd.so" ++#else + #define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-powerpc64-linux.so" ++#endif + #else /* !__x86_64__ && !__powerpc__ && !_ARMEL */ ++#ifdef __FreeBSD__ ++#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-i386-freebsd.so" ++#else + #define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-i486-linux.so" ++#endif + #endif /* __x86_64__ */ + #endif /* _LINUX */ + Index: files/patch-addons-library.xbmc.pvr-libXBMC_pvr.h @@ -0,0 +1,34 @@ +--- addons/library.xbmc.pvr/libXBMC_pvr.h.orig ++++ addons/library.xbmc.pvr/libXBMC_pvr.h +@@ -41,15 +41,31 @@ + #define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-x86-osx.so" + #endif + #elif defined(__x86_64__) ++#ifdef __FreeBSD__ ++#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-x86_64-freebsd.so" ++#else + #define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-x86_64-linux.so" ++#endif + #elif defined(_POWERPC) ++#ifdef __FreeBSD__ ++#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-powerpc-freebsd.so" ++#else + #define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-powerpc-linux.so" ++#endif + #elif defined(_POWERPC64) ++#ifdef __FreeBSD__ ++#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-powerpc64-freebsd.so" ++#else + #define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-powerpc64-linux.so" ++#endif + #elif defined(_ARMEL) + #define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-arm.so" + #else /* !__x86_64__ && !__powerpc__ */ ++#ifdef __FreeBSD__ ++#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-i386-freebsd.so" ++#else + #define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-i486-linux.so" ++#endif + #endif /* __x86_64__ */ + #endif /* _LINUX */ + Index: files/patch-lib-cximage-6.0-raw-dcr.c @@ -0,0 +1,12 @@ +--- lib/cximage-6.0/raw/dcr.c.orig ++++ lib/cximage-6.0/raw/dcr.c +@@ -144,7 +144,9 @@ int DCR_CLASS main (int argc, char **arg + + //!!! set return point for error handling + if (setjmp (dcr.failure)) { ++#if !defined(__FreeBSD__) + if (fileno(dcr.obj_) > 2) (*dcr.ops_->close_)(dcr.obj_); ++#endif + if (fileno(ofp) > 2) fclose(ofp); + status = 1; + goto cleanup; Index: files/patch-lib-cximage-6.0-raw-libdcr.h @@ -0,0 +1,11 @@ +--- lib/cximage-6.0/raw/libdcr.h.orig ++++ lib/cximage-6.0/raw/libdcr.h +@@ -41,7 +41,7 @@ + #include + #include + #endif +-#if defined(_LINUX) || defined(__APPLE__) ++#if defined(_LINUX) || defined(__APPLE__) || defined(__FreeBSD__) + #include + #include + #define _swab swab Index: files/patch-lib-libPlatform-linux-os_posix.h @@ -0,0 +1,11 @@ +--- lib/libPlatform/linux/os_posix.h.orig ++++ lib/libPlatform/linux/os_posix.h +@@ -32,7 +32,7 @@ + #include + #include + #include +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include + #endif + #include Index: files/patch-lib-libXDAAP-httpClient.c @@ -0,0 +1,14 @@ +--- lib/libXDAAP/httpClient.c.orig ++++ lib/libXDAAP/httpClient.c +@@ -61,6 +61,11 @@ + #include + #endif + ++#if defined(__FreeBSD__) ++#include ++#include ++#endif /* __FreeBSD__ */ ++ + struct HTTP_ConnectionTAG + { + char *host; Index: files/patch-lib-libXDAAP-ioloop.c @@ -0,0 +1,13 @@ +--- lib/libXDAAP/ioloop.c.orig ++++ lib/libXDAAP/ioloop.c +@@ -122,9 +122,9 @@ + + void fd_event_reset(fd_event *event) + { +- event->signalled = 0; + char buf[1] = {0}; + int flags; ++ event->signalled = 0; + + /* set non-blocking on read pipe */ + flags = fcntl(event->pipe[0], F_GETFL, 0); Index: files/patch-lib-libXDAAP-threadpool.c @@ -0,0 +1,15 @@ +--- lib/libXDAAP/threadpool.c.orig ++++ lib/libXDAAP/threadpool.c +@@ -279,10 +279,10 @@ + void CP_ThreadPool_QueueWorkItem(CP_SThreadPool *pTPThis, CP_TPfnJob pfnCallback, + void *arg1, void *arg2) + { +- ts_mutex_lock(pTPThis->mtJobQueueMutex); +- + CP_STPJobQueue *pTPJQNewJob = malloc(sizeof(CP_STPJobQueue)); + ++ ts_mutex_lock(pTPThis->mtJobQueueMutex); ++ + pTPJQNewJob->fnJobCallback = pfnCallback; + pTPJQNewJob->arg1 = arg1; + pTPJQNewJob->arg2 = arg2; Index: files/patch-lib-libsidplay2-eventh @@ -0,0 +1,88 @@ +--- lib/libsidplay2/libsidplay/src/event.cpp.orig ++++ lib/libsidplay2/libsidplay/src/event.cpp +@@ -50,7 +50,7 @@ + ***************************************************************************/ + + #include +-#include "event.h" ++#include "../../include/sidplay/event.h" + + #define EVENT_TIMEWARP_COUNT 0x0FFFFF + +--- lib/libsidplay2/libsidplay/src/mos6510/mos6510.h.orig ++++ lib/libsidplay2/libsidplay/src/mos6510/mos6510.h +@@ -36,7 +36,7 @@ + #include "config.h" + #include "component.h" + #include "sidenv.h" +-#include "event.h" ++#include "../../include/sidplay/event.h" + + #undef MOS6510_VERSION + #undef MOS6510_DATE +--- lib/libsidplay2/libsidplay/include/sidplay/c64env.h.orig ++++ lib/libsidplay2/libsidplay/include/sidplay/c64env.h +@@ -19,7 +19,7 @@ + #define _c64env_h_ + + #include "sidtypes.h" +-#include "event.h" ++#include "../../include/sidplay/event.h" + + /* An implementation of of this class can be created to perform the C64 + specifics. A pointer to this child class can then be passed to +--- lib/libsidplay2/libsidplay/include/sidplay/sid2types.h.orig ++++ lib/libsidplay2/libsidplay/include/sidplay/sid2types.h +@@ -19,7 +19,7 @@ + #define _sid2types_h_ + + #include "sidtypes.h" +-#include "event.h" ++#include "../../include/sidplay/event.h" + + class sidbuilder; + struct SidTuneInfo; +--- lib/libsidplay2/libsidplay/src/mos6526/mos6526.h.orig ++++ lib/libsidplay2/libsidplay/src/mos6526/mos6526.h +@@ -85,7 +85,7 @@ + #define _mos6526_h_ + + #include "component.h" +-#include "event.h" ++#include "../../include/sidplay/event.h" + + class MOS6526: public component + { +--- lib/libsidplay2/libsidplay/src/mos656x/mos656x.h.orig ++++ lib/libsidplay2/libsidplay/src/mos656x/mos656x.h +@@ -19,7 +19,7 @@ + #define _mos656x_h_ + + #include "component.h" +-#include "event.h" ++#include "../../include/sidplay/event.h" + + typedef enum + { +--- lib/libsidplay2/libsidplay/src/sid6526/sid6526.h.orig ++++ lib/libsidplay2/libsidplay/src/sid6526/sid6526.h +@@ -38,7 +38,7 @@ + #define _sid6526_h_ + + #include "component.h" +-#include "event.h" ++#include "../../include/sidplay/event.h" + #include "c64env.h" + + class SID6526: public component +--- lib/libsidplay2/libsidplay/src/xsid/xsid.h.orig ++++ lib/libsidplay2/libsidplay/src/xsid/xsid.h +@@ -106,7 +106,7 @@ programmed with. + + #include "config.h" + #include "sidbuilder.h" +-#include "event.h" ++#include "../../include/sidplay/event.h" + + // XSID configuration settings + //#define XSID_DEBUG 1 Index: files/patch-xbmc-filesystem-CacheStrategy.cpp @@ -0,0 +1,33 @@ +--- xbmc/filesystem/CacheStrategy.cpp.orig ++++ xbmc/filesystem/CacheStrategy.cpp +@@ -93,7 +93,8 @@ + + if(m_hCacheFileWrite == INVALID_HANDLE_VALUE) + { +- CLog::Log(LOGERROR, "%s - failed to create file %s with error code %d", __FUNCTION__, fileName.c_str(), GetLastError()); ++ CLog::Log(LOGERROR, "%s - failed to create file %s with error code %d", ++ __FUNCTION__, fileName.c_str(), (int)GetLastError()); + Close(); + return CACHE_RC_ERROR; + } +@@ -107,7 +108,8 @@ + + if(m_hCacheFileRead == INVALID_HANDLE_VALUE) + { +- CLog::Log(LOGERROR, "%s - failed to open file %s with error code %d", __FUNCTION__, fileName.c_str(), GetLastError()); ++ CLog::Log(LOGERROR, "%s - failed to open file %s with error code %d", ++ __FUNCTION__, fileName.c_str(), (int)GetLastError()); + Close(); + return CACHE_RC_ERROR; + } +@@ -140,8 +142,8 @@ + DWORD iWritten=0; + if (!WriteFile(m_hCacheFileWrite, pBuffer, iSize, &iWritten, NULL)) + { +- CLog::Log(LOGERROR, "%s - failed to write to file. err: %u", +- __FUNCTION__, GetLastError()); ++ CLog::Log(LOGERROR, "%s - failed to write to file. err: %d", ++ __FUNCTION__, (int)GetLastError()); + return CACHE_RC_ERROR; + } + Index: files/patch-xbmc-filesystem-SAPDirectory.cpp @@ -0,0 +1,12 @@ +--- xbmc/filesystem/SAPDirectory.cpp.orig ++++ xbmc/filesystem/SAPDirectory.cpp +@@ -31,6 +31,9 @@ + #ifdef __APPLE__ + #include "OSXGNUReplacements.h" // strnlen + #endif ++#ifdef __FreeBSD__ ++#include "FreeBSDGNUReplacements.h" // strnlen ++#endif + + #include + #include Index: files/patch-xbmc-music-tags-MusicInfoTagLoaderWMA.cpp @@ -0,0 +1,11 @@ +--- xbmc/music/tags/MusicInfoTagLoaderWMA.cpp.orig ++++ xbmc/music/tags/MusicInfoTagLoaderWMA.cpp +@@ -538,7 +538,7 @@ + "Unable to create album art for %s " + "(extension=%s, size=%u)", + tag.GetURL().c_str(), strExtension.c_str(), +- picture.dwDataLen); ++ (unsigned int)picture.dwDataLen); + } + } + } Index: files/patch-xbmc-network-Network.cpp @@ -0,0 +1,12 @@ +--- xbmc/network/Network.cpp.orig ++++ xbmc/network/Network.cpp +@@ -31,6 +31,9 @@ + + #include + #include ++#ifdef __FreeBSD__ ++#include ++#endif + + using namespace std; + Index: files/patch-xbmc-network-linux-NetworkLinux.cpp @@ -0,0 +1,195 @@ +--- xbmc/network/linux/NetworkLinux.cpp.orig ++++ xbmc/network/linux/NetworkLinux.cpp +@@ -23,14 +23,14 @@ + #include + #include + #include +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include + #include + #include + #endif + #include + #include +-#if defined(__APPLE__) ++#if defined(__APPLE__) || defined(__FreeBSD__) + #include + #include + #include +@@ -42,6 +42,9 @@ + #include "NetworkLinux.h" + #include "Util.h" + #include "utils/log.h" ++#if defined(__FreeBSD__) ++#include ++#endif + + using namespace std; + +@@ -64,7 +67,7 @@ CStdString& CNetworkInterfaceLinux::GetN + + bool CNetworkInterfaceLinux::IsWireless() + { +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__FreeBSD__) + return false; + #else + struct iwreq wrq; +@@ -144,7 +147,7 @@ CStdString CNetworkInterfaceLinux::GetCu + { + CStdString result = ""; + +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + char essid[IW_ESSID_MAX_SIZE + 1]; + memset(&essid, 0, sizeof(essid)); + +@@ -166,7 +169,84 @@ CStdString CNetworkInterfaceLinux::GetCu + { + CStdString result = ""; + +-#ifndef __APPLE__ ++#if defined(__FreeBSD__) ++ struct { ++ struct rt_msghdr m_rtm; ++ char m_space[512]; ++ } m_rtmsg; ++ int s, seq, l, pid, rtm_addrs, i; ++ struct sockaddr so_dst, so_mask; ++ struct rt_msghdr rtm; ++ char *cp = m_rtmsg.m_space; ++ struct sockaddr *gate = NULL, *sa; ++ struct rt_msghdr *rtm_aux; ++ ++#define ROUNDUP(a) \ ++ ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) ++ ++#define NEXTADDR(w, u) \ ++ if (rtm_addrs & (w)) {\ ++ l = ROUNDUP(u.sa_len); memmove(cp, &(u), l); cp += l;\ ++ } ++ ++#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len)) ++ ++ pid = getpid(); ++ seq = 0; ++ rtm_addrs = RTA_DST | RTA_NETMASK; ++ ++ bzero(&so_dst, sizeof(so_dst)); ++ bzero(&so_mask, sizeof(so_mask)); ++ bzero(&rtm, sizeof(struct rt_msghdr)); ++ ++ rtm.rtm_type = RTM_GET; ++ rtm.rtm_flags = RTF_UP | RTF_GATEWAY; ++ rtm.rtm_version = RTM_VERSION; ++ rtm.rtm_seq = ++seq; ++ rtm.rtm_addrs = rtm_addrs; ++ ++ so_dst.sa_family = AF_INET; ++ so_dst.sa_len = sizeof(struct sockaddr_in); ++ so_mask.sa_family = AF_INET; ++ so_mask.sa_len = sizeof(struct sockaddr_in); ++ ++ NEXTADDR(RTA_DST, so_dst); ++ NEXTADDR(RTA_NETMASK, so_mask); ++ ++ rtm.rtm_msglen = l = cp - (char *)&m_rtmsg; ++ ++ s = socket(PF_ROUTE, SOCK_RAW, 0); ++ ++ if (write(s, (char *)&m_rtmsg, l) < 0) ++ return result; ++ ++ do { ++ l = read(s, (char *)&m_rtmsg, sizeof(m_rtmsg)); ++ } while (l > 0 && (rtm.rtm_seq != seq || rtm.rtm_pid != pid)); ++ ++ close(s); ++ ++ rtm_aux = &rtm; ++ ++ cp = ((char *)(rtm_aux + 1)); ++ if (rtm_aux->rtm_addrs) { ++ for (i = 1; i; i <<= 1) ++ if (i & rtm_aux->rtm_addrs) { ++ sa = (struct sockaddr *)cp; ++ if (i == RTA_GATEWAY) ++ gate = sa; ++ ADVANCE(cp, sa); ++ } ++ } ++ else ++ return result; ++ ++ if (gate != NULL) ++ result = inet_ntoa(((struct sockaddr_in *)gate)->sin_addr); ++ ++ return result; ++ ++#elif !defined(__APPLE__) + FILE* fp = fopen("/proc/net/route", "r"); + if (!fp) + { +@@ -267,7 +347,7 @@ CNetworkInterface* CNetworkLinux::GetFir + CStdString CNetworkLinux::GetMacAddress(CStdString interfaceName) + { + CStdString result = "00:00:00:00:00:00"; +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__FreeBSD__) + + #if ! defined(IFT_ETHER) + #define IFT_ETHER 0x6/* Ethernet CSMACD */ +@@ -333,7 +413,7 @@ void CNetworkLinux::queryInterfaceList() + CStdString macAddr = ""; + m_interfaces.clear(); + +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__FreeBSD__) + + // Query the list of interfaces. + struct ifaddrs *list; +@@ -352,7 +432,6 @@ void CNetworkLinux::queryInterfaceList() + } + + freeifaddrs(list); +- + #else + FILE* fp = fopen("/proc/net/dev", "r"); + if (!fp) +@@ -394,7 +473,7 @@ void CNetworkLinux::queryInterfaceList() + std::vector CNetworkLinux::GetNameServers(void) + { + std::vector result; +-#ifndef __APPLE__ ++#if !defined(__APPLE__) + res_init(); + + for (int i = 0; i < _res.nscount; i ++) +@@ -430,7 +509,7 @@ std::vector CNetwork + if (!IsWireless()) + return result; + +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + // Query the wireless extentsions version number. It will help us when we + // parse the resulting events + struct iwreq iwr; +@@ -616,7 +695,7 @@ void CNetworkInterfaceLinux::GetSettings + encryptionMode = ENC_NONE; + assignment = NETWORK_DISABLED; + +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + FILE* fp = fopen("/etc/network/interfaces", "r"); + if (!fp) + { +@@ -692,7 +771,7 @@ void CNetworkInterfaceLinux::GetSettings + + void CNetworkInterfaceLinux::SetSettings(NetworkAssignment& assignment, CStdString& ipAddress, CStdString& networkMask, CStdString& defaultGateway, CStdString& essId, CStdString& key, EncMode& encryptionMode) + { +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + FILE* fr = fopen("/etc/network/interfaces", "r"); + if (!fr) + { Index: files/patch-xbmc-programs-ProgramDatabase.cpp @@ -0,0 +1,11 @@ +--- xbmc/programs/ProgramDatabase.cpp.orig ++++ xbmc/programs/ProgramDatabase.cpp +@@ -63,7 +63,7 @@ + catch (...) + { + CLog::Log(LOGERROR, "programdatabase::unable to create tables:%u", +- GetLastError()); ++ (unsigned int)GetLastError()); + return false; + } + Index: files/patch-xbmc-pvrclients-tvheadend-thread.cpp @@ -0,0 +1,38 @@ +--- xbmc/pvrclients/tvheadend/thread.cpp.orig ++++ xbmc/pvrclients/tvheadend/thread.cpp +@@ -25,10 +25,14 @@ + + #include "thread.h" + #include +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include + #endif + ++#if defined(__FreeBSD__) ++#include ++#endif ++ + #if !defined(__WINDOWS__) + #include + #endif +@@ -164,7 +168,7 @@ cMutex::cMutex(void) + locked = 0; + pthread_mutexattr_t attr; + pthread_mutexattr_init(&attr); +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP); + #else + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK); +@@ -342,8 +346,8 @@ void cThread::Cancel(int WaitSeconds) + + tThreadId cThread::ThreadId(void) + { +-#ifdef __APPLE__ +- return (int)pthread_self(); ++#if defined(__APPLE__) || defined(__FreeBSD__) ++ return (tThreadId)pthread_self(); + #else + #ifdef __WINDOWS__ + return GetCurrentThreadId(); Index: files/patch-xbmc-pvrclients-tvheadend-thread.h @@ -0,0 +1,23 @@ +--- xbmc/pvrclients/tvheadend/thread.h.orig ++++ xbmc/pvrclients/tvheadend/thread.h +@@ -76,7 +76,11 @@ public: + void Unlock(void); + }; + ++#ifdef __FreeBSD__ ++typedef pthread_t tThreadId; ++#else + typedef pid_t tThreadId; ++#endif + + class cThread { + friend class cThreadLock; +@@ -127,7 +131,7 @@ public: + bool Active(void); + ///< Checks whether the thread is still alive. + static tThreadId ThreadId(void); +- static tThreadId IsMainThread(void) { return ThreadId() == mainThreadId; } ++ static int IsMainThread(void) { return ThreadId() == mainThreadId; } + static void SetMainThreadId(void); + }; + Index: files/patch-xbmc-pvrclients-vdr-vnsi-thread.cpp @@ -0,0 +1,38 @@ +--- xbmc/pvrclients/vdr-vnsi/thread.cpp.orig ++++ xbmc/pvrclients/vdr-vnsi/thread.cpp +@@ -28,10 +28,14 @@ + #include "thread.h" + #include "client.h" + +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include + #endif + ++#if defined(__FreeBSD__) ++#include ++#endif ++ + #if !defined(__WINDOWS__) + #include + #endif +@@ -162,7 +166,7 @@ cMutex::cMutex(void) + locked = 0; + pthread_mutexattr_t attr; + pthread_mutexattr_init(&attr); +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP); + #else + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK); +@@ -348,8 +352,8 @@ void cThread::Cancel(int WaitSeconds) + + tThreadId cThread::ThreadId(void) + { +-#ifdef __APPLE__ +- return (int)pthread_self(); ++#if defined(__APPLE__) || defined(__FreeBSD__) ++ return (tThreadId)pthread_self(); + #else + #ifdef __WINDOWS__ + return GetCurrentThreadId(); Index: files/patch-xbmc-pvrclients-vdr-vnsi-thread.h @@ -0,0 +1,23 @@ +--- xbmc/pvrclients/vdr-vnsi/thread.h.orig ++++ xbmc/pvrclients/vdr-vnsi/thread.h +@@ -76,7 +76,11 @@ public: + void Unlock(void); + }; + ++#ifdef __FreeBSD__ ++typedef pthread_t tThreadId; ++#else + typedef pid_t tThreadId; ++#endif + + class cThread { + friend class cThreadLock; +@@ -123,7 +127,7 @@ public: + bool Active(void); + ///< Checks whether the thread is still alive. + static tThreadId ThreadId(void); +- static tThreadId IsMainThread(void) { return ThreadId() == mainThreadId; } ++ static int IsMainThread(void) { return ThreadId() == mainThreadId; } + static void SetMainThreadId(void); + }; + Index: files/patch-xbmc-storage-IoSupport.cpp @@ -0,0 +1,39 @@ +--- xbmc/storage/IoSupport.cpp.orig ++++ xbmc/storage/IoSupport.cpp +@@ -30,7 +30,7 @@ + #include "WIN32Util.h" + #include "utils/CharsetConverter.h" + #endif +-#if defined (_LINUX) && !defined(__APPLE__) ++#if defined (_LINUX) && !defined(__APPLE__) && !defined(__FreeBSD__) + #include + #include + #include +@@ -54,6 +54,9 @@ + #include + #endif + #endif ++#ifdef __FreeBSD__ ++#include ++#endif + #include "cdioSupport.h" + #include "filesystem/iso9660.h" + #include "MediaManager.h" +@@ -226,7 +229,7 @@ HRESULT CIoSupport::EjectTray( const boo + HRESULT CIoSupport::CloseTray() + { + #ifdef HAS_DVD_DRIVE +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__FreeBSD__) + // FIXME... + #elif defined(_LINUX) + char* dvdDevice = CLibcdio::GetInstance()->GetDeviceFileName(); +@@ -402,6 +405,8 @@ INT CIoSupport::ReadSectorMode2(HANDLE h + return -1; + } + return MODE2_DATA_SIZE; ++#elif defined(__FreeBSD__) ++ // TODO + #elif defined(_LINUX) + if (hDevice->m_bCDROM) + { Index: files/patch-xbmc-utils-StdString.h @@ -0,0 +1,10 @@ +--- xbmc/utils/StdString.h.orig ++++ xbmc/utils/StdString.h +@@ -2,6 +2,7 @@ + #include + #include + #include ++#include + + #if defined(_WIN32) && !defined(va_copy) + #define va_copy(dst, src) ((dst) = (src)) Index: files/patch-xbmc-windowing-X11-XRandR.cpp @@ -0,0 +1,14 @@ +--- xbmc/windowing/X11/XRandR.cpp.orig ++++ xbmc/windowing/X11/XRandR.cpp +@@ -29,6 +29,11 @@ + #include "tinyXML/tinyxml.h" + #include "../xbmc/utils/log.h" + ++#if defined(__FreeBSD__) ++#include ++#include ++#endif ++ + using namespace std; + + CXRandR::CXRandR(bool query) Index: files/patch-tools-TexturePacker-XBTFWriter.cpp @@ -0,0 +1,11 @@ +--- tools/TexturePacker/XBTFWriter.cpp.orig ++++ tools/TexturePacker/XBTFWriter.cpp +@@ -26,6 +26,8 @@ + #include "utils/EndianSwap.h" + #if !defined(__APPLE__) && !defined(__FreeBSD__) + #include ++#else ++#include + #endif + #include + Index: files/patch-xbmc-cores-VideoRenderers-LinuxRendererGL.cpp @@ -0,0 +1,33 @@ +--- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp.orig ++++ xbmc/cores/VideoRenderers/LinuxRendererGL.cpp +@@ -159,6 +159,10 @@ CLinuxRendererGL::CLinuxRendererGL() + m_rgbPbo = 0; + + m_dllSwScale = new DllSwScale; ++ ++#ifdef __FreeBSD__ ++ m_tid = NULL; ++#endif + } + + CLinuxRendererGL::~CLinuxRendererGL() +@@ -247,6 +251,9 @@ bool CLinuxRendererGL::ValidateRenderTar + (this->*m_textureCreate)(i); + + m_bValidated = true; ++#ifdef __FreeBSD__ ++ m_tid = pthread_self(); ++#endif + return true; + } + return false; +@@ -716,6 +723,9 @@ unsigned int CLinuxRendererGL::PreInit() + CSingleLock lock(g_graphicsContext); + m_bConfigured = false; + m_bValidated = false; ++#ifdef __FreeBSD__ // XXX Will this leak? It's needed to avoid crashes... :( ++ if (pthread_self() == m_tid) ++#endif + UnInit(); + m_resolution = g_guiSettings.m_LookAndFeelResolution; + if ( m_resolution == RES_WINDOW ) Index: files/patch-xbmc-cores-VideoRenderers-LinuxRendererGL.h @@ -0,0 +1,13 @@ +--- xbmc/cores/VideoRenderers/LinuxRendererGL.h.orig ++++ xbmc/cores/VideoRenderers/LinuxRendererGL.h +@@ -228,6 +228,10 @@ protected: + int m_currentField; + int m_reloadShaders; + ++#ifdef __FreeBSD__ ++ pthread_t m_tid; ++#endif ++ + struct YUVPLANE + { + GLuint id; Index: files/patch-threadid-freebsd @@ -0,0 +1,177 @@ +--- xbmc/linux/XThreadUtils.cpp.orig ++++ xbmc/linux/XThreadUtils.cpp +@@ -38,7 +38,11 @@ HANDLE WINAPI CreateThread( + LPTHREAD_START_ROUTINE lpStartAddress, + LPVOID lpParameter, + DWORD dwCreationFlags, ++#ifdef __FreeBSD__ ++ LPLONG lpThreadId ++#else + LPDWORD lpThreadId ++#endif + ) { + + // a thread handle would actually contain an event +@@ -62,8 +66,12 @@ HANDLE WINAPI CreateThread( + pthread_attr_destroy(&attr); + + if (h && lpThreadId) ++#ifdef __FreeBSD__ ++ *lpThreadId = (LONG)h->m_hThread; ++#else + // WARNING: This can truncate thread IDs on x86_64. + *lpThreadId = (DWORD)h->m_hThread; ++#endif + return h; + } + +@@ -89,10 +97,18 @@ HANDLE _beginthreadex( + int ( *start_address )( void * ), + void *arglist, + unsigned initflag, ++#ifdef __FreeBSD__ ++ unsigned long *thrdaddr ++#else + unsigned *thrdaddr ++#endif + ) { + ++#ifdef __FreeBSD__ ++ HANDLE h = CreateThread(NULL, stack_size, start_address, arglist, initflag, (LPLONG)thrdaddr); ++#else + HANDLE h = CreateThread(NULL, stack_size, start_address, arglist, initflag, (LPDWORD)thrdaddr); ++#endif + return h; + + } +--- xbmc/linux/XThreadUtils.h.orig ++++ xbmc/linux/XThreadUtils.h +@@ -30,7 +30,11 @@ HANDLE WINAPI CreateThread( + LPTHREAD_START_ROUTINE lpStartAddress, + LPVOID lpParameter, + DWORD dwCreationFlags, ++#ifdef __FreeBSD__ ++ LPLONG lpThreadId ++#else + LPDWORD lpThreadId ++#endif + ); + + HANDLE _beginthreadex( +@@ -39,7 +43,11 @@ HANDLE _beginthreadex( + int ( *start_address )( void * ), + void *arglist, + unsigned initflag, ++#ifdef __FreeBSD__ ++ unsigned long *thrdaddr ++#else + unsigned *thrdaddr ++#endif + ); + + uintptr_t _beginthread( +--- lib/asap/win32/winamp/in_asap.c.orig ++++ lib/asap/win32/winamp/in_asap.c +@@ -305,7 +305,11 @@ static int play(char *fn) + { + int song; + int maxlatency; ++#ifdef __FreeBSD__ ++ LONG threadId; ++#else + DWORD threadId; ++#endif + strcpy(current_filename_with_song, fn); + song = extractSongNumber(fn, current_filename); + if (!loadModule(current_filename, module, &module_len)) +--- lib/timidity/interface/w32g.h.orig ++++ lib/timidity/interface/w32g.h +@@ -65,9 +65,14 @@ typedef LPTHREAD_START_ROUTINE BCC_BEGIN + #define crt_beginthread(start_address,stack_size,arglist) \ + (HANDLE)_beginthread((BCC_BEGINTHREAD_START_ADDRESS)start_address,(unsigned)stack_size,(void *)arglist) + #else ++#ifdef __FreeBSD__ ++#define crt_beginthread(start_address,stack_size,arglist) \ ++(HANDLE)CreateThread(NULL,(DWORD)stack_size,(LPTHREAD_START_ROUTINE)start_address,(LPVOID)arglist,0,NULL) ++#else + #define crt_beginthread(start_address,stack_size,arglist) \ + (HANDLE)CreateThread(NULL,(DWORD)stack_size,(LPTHREAD_START_ROUTINE)start_address,(LPVOID)arglist,0,&dwTmp) + #endif ++#endif + + // (HANDLE)crt_beginthreadex(LPSECURITY_ATTRIBUTES security, DWORD stack_size, LPTHREAD_START_ROUTINE start_address, LPVOID arglist, DWORD initflag, LPDWORD thrdaddr ); + #if defined(_MSC_VER) || defined(__WATCOMC__) +@@ -77,9 +82,14 @@ typedef LPTHREAD_START_ROUTINE BCC_BEGIN + #define crt_beginthreadex(security,stack_size,start_address,arglist,initflag,thrdaddr ) \ + (HANDLE)_beginthreadNT((BCC_BEGINTHREAD_START_ADDRESS)start_address,(unsigned)stack_size,(void *)arglist,(void *)security_attrib,(unsigned long)create_flags,(unsigned long *)thread_id) + #else ++#ifdef __FreeBSD__ ++#define crt_beginthreadex(security,stack_size,start_address,arglist,initflag,thrdaddr ) \ ++(HANDLE)CreateThread((LPSECURITY_ATTRIBUTES)security,(DWORD)stack_size,(LPTHREAD_START_ROUTINE)start_address,(LPVOID)arglist,(DWORD)initflag,(LPLONG)thrdaddr) ++#else + #define crt_beginthreadex(security,stack_size,start_address,arglist,initflag,thrdaddr ) \ + (HANDLE)CreateThread((LPSECURITY_ATTRIBUTES)security,(DWORD)stack_size,(LPTHREAD_START_ROUTINE)start_address,(LPVOID)arglist,(DWORD)initflag,(LPDWORD)thrdaddr) + #endif ++#endif + + #if defined(_MSC_VER) || defined(__WATCOMC__) + #define crt_endthread() _endthread() +--- lib/timidity/timidity/gogo_a.c.orig ++++ lib/timidity/timidity/gogo_a.c +@@ -109,9 +109,14 @@ typedef LPTHREAD_START_ROUTINE BCC_BEGIN + #define crt_beginthreadex(security,stack_size,start_address,arglist,initflag,thrdaddr ) \ + (HANDLE)_beginthreadNT((BCC_BEGINTHREAD_START_ADDRESS)start_address,(unsigned)stack_size,(void *)arglist,(void *)security_attrib,(unsigned long)create_flags,(unsigned long *)thread_id) + #else ++#ifdef __FreeBSD__ ++#define crt_beginthreadex(security,stack_size,start_address,arglist,initflag,thrdaddr ) \ ++(HANDLE)CreateThread((LPSECURITY_ATTRIBUTES)security,(DWORD)stack_size,(LPTHREAD_START_ROUTINE)start_address,(LPVOID)arglist,(DWORD)initflag,(LPLONG)thrdaddr) ++#else + #define crt_beginthreadex(security,stack_size,start_address,arglist,initflag,thrdaddr ) \ + (HANDLE)CreateThread((LPSECURITY_ATTRIBUTES)security,(DWORD)stack_size,(LPTHREAD_START_ROUTINE)start_address,(LPVOID)arglist,(DWORD)initflag,(LPDWORD)thrdaddr) + #endif ++#endif + + volatile extern char *w32g_output_dir; + volatile extern int w32g_auto_output_mode; +--- xbmc/visualizations/XBMCProjectM/libprojectM/fftsg.cpp.orig ++++ xbmc/visualizations/XBMCProjectM/libprojectM/fftsg.cpp +@@ -782,6 +782,16 @@ void makect(int nc, int *ip, double *c) + #include + #include + #define cdft_thread_t HANDLE ++#ifdef __FreeBSD__ ++#define cdft_thread_create(thp,func,argp) { \ ++ LONG thid; \ ++ *(thp) = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) func, (LPVOID) argp, 0, &thid); \ ++ if (*(thp) == 0) { \ ++ fprintf(stderr, "cdft thread error\n"); \ ++ exit(1); \ ++ } \ ++} ++#else + #define cdft_thread_create(thp,func,argp) { \ + DWORD thid; \ + *(thp) = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) func, (LPVOID) argp, 0, &thid); \ +@@ -790,6 +800,7 @@ void makect(int nc, int *ip, double *c) + exit(1); \ + } \ + } ++#endif + #define cdft_thread_wait(th) { \ + WaitForSingleObject(th, INFINITE); \ + CloseHandle(th); \ +--- xbmc/threads/Thread.h.orig ++++ xbmc/threads/Thread.h +@@ -117,8 +117,12 @@ private: + ThreadIdentifier ThreadId() const; + bool m_bAutoDelete; + CEvent m_StopEvent; ++#ifdef __FreeBSD__ ++ unsigned long m_ThreadId; ++#else + unsigned m_ThreadId; // This value is unreliable on platforms using pthreads + // Use m_ThreadHandle->m_hThread instead ++#endif + IRunnable* m_pRunnable; + + unsigned __int64 m_iLastUsage; Index: files/patch-libdl-freebsd @@ -0,0 +1,43 @@ +--- xbmc/pvrclients/MediaPortal/Makefile.in.orig ++++ xbmc/pvrclients/MediaPortal/Makefile.in +@@ -5,7 +5,7 @@ + # how to reach the author. + # + +-LIBS = @abs_top_srcdir@/lib/libTcpSocket/libTcpSocket.a lib/tinyxml/tinyxml.a -ldl ++LIBS = @abs_top_srcdir@/lib/libTcpSocket/libTcpSocket.a lib/tinyxml/tinyxml.a + LIBDIR = @abs_top_srcdir@/addons/pvr.team-mediaportal.tvserver + LIB = @abs_top_srcdir@/addons/pvr.team-mediaportal.tvserver/XBMC_MPTV.pvr + +--- xbmc/pvrclients/mythtv/Makefile.in.orig ++++ xbmc/pvrclients/mythtv/Makefile.in +@@ -5,7 +5,6 @@ + # how to reach the author. + # + +-LIBS = -ldl + LIBDIR = @abs_top_srcdir@/addons/pvr.mythtv + LIB = @abs_top_srcdir@/addons/pvr.mythtv/XBMC_Mythtv.pvr + +--- xbmc/pvrclients/tvheadend/Makefile.in.orig ++++ xbmc/pvrclients/tvheadend/Makefile.in +@@ -6,7 +6,7 @@ + # + + LIBS = @abs_top_srcdir@/lib/libTcpSocket/libTcpSocket.a \ +- @abs_top_srcdir@/lib/libhts/libhts.a -ldl ++ @abs_top_srcdir@/lib/libhts/libhts.a + LIBDIR = @abs_top_srcdir@/addons/pvr.hts + LIB = @abs_top_srcdir@/addons/pvr.hts/XBMC_Tvheadend.pvr + +--- xbmc/pvrclients/vdr-vnsi/Makefile.in.orig ++++ xbmc/pvrclients/vdr-vnsi/Makefile.in +@@ -5,7 +5,7 @@ + # how to reach the author. + # + +-LIBS = @abs_top_srcdir@/lib/libTcpSocket/libTcpSocket.a -ldl -lpthread ++LIBS = @abs_top_srcdir@/lib/libTcpSocket/libTcpSocket.a -lpthread + LIBDIR = @abs_top_srcdir@/addons/pvr.vdr.vnsi + LIB = @abs_top_srcdir@/addons/pvr.vdr.vnsi/XBMC_VDR_vnsi.pvr + Index: files/patch-xbmc-pvrclients-MediaPortal-CriticalSection.cpp @@ -0,0 +1,13 @@ +--- xbmc/pvrclients/MediaPortal/CriticalSection.cpp.orig ++++ xbmc/pvrclients/MediaPortal/CriticalSection.cpp +@@ -18,6 +18,10 @@ + + #include "CriticalSection.h" + ++#ifdef __FreeBSD__ ++#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE ++#endif ++ + CCriticalSection::CCriticalSection(void) + { + }