diff options
author | Michael Scheidell <scheidell@FreeBSD.org> | 2012-01-25 13:48:29 +0000 |
---|---|---|
committer | Michael Scheidell <scheidell@FreeBSD.org> | 2012-01-25 13:48:29 +0000 |
commit | 57f3c98669358f640f0b2fdb05a9ccff14a9b52f (patch) | |
tree | b0c58217650ab8064e3f47f54752da12c70abed3 /multimedia | |
parent | f83329d605eab3dd74f635a281294384b8010fbd (diff) | |
download | ports-57f3c98669358f640f0b2fdb05a9ccff14a9b52f.tar.gz ports-57f3c98669358f640f0b2fdb05a9ccff14a9b52f.zip |
Notes
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/xbmc/Makefile | 7 | ||||
-rw-r--r-- | multimedia/xbmc/distinfo | 4 | ||||
-rw-r--r-- | multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDDemuxers__DVDDemuxFFmpeg.cpp | 8 | ||||
-rw-r--r-- | multimedia/xbmc/files/patch-xbmc__system.h | 11 | ||||
-rw-r--r-- | multimedia/xbmc/pkg-plist | 15 |
5 files changed, 23 insertions, 22 deletions
diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile index 437dbcd92098..5685c5b65016 100644 --- a/multimedia/xbmc/Makefile +++ b/multimedia/xbmc/Makefile @@ -6,11 +6,10 @@ # PORTNAME= xbmc -PORTVERSION= 11.0.b1 -PORTREVISION= 1 +PORTVERSION= 11.0.b2 CATEGORIES= multimedia MASTER_SITES= http://mirrors.xbmc.org/releases/source/ -DISTNAME= ${PORTNAME}-11.0-Eden_beta1 +DISTNAME= ${PORTNAME}-11.0-Eden_beta2 MAINTAINER= mickael.maillot@gmail.com COMMENT= XBMC is an award winning media center application @@ -26,7 +25,6 @@ BUILD_DEPENDS= enca:${PORTSDIR}/converters/enca \ nasm:${PORTSDIR}/devel/nasm \ dvdread-config:${PORTSDIR}/multimedia/libdvdread \ gtk-update-icon-cache:${PORTSDIR}/x11-toolkits/gtk20 - LIB_DEPENDS= asound.2:${PORTSDIR}/audio/alsa-lib \ ass.5:${PORTSDIR}/multimedia/libass \ boost_thread.4:${PORTSDIR}/devel/boost-libs \ @@ -55,7 +53,6 @@ LIB_DEPENDS= asound.2:${PORTSDIR}/audio/alsa-lib \ sqlite3.8:${PORTSDIR}/databases/sqlite3 \ vorbis.4:${PORTSDIR}/audio/libvorbis \ 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 \ glxinfo:${PORTSDIR}/graphics/mesa-demos \ diff --git a/multimedia/xbmc/distinfo b/multimedia/xbmc/distinfo index 2d0f42fb48a4..2855fc27651a 100644 --- a/multimedia/xbmc/distinfo +++ b/multimedia/xbmc/distinfo @@ -1,2 +1,2 @@ -SHA256 (xbmc-11.0-Eden_beta1.tar.gz) = f8651ac846d4aa0f06628802a9b8642f4dbbe8f741b3dbacfef63fb9c0be774f -SIZE (xbmc-11.0-Eden_beta1.tar.gz) = 56530997 +SHA256 (xbmc-11.0-Eden_beta2.tar.gz) = 1f87e04b0444bb3587f055ae1b9d86e3f2fbf4284caeab8bc393e36e0e4c2ec6 +SIZE (xbmc-11.0-Eden_beta2.tar.gz) = 56577092 diff --git a/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDDemuxers__DVDDemuxFFmpeg.cpp b/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDDemuxers__DVDDemuxFFmpeg.cpp index b06a051b409e..3f44759da068 100644 --- a/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDDemuxers__DVDDemuxFFmpeg.cpp +++ b/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDDemuxers__DVDDemuxFFmpeg.cpp @@ -1,9 +1,9 @@ --- ./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 +@@ -91,12 +91,20 @@ CCriticalSection DllAvCodec::m_critSection; + static CCriticalSection m_logSection; +#ifdef __FreeBSD__ +std::map<uint64_t, CStdString> g_logbuffer; +#else @@ -12,7 +12,7 @@ void ff_avutil_log(void* ptr, int level, const char* format, va_list va) { - CSingleLock lock(DllAvCodec::m_critSection); + CSingleLock lock(m_logSection); +#ifdef __FreeBSD__ + uint64_t threadId = (uint64_t)CThread::GetCurrentThreadId(); +#else @@ -21,7 +21,7 @@ CStdString &buffer = g_logbuffer[threadId]; AVClass* avc= ptr ? *(AVClass**)ptr : NULL; -@@ -144,7 +152,11 @@ +@@ -145,7 +153,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 */ diff --git a/multimedia/xbmc/files/patch-xbmc__system.h b/multimedia/xbmc/files/patch-xbmc__system.h deleted file mode 100644 index 54c4d0bbd440..000000000000 --- a/multimedia/xbmc/files/patch-xbmc__system.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./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/pkg-plist b/multimedia/xbmc/pkg-plist index 6d40e8c0220e..e2b4407fa379 100644 --- a/multimedia/xbmc/pkg-plist +++ b/multimedia/xbmc/pkg-plist @@ -85,6 +85,7 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/strings.xml %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/English/strings.xml +%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/French/strings.xml %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/German/strings.xml %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml @@ -119,10 +120,12 @@ share/icons/hicolor/48x48/apps/xbmc.png %%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/Finnish/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/language/Swedish/strings.xml %%DATADIR%%/addons/metadata.yahoomusic.com/resources/settings.xml %%DATADIR%%/addons/metadata.yahoomusic.com/yahoomusic.xml %%DATADIR%%/addons/repository.xbmc.org/addon.xml @@ -311,6 +314,7 @@ share/icons/hicolor/48x48/apps/xbmc.png %%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/Lithuanian/strings.xml %%DATADIR%%/addons/skin.confluence/language/Norwegian/strings.xml %%DATADIR%%/addons/skin.confluence/language/Polish/strings.xml %%DATADIR%%/addons/skin.confluence/language/Portuguese (Brazil)/strings.xml @@ -748,7 +752,9 @@ share/icons/hicolor/48x48/apps/xbmc.png %%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/Finnish/strings.xml %%DATADIR%%/addons/weather.wunderground/resources/language/German/strings.xml +%%DATADIR%%/addons/weather.wunderground/resources/language/Swedish/strings.xml %%DATADIR%%/addons/weather.wunderground/resources/lib/utilities.py %%DATADIR%%/addons/weather.wunderground/resources/settings.xml %%DATADIR%%/addons/webinterface.default/addon.xml @@ -835,6 +841,8 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/language/Japanese/strings.xml %%DATADIR%%/language/Korean/langinfo.xml %%DATADIR%%/language/Korean/strings.xml +%%DATADIR%%/language/Lithuanian/langinfo.xml +%%DATADIR%%/language/Lithuanian/strings.xml %%DATADIR%%/language/Maltese/langinfo.xml %%DATADIR%%/language/Maltese/strings.xml %%DATADIR%%/language/Norwegian/langinfo.xml @@ -1017,6 +1025,7 @@ share/xsessions/XBMC.desktop @dirrm %%DATADIR%%/language/Polish @dirrm %%DATADIR%%/language/Norwegian @dirrm %%DATADIR%%/language/Maltese +@dirrm %%DATADIR%%/language/Lithuanian @dirrm %%DATADIR%%/language/Korean @dirrm %%DATADIR%%/language/Japanese @dirrm %%DATADIR%%/language/Italian @@ -1054,7 +1063,9 @@ 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.wunderground/resources/language/Swedish @dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/German +@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Finnish @dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/English @dirrm %%DATADIR%%/addons/weather.wunderground/resources/language @dirrm %%DATADIR%%/addons/weather.wunderground/resources/lib @@ -1158,6 +1169,7 @@ share/xsessions/XBMC.desktop @dirrm %%DATADIR%%/addons/skin.confluence/language/Portuguese @dirrm %%DATADIR%%/addons/skin.confluence/language/Polish @dirrm %%DATADIR%%/addons/skin.confluence/language/Norwegian +@dirrm %%DATADIR%%/addons/skin.confluence/language/Lithuanian @dirrm %%DATADIR%%/addons/skin.confluence/language/Korean @dirrm %%DATADIR%%/addons/skin.confluence/language/Japanese @dirrm %%DATADIR%%/addons/skin.confluence/language/Italian @@ -1229,10 +1241,12 @@ share/xsessions/XBMC.desktop %%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/Swedish @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/Finnish @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 @@ -1264,6 +1278,7 @@ share/xsessions/XBMC.desktop @dirrm %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Hungarian @dirrm %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/German @dirrm %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/French +@dirrm %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Finnish @dirrm %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/English @dirrm %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Dutch @dirrm %%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Chinese (Simple) |