diff options
| author | Bernhard Froehlich <decke@FreeBSD.org> | 2012-01-18 12:05:48 +0000 |
|---|---|---|
| committer | Bernhard Froehlich <decke@FreeBSD.org> | 2012-01-18 12:05:48 +0000 |
| commit | b7207fae880a67bfd99a6dc8f93632ae96b2d135 (patch) | |
| tree | 493e8171622e1364697840f01141e323d7dc0bab /multimedia/xbmc | |
| parent | 0dd26a3a8b42d311d671ba416a74c9e7840544de (diff) | |
| download | ports-b7207fae880a67bfd99a6dc8f93632ae96b2d135.tar.gz ports-b7207fae880a67bfd99a6dc8f93632ae96b2d135.zip | |
Notes
Diffstat (limited to 'multimedia/xbmc')
97 files changed, 1033 insertions, 2444 deletions
diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile index cf0fa457478b..5cd68283ddb6 100644 --- a/multimedia/xbmc/Makefile +++ b/multimedia/xbmc/Makefile @@ -6,10 +6,10 @@ # PORTNAME= xbmc -PORTVERSION= 10.1 -PORTREVISION= 4 +PORTVERSION= 11.0.b1 CATEGORIES= multimedia MASTER_SITES= http://mirrors.xbmc.org/releases/source/ +DISTNAME= ${PORTNAME}-11.0-Eden_beta1 MAINTAINER= mickael.maillot@gmail.com COMMENT= XBMC is an award winning media center application @@ -23,9 +23,11 @@ BUILD_DEPENDS= enca:${PORTSDIR}/converters/enca \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip \ nasm:${PORTSDIR}/devel/nasm \ - dvdread-config:${PORTSDIR}/multimedia/libdvdread + dvdread-config:${PORTSDIR}/multimedia/libdvdread \ + gtk-update-icon-cache:${PORTSDIR}/x11-toolkits/gtk20 -LIB_DEPENDS= asound.2:${PORTSDIR}/audio/alsa-lib \ +LIB_DEPENDS= asound.2:${PORTSDIR}/audio/alsa-lib \ + ass.5:${PORTSDIR}/multimedia/libass \ boost_thread.4:${PORTSDIR}/devel/boost-libs \ cdio.12:${PORTSDIR}/sysutils/libcdio \ curl.6:${PORTSDIR}/ftp/curl \ @@ -33,24 +35,25 @@ LIB_DEPENDS= asound.2:${PORTSDIR}/audio/alsa-lib \ enca.5:${PORTSDIR}/converters/enca \ GLEW.1:${PORTSDIR}/graphics/glew \ avcodec.1:${PORTSDIR}/multimedia/ffmpeg \ + FLAC.10:${PORTSDIR}/audio/flac \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ freetype.9:${PORTSDIR}/print/freetype2 \ fribidi.3:${PORTSDIR}/converters/fribidi \ lzo2.2:${PORTSDIR}/archivers/lzo2 \ jasper.4:${PORTSDIR}/graphics/jasper \ jpeg.11:${PORTSDIR}/graphics/jpeg \ - faad.2:${PORTSDIR}/audio/faad \ mad:${PORTSDIR}/audio/libmad \ modplug:${PORTSDIR}/audio/libmodplug \ mpeg2:${PORTSDIR}/multimedia/libmpeg2 \ ogg.7:${PORTSDIR}/audio/libogg \ pcre.0:${PORTSDIR}/devel/pcre \ + plist.1:${PORTSDIR}/devel/libplist \ png.6:${PORTSDIR}/graphics/png \ samplerate.1:${PORTSDIR}/audio/libsamplerate \ smbclient.0:${PORTSDIR}/net/samba-libsmbclient \ sqlite3.8:${PORTSDIR}/databases/sqlite3 \ vorbis.4:${PORTSDIR}/audio/libvorbis \ - wavpack.2:${PORTSDIR}/audio/wavpack + yajl:${PORTSDIR}/devel/yajl RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins \ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ @@ -63,28 +66,22 @@ USE_GMAKE= yes USE_GNOME= pkgconfig USE_AUTOTOOLS= autoconf libtool automake libltdl GNU_CONFIGURE= yes -USE_XORG= xinerama xt xmu xrandr xtst +USE_XORG= xt xmu xrandr xtst USE_GL= glu USE_SDL= image mixer sdl USE_MYSQL= yes -USE_PYTHON= 2.5-2.7 +USE_PYTHON= 2.5+ MAKE_JOBS_SAFE= yes NOPRECIOUSMAKEVARS= yes INSTALLS_ICONS= yes ONLY_FOR_ARCHS= i386 amd64 -USE_LDCONFIG= ${PREFIX}/lib/xbmc/system \ - ${PREFIX}/lib/xbmc/system/players/dvdplayer \ - ${PREFIX}/lib/xbmc/system/players/paplayer -USE_DOS2UNIX= xbmc/lib/libid3tag/libid3tag/compat.gperf PLIST_SUB+= PYVER="${PYTHON_VERSION:S/python//:S/.//g}" OPTIONS= AVAHI "Enable Avahi support" on \ LIBBLURAY "Enable libbluray support" on \ - FAAC "Enable FAAC support" off \ HAL "Enable HAL support" on \ LIRC "Enable lirc support" off \ - MMS "Enable mms:// & mmsh:// support" on \ NONFREE "Enable non-free components (rar, ccx, ffmpeg)" off \ PULSE "Enable PulseAudio support" off \ RTMP "RTMP support via librtmp" off \ @@ -99,10 +96,7 @@ DESKTOP_ENTRIES="XBMC" \ "AudioVideo;Video;" \ true -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -CONFIGURE_ARGS+= --enable-external-libraries +CONFIGURE_ARGS+= --disable-nfs .include <bsd.port.pre.mk> @@ -132,13 +126,6 @@ LIB_DEPENDS+= bluray.0:${PORTSDIR}/multimedia/libbluray CONFIGURE_ARGS+= --disable-libbluray .endif -.if defined(WITH_FAAC) -CONFIGURE_ARGS+= --enable-faac -LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac -.else -CONFIGURE_ARGS+= --disable-faac -.endif - .if !defined(WITHOUT_HAL) CONFIGURE_ARGS+= --enable-hal LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal @@ -150,13 +137,6 @@ CONFIGURE_ARGS+= --disable-hal RUN_DEPENDS+= lircd:${PORTSDIR}/comms/lirc .endif -.if !defined(WITHOUT_MMS) -CONFIGURE_ARGS+= --enable-libmms -LIB_DEPENDS+= mms.0:${PORTSDIR}/net/libmms -.else -CONFIGURE_ARGS+= --disable-libmms -.endif - .if defined(WITH_NONFREE) CONFIGURE_ARGS+= --enable-non-free NO_CDROM= Restricted binary distribution @@ -202,107 +182,12 @@ CONFIGURE_ARGS+= --disable-webserver PLIST_SUB+= HTTPD="@comment " .endif -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 +.if ${CC} == "clang" || ${CXX} == "clang++" +CONFIGURE_ARGS+= --disable-rsxs +PLIST_SUB+= RSXS="@comment " +.else +PLIST_SUB+= RSXS="" +.endif pre-configure: cd ${WRKSRC} && ./bootstrap diff --git a/multimedia/xbmc/distinfo b/multimedia/xbmc/distinfo index 72cb1630ab9f..2d0f42fb48a4 100644 --- a/multimedia/xbmc/distinfo +++ b/multimedia/xbmc/distinfo @@ -1,2 +1,2 @@ -SHA256 (xbmc-10.1.tar.gz) = 3403195b7eb1d076523f2394793b7f050df00743892b031f6fea86b998559d8a -SIZE (xbmc-10.1.tar.gz) = 130187822 +SHA256 (xbmc-11.0-Eden_beta1.tar.gz) = f8651ac846d4aa0f06628802a9b8642f4dbbe8f741b3dbacfef63fb9c0be774f +SIZE (xbmc-11.0-Eden_beta1.tar.gz) = 56530997 diff --git a/multimedia/xbmc/files/patch-Makefile.in b/multimedia/xbmc/files/patch-Makefile.in index b2166dbffeaf..1b18baf73dd8 100644 --- a/multimedia/xbmc/files/patch-Makefile.in +++ b/multimedia/xbmc/files/patch-Makefile.in @@ -1,141 +1,14 @@ ---- 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 \ - - ifeq (@USE_INTERNAL_LIBA52@,1) -@@ -363,9 +362,6 @@ +--- ./Makefile.in.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./Makefile.in 2012-01-02 10:14:38.000000000 +0100 +@@ -286,9 +286,11 @@ 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 --endif - imagelib: dllloader - $(MAKE) -C xbmc/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'" + $(MAKE) -C lib/stsound/StSoundLibrary ++ifneq ($(findstring freebsd,@ARCH@), freebsd) + ifeq ($(or $(findstring powerpc,@ARCH@),$(findstring x86_64-linux,@ARCH@),$(findstring arm, @ARCH@)),) + $(MAKE) -C lib/snesapu/SNES/SNESAPU 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 + imagelib: dllloader + $(MAKE) -C lib/cximage-6.0 - uninstall: - @echo "Removing XBMC..." diff --git a/multimedia/xbmc/files/patch-Makefile.include.in b/multimedia/xbmc/files/patch-Makefile.include.in deleted file mode 100644 index 7b00ae4a355b..000000000000 --- a/multimedia/xbmc/files/patch-Makefile.include.in +++ /dev/null @@ -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@ diff --git a/multimedia/xbmc/files/patch-configure.in b/multimedia/xbmc/files/patch-configure.in index c93b7ed6629c..435f7cedd684 100644 --- a/multimedia/xbmc/files/patch-configure.in +++ b/multimedia/xbmc/files/patch-configure.in @@ -1,63 +1,57 @@ ---- 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 2011-12-23 04:12:21.000000000 +0100 ++++ configure.in 2012-01-03 16:44:09.000000000 +0100 +@@ -18,7 +18,13 @@ + # check for library basenames + AC_DEFUN([XB_FIND_SONAME], [ - if [[ "$host_vendor" != "apple" ]]; then +- if [[ "$host_vendor" != "apple" ]]; then ++ if echo "$host" | grep -q freebsd ; then ++ AC_MSG_CHECKING([for lib$2 soname]) ++ $1_SONAME=[`ldconfig -r | sed -n "s;.* \(/.*lib$2\.so.*\)$;\1;p" | head -n 1`] ++ if test x$$1_SONAME != x ; then ++ $1_SONAME=[`basename $$1_SONAME`] ++ fi ++ elif [[ "$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]) - -+AC_ARG_ENABLE([libmms], -+ [AS_HELP_STRING([--enable-libmms], -+ [enable mms:// and mmsh:// support (default is auto)])], -+ [use_libmms=$enableval], -+ [use_libmms=auto]) -+ - 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*) + $1_FILENAME=$($CC -nostdlib -o /dev/null $LDFLAGS -l$2 -Wl,-M 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}') + if [[ ! -z $$1_FILENAME ]]; then +@@ -453,6 +459,18 @@ 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" ++ use_external_ffmpeg="yes" ++ 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" ++ use_external_ffmpeg="yes" ++ 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_neon=yes +@@ -551,6 +569,13 @@ + -+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") + # platform specific flags ++if echo "$ARCH" | grep -q "freebsd" ; then ++ LOCALBASE="${LOCALBASE:-/usr/local}" ++ CFLAGS="$CFLAGS -I$LOCALBASE/include" ++ CXXFLAGS="$CXXFLAGS -I$LOCALBASE/include" ++ CPPFLAGS="$CPPFLAGS -I$LOCALBASE/include" ++ LDFLAGS="$LDFLAGS -L$LOCALBASE/lib" ++fi + if test "$host_vendor" = "apple" ; then + # standard xbmc paths + INCLUDES="$INCLUDES -I\$(abs_top_srcdir)/xbmc/osx" +@@ -713,7 +738,11 @@ AC_CHECK_LIB([bz2], [main],, AC_MSG_ERROR($missing_library)) AC_CHECK_LIB([jpeg], [main],, AC_MSG_ERROR($missing_library)) # check for cximage + AC_CHECK_LIB([tiff], [main],, AC_MSG_ERROR($missing_library)) +if echo "$ARCH" | grep -q freebsd; then +AC_CHECK_LIB([pthread], [main],LIBS="-pthread $LIBS", AC_MSG_ERROR($missing_library)) +else @@ -65,158 +59,57 @@ +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 @@ - ] - ) - -+# check for libmms -+AS_CASE([x$use_libmms], -+ [xyes],[ -+ PKG_CHECK_MODULES([LIBMMS],[libmms],[use_libmms="yes"], AC_MSG_ERROR($missing_library)) -+ ], -+ [xauto],[ -+ PKG_CHECK_MODULES([LIBMMS],[libmms],[use_libmms="yes"], [use_libmms="no"]) -+ ]) -+ -+AS_CASE([x$use_libmms], -+ [xyes],[ -+ INCLUDES="$INCLUDES $LIBMMS_CFLAGS"; -+ LIBS="$LIBS $LIBMMS_LIBS"; -+ if test "$host_vendor" != "apple"; then -+ XB_FIND_SONAME([MMS], [mms], [use_libmms]) -+ fi; -+ AC_DEFINE([HAVE_LIBMMS], 1, [System has libmms library]) -+ AC_SUBST([HAVE_LIBMMS], 1) -+ ],[ -+ AC_SUBST([HAVE_LIBMMS], 0) -+ ] -+) -+ - # 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)) + AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library)) +@@ -809,8 +838,10 @@ + 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++]) + +@@ -1143,7 +1174,11 @@ + use_libusb="no" + AC_MSG_NOTICE($libusb_disabled) else - AC_MSG_RESULT($faac_disabled) - fi -@@ -919,7 +965,11 @@ +- if test "$use_libusb" = "auto"; then ++ if echo "$ARCH" | grep -q freebsd ; then ++ AC_CHECK_LIB([usb],[main], ++ [use_libusb="yes";USB_LIBS="-lusb"], ++ [use_libusb="no";AC_MSG_RESULT($libusb_not_found)]) ++ elif test "$use_libusb" = "auto"; then + PKG_CHECK_MODULES([USB],[libusb],,[use_libusb="no";AC_MSG_RESULT($libusb_not_found)]) + elif test "$use_libusb" = "yes"; then + PKG_CHECK_MODULES([USB],[libusb],,[use_libusb="no";AC_MSG_ERROR($libusb_not_found)]) +@@ -2157,7 +2192,8 @@ - # 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)] )] )] )] ) + XB_CONFIG_MODULE([xbmc/visualizations/XBMCProjectM/libprojectM],[ + set -x +- rm -f CMakeCache.txt && CC="$ORIGCC" CXX="$ORIGCXX" cmake \ ++ rm -f CMakeCache.txt && \ ++ CC="$ORIGCC" CXX="$ORIGCXX" LDFLAGS="$LDFLAGS" cmake \ + -DCMAKE_BUILD_TYPE=None -DUSE_FTGL:BOOL=OFF \ + -DCMAKE_C_FLAGS:STRING="${CPPFLAGS} ${CFLAGS}" \ + -DCMAKE_CXX_FLAGS:STRING="${CPPFLAGS} ${CXXFLAGS}" \ +@@ -2210,6 +2246,9 @@ + --disable-hyperspace \ + --disable-lattice \ + --disable-skyrocket ++ if echo "$ARCH" | grep -q freebsd ; then ++ sed -i.back "s;\(STDBOOL_H = \)stdbool.h;\1;" lib/Makefile ++ fi + ], [$DISABLE_RSXS]) - 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" - fi + XB_CONFIG_MODULE([lib/libapetag], [ +@@ -2226,7 +2265,7 @@ + --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ + --host=$host_alias \ + --build=$build_alias \ +- --target=$target_alias CFLAGS="$CFLAGS" CC="$CC" CXX="$CXX" ++ --target=$target_alias CFLAGS="$CFLAGS" CC="$CC" CXX="$CXX" LDFLAGS="$LDFLAGS" + #LDFLAGS="$LDFLAGS -Wl,-read_only_relocs,suppress" + ], [0]) -+if test "$use_libmms" = "yes"; then -+ final_message="$final_message\n MMS Support:\tYes" -+else -+ final_message="$final_message\n MMS Support:\tNo" -+fi -+ - 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 \ - 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" \ diff --git a/multimedia/xbmc/files/patch-guilib__StdString.h b/multimedia/xbmc/files/patch-guilib__StdString.h deleted file mode 100644 index f8a495520a2e..000000000000 --- a/multimedia/xbmc/files/patch-guilib__StdString.h +++ /dev/null @@ -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 <string> - #include <stdint.h> - #include <vector> -+#include <cstring> - - #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); diff --git a/multimedia/xbmc/files/patch-guilib__TextureBundleXPR.cpp b/multimedia/xbmc/files/patch-guilib__TextureBundleXPR.cpp deleted file mode 100644 index aae0f70c69b2..000000000000 --- a/multimedia/xbmc/files/patch-guilib__TextureBundleXPR.cpp +++ /dev/null @@ -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 diff --git a/multimedia/xbmc/files/patch-guilib__XBTFReader.cpp b/multimedia/xbmc/files/patch-guilib__XBTFReader.cpp deleted file mode 100644 index 83f5adb27b62..000000000000 --- a/multimedia/xbmc/files/patch-guilib__XBTFReader.cpp +++ /dev/null @@ -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) diff --git a/multimedia/xbmc/files/patch-guilib__common__LIRC.cpp b/multimedia/xbmc/files/patch-guilib__common__LIRC.cpp deleted file mode 100644 index cb499bf261f6..000000000000 --- a/multimedia/xbmc/files/patch-guilib__common__LIRC.cpp +++ /dev/null @@ -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 <sys/time.h> - #include <sys/types.h> - #include <sys/socket.h> - #include <sys/un.h> -+#ifdef HAVE_INOTIFY - #include <sys/inotify.h> -+#endif - #include <limits.h> - #include <unistd.h> - #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; - } - diff --git a/multimedia/xbmc/files/patch-guilib__system.h b/multimedia/xbmc/files/patch-guilib__system.h deleted file mode 100644 index 9431e4604626..000000000000 --- a/multimedia/xbmc/files/patch-guilib__system.h +++ /dev/null @@ -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 diff --git a/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__cpluff.c b/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__cpluff.c new file mode 100644 index 000000000000..88c4dcc8d617 --- /dev/null +++ b/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__cpluff.c @@ -0,0 +1,18 @@ +--- ./lib/cpluff/libcpluff/cpluff.c.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./lib/cpluff/libcpluff/cpluff.c 2012-01-02 10:14:38.000000000 +0100 +@@ -77,6 +77,7 @@ + return CP_HOST; + } + ++#if defined(CP_THREADS) || !defined(NDEBUG) + CP_HIDDEN void cpi_lock_framework(void) { + #if defined(CP_THREADS) + cpi_lock_mutex(framework_mutex); +@@ -93,6 +94,7 @@ + framework_locked--; + #endif + } ++#endif + + static void reset(void) { + #ifdef CP_THREADS diff --git a/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__logging.c b/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__logging.c new file mode 100644 index 000000000000..86fa1c9d3f7f --- /dev/null +++ b/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__logging.c @@ -0,0 +1,26 @@ +--- ./lib/cpluff/libcpluff/logging.c.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./lib/cpluff/libcpluff/logging.c 2012-01-02 10:14:38.000000000 +0100 +@@ -130,9 +130,11 @@ + if (status == CP_ERR_RESOURCE) { + cpi_error(context, N_("Logger could not be registered due to insufficient memory.")); + } else if (cpi_is_logged(context, CP_LOG_DEBUG)) { ++#ifndef __clang__ + char owner[64]; + /* TRANSLATORS: %s is the context owner */ + cpi_debugf(context, N_("%s registered a logger."), cpi_context_owner(context, owner, sizeof(owner))); ++#endif + } + cpi_unlock_context(context); + +@@ -167,9 +169,11 @@ + update_logging_limits(context); + } + if (cpi_is_logged(context, CP_LOG_DEBUG)) { ++#ifndef __clang__ + char owner[64]; + /* TRANSLATORS: %s is the context owner */ + cpi_debugf(context, N_("%s unregistered a logger."), cpi_context_owner(context, owner, sizeof(owner))); ++#endif + } + cpi_unlock_context(context); + } diff --git a/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__pinfo.c b/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__pinfo.c new file mode 100644 index 000000000000..c72f8476e86b --- /dev/null +++ b/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__pinfo.c @@ -0,0 +1,26 @@ +--- ./lib/cpluff/libcpluff/pinfo.c.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./lib/cpluff/libcpluff/pinfo.c 2012-01-02 10:14:38.000000000 +0100 +@@ -570,9 +570,11 @@ + if (status != CP_OK) { + cpi_error(context, _("A plug-in listener could not be registered due to insufficient memory.")); + } else if (cpi_is_logged(context, CP_LOG_DEBUG)) { ++#ifndef __clang__ + char owner[64]; + /* TRANSLATORS: %s is the context owner */ + cpi_debugf(context, N_("%s registered a plug-in listener."), cpi_context_owner(context, owner, sizeof(owner))); ++#endif + } + cpi_unlock_context(context); + +@@ -592,9 +594,11 @@ + process_unregister_plistener(context->env->plugin_listeners, node, NULL); + } + if (cpi_is_logged(context, CP_LOG_DEBUG)) { ++#ifndef __clang__ + char owner[64]; + /* TRANSLATORS: %s is the context owner */ + cpi_debugf(context, N_("%s unregistered a plug-in listener."), cpi_context_owner(context, owner, sizeof(owner))); ++#endif + } + cpi_unlock_context(context); + } diff --git a/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__ploader.c b/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__ploader.c deleted file mode 100644 index 790e45dc0778..000000000000 --- a/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__ploader.c +++ /dev/null @@ -1,55 +0,0 @@ ---- ./lib/cpluff/libcpluff/ploader.c.orig 2010-07-09 17:51:15.000000000 +0200 -+++ ./lib/cpluff/libcpluff/ploader.c 2010-12-01 12:17:34.288126970 +0100 -@@ -161,15 +161,15 @@ - cpi_warnf(plcontext->context, - N_("Suspicious plug-in descriptor content in %s, line %d, column %d (%s)."), - plcontext->file, -- XML_GetCurrentLineNumber(plcontext->parser), -- XML_GetCurrentColumnNumber(plcontext->parser) + 1, -+ (int)XML_GetCurrentLineNumber(plcontext->parser), -+ (int)XML_GetCurrentColumnNumber(plcontext->parser) + 1, - message); - } else { - cpi_errorf(plcontext->context, - N_("Invalid plug-in descriptor content in %s, line %d, column %d (%s)."), - plcontext->file, -- XML_GetCurrentLineNumber(plcontext->parser), -- XML_GetCurrentColumnNumber(plcontext->parser) + 1, -+ (int)XML_GetCurrentLineNumber(plcontext->parser), -+ (int)XML_GetCurrentColumnNumber(plcontext->parser) + 1, - message); - } - if (!warn) { -@@ -188,8 +188,8 @@ - cpi_errorf(plcontext->context, - N_("Insufficient system resources to parse plug-in descriptor content in %s, line %d, column %d."), - plcontext->file, -- XML_GetCurrentLineNumber(plcontext->parser), -- XML_GetCurrentColumnNumber(plcontext->parser) + 1); -+ (int)XML_GetCurrentLineNumber(plcontext->parser), -+ (int)XML_GetCurrentColumnNumber(plcontext->parser) + 1); - } - plcontext->resource_error_count++; - } -@@ -1084,8 +1084,8 @@ - cpi_errorf(context, - N_("XML parsing error in %s, line %d, column %d (%s)."), - file, -- XML_GetErrorLineNumber(parser), -- XML_GetErrorColumnNumber(parser) + 1, -+ (int)XML_GetErrorLineNumber(parser), -+ (int)XML_GetErrorColumnNumber(parser) + 1, - XML_ErrorString(XML_GetErrorCode(parser))); - cpi_unlock_context(context); - } -@@ -1270,8 +1270,8 @@ - cpi_errorf(context, - N_("XML parsing error in %s, line %d, column %d (%s)."), - file, -- XML_GetErrorLineNumber(parser), -- XML_GetErrorColumnNumber(parser) + 1, -+ (int)XML_GetErrorLineNumber(parser), -+ (int)XML_GetErrorColumnNumber(parser) + 1, - XML_ErrorString(XML_GetErrorCode(parser))); - cpi_unlock_context(context); - } diff --git a/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__psymbol.c b/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__psymbol.c new file mode 100644 index 000000000000..7fc56663c11e --- /dev/null +++ b/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__psymbol.c @@ -0,0 +1,26 @@ +--- ./lib/cpluff/libcpluff/psymbol.c.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./lib/cpluff/libcpluff/psymbol.c 2012-01-02 10:14:38.000000000 +0100 +@@ -249,9 +249,11 @@ + provider_info->usage_count++; + + if (cpi_is_logged(context, CP_LOG_DEBUG)) { ++#ifndef __clang__ + char owner[64]; + /* TRANSLATORS: First %s is the context owner */ + cpi_debugf(context, "%s resolved symbol %s defined by plug-in %s.", cpi_context_owner(context, owner, sizeof(owner)), name, id); ++#endif + } + } while (0); + +@@ -315,9 +317,11 @@ + hash_delete_free(context->resolved_symbols, node); + free(symbol_info); + if (cpi_is_logged(context, CP_LOG_DEBUG)) { ++#ifndef __clang__ + char owner[64]; + /* TRANSLATORS: First %s is the context owner */ + cpi_debugf(context, _("%s released the symbol at address %p defined by plug-in %s."), cpi_context_owner(context, owner, sizeof(owner)), ptr, provider_info->plugin->plugin->identifier); ++#endif + } + } + diff --git a/multimedia/xbmc/files/patch-lib__cximage-6.0__raw__dcr.c b/multimedia/xbmc/files/patch-lib__cximage-6.0__raw__dcr.c new file mode 100644 index 000000000000..308d149e2816 --- /dev/null +++ b/multimedia/xbmc/files/patch-lib__cximage-6.0__raw__dcr.c @@ -0,0 +1,12 @@ +--- ./lib/cximage-6.0/raw/dcr.c.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./lib/cximage-6.0/raw/dcr.c 2012-01-02 10:14:38.000000000 +0100 +@@ -144,7 +144,9 @@ + + //!!! 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; diff --git a/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__event.cpp b/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__event.cpp new file mode 100644 index 000000000000..3398f130fea4 --- /dev/null +++ b/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__event.cpp @@ -0,0 +1,11 @@ +--- ./lib/libsidplay2/libsidplay/src/event.cpp.orig 2012-01-02 11:40:56.000000000 +0100 ++++ ./lib/libsidplay2/libsidplay/src/event.cpp 2012-01-02 11:40:57.000000000 +0100 +@@ -50,7 +50,7 @@ + ***************************************************************************/ + + #include <string.h> +-#include "event.h" ++#include "sidplay/event.h" + + #define EVENT_TIMEWARP_COUNT 0x0FFFFF + diff --git a/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__mos6510__mos6510.h b/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__mos6510__mos6510.h new file mode 100644 index 000000000000..98964fdd831f --- /dev/null +++ b/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__mos6510__mos6510.h @@ -0,0 +1,11 @@ +--- ./lib/libsidplay2/libsidplay/src/mos6510/mos6510.h.orig 2012-01-02 11:44:06.000000000 +0100 ++++ ./lib/libsidplay2/libsidplay/src/mos6510/mos6510.h 2012-01-02 11:44:18.000000000 +0100 +@@ -36,7 +36,7 @@ + #include "config.h" + #include "component.h" + #include "sidenv.h" +-#include "event.h" ++#include "sidplay/event.h" + + #undef MOS6510_VERSION + #undef MOS6510_DATE diff --git a/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__mos6526__mos6526.h b/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__mos6526__mos6526.h new file mode 100644 index 000000000000..1d1e604851da --- /dev/null +++ b/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__mos6526__mos6526.h @@ -0,0 +1,11 @@ +--- ./lib/libsidplay2/libsidplay/src/mos6526/mos6526.h.orig 2012-01-02 11:46:36.000000000 +0100 ++++ ./lib/libsidplay2/libsidplay/src/mos6526/mos6526.h 2012-01-02 11:46:47.000000000 +0100 +@@ -85,7 +85,7 @@ + #define _mos6526_h_ + + #include "component.h" +-#include "event.h" ++#include "sidplay/event.h" + + class MOS6526: public component + { diff --git a/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__mos656x__mos656x.h b/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__mos656x__mos656x.h new file mode 100644 index 000000000000..e77818119b6e --- /dev/null +++ b/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__mos656x__mos656x.h @@ -0,0 +1,11 @@ +--- ./lib/libsidplay2/libsidplay/src/mos656x/mos656x.h.orig 2012-01-02 11:41:49.000000000 +0100 ++++ ./lib/libsidplay2/libsidplay/src/mos656x/mos656x.h 2012-01-02 11:42:18.000000000 +0100 +@@ -19,7 +19,7 @@ + #define _mos656x_h_ + + #include "component.h" +-#include "event.h" ++#include "sidplay/event.h" + + typedef enum + { diff --git a/multimedia/xbmc/files/patch-lib__timidity__interface__w32g.h b/multimedia/xbmc/files/patch-lib__timidity__interface__w32g.h new file mode 100644 index 000000000000..bdaebf859f70 --- /dev/null +++ b/multimedia/xbmc/files/patch-lib__timidity__interface__w32g.h @@ -0,0 +1,22 @@ +--- ./lib/timidity/interface/w32g.h.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./lib/timidity/interface/w32g.h 2012-01-02 10:14:38.000000000 +0100 +@@ -64,6 +64,9 @@ + #elif defined(_BORLANDC_) + #define crt_beginthread(start_address,stack_size,arglist) \ + (HANDLE)_beginthread((BCC_BEGINTHREAD_START_ADDRESS)start_address,(unsigned)stack_size,(void *)arglist) ++#elif defined(__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) +@@ -76,6 +79,9 @@ + #elif defined(_BORLANDC_) + #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) ++#elif defined(__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) diff --git a/multimedia/xbmc/files/patch-lib__timidity__timidity__gogo_a.c b/multimedia/xbmc/files/patch-lib__timidity__timidity__gogo_a.c new file mode 100644 index 000000000000..20bfc676de86 --- /dev/null +++ b/multimedia/xbmc/files/patch-lib__timidity__timidity__gogo_a.c @@ -0,0 +1,12 @@ +--- ./lib/timidity/timidity/gogo_a.c.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./lib/timidity/timidity/gogo_a.c 2012-01-02 10:14:38.000000000 +0100 +@@ -108,6 +108,9 @@ + #elif defined(_BORLANDC_) + #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) ++#elif defined(__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) diff --git a/multimedia/xbmc/files/patch-m4__ax_python_devel.m4 b/multimedia/xbmc/files/patch-m4__ax_python_devel.m4 new file mode 100644 index 000000000000..b158173ee993 --- /dev/null +++ b/multimedia/xbmc/files/patch-m4__ax_python_devel.m4 @@ -0,0 +1,22 @@ +--- ./m4/ax_python_devel.m4.orig 2012-01-02 17:23:11.000000000 +0100 ++++ ./m4/ax_python_devel.m4 2012-01-02 17:23:13.000000000 +0100 +@@ -178,7 +178,8 @@ + if (e != None): + ret += e + print (ret) +-EOD` ++EOD ++` + + if test -z "$ac_python_version"; then + if test -n "$PYTHON_VERSION"; then +@@ -202,7 +203,8 @@ + if e != None: + print (e) + break +-EOD` ++EOD ++` + + # Before checking for libpythonX.Y, we need to know + # the extension the OS we're on uses for libraries diff --git a/multimedia/xbmc/files/patch-tools__Linux__xbmc.sh.in b/multimedia/xbmc/files/patch-tools__Linux__xbmc.sh.in deleted file mode 100644 index 2978dfbf69c8..000000000000 --- a/multimedia/xbmc/files/patch-tools__Linux__xbmc.sh.in +++ /dev/null @@ -1,28 +0,0 @@ ---- ./tools/Linux/xbmc.sh.in.orig 2010-10-28 21:09:04.000000000 +0200 -+++ ./tools/Linux/xbmc.sh.in 2010-12-01 12:17:34.286115032 +0100 -@@ -23,6 +23,8 @@ - exec_prefix="@exec_prefix@" - datarootdir="@datarootdir@" - LIBDIR="@libdir@" -+export XBMC_BIN_HOME="${LIBDIR}/xbmc" -+export XBMC_HOME="${datarootdir}/xbmc" - - # Check for some options used by this script - while [ "$#" -gt "0" ] -@@ -103,11 +105,11 @@ - echo "Crash report available at $FILE" - } - --python @datadir@/xbmc/FEH.py $SAVED_ARGS --RET=$? --if [ $RET -ne 0 ]; then -- exit $RET --fi -+# python @datadir@/xbmc/FEH.py $SAVED_ARGS -+# RET=$? -+# if [ $RET -ne 0 ]; then -+# exit $RET -+# fi - - if which gdb >/dev/null 2>&1; then - # Output warning in case ulimit is unsupported by shell diff --git a/multimedia/xbmc/files/patch-tools__TexturePacker__XBMCTex.cpp b/multimedia/xbmc/files/patch-tools__TexturePacker__XBMCTex.cpp deleted file mode 100644 index 4fd9d9c6b27e..000000000000 --- a/multimedia/xbmc/files/patch-tools__TexturePacker__XBMCTex.cpp +++ /dev/null @@ -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 <lzo/lzo1x.h> -+#else /* !__FreeBSD__ */ - #include <lzo1x.h> -+#endif - #else - #include "../../xbmc/lib/liblzo/LZO1X.H" - #endif diff --git a/multimedia/xbmc/files/patch-tools__TexturePacker__XBTFWriter.cpp b/multimedia/xbmc/files/patch-tools__TexturePacker__XBTFWriter.cpp new file mode 100644 index 000000000000..1e0b868b8fd4 --- /dev/null +++ b/multimedia/xbmc/files/patch-tools__TexturePacker__XBTFWriter.cpp @@ -0,0 +1,13 @@ +--- ./tools/TexturePacker/XBTFWriter.cpp.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./tools/TexturePacker/XBTFWriter.cpp 2012-01-02 10:14:38.000000000 +0100 +@@ -24,7 +24,9 @@ + #include <inttypes.h> + #include "guilib/XBTF.h" + #include "utils/EndianSwap.h" +-#if !defined(__APPLE__) && !defined(__FreeBSD__) ++#if defined(__FreeBSD__) ++#include <stdlib.h> ++#elif !defined(__APPLE__) + #include <malloc.h> + #endif + #include <memory.h> diff --git a/multimedia/xbmc/files/patch-xbmc__Application.cpp b/multimedia/xbmc/files/patch-xbmc__Application.cpp deleted file mode 100644 index 2af15ef00955..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__Application.cpp +++ /dev/null @@ -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); diff --git a/multimedia/xbmc/files/patch-xbmc__DetectDVDType.cpp b/multimedia/xbmc/files/patch-xbmc__DetectDVDType.cpp deleted file mode 100644 index f2246fceb785..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__DetectDVDType.cpp +++ /dev/null @@ -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 <sys/types.h> - #include <sys/ioctl.h> - #include <fcntl.h> --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - #include <linux/cdrom.h> - #endif - #endif diff --git a/multimedia/xbmc/files/patch-xbmc__FileSystem__CacheStrategy.cpp b/multimedia/xbmc/files/patch-xbmc__FileSystem__CacheStrategy.cpp deleted file mode 100644 index d43e982482b4..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__FileSystem__CacheStrategy.cpp +++ /dev/null @@ -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; - } - diff --git a/multimedia/xbmc/files/patch-xbmc__FileSystem__DllLibCurl.cpp b/multimedia/xbmc/files/patch-xbmc__FileSystem__DllLibCurl.cpp deleted file mode 100644 index 5805715b4ba1..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__FileSystem__DllLibCurl.cpp +++ /dev/null @@ -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; diff --git a/multimedia/xbmc/files/patch-xbmc__FileSystem__SAPDirectory.cpp b/multimedia/xbmc/files/patch-xbmc__FileSystem__SAPDirectory.cpp deleted file mode 100644 index ff577a90e6d3..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__FileSystem__SAPDirectory.cpp +++ /dev/null @@ -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 <Ws2tcpip.h> - #else diff --git a/multimedia/xbmc/files/patch-xbmc__GUILargeTextureManager.cpp b/multimedia/xbmc/files/patch-xbmc__GUILargeTextureManager.cpp deleted file mode 100644 index 654b988afe2f..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__GUILargeTextureManager.cpp +++ /dev/null @@ -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; diff --git a/multimedia/xbmc/files/patch-xbmc__MusicInfoTagLoaderWMA.cpp b/multimedia/xbmc/files/patch-xbmc__MusicInfoTagLoaderWMA.cpp deleted file mode 100644 index 4b848a2c1c53..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__MusicInfoTagLoaderWMA.cpp +++ /dev/null @@ -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); - } - } - } diff --git a/multimedia/xbmc/files/patch-xbmc__ProgramDatabase.cpp b/multimedia/xbmc/files/patch-xbmc__ProgramDatabase.cpp deleted file mode 100644 index 0b881e84fba8..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__ProgramDatabase.cpp +++ /dev/null @@ -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; - } - diff --git a/multimedia/xbmc/files/patch-xbmc__Util.cpp b/multimedia/xbmc/files/patch-xbmc__Util.cpp deleted file mode 100644 index 974fcf9760fb..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__Util.cpp +++ /dev/null @@ -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 <mach-o/dyld.h> - #endif - -+#if defined(__FreeBSD__) -+#include <sys/param.h> -+#include <sys/sysctl.h> -+#endif -+ - #ifdef _LINUX - #include <sys/types.h> - #include <dirent.h> -@@ -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(); diff --git a/multimedia/xbmc/files/patch-xbmc__VideoDatabase.cpp b/multimedia/xbmc/files/patch-xbmc__VideoDatabase.cpp deleted file mode 100644 index 59f7a6108c2c..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__VideoDatabase.cpp +++ /dev/null @@ -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(); diff --git a/multimedia/xbmc/files/patch-xbmc__ViewDatabase.cpp b/multimedia/xbmc/files/patch-xbmc__ViewDatabase.cpp deleted file mode 100644 index 1ba267d3e0e6..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__ViewDatabase.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ./xbmc/ViewDatabase.cpp.orig 2010-07-03 13:07:36.000000000 +0200 -+++ ./xbmc/ViewDatabase.cpp 2010-12-01 12:17:34.233780060 +0100 -@@ -62,7 +62,7 @@ - catch (...) - { - CLog::Log(LOGERROR, "%s unable to create tables:%u", -- __FUNCTION__, GetLastError()); -+ __FUNCTION__, (unsigned int)GetLastError()); - return false; - } - diff --git a/multimedia/xbmc/files/patch-xbmc__addons__Addon.cpp b/multimedia/xbmc/files/patch-xbmc__addons__Addon.cpp index b22eb423d786..83aff567d65c 100644 --- a/multimedia/xbmc/files/patch-xbmc__addons__Addon.cpp +++ b/multimedia/xbmc/files/patch-xbmc__addons__Addon.cpp @@ -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 2011-12-23 04:12:21.000000000 +0100 ++++ ./xbmc/addons/Addon.cpp 2012-01-02 10:14:38.000000000 +0100 +@@ -28,6 +28,9 @@ #ifdef __APPLE__ #include "../osx/OSXGNUReplacements.h" #endif +#ifdef __FreeBSD__ -+#include "FreeBSDGNUReplacements.h" // strverscmp ++#include "FreeBSDGNUReplacements.h" +#endif - #include "log.h" + #include "utils/log.h" + #include "utils/URIUtils.h" #include <vector> - #include <string.h> diff --git a/multimedia/xbmc/files/patch-xbmc__cores__AudioRenderers__ALSADirectSound.cpp b/multimedia/xbmc/files/patch-xbmc__cores__AudioRenderers__ALSADirectSound.cpp deleted file mode 100644 index c3d1da503e90..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__cores__AudioRenderers__ALSADirectSound.cpp +++ /dev/null @@ -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(); - } diff --git a/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.cpp b/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.cpp index 4748d8d54927..92e975b3ddc5 100644 --- a/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.cpp +++ b/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.cpp @@ -1,45 +1,34 @@ ---- ./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 @@ +--- ./xbmc/cores/DllLoader/exports/emu_msvcrt.cpp.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./xbmc/cores/DllLoader/exports/emu_msvcrt.cpp 2012-01-02 10:14:38.000000000 +0100 +@@ -27,21 +27,23 @@ + #include <direct.h> + #include <process.h> + #else +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include <mntent.h> + #endif + #endif #include <sys/stat.h> #include <sys/types.h> - #include <sys/timeb.h> +#if !defined(__FreeBSD__) - #ifdef _LINUX - #include <sys/ioctl.h> - #ifndef __APPLE__ -@@ -39,6 +40,7 @@ - #include <IOKit/storage/IODVDMediaBSDClient.h> - #endif - #endif + #include <sys/timeb.h> +#endif - #include <fcntl.h> - #include <time.h> - #include <signal.h> -@@ -134,6 +136,8 @@ - dll_putenv("OS=darwin"); - #elif defined(_LINUX) - dll_putenv("OS=linux"); -+#elif defined(__FreeBSD__) -+ dll_putenv("OS=freebsd"); - #else - dll_putenv("OS=unknown"); + #include "system.h" // for HAS_DVD_DRIVE + #ifdef HAS_DVD_DRIVE + #ifdef _LINUX + #include <sys/ioctl.h> +- #ifndef __APPLE__ +- #include <linux/cdrom.h> +- #else ++ #ifdef __APPLE__ + #include <IOKit/storage/IODVDMediaBSDClient.h> ++ #elif !defined(__FreeBSD__) ++ #include <linux/cdrom.h> + #endif + #endif #endif -@@ -141,11 +145,11 @@ - dll_putenv("PYTHONHOME=special://xbmc/system/python"); - dll_putenv("PATH=.;special://xbmc;special://xbmc/system/python"); - //dll_putenv("PYTHONCASEOK=1"); -- //dll_putenv("PYTHONDEBUG=1"); -+ dll_putenv("PYTHONDEBUG=1"); - //dll_putenv("PYTHONVERBOSE=2"); // "1" for normal verbose, "2" for more verbose ? - dll_putenv("PYTHONOPTIMIZE=1"); - //dll_putenv("PYTHONDUMPREFS=1"); -- //dll_putenv("THREADDEBUG=1"); -+ dll_putenv("THREADDEBUG=1"); - //dll_putenv("PYTHONMALLOCSTATS=1"); - //dll_putenv("PYTHONY2K=1"); - dll_putenv("TEMP=special://temp/temp"); // for python tempdir -@@ -1141,7 +1145,7 @@ +@@ -1159,7 +1161,7 @@ FILE* dll_fopen(const char* filename, const char* mode) { FILE* file = NULL; @@ -48,7 +37,7 @@ if (strcmp(filename, MOUNTED) == 0 || strcmp(filename, MNTTAB) == 0) { -@@ -1249,7 +1253,7 @@ +@@ -1267,7 +1269,7 @@ { // it might be something else than a file, or the file is not emulated // let the operating system handle it @@ -57,7 +46,7 @@ return fseek(stream, offset, origin); #else return fseeko64(stream, offset, origin); -@@ -1314,7 +1318,7 @@ +@@ -1332,7 +1334,7 @@ { // it might be something else than a file, or the file is not emulated // let the operating system handle it @@ -66,7 +55,7 @@ return ftello(stream); #else return ftello64(stream); -@@ -1360,7 +1364,7 @@ +@@ -1378,7 +1380,7 @@ CLog::Log(LOGWARNING, "msvcrt.dll: dll_telli64 called, TODO: add 'int64 -> long' type checking"); //warning #ifndef _LINUX return (__int64)tell(fd); @@ -75,7 +64,7 @@ return lseek(fd, 0, SEEK_CUR); #else return lseek64(fd, 0, SEEK_CUR); -@@ -1537,7 +1541,7 @@ +@@ -1555,7 +1557,7 @@ int ret; ret = dll_fgetpos64(stream, &tmpPos); @@ -84,7 +73,7 @@ *pos = (fpos_t)tmpPos; #else pos->__pos = (off_t)tmpPos.__pos; -@@ -1550,7 +1554,7 @@ +@@ -1568,7 +1570,7 @@ CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream); if (pFile != NULL) { @@ -93,7 +82,7 @@ *pos = pFile->GetPosition(); #else pos->__pos = pFile->GetPosition(); -@@ -1572,7 +1576,7 @@ +@@ -1590,7 +1592,7 @@ int fd = g_emuFileWrapper.GetDescriptorByStream(stream); if (fd >= 0) { @@ -102,7 +91,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 +1609,7 @@ { // it might be something else than a file, or the file is not emulated // let the operating system handle it @@ -111,7 +100,7 @@ return fsetpos(stream, pos); #else return fsetpos64(stream, pos); -@@ -1605,7 +1609,7 @@ +@@ -1623,7 +1625,7 @@ if (fd >= 0) { fpos64_t tmpPos; @@ -120,28 +109,16 @@ tmpPos= *pos; #else tmpPos.__pos = (off64_t)(pos->__pos); -@@ -2079,7 +2083,7 @@ - return (char***)&t; - } - --#ifdef _LINUX -+#if defined(_LINUX) - int * __cdecl dll_errno(void) - { - return &errno; -@@ -2090,8 +2094,9 @@ - CFile* pFile = g_emuFileWrapper.GetFileXbmcByDescriptor(fd); +@@ -2082,7 +2084,7 @@ if (!pFile) return -1; -- --#ifndef __APPLE__ -+#if defined(__FreeBSD__) -+ if (0) -+#elif !defined(__APPLE__) + +-#ifdef HAS_DVD_DRIVE ++#if defined(HAS_DVD_DRIVE) && !defined(__FreeBSD__) + #ifndef __APPLE__ if(request == DVD_READ_STRUCT || request == DVD_AUTH) #else - if(request == DKIOCDVDSENDKEY || request == DKIOCDVDREPORTKEY || request == DKIOCDVDREADSTRUCTURE) -@@ -2129,7 +2134,7 @@ +@@ -2125,7 +2127,7 @@ CLog::Log(LOGERROR, "%s - getmntent is not implemented for our virtual filesystem", __FUNCTION__); return NULL; } @@ -150,12 +127,3 @@ return getmntent(fp); #else CLog::Log(LOGWARNING, "%s - unimplemented function called", __FUNCTION__); -@@ -2154,7 +2159,7 @@ - else - return 0; - } --#ifdef _LINUX -+#if defined(_LINUX) - return 0; - #else - return _filbuf(fp); diff --git a/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.h b/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.h index 49d9bbde9d11..66ba89af45b7 100644 --- a/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.h +++ b/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.h @@ -1,18 +1,14 @@ ---- ./xbmc/cores/DllLoader/exports/emu_msvcrt.h.orig 2010-05-28 21:31:42.000000000 +0200 -+++ ./xbmc/cores/DllLoader/exports/emu_msvcrt.h 2010-12-01 12:17:34.210600869 +0100 -@@ -35,9 +35,15 @@ - - typedef void ( *PFV)(void); - -+#if defined(__FreeBSD__) -+#define __IS_STDIN_STREAM(stream) (stream->_file == STDIN_FILENO) -+#define __IS_STDOUT_STREAM(stream) (stream->_file == STDOUT_FILENO) -+#define __IS_STDERR_STREAM(stream) (stream->_file == STDERR_FILENO) +--- ./xbmc/cores/DllLoader/exports/emu_msvcrt.h.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./xbmc/cores/DllLoader/exports/emu_msvcrt.h 2012-01-02 10:14:38.000000000 +0100 +@@ -132,7 +132,11 @@ + uintptr_t dll_beginthread(void( *start_address )( void * ),unsigned stack_size,void *arglist); + HANDLE dll_beginthreadex(LPSECURITY_ATTRIBUTES lpThreadAttributes, DWORD dwStackSize, + LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter, DWORD dwCreationFlags, ++#ifdef __FreeBSD__ ++ LPLONG lpThreadId); +#else - #define __IS_STDIN_STREAM(stream) (stream == stdin || stream->_file == stdin->_file || stream->_file == 0) - #define __IS_STDOUT_STREAM(stream) (stream == stdout || stream->_file == stdout->_file || stream->_file == 1) - #define __IS_STDERR_STREAM(stream) (stream == stderr || stream->_file == stderr->_file || stream->_file == 2) + LPDWORD lpThreadId); +#endif - #define IS_STDIN_STREAM(stream) (stream != NULL && __IS_STDIN_STREAM(stream)) - #define IS_STDOUT_STREAM(stream) (stream != NULL && __IS_STDOUT_STREAM(stream)) - #define IS_STDERR_STREAM(stream) (stream != NULL && __IS_STDERR_STREAM(stream)) + int dll_stati64(const char *path, struct _stati64 *buffer); + int dll_stat64(const char *path, struct __stat64 *buffer); + #ifdef _WIN32 diff --git a/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__exports_python_linux.cpp b/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__exports_python_linux.cpp deleted file mode 100644 index 26ccf8fe4232..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__exports_python_linux.cpp +++ /dev/null @@ -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); diff --git a/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__util__EmuFileWrapper.h b/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__util__EmuFileWrapper.h deleted file mode 100644 index 63097e9f96a6..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__util__EmuFileWrapper.h +++ /dev/null @@ -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 - diff --git a/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__wrapper.c b/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__wrapper.c deleted file mode 100644 index e6c6c1ca2d80..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__wrapper.c +++ /dev/null @@ -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 <dirent.h> - #endif - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - typedef int64_t off64_t; - typedef off_t __off_t; - typedef off64_t __off64_t; diff --git a/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDAudio.cpp b/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDAudio.cpp deleted file mode 100644 index 8870cfbda496..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDAudio.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- ./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 @@ - - 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); - memset(m_pBuffer+m_iBufferSize, 0, silence); - m_iBufferSize += silence; - } - - if(AddPacketsRenderer(m_pBuffer, m_iBufferSize, lock) != m_iBufferSize) -- CLog::Log(LOGERROR, "CDVDAudio::Drain - failed to play the final %d bytes", m_iBufferSize); -+ CLog::Log(LOGERROR, "CDVDAudio::Drain - failed to play the final %d bytes", (int)m_iBufferSize); - - m_iBufferSize = 0; - } diff --git a/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VDPAU.cpp b/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VDPAU.cpp deleted file mode 100644 index 01ac4df23ef6..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VDPAU.cpp +++ /dev/null @@ -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) diff --git a/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDDemuxers__DVDDemuxFFmpeg.cpp b/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDDemuxers__DVDDemuxFFmpeg.cpp new file mode 100644 index 000000000000..b06a051b409e --- /dev/null +++ b/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDDemuxers__DVDDemuxFFmpeg.cpp @@ -0,0 +1,35 @@ +--- ./xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2012-01-02 10:14:38.000000000 +0100 +@@ -90,12 +90,20 @@ + // these need to be put somewhere that are compiled, we should have some better place for it + + CCriticalSection DllAvCodec::m_critSection; ++#ifdef __FreeBSD__ ++std::map<uint64_t, CStdString> g_logbuffer; ++#else + std::map<uintptr_t, CStdString> g_logbuffer; ++#endif + + void ff_avutil_log(void* ptr, int level, const char* format, va_list va) + { + CSingleLock lock(DllAvCodec::m_critSection); ++#ifdef __FreeBSD__ ++ uint64_t threadId = (uint64_t)CThread::GetCurrentThreadId(); ++#else + uintptr_t threadId = (uintptr_t)CThread::GetCurrentThreadId(); ++#endif + CStdString &buffer = g_logbuffer[threadId]; + + AVClass* avc= ptr ? *(AVClass**)ptr : NULL; +@@ -144,7 +152,11 @@ + /* Loop through the logbuffer list and remove any blank buffers + If the thread using the buffer is still active, it will just + add a new buffer next time it writes to the log */ ++#ifdef __FreeBSD__ ++ std::map<uint64_t, CStdString>::iterator it; ++#else + std::map<uintptr_t, CStdString>::iterator it; ++#endif + for (it = g_logbuffer.begin(); it != g_logbuffer.end(); ) + if ((*it).second.IsEmpty()) + g_logbuffer.erase(it++); diff --git a/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDPlayer.cpp b/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDPlayer.cpp deleted file mode 100644 index 2d4e0d1ce03a..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDPlayer.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ./xbmc/cores/dvdplayer/DVDPlayer.cpp.orig 2010-10-27 19:02:14.000000000 +0200 -+++ ./xbmc/cores/dvdplayer/DVDPlayer.cpp 2010-12-01 12:17:34.204563658 +0100 -@@ -2868,7 +2868,7 @@ - m_dvd.state = DVDSTATE_STILL; - CLog::Log(LOGDEBUG, - "DVDNAV_STILL_FRAME - waiting %i sec, with delay of %d sec", -- still_event->length, time / 1000); -+ still_event->length, (int)(time / 1000)); - } - return NAVRESULT_HOLD; - } diff --git a/multimedia/xbmc/files/patch-xbmc__cores__paplayer__Makefile.in b/multimedia/xbmc/files/patch-xbmc__cores__paplayer__Makefile.in deleted file mode 100644 index f1db1efcc51a..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__cores__paplayer__Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- xbmc/cores/paplayer/Makefile.in.orig 2011-02-23 22:23:24.000000000 +0100 -+++ xbmc/cores/paplayer/Makefile.in 2011-02-23 22:24:24.000000000 +0100 -@@ -20,7 +20,6 @@ - endif - - ifneq ($(ARCH), arm) -- CXXFLAGS+=-DHAS_SPC_CODEC - SRCS+=SPCCodec.cpp - endif - diff --git a/multimedia/xbmc/files/patch-xbmc__cores__paplayer__NSFCodec__NoseFartDLL.cpp b/multimedia/xbmc/files/patch-xbmc__cores__paplayer__NSFCodec__NoseFartDLL.cpp deleted file mode 100644 index b9a4d736015e..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__cores__paplayer__NSFCodec__NoseFartDLL.cpp +++ /dev/null @@ -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" diff --git a/multimedia/xbmc/files/patch-xbmc__cores__paplayer__PAPlayer.cpp b/multimedia/xbmc/files/patch-xbmc__cores__paplayer__PAPlayer.cpp deleted file mode 100644 index fe7a85c6e84f..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__cores__paplayer__PAPlayer.cpp +++ /dev/null @@ -1,21 +0,0 @@ ---- ./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 -@@ -341,7 +341,8 @@ - - if(silence > 0 && m_bufferPos[stream] > 0) - { -- CLog::Log(LOGDEBUG, "PAPlayer: Drain - adding %d bytes of silence, real pcmdata size: %d, chunk size: %d", silence, m_bufferPos[stream], m_pAudioDecoder[stream]->GetChunkLen()); -+ CLog::Log(LOGDEBUG, "PAPlayer: Drain - adding %d bytes of silence, real pcmdata size: %d, chunk size: %d", -+ (int)silence, m_bufferPos[stream], m_pAudioDecoder[stream]->GetChunkLen()); - 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; - } diff --git a/multimedia/xbmc/files/patch-xbmc__cores__paplayer__SIDCodec__Makefile.in b/multimedia/xbmc/files/patch-xbmc__cores__paplayer__SIDCodec__Makefile.in deleted file mode 100644 index 1180a7a1dfd6..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__cores__paplayer__SIDCodec__Makefile.in +++ /dev/null @@ -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 diff --git a/multimedia/xbmc/files/patch-xbmc__cores__paplayer__WAVcodec.cpp b/multimedia/xbmc/files/patch-xbmc__cores__paplayer__WAVcodec.cpp deleted file mode 100644 index f74132730272..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__cores__paplayer__WAVcodec.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ./xbmc/cores/paplayer/WAVcodec.cpp.orig 2010-06-03 06:23:58.000000000 +0200 -+++ ./xbmc/cores/paplayer/WAVcodec.cpp 2010-12-01 12:17:34.221698375 +0100 -@@ -137,7 +137,7 @@ - return false; - } - m_ChannelMask = Endian_SwapLE32(wfx.dwChannelMask); -- CLog::Log(LOGINFO, "WAVCodec::Init - WAVE_FORMAT_EXTENSIBLE detected, channel mask: %d", m_ChannelMask); -+ CLog::Log(LOGINFO, "WAVCodec::Init - WAVE_FORMAT_EXTENSIBLE detected, channel mask: %d", (int)m_ChannelMask); - - wfx.SubFormat.Data1 = Endian_SwapLE32(wfx.SubFormat.Data1); - wfx.SubFormat.Data2 = Endian_SwapLE16(wfx.SubFormat.Data2); diff --git a/multimedia/xbmc/files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__XBMCYM.cpp b/multimedia/xbmc/files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__XBMCYM.cpp deleted file mode 100644 index f50f347a010d..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__XBMCYM.cpp +++ /dev/null @@ -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 <stdio.h> - #include <stdint.h> - --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - #define __declspec(x) - #endif - diff --git a/multimedia/xbmc/files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__YmTypes.h b/multimedia/xbmc/files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__YmTypes.h deleted file mode 100644 index bcb75bf438d6..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__YmTypes.h +++ /dev/null @@ -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 <inttypes.h> - 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 diff --git a/multimedia/xbmc/files/patch-xbmc__filesystem__SAPDirectory.cpp b/multimedia/xbmc/files/patch-xbmc__filesystem__SAPDirectory.cpp new file mode 100644 index 000000000000..bdc0c83ca0cd --- /dev/null +++ b/multimedia/xbmc/files/patch-xbmc__filesystem__SAPDirectory.cpp @@ -0,0 +1,12 @@ +--- ./xbmc/filesystem/SAPDirectory.cpp.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./xbmc/filesystem/SAPDirectory.cpp 2012-01-02 10:14:38.000000000 +0100 +@@ -31,6 +31,9 @@ + #ifdef __APPLE__ + #include "OSXGNUReplacements.h" // strnlen + #endif ++#ifdef __FreeBSD__ ++#include "FreeBSDGNUReplacements.h" ++#endif + + #include <sys/socket.h> + #include <netinet/in.h> diff --git a/multimedia/xbmc/files/patch-xbmc__interfaces__python__XBPython.cpp b/multimedia/xbmc/files/patch-xbmc__interfaces__python__XBPython.cpp new file mode 100644 index 000000000000..bdab987b5d80 --- /dev/null +++ b/multimedia/xbmc/files/patch-xbmc__interfaces__python__XBPython.cpp @@ -0,0 +1,11 @@ +--- ./xbmc/interfaces/python/XBPython.cpp.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./xbmc/interfaces/python/XBPython.cpp 2012-01-02 10:14:38.000000000 +0100 +@@ -428,7 +428,7 @@ + #if !(defined(__APPLE__) || defined(_WIN32)) + DllLoaderContainer::UnloadPythonDlls(); + #endif +-#if defined(_LINUX) && !defined(__APPLE__) ++#if defined(_LINUX) && !defined(__APPLE__) && !defined(__FreeBSD__) + // we can't release it on windows, as this is done in UnloadPythonDlls() for win32 (see above). + // The implementation for linux needs looking at - UnloadPythonDlls() currently only searches for "python24.dll" + // The implementation for osx can never unload the python dylib. diff --git a/multimedia/xbmc/files/patch-xbmc__lib__cximage-6.0__raw__dcr.c b/multimedia/xbmc/files/patch-xbmc__lib__cximage-6.0__raw__dcr.c deleted file mode 100644 index e00798225b61..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__lib__cximage-6.0__raw__dcr.c +++ /dev/null @@ -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;
- }
diff --git a/multimedia/xbmc/files/patch-xbmc__lib__cximage-6.0__raw__libdcr.h b/multimedia/xbmc/files/patch-xbmc__lib__cximage-6.0__raw__libdcr.h deleted file mode 100644 index 98ad94df26dd..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__lib__cximage-6.0__raw__libdcr.h +++ /dev/null @@ -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 <setjmp.h>
- #include <sys/types.h>
- #endif
--#if defined(_LINUX) || defined(__APPLE__)
-+#if defined(_LINUX) || defined(__APPLE__) || defined(__FreeBSD__)
- #include <setjmp.h>
- #include <sys/types.h>
- #define _swab swab
diff --git a/multimedia/xbmc/files/patch-xbmc__lib__libPython__XBPython.cpp b/multimedia/xbmc/files/patch-xbmc__lib__libPython__XBPython.cpp deleted file mode 100644 index df7a5f9fe3c8..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__lib__libPython__XBPython.cpp +++ /dev/null @@ -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 <python2.7/Python.h> -+ #elif (defined HAVE_LIBPYTHON2_6) - #include <python2.6/Python.h> - #elif (defined HAVE_LIBPYTHON2_5) - #include <python2.5/Python.h> -@@ -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); diff --git a/multimedia/xbmc/files/patch-xbmc__lib__libPython__linux__Makefile.in b/multimedia/xbmc/files/patch-xbmc__lib__libPython__linux__Makefile.in deleted file mode 100644 index 03ecdf6e3a47..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__lib__libPython__linux__Makefile.in +++ /dev/null @@ -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) diff --git a/multimedia/xbmc/files/patch-xbmc__lib__libPython__linux__wrapper_python.c b/multimedia/xbmc/files/patch-xbmc__lib__libPython__linux__wrapper_python.c deleted file mode 100644 index cdfde7547462..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__lib__libPython__linux__wrapper_python.c +++ /dev/null @@ -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); diff --git a/multimedia/xbmc/files/patch-xbmc__lib__libRTV__GuideParser.cpp b/multimedia/xbmc/files/patch-xbmc__lib__libRTV__GuideParser.cpp deleted file mode 100644 index 626d33733441..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__lib__libRTV__GuideParser.cpp +++ /dev/null @@ -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 <winbase.h>
- #endif
-
--#if (defined(__unix__) || defined(__APPLE__)) && !defined(__FreeBSD__)
-+#if (defined(__unix__) || defined(__APPLE__))
- #include <netinet/in.h>
- #endif
-
diff --git a/multimedia/xbmc/files/patch-xbmc__lib__libXBMS__ccincludes.h b/multimedia/xbmc/files/patch-xbmc__lib__libXBMS__ccincludes.h deleted file mode 100644 index c5ab92e9d662..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__lib__libXBMS__ccincludes.h +++ /dev/null @@ -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 <netinet/in.h> -+#endif -+ - //extern int errno; - - #ifndef PATH_MAX diff --git a/multimedia/xbmc/files/patch-xbmc__lib__libXDAAP__httpClient.c b/multimedia/xbmc/files/patch-xbmc__lib__libXDAAP__httpClient.c deleted file mode 100644 index 5e5638e25261..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__lib__libXDAAP__httpClient.c +++ /dev/null @@ -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 <netinet/in.h> - #endif - -+#if defined(__FreeBSD__) -+#include <sys/types.h> -+#include <sys/socket.h> -+#endif /* __FreeBSD__ */ -+ - struct HTTP_ConnectionTAG - { - char *host; diff --git a/multimedia/xbmc/files/patch-xbmc__lib__libXDAAP__ioloop.c b/multimedia/xbmc/files/patch-xbmc__lib__libXDAAP__ioloop.c deleted file mode 100644 index c5c63d659a1f..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__lib__libXDAAP__ioloop.c +++ /dev/null @@ -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); diff --git a/multimedia/xbmc/files/patch-xbmc__lib__libXDAAP__thread.h b/multimedia/xbmc/files/patch-xbmc__lib__libXDAAP__thread.h deleted file mode 100644 index 0f178386af03..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__lib__libXDAAP__thread.h +++ /dev/null @@ -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 - diff --git a/multimedia/xbmc/files/patch-xbmc__lib__libXDAAP__threadpool.c b/multimedia/xbmc/files/patch-xbmc__lib__libXDAAP__threadpool.c deleted file mode 100644 index ef556b0c7e70..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__lib__libXDAAP__threadpool.c +++ /dev/null @@ -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; diff --git a/multimedia/xbmc/files/patch-xbmc__lib__libhts__net_posix.c b/multimedia/xbmc/files/patch-xbmc__lib__libhts__net_posix.c deleted file mode 100644 index 393e794d29e8..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__lib__libhts__net_posix.c +++ /dev/null @@ -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 <netdb.h> --#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 <sys/epoll.h> - #endif -@@ -41,6 +43,10 @@ - - #include "net.h" - -+#if defined(__FreeBSD__) -+#include <sys/socket.h> -+#endif -+ - - /** - * diff --git a/multimedia/xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.c b/multimedia/xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.c index 41313ca75aa5..7140ba5485bf 100644 --- a/multimedia/xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.c +++ b/multimedia/xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.c @@ -1,5 +1,5 @@ ---- /dev/null 2010-12-16 16:44:10.000000000 +0100 -+++ xbmc/linux/FreeBSDGNUReplacements.c 2010-12-16 16:45:22.613185593 +0100 +--- ./xbmc/linux/FreeBSDGNUReplacements.c.orig 2012-01-02 10:14:38.000000000 +0100 ++++ ./xbmc/linux/FreeBSDGNUReplacements.c 2012-01-02 10:14:38.000000000 +0100 @@ -0,0 +1,252 @@ + +#include "FreeBSDGNUReplacements.h" diff --git a/multimedia/xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.h b/multimedia/xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.h index 1b65441afd4e..eacdde63be9f 100644 --- a/multimedia/xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.h +++ b/multimedia/xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.h @@ -1,5 +1,5 @@ ---- /dev/null 2010-12-16 17:00:01.000000000 +0100 -+++ xbmc/linux/FreeBSDGNUReplacements.h 2010-12-16 16:54:02.098300652 +0100 +--- ./xbmc/linux/FreeBSDGNUReplacements.h.orig 2012-01-02 10:14:38.000000000 +0100 ++++ ./xbmc/linux/FreeBSDGNUReplacements.h 2012-01-02 10:14:38.000000000 +0100 @@ -0,0 +1,25 @@ +#ifndef __FREEBSDGNUREPLACEMENTS_H__ +#define __FREEBSDGNUREPLACEMENTS_H__ diff --git a/multimedia/xbmc/files/patch-xbmc__linux__LinuxTimezone.cpp b/multimedia/xbmc/files/patch-xbmc__linux__LinuxTimezone.cpp index 3bf0e4f74ccc..24ee6e12a9dd 100644 --- a/multimedia/xbmc/files/patch-xbmc__linux__LinuxTimezone.cpp +++ b/multimedia/xbmc/files/patch-xbmc__linux__LinuxTimezone.cpp @@ -1,189 +1,49 @@ ---- xbmc/linux/LinuxTimezone.cpp (revision 35637) -+++ xbmc/linux/LinuxTimezone.cpp (working copy) -@@ -27,6 +27,12 @@ +--- ./xbmc/linux/LinuxTimezone.cpp.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./xbmc/linux/LinuxTimezone.cpp 2012-01-02 10:14:38.000000000 +0100 +@@ -27,6 +27,9 @@ + #ifdef __APPLE__ #include "OSXGNUReplacements.h" #endif - -+#if defined(__FreeBSD__) -+#include "FreeBSDGNUReplacements.h" // getdelim -+#include <sys/types.h> -+#include <dirent.h> ++#ifdef __FreeBSD__ ++#include "FreeBSDGNUReplacements.h" +#endif -+ + #include "Util.h" - using namespace std; -@@ -89,7 +95,11 @@ - } +@@ -36,6 +39,7 @@ + { + char* line = NULL; + size_t linelen = 0; ++ int nameonfourthfield = 0; + CStdString s; + vector<CStdString> tokens; + +@@ -91,6 +95,11 @@ // Load countries -+#if defined(__FreeBSD__) -+ fp = fopen("/usr/share/misc/iso3166", "r"); -+#else fp = fopen("/usr/share/zoneinfo/iso3166.tab", "r"); -+#endif ++ if (!fp) ++ { ++ fp = fopen("/usr/share/misc/iso3166", "r"); ++ nameonfourthfield = 1; ++ } if (fp) { CStdString countryCode; -@@ -109,7 +119,14 @@ - // Search for the first non space from the 2nd character and on +@@ -111,6 +120,16 @@ int i = 2; while (s[i] == ' ' || s[i] == '\t') i++; -- -+#if defined(__FreeBSD__) -+ // skip three -+ while (s[i] != ' ' && s[i] != '\t') i++; -+ while (s[i] == ' ' || s[i] == '\t') i++; -+ // skip number -+ while (s[i] != ' ' && s[i] != '\t') i++; -+ while (s[i] == ' ' || s[i] == '\t') i++; -+#endif - countryCode = s.Left(2); - countryName = s.Mid(i); -@@ -144,7 +161,10 @@ - - void CLinuxTimezone::SetTimezone(CStdString timezoneName) - { --#ifndef __APPLE__ -+#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 - } - -+#if defined(__FreeBSD__) -+/* -+* Scans the specified directory and its subdirectories to find a -+* zoneinfo file which has the same content as /etc/localtime given in -+* 'buf'. Returns a zone ID if found, otherwise, NULL is returned. -+*/ -+static char * -+findZoneinfoFile(char *buf, size_t size, const char *dir) -+{ -+ DIR *dirp = NULL; -+ struct stat statbuf; -+ struct dirent entry; -+ struct dirent *dp; -+ char *pathname = NULL; -+ int fd = -1; -+ char *dbuf = NULL; -+ char *tz = NULL; -+ char *p; -+ -+ dirp = opendir(dir); -+ if (dirp == NULL) -+ return NULL; -+ -+ while (readdir_r(dirp, &entry, &dp) == 0 && dp != NULL) { -+ if (dp->d_name[0] == '.') -+ continue; -+ -+ if (strcmp(dp->d_name, "zone.tab") == 0) -+ continue; -+ -+ p = (char *)malloc(strlen(dir) + strlen(dp->d_name) + 2); -+ if (p == NULL) -+ break; -+ -+ pathname = strcat(strcat(strcpy(p, dir), "/"), dp->d_name); -+ if (pathname == NULL) -+ break; -+ -+ if (stat(pathname, &statbuf) == -1) -+ break; -+ -+ if (S_ISDIR(statbuf.st_mode)) { -+ tz = findZoneinfoFile(buf, size, pathname); -+ if (tz != NULL) -+ break; -+ } else if (S_ISREG(statbuf.st_mode) && (size_t)statbuf.st_size == size) { -+ dbuf = (char *)malloc(size); -+ if (dbuf == NULL) -+ break; -+ if ((fd = open(pathname, O_RDONLY)) == -1) { -+ fd = 0; -+ break; -+ } -+ if (read(fd, dbuf, size) != (ssize_t)size) -+ break; -+ if (memcmp(buf, dbuf, size) == 0) { -+ p = strstr(pathname, "zoneinfo/"); -+ if (p == NULL) -+ break; -+ p += strlen("zoneinfo/"); -+ tz = strdup(p); -+ break; ++ if (nameonfourthfield) ++ { ++ // skip three letter ++ while (s[i] != ' ' && s[i] != '\t') i++; ++ while (s[i] == ' ' || s[i] == '\t') i++; ++ // skip number ++ while (s[i] != ' ' && s[i] != '\t') i++; ++ while (s[i] == ' ' || s[i] == '\t') i++; + } -+ free(dbuf); -+ dbuf = NULL; -+ (void)close(fd); -+ fd = 0; -+ } -+ free(pathname); -+ pathname = NULL; -+ } -+ -+ if (dirp != NULL) -+ (void)closedir(dirp); -+ if (pathname != NULL) -+ free(pathname); -+ if (fd != 0) -+ (void)close(fd); -+ if (dbuf != NULL) -+ free(dbuf); -+ -+ return tz; -+} -+#endif -+ - CStdString CLinuxTimezone::GetOSConfiguredTimezone() - { -+#if defined(__FreeBSD__) -+ const char * timezonefile = "/etc/localtime"; -+ struct stat statbuf; -+ int fd; -+ char *buf; -+ char *tz; -+ size_t size; + -+ if (lstat(timezonefile, &statbuf) == -1) -+ return ""; -+ if (!S_ISREG(statbuf.st_mode)) -+ return ""; -+ -+ size = (size_t)statbuf.st_size; -+ buf = (char *)malloc(size); -+ -+ if ((fd = open(timezonefile, O_RDONLY)) == -1) { -+ free(buf); -+ return ""; -+ } -+ -+ if (read(fd, buf, size) != (ssize_t) size) { -+ (void)close(fd); -+ free(buf); -+ return ""; -+ } -+ (void)close(fd); -+ -+ tz = findZoneinfoFile(buf, size, "/usr/share/zoneinfo"); -+ free(buf); -+ return tz; -+#else - char timezoneName[255]; - timezoneName[0] = 0; - FILE* fp = fopen("/etc/timezone", "r"); -@@ -165,6 +302,7 @@ - } - - return timezoneName; -+#endif - } + countryCode = s.Left(2); + countryName = s.Mid(i); - CLinuxTimezone g_timezone; diff --git a/multimedia/xbmc/files/patch-xbmc__linux__Makefile.in b/multimedia/xbmc/files/patch-xbmc__linux__Makefile.in index 8e17efc2af9b..55249040f6ad 100644 --- a/multimedia/xbmc/files/patch-xbmc__linux__Makefile.in +++ b/multimedia/xbmc/files/patch-xbmc__linux__Makefile.in @@ -1,15 +1,13 @@ -Index: xbmc/linux/Makefile.in -=================================================================== ---- xbmc/linux/Makefile.in (revision 35575) -+++ xbmc/linux/Makefile.in (working copy) -@@ -9,6 +9,10 @@ - - SRCS=ConvUtils.cpp XEventUtils.cpp XFileUtils.cpp XHandle.cpp XSyncUtils.cpp XTimeUtils.cpp XMemUtils.cpp XThreadUtils.cpp NetworkLinux.cpp LinuxResourceCounter.cpp LinuxTimezone.cpp XRandR.cpp XCriticalSection.cpp XLCDproc.cpp HALManager.cpp HALPowerSyscall.cpp ConsoleDeviceKitPowerSyscall.cpp DBusUtil.cpp DBusMessage.cpp ZeroconfAvahi.cpp ZeroconfBrowserAvahi.cpp HALProvider.cpp PosixMountProvider.cpp DeviceKitDisksProvider.cpp UDisksProvider.cpp ConsoleUPowerSyscall.cpp +--- ./xbmc/linux/Makefile.in.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./xbmc/linux/Makefile.in 2012-01-02 10:14:38.000000000 +0100 +@@ -19,6 +19,10 @@ + XTimeUtils.cpp \ + XThreadUtils.cpp \ +ifeq ($(findstring freebsd,$(ARCH)), freebsd) -+ SRCS+=FreeBSDGNUReplacements.cpp ++ SRCS+=FreeBSDGNUReplacements.cpp +endif + LIB=linux.a - include ../../Makefile.include + include @abs_top_srcdir@/Makefile.include diff --git a/multimedia/xbmc/files/patch-xbmc__linux__NetworkLinux.cpp b/multimedia/xbmc/files/patch-xbmc__linux__NetworkLinux.cpp deleted file mode 100644 index b328f7c69d01..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__linux__NetworkLinux.cpp +++ /dev/null @@ -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 <sys/socket.h> - #include <netinet/in.h> - #include <arpa/inet.h> --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - #include <linux/if.h> - #include <linux/wireless.h> - #include <linux/sockios.h> - #endif - #include <errno.h> - #include <resolv.h> --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - #include <sys/sockio.h> - #include <net/if.h> - #include <ifaddrs.h> -@@ -40,6 +40,9 @@ - #include "NetworkLinux.h" - #include "Util.h" - #include "log.h" -+#if defined(__FreeBSD__) -+#include <net/route.h> -+#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<CStdString> CNetworkLinux::GetNameServers(void) - { - std::vector<CStdString> 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) - { diff --git a/multimedia/xbmc/files/patch-xbmc__linux__PlatformDefs.h b/multimedia/xbmc/files/patch-xbmc__linux__PlatformDefs.h index 719346230bf6..66378aea5bcb 100644 --- a/multimedia/xbmc/files/patch-xbmc__linux__PlatformDefs.h +++ b/multimedia/xbmc/files/patch-xbmc__linux__PlatformDefs.h @@ -1,23 +1,16 @@ ---- ./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 @@ - #include <unistd.h> - #include <pthread.h> - #include <string.h> --#ifdef __APPLE__ -+#if defined(__APPLE__) +--- ./xbmc/linux/PlatformDefs.h.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./xbmc/linux/PlatformDefs.h 2012-01-02 10:14:38.000000000 +0100 +@@ -43,6 +43,10 @@ #include <stdio.h> #include <sys/sysctl.h> #include <mach/mach.h> --#else +#elif defined(__FreeBSD__) +#include <stdio.h> +#include <sys/sysctl.h> +#include <sys/types.h> -+#else /* !__APPLE__ && !__FreeBSD__ */ + #else #include <sys/sysinfo.h> #endif - #include <sys/time.h> @@ -166,7 +170,7 @@ #define CALLBACK __stdcall #define WINAPI __stdcall @@ -27,61 +20,21 @@ #define APIENTRY WINAPI #else #define APIENTRY -@@ -190,16 +194,24 @@ - typedef void* HINSTANCE; - typedef void* HMODULE; - -+#if defined(__APPLE__) || defined(__FreeBSD__) - #ifdef __APPLE__ - #include <AvailabilityMacros.h> -+#endif - typedef int64_t off64_t; - typedef off_t __off_t; - typedef off64_t __off64_t; - typedef fpos_t fpos64_t; -+#ifdef __APPLE__ - #include <sched.h> +@@ -364,7 +368,16 @@ + #else + #define fstat64 fstat + #endif +-#else ++#elif defined(__FreeBSD__) ++typedef int64_t off64_t; ++typedef off_t __off_t; ++typedef off64_t __off64_t; ++typedef fpos_t fpos64_t; ++#define __stat64 stat ++#define stat64 stat ++#define statfs64 statfs ++#define fstat64 fstat ++#else /* !__APPLE__ && !__FreeBSD__ */ + #define __stat64 stat64 #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 defined(__FreeBSD__) || (defined(__APPLE__) && (MAC_OS_X_VERSION_MAX_ALLOWED < 1050)) - #define __stat64 stat - #define stat64 stat - #define statfs64 statfs diff --git a/multimedia/xbmc/files/patch-xbmc__linux__PosixMountProvider.cpp b/multimedia/xbmc/files/patch-xbmc__linux__PosixMountProvider.cpp deleted file mode 100644 index 099642d55c32..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__linux__PosixMountProvider.cpp +++ /dev/null @@ -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 diff --git a/multimedia/xbmc/files/patch-xbmc__linux__XFileUtils.cpp b/multimedia/xbmc/files/patch-xbmc__linux__XFileUtils.cpp deleted file mode 100644 index a17d6d48eded..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__linux__XFileUtils.cpp +++ /dev/null @@ -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 <sys/types.h> - #include <sys/stat.h> --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - #include <sys/vfs.h> - #else - #include <sys/param.h> -@@ -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); diff --git a/multimedia/xbmc/files/patch-xbmc__linux__XSyncUtils.cpp b/multimedia/xbmc/files/patch-xbmc__linux__XSyncUtils.cpp deleted file mode 100644 index 7007b844be87..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__linux__XSyncUtils.cpp +++ /dev/null @@ -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]; diff --git a/multimedia/xbmc/files/patch-xbmc__linux__XThreadUtils.cpp b/multimedia/xbmc/files/patch-xbmc__linux__XThreadUtils.cpp new file mode 100644 index 000000000000..e3e764e81540 --- /dev/null +++ b/multimedia/xbmc/files/patch-xbmc__linux__XThreadUtils.cpp @@ -0,0 +1,46 @@ +--- ./xbmc/linux/XThreadUtils.cpp.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./xbmc/linux/XThreadUtils.cpp 2012-01-02 10:14:38.000000000 +0100 +@@ -38,7 +38,11 @@ + 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 @@ + 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 @@ + 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; + + } diff --git a/multimedia/xbmc/files/patch-xbmc__linux__XThreadUtils.h b/multimedia/xbmc/files/patch-xbmc__linux__XThreadUtils.h new file mode 100644 index 000000000000..08b6c6ad15dd --- /dev/null +++ b/multimedia/xbmc/files/patch-xbmc__linux__XThreadUtils.h @@ -0,0 +1,26 @@ +--- ./xbmc/linux/XThreadUtils.h.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./xbmc/linux/XThreadUtils.h 2012-01-02 10:14:38.000000000 +0100 +@@ -30,7 +30,11 @@ + LPTHREAD_START_ROUTINE lpStartAddress, + LPVOID lpParameter, + DWORD dwCreationFlags, ++#ifdef __FreeBSD__ ++ LPLONG lpThreadId ++#else + LPDWORD lpThreadId ++#endif + ); + + HANDLE _beginthreadex( +@@ -39,7 +43,11 @@ + int ( *start_address )( void * ), + void *arglist, + unsigned initflag, ++#ifdef __FreeBSD__ ++ unsigned long *thrdaddr ++#else + unsigned *thrdaddr ++#endif + ); + + uintptr_t _beginthread( diff --git a/multimedia/xbmc/files/patch-xbmc__network__Network.cpp b/multimedia/xbmc/files/patch-xbmc__network__Network.cpp new file mode 100644 index 000000000000..7a9c859ceb36 --- /dev/null +++ b/multimedia/xbmc/files/patch-xbmc__network__Network.cpp @@ -0,0 +1,10 @@ +--- ./xbmc/network/Network.cpp.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./xbmc/network/Network.cpp 2012-01-02 10:14:38.000000000 +0100 +@@ -30,6 +30,7 @@ + #include "dialogs/GUIDialogKaiToast.h" + + #include <netinet/in.h> ++#include <sys/socket.h> + #include <arpa/inet.h> + + using namespace std; diff --git a/multimedia/xbmc/files/patch-xbmc__network__Socket.h b/multimedia/xbmc/files/patch-xbmc__network__Socket.h new file mode 100644 index 000000000000..0e80d392ac8f --- /dev/null +++ b/multimedia/xbmc/files/patch-xbmc__network__Socket.h @@ -0,0 +1,12 @@ +--- ./xbmc/network/Socket.h.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./xbmc/network/Socket.h 2012-01-02 10:14:38.000000000 +0100 +@@ -30,6 +30,9 @@ + #include <sys/time.h> + #include <sys/types.h> + #include <unistd.h> ++#ifdef __FreeBSD__ ++#include <netinet/in.h> ++#endif + #ifdef _LINUX + typedef int SOCKET; + #endif diff --git a/multimedia/xbmc/files/patch-xbmc__network__linux__NetworkLinux.cpp b/multimedia/xbmc/files/patch-xbmc__network__linux__NetworkLinux.cpp new file mode 100644 index 000000000000..02ea00ea59d1 --- /dev/null +++ b/multimedia/xbmc/files/patch-xbmc__network__linux__NetworkLinux.cpp @@ -0,0 +1,144 @@ +--- ./xbmc/network/linux/NetworkLinux.cpp.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./xbmc/network/linux/NetworkLinux.cpp 2012-01-02 10:14:38.000000000 +0100 +@@ -23,18 +23,26 @@ + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include <linux/if.h> + #include <linux/wireless.h> + #include <linux/sockios.h> + #endif + #include <errno.h> + #include <resolv.h> +-#if defined(__APPLE__) ++#if defined(__APPLE__) || defined(__FreeBSD__) + #include <sys/sockio.h> + #include <net/if.h> + #include <net/if_dl.h> + #include <ifaddrs.h> ++#include <net/route.h> ++/* Darwin doesn't define this for some very odd reason */ ++#ifndef SA_SIZE ++# define SA_SIZE(sa) \ ++ ( (!(sa) || ((struct sockaddr *)(sa))->sa_len == 0) ? \ ++ sizeof(long) : \ ++ 1 + ( (((struct sockaddr *)(sa))->sa_len - 1) | (sizeof(long) - 1) ) ) ++#endif + #else + #include <net/if_arp.h> + #endif +@@ -64,7 +72,7 @@ + + bool CNetworkInterfaceLinux::IsWireless() + { +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__FreeBSD__) + return false; + #else + struct iwreq wrq; +@@ -144,7 +152,7 @@ + { + CStdString result = ""; + +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + char essid[IW_ESSID_MAX_SIZE + 1]; + memset(&essid, 0, sizeof(essid)); + +@@ -166,7 +174,48 @@ + { + CStdString result = ""; + +-#ifndef __APPLE__ ++#if defined(__APPLE__) || defined(__FreeBSD__) ++ size_t needed; ++ int mib[6]; ++ char *buf, *next, *lim; ++ char line[16]; ++ struct rt_msghdr *rtm; ++ struct sockaddr *sa; ++ struct sockaddr_in *sockin; ++ ++ mib[0] = CTL_NET; ++ mib[1] = PF_ROUTE; ++ mib[2] = 0; ++ mib[3] = 0; ++ mib[4] = NET_RT_DUMP; ++ mib[5] = 0; ++ if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0) ++ return result; ++ ++ if ((buf = (char *)malloc(needed)) == NULL) ++ return result; ++ ++ if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) { ++ free(buf); ++ return result; ++ } ++ ++ lim = buf + needed; ++ for (next = buf; next < lim; next += rtm->rtm_msglen) { ++ rtm = (struct rt_msghdr *)next; ++ sa = (struct sockaddr *)(rtm + 1); ++ sa = (struct sockaddr *)(SA_SIZE(sa) + (char *)sa); ++ sockin = (struct sockaddr_in *)sa; ++ if (inet_ntop(AF_INET, &sockin->sin_addr.s_addr, ++ line, sizeof(line)) == NULL) { ++ free(buf); ++ return result; ++ } ++ result = line; ++ break; ++ } ++ free(buf); ++#else + FILE* fp = fopen("/proc/net/route", "r"); + if (!fp) + { +@@ -267,7 +316,7 @@ + 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 +382,7 @@ + CStdString macAddr = ""; + m_interfaces.clear(); + +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__FreeBSD__) + + // Query the list of interfaces. + struct ifaddrs *list; +@@ -430,7 +479,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; +@@ -616,7 +665,7 @@ + encryptionMode = ENC_NONE; + assignment = NETWORK_DISABLED; + +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + FILE* fp = fopen("/etc/network/interfaces", "r"); + if (!fp) + { +@@ -692,7 +741,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) + { diff --git a/multimedia/xbmc/files/patch-xbmc__screensavers__rsxs-0.9__lib__stdbool_.h b/multimedia/xbmc/files/patch-xbmc__screensavers__rsxs-0.9__lib__stdbool_.h deleted file mode 100644 index 102e2de80f07..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__screensavers__rsxs-0.9__lib__stdbool_.h +++ /dev/null @@ -1,12 +0,0 @@ ---- ./xbmc/screensavers/rsxs-0.9/lib/stdbool_.h.orig 2007-10-08 19:37:14.000000000 +0200 -+++ ./xbmc/screensavers/rsxs-0.9/lib/stdbool_.h 2010-12-01 12:17:34.237808685 +0100 -@@ -101,7 +101,9 @@ - # else - /* With this compiler, trust the _Bool type if the compiler has it. */ - # if !@HAVE__BOOL@ -+#if !defined(__FreeBSD__) - typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool; -+#endif - # endif - # endif - #endif diff --git a/multimedia/xbmc/files/patch-xbmc__utils__IoSupport.cpp b/multimedia/xbmc/files/patch-xbmc__storage__IoSupport.cpp index 12d4cec7d137..b234e78e9def 100644 --- a/multimedia/xbmc/files/patch-xbmc__utils__IoSupport.cpp +++ b/multimedia/xbmc/files/patch-xbmc__storage__IoSupport.cpp @@ -1,39 +1,39 @@ ---- 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 @@ +--- ./xbmc/storage/IoSupport.cpp.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./xbmc/storage/IoSupport.cpp 2012-01-02 10:14:38.000000000 +0100 +@@ -30,7 +30,7 @@ #include "WIN32Util.h" - #include "CharsetConverter.h" + #include "utils/CharsetConverter.h" #endif -#if defined (_LINUX) && !defined(__APPLE__) +#if defined (_LINUX) && !defined(__APPLE__) && !defined(__FreeBSD__) #include <linux/limits.h> #include <sys/types.h> #include <sys/ioctl.h> -@@ -53,6 +53,9 @@ - #include <IOKit/storage/IODVDMediaBSDClient.h> +@@ -54,6 +54,9 @@ #include <IOKit/storage/IOStorageDeviceCharacteristics.h> #endif + #endif +#ifdef __FreeBSD__ +#include <sys/syslimits.h> +#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__) + #include "cdioSupport.h" + #include "filesystem/iso9660.h" + #include "MediaManager.h" +@@ -228,6 +231,8 @@ + #ifdef HAS_DVD_DRIVE + #ifdef __APPLE__ // FIXME... ++#elif defined(__FreeBSD__) ++ // NYI #elif defined(_LINUX) char* dvdDevice = CLibcdio::GetInstance()->GetDeviceFileName(); -@@ -496,6 +499,8 @@ + if (strlen(dvdDevice) != 0) +@@ -402,6 +407,8 @@ return -1; } return MODE2_DATA_SIZE; +#elif defined(__FreeBSD__) -+ // TODO ++ // NYI #elif defined(_LINUX) if (hDevice->m_bCDROM) { diff --git a/multimedia/xbmc/files/patch-xbmc__system.h b/multimedia/xbmc/files/patch-xbmc__system.h new file mode 100644 index 000000000000..54c4d0bbd440 --- /dev/null +++ b/multimedia/xbmc/files/patch-xbmc__system.h @@ -0,0 +1,11 @@ +--- ./xbmc/system.h.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./xbmc/system.h 2012-01-02 10:14:38.000000000 +0100 +@@ -23,7 +23,7 @@ + + #if defined(HAVE_CONFIG_H) && !defined(TARGET_WINDOWS) + #include "config.h" +-#define DECLARE_UNUSED(a,b) a __attribute__(unused) b; ++#define DECLARE_UNUSED(a,b) a __attribute__((unused)) b; + #endif + + /***************** diff --git a/multimedia/xbmc/files/patch-xbmc__threads__Thread.h b/multimedia/xbmc/files/patch-xbmc__threads__Thread.h new file mode 100644 index 000000000000..5733ed66b6f2 --- /dev/null +++ b/multimedia/xbmc/files/patch-xbmc__threads__Thread.h @@ -0,0 +1,15 @@ +--- ./xbmc/threads/Thread.h.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./xbmc/threads/Thread.h 2012-01-02 10:14:38.000000000 +0100 +@@ -117,8 +117,12 @@ + 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; diff --git a/multimedia/xbmc/files/patch-xbmc__utils__Semaphore.cpp b/multimedia/xbmc/files/patch-xbmc__utils__Semaphore.cpp deleted file mode 100644 index 057af6f8ba61..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__utils__Semaphore.cpp +++ /dev/null @@ -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()); diff --git a/multimedia/xbmc/files/patch-xbmc__utils__StdString.h b/multimedia/xbmc/files/patch-xbmc__utils__StdString.h new file mode 100644 index 000000000000..0c5fbfe3adf8 --- /dev/null +++ b/multimedia/xbmc/files/patch-xbmc__utils__StdString.h @@ -0,0 +1,20 @@ +--- ./xbmc/utils/StdString.h.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./xbmc/utils/StdString.h 2012-01-02 10:14:38.000000000 +0100 +@@ -864,7 +864,7 @@ + PWSTR pNextDstW = pDstW; + SSCodeCvt::result res = SSCodeCvt::ok; + const SSCodeCvt& conv = SS_USE_FACET(loc, SSCodeCvt); +-#if defined(TARGET_DARWIN) ++#if defined(TARGET_DARWIN) || defined(__FreeBSD__) + SSCodeCvt::state_type st= { { 0 } }; + #else + SSCodeCvt::state_type st= { 0 }; +@@ -911,7 +911,7 @@ + PCWSTR pNextSrcW = pSrcW; + SSCodeCvt::result res = SSCodeCvt::ok; + const SSCodeCvt& conv = SS_USE_FACET(loc, SSCodeCvt); +-#if defined(TARGET_DARWIN) ++#if defined(TARGET_DARWIN) || defined(__FreeBSD__) + SSCodeCvt::state_type st= { { 0 } }; + #else + SSCodeCvt::state_type st= { 0 }; diff --git a/multimedia/xbmc/files/patch-xbmc__utils__Stopwatch.cpp b/multimedia/xbmc/files/patch-xbmc__utils__Stopwatch.cpp deleted file mode 100644 index a6cfad61bd14..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__utils__Stopwatch.cpp +++ /dev/null @@ -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 <sys/sysinfo.h> - #endif - #include "utils/TimeUtils.h" diff --git a/multimedia/xbmc/files/patch-xbmc__utils__SystemInfo.cpp b/multimedia/xbmc/files/patch-xbmc__utils__SystemInfo.cpp deleted file mode 100644 index 7facc390a1bc..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__utils__SystemInfo.cpp +++ /dev/null @@ -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(); diff --git a/multimedia/xbmc/files/patch-xbmc__utils__SystemInfo.h b/multimedia/xbmc/files/patch-xbmc__utils__SystemInfo.h deleted file mode 100644 index 21eebe41562e..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__utils__SystemInfo.h +++ /dev/null @@ -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 diff --git a/multimedia/xbmc/files/patch-xbmc__utils__Thread.cpp b/multimedia/xbmc/files/patch-xbmc__utils__Thread.cpp deleted file mode 100644 index a94594970a65..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__utils__Thread.cpp +++ /dev/null @@ -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 diff --git a/multimedia/xbmc/files/patch-xbmc__visualizations__XBMCProjectM__libprojectM__fftsg.cpp b/multimedia/xbmc/files/patch-xbmc__visualizations__XBMCProjectM__libprojectM__fftsg.cpp new file mode 100644 index 000000000000..ac29b87cb3d8 --- /dev/null +++ b/multimedia/xbmc/files/patch-xbmc__visualizations__XBMCProjectM__libprojectM__fftsg.cpp @@ -0,0 +1,27 @@ +--- ./xbmc/visualizations/XBMCProjectM/libprojectM/fftsg.cpp.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./xbmc/visualizations/XBMCProjectM/libprojectM/fftsg.cpp 2012-01-02 10:14:38.000000000 +0100 +@@ -782,6 +782,16 @@ + #include <stdio.h> + #include <stdlib.h> + #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 @@ + exit(1); \ + } \ + } ++#endif + #define cdft_thread_wait(th) { \ + WaitForSingleObject(th, INFINITE); \ + CloseHandle(th); \ diff --git a/multimedia/xbmc/files/patch-xbmc__linux__XRandR.cpp b/multimedia/xbmc/files/patch-xbmc__windowing__X11__XRandR.cpp index 14b7e6685f88..41a55df2d56a 100644 --- a/multimedia/xbmc/files/patch-xbmc__linux__XRandR.cpp +++ b/multimedia/xbmc/files/patch-xbmc__windowing__X11__XRandR.cpp @@ -1,6 +1,6 @@ ---- ./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 @@ +--- ./xbmc/windowing/X11/XRandR.cpp.orig 2011-12-23 04:12:21.000000000 +0100 ++++ ./xbmc/windowing/X11/XRandR.cpp 2012-01-02 10:14:38.000000000 +0100 +@@ -30,6 +30,11 @@ #include "tinyXML/tinyxml.h" #include "../xbmc/utils/log.h" diff --git a/multimedia/xbmc/pkg-descr b/multimedia/xbmc/pkg-descr index ffd168df0dfc..cecc1bd633d7 100644 --- a/multimedia/xbmc/pkg-descr +++ b/multimedia/xbmc/pkg-descr @@ -2,4 +2,4 @@ XBMC Media Center (formerly named "XBox Media Center") is a free and open source cross-platform media-player and entertainment hub. -WWW: http://xbmc.org/ +WWW: http://xbmc.org/ diff --git a/multimedia/xbmc/pkg-plist b/multimedia/xbmc/pkg-plist index 0d521ef7cb62..6d40e8c0220e 100644 --- a/multimedia/xbmc/pkg-plist +++ b/multimedia/xbmc/pkg-plist @@ -1,19 +1,17 @@ bin/xbmc-standalone bin/xbmc -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 +%%RSXS%%lib/xbmc/addons/screensaver.rsxs.euphoria/Euphoria.xbs +%%RSXS%%lib/xbmc/addons/screensaver.rsxs.plasma/Plasma.xbs +%%RSXS%%lib/xbmc/addons/screensaver.rsxs.solarwinds/Solarwinds.xbs 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 +20,6 @@ lib/xbmc/system/players/paplayer/nosefart-%%ARCH%%-freebsd.so 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 @@ -46,7 +43,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 +61,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 +78,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,20 +110,29 @@ 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/repository.xbmc.org/addon.xml %%DATADIR%%/addons/repository.xbmc.org/icon.png -%%DATADIR%%/addons/screensaver.rsxs.euphoria/addon.xml -%%DATADIR%%/addons/screensaver.rsxs.euphoria/icon.png -%%DATADIR%%/addons/screensaver.rsxs.plasma/addon.xml -%%DATADIR%%/addons/screensaver.rsxs.plasma/icon.png -%%DATADIR%%/addons/screensaver.rsxs.solarwinds/addon.xml -%%DATADIR%%/addons/screensaver.rsxs.solarwinds/icon.png +%%RSXS%%%%DATADIR%%/addons/screensaver.rsxs.euphoria/addon.xml +%%RSXS%%%%DATADIR%%/addons/screensaver.rsxs.euphoria/icon.png +%%RSXS%%%%DATADIR%%/addons/screensaver.rsxs.plasma/addon.xml +%%RSXS%%%%DATADIR%%/addons/screensaver.rsxs.plasma/icon.png +%%RSXS%%%%DATADIR%%/addons/screensaver.rsxs.solarwinds/addon.xml +%%RSXS%%%%DATADIR%%/addons/screensaver.rsxs.solarwinds/icon.png %%DATADIR%%/addons/screensaver.xbmc.builtin.black/addon.xml %%DATADIR%%/addons/screensaver.xbmc.builtin.black/icon.png %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/addon.xml @@ -148,6 +149,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 +165,20 @@ 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/script.module.simplejson/addon.xml +%%DATADIR%%/addons/script.module.simplejson/lib/LICENSE.txt +%%DATADIR%%/addons/script.module.simplejson/lib/simplejson/__init__.py +%%DATADIR%%/addons/script.module.simplejson/lib/simplejson/decoder.py +%%DATADIR%%/addons/script.module.simplejson/lib/simplejson/encoder.py +%%DATADIR%%/addons/script.module.simplejson/lib/simplejson/scanner.py +%%DATADIR%%/addons/script.module.simplejson/lib/simplejson/tool.py %%DATADIR%%/addons/skin.confluence/720p/AddonBrowser.xml %%DATADIR%%/addons/skin.confluence/720p/DialogAddonInfo.xml %%DATADIR%%/addons/skin.confluence/720p/DialogAddonSettings.xml @@ -201,7 +189,6 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/720p/DialogContextMenu.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 +200,8 @@ 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/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 +217,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 @@ -242,7 +233,6 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/720p/MyMusicSongs.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 @@ -270,28 +260,25 @@ share/icons/hicolor/48x48/apps/xbmc.png %%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 @@ -306,7 +293,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 +309,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 +319,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 +338,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 +353,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 +400,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 +438,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 @@ -509,6 +477,7 @@ 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 @@ -541,10 +510,7 @@ share/icons/hicolor/48x48/apps/xbmc.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/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,34 +518,25 @@ 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/flagging/aspectratio/1.33.png @@ -590,31 +547,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,10 +607,10 @@ 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 @@ -646,11 +618,12 @@ share/icons/hicolor/48x48/apps/xbmc.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.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 +651,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 +678,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 +695,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 +717,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 +735,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 +760,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 +776,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 +821,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 +883,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 +896,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 +944,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 @@ -989,8 +986,6 @@ share/xsessions/XBMC.desktop @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 +993,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 +1023,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 +1040,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 +1054,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/language/German +@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/English +@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language +@dirrm %%DATADIR%%/addons/weather.wunderground/resources/lib +@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 +1080,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 +1101,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 +1118,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 +1138,18 @@ 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/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 +1159,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 +1173,26 @@ 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.pil +@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.simplejson/lib/simplejson +@dirrm %%DATADIR%%/addons/script.module.simplejson/lib +@dirrm %%DATADIR%%/addons/script.module.simplejson @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 +1207,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 @@ -1208,14 +1225,22 @@ share/xsessions/XBMC.desktop @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.black -@dirrm %%DATADIR%%/addons/screensaver.rsxs.solarwinds -@dirrm %%DATADIR%%/addons/screensaver.rsxs.plasma -@dirrm %%DATADIR%%/addons/screensaver.rsxs.euphoria +%%RSXS%%@dirrm %%DATADIR%%/addons/screensaver.rsxs.solarwinds +%%RSXS%%@dirrm %%DATADIR%%/addons/screensaver.rsxs.plasma +%%RSXS%%@dirrm %%DATADIR%%/addons/screensaver.rsxs.euphoria @dirrm %%DATADIR%%/addons/repository.xbmc.org +@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 +1271,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 +1280,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 +1297,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 @@ -1303,15 +1325,12 @@ share/xsessions/XBMC.desktop @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 +%%RSXS%%@dirrm lib/xbmc/addons/screensaver.rsxs.solarwinds +%%RSXS%%@dirrm lib/xbmc/addons/screensaver.rsxs.plasma +%%RSXS%%@dirrm lib/xbmc/addons/screensaver.rsxs.euphoria @dirrm lib/xbmc/addons @dirrm lib/xbmc |