Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Jan 2012 10:12:18 GMT
From:      Mickael Maillot <mickael.maillot@gmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/164401: [maintainer update] update multimedia/xbmc to 11.0 beta2
Message-ID:  <201201231012.q0NACIGN037437@red.freebsd.org>
Resent-Message-ID: <201201231020.q0NAK5kC035448@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         164401
>Category:       ports
>Synopsis:       [maintainer update] update multimedia/xbmc to 11.0 beta2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 23 10:20:05 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Mickael Maillot
>Release:        
>Organization:
>Environment:
>Description:
update XBMC 11.0 to beta 2

update tested in redports.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -rudN xbmc.orig/Makefile xbmc/Makefile
--- xbmc.orig/Makefile	2012-01-23 11:08:42.000000000 +0100
+++ xbmc/Makefile	2012-01-23 08:43:19.000000000 +0100
@@ -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
diff -rudN xbmc.orig/distinfo xbmc/distinfo
--- xbmc.orig/distinfo	2012-01-23 11:03:28.000000000 +0100
+++ xbmc/distinfo	2012-01-23 08:43:19.000000000 +0100
@@ -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 -rudN xbmc.orig/files/patch-xbmc__cores__dvdplayer__DVDDemuxers__DVDDemuxFFmpeg.cpp xbmc/files/patch-xbmc__cores__dvdplayer__DVDDemuxers__DVDDemuxFFmpeg.cpp
--- xbmc.orig/files/patch-xbmc__cores__dvdplayer__DVDDemuxers__DVDDemuxFFmpeg.cpp	2012-01-23 11:03:28.000000000 +0100
+++ xbmc/files/patch-xbmc__cores__dvdplayer__DVDDemuxers__DVDDemuxFFmpeg.cpp	2012-01-23 08:43:19.000000000 +0100
@@ -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 -rudN xbmc.orig/files/patch-xbmc__system.h xbmc/files/patch-xbmc__system.h
--- xbmc.orig/files/patch-xbmc__system.h	2012-01-23 11:03:28.000000000 +0100
+++ xbmc/files/patch-xbmc__system.h	1970-01-01 01:00:00.000000000 +0100
@@ -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 -rudN xbmc.orig/pkg-plist xbmc/pkg-plist
--- xbmc.orig/pkg-plist	2012-01-23 11:03:28.000000000 +0100
+++ xbmc/pkg-plist	2012-01-23 08:48:59.000000000 +0100
@@ -85,6 +85,7 @@
 %%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 @@
 %%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 @@
 %%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 @@
 %%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 @@
 %%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 @@
 @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 @@
 @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 @@
 @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 @@
 %%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 @@
 @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)


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201231012.q0NACIGN037437>