Date: Fri, 30 May 2014 07:46:34 +0000 (UTC) From: Philippe Audeoud <jadawin@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355797 - in head/multimedia/xbmc: . files Message-ID: <201405300746.s4U7kYv6009323@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jadawin Date: Fri May 30 07:46:33 2014 New Revision: 355797 URL: http://svnweb.freebsd.org/changeset/ports/355797 QAT: https://qat.redports.org/buildarchive/r355797/ Log: - Update to 13.1 RC1 PR: ports/190310 Submitted by: maintainer Added: head/multimedia/xbmc/files/patch-xbmc__cores__AudioEngine__Sinks__AESinkOSS.cpp (contents, props changed) Modified: head/multimedia/xbmc/Makefile head/multimedia/xbmc/distinfo head/multimedia/xbmc/pkg-plist Modified: head/multimedia/xbmc/Makefile ============================================================================== --- head/multimedia/xbmc/Makefile Fri May 30 07:31:42 2014 (r355796) +++ head/multimedia/xbmc/Makefile Fri May 30 07:46:33 2014 (r355797) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= xbmc -DISTVERSION= 13.0.rc1 +DISTVERSION= 13.1.rc1 CATEGORIES= multimedia MAINTAINER= mickael.maillot@gmail.com @@ -17,6 +17,7 @@ BUILD_DEPENDS= enca:${PORTSDIR}/converte unzip:${PORTSDIR}/archivers/unzip \ nasm:${PORTSDIR}/devel/nasm \ gtk-update-icon-cache:${PORTSDIR}/x11-toolkits/gtk20 \ + libtool:${PORTSDIR}/devel/libtool \ swig2.0:${PORTSDIR}/devel/swig20 LIB_DEPENDS= libass.so:${PORTSDIR}/multimedia/libass \ libboost_thread.so:${PORTSDIR}/devel/boost-libs \ @@ -52,11 +53,11 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqli USE_GITHUB= yes GH_ACCOUNT= xbmc -GH_COMMIT= 2372235 -GH_TAGNAME= Gotham_rc1 +GH_COMMIT= 6ac3af1 +GH_TAGNAME= 13.1rc1-Gotham -USES= gmake iconv:wchar_t pkgconfig -USE_AUTOTOOLS= autoconf libtool automake libltdl +USES= gmake iconv:wchar_t libtool pkgconfig +USE_AUTOTOOLS= autoconf automake libltdl GNU_CONFIGURE= yes USE_XORG= xt xmu xtst USE_GL= glu Modified: head/multimedia/xbmc/distinfo ============================================================================== --- head/multimedia/xbmc/distinfo Fri May 30 07:31:42 2014 (r355796) +++ head/multimedia/xbmc/distinfo Fri May 30 07:46:33 2014 (r355797) @@ -1,2 +1,2 @@ -SHA256 (xbmc-13.0.rc1.tar.gz) = ccd2fb7df3428e6bc211ca2d8853e5c7428c21719f4b89d7856e0326d41680e7 -SIZE (xbmc-13.0.rc1.tar.gz) = 64991019 +SHA256 (xbmc-13.1.rc1.tar.gz) = 1e55d5bde8dce77868de85c4ed37afbb6667c41f26161f38afee182fb6d2ce9d +SIZE (xbmc-13.1.rc1.tar.gz) = 65709064 Added: head/multimedia/xbmc/files/patch-xbmc__cores__AudioEngine__Sinks__AESinkOSS.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/xbmc/files/patch-xbmc__cores__AudioEngine__Sinks__AESinkOSS.cpp Fri May 30 07:46:33 2014 (r355797) @@ -0,0 +1,40 @@ +diff --git xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp +index f6ec980..7bcb6d6 100644 +--- xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp ++++ xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp +@@ -298,6 +298,8 @@ bool CAESinkOSS::Initialize(AEAudioFormat &format, std::string &device) + #endif + + int tmp = (CAEUtil::DataFormatToBits(format.m_dataFormat) >> 3) * format.m_channelLayout.Count() * OSS_FRAMES; ++ if (AE_IS_RAW_HD(format.m_dataFormat)) ++ tmp *= 8; + int pos = 0; + while ((tmp & 0x1) == 0x0) + { +@@ -478,12 +480,23 @@ void CAESinkOSS::EnumerateDevicesEx(AEDeviceInfoList &list, bool force) + devicename << cardinfo.shortname << " " << cardinfo.longname; + info.m_displayName = devicename.str(); + +- if (info.m_displayName.find("HDMI") != std::string::npos) ++ info.m_dataFormats.push_back(AE_FMT_S16NE); ++ info.m_dataFormats.push_back(AE_FMT_S32NE); ++ if (info.m_displayName.find("HDMI") != std::string::npos) { + info.m_deviceType = AE_DEVTYPE_HDMI; +- else if (info.m_displayName.find("Digital") != std::string::npos) ++ info.m_dataFormats.push_back(AE_FMT_AC3); ++ info.m_dataFormats.push_back(AE_FMT_DTS); ++ info.m_dataFormats.push_back(AE_FMT_EAC3); ++ info.m_dataFormats.push_back(AE_FMT_TRUEHD); ++ info.m_dataFormats.push_back(AE_FMT_DTSHD); ++ info.m_dataFormats.push_back(AE_FMT_LPCM); ++ } else if (info.m_displayName.find("Digital") != std::string::npos) { + info.m_deviceType = AE_DEVTYPE_IEC958; +- else ++ info.m_dataFormats.push_back(AE_FMT_AC3); ++ info.m_dataFormats.push_back(AE_FMT_DTS); ++ } else { + info.m_deviceType = AE_DEVTYPE_PCM; ++ } + + oss_audioinfo ainfo; + memset(&ainfo, 0, sizeof(ainfo)); Modified: head/multimedia/xbmc/pkg-plist ============================================================================== --- head/multimedia/xbmc/pkg-plist Fri May 30 07:31:42 2014 (r355796) +++ head/multimedia/xbmc/pkg-plist Fri May 30 07:46:33 2014 (r355797) @@ -707,6 +707,7 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/skin.confluence/language/Turkish/strings.po %%DATADIR%%/addons/skin.confluence/language/Ukrainian/strings.po %%DATADIR%%/addons/skin.confluence/language/Uzbek/strings.po +%%DATADIR%%/addons/skin.confluence/language/Vietnamese (Viet Nam)/strings.po %%DATADIR%%/addons/skin.confluence/language/Vietnamese/strings.po %%DATADIR%%/addons/skin.confluence/language/Welsh/strings.po %%DATADIR%%/addons/skin.confluence/media/CalibrateBottomRight.png @@ -1483,6 +1484,7 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/visualization.vortex/resources/language/Portuguese/strings.po %%DATADIR%%/addons/visualization.vortex/resources/language/Romanian/strings.po %%DATADIR%%/addons/visualization.vortex/resources/language/Russian/strings.po +%%DATADIR%%/addons/visualization.vortex/resources/language/Serbian/strings.po %%DATADIR%%/addons/visualization.vortex/resources/language/Slovak/strings.po %%DATADIR%%/addons/visualization.vortex/resources/language/Slovenian/strings.po %%DATADIR%%/addons/visualization.vortex/resources/language/Spanish (Argentina)/strings.po @@ -1724,16 +1726,15 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/language/Vietnamese/strings.po %%DATADIR%%/language/Welsh/langinfo.xml %%DATADIR%%/language/Welsh/strings.po -%%DATADIR%%/media/AppIcon.png %%DATADIR%%/media/Fonts/arial.ttf %%DATADIR%%/media/Fonts/teletext.ttf %%DATADIR%%/media/Splash.png -%%DATADIR%%/media/icon-flat-120x120.png -%%DATADIR%%/media/icon-flat-256x256.png -%%DATADIR%%/media/icon.png +%%DATADIR%%/media/icon120x120.png +%%DATADIR%%/media/icon16x16.png +%%DATADIR%%/media/icon256x256.png %%DATADIR%%/media/icon32x32.png +%%DATADIR%%/media/icon48x48.png %%DATADIR%%/media/weather.zip -%%DATADIR%%/media/xbmc.icns %%DATADIR%%/sounds/Bursting Bubbles/nav.wav %%DATADIR%%/sounds/Bursting Bubbles/sounds.xml %%DATADIR%%/system/IRSSmap.xml @@ -2067,6 +2068,7 @@ share/xsessions/XBMC.desktop @dirrmtry %%DATADIR%%/addons/visualization.vortex/resources/language/Spanish @dirrmtry %%DATADIR%%/addons/visualization.vortex/resources/language/Slovenian @dirrmtry %%DATADIR%%/addons/visualization.vortex/resources/language/Slovak +@dirrmtry %%DATADIR%%/addons/visualization.vortex/resources/language/Serbian @dirrmtry %%DATADIR%%/addons/visualization.vortex/resources/language/Russian @dirrmtry %%DATADIR%%/addons/visualization.vortex/resources/language/Romanian @dirrmtry %%DATADIR%%/addons/visualization.vortex/resources/language/Portuguese (Brazil) @@ -2340,6 +2342,7 @@ share/xsessions/XBMC.desktop @dirrmtry %%DATADIR%%/addons/skin.confluence/media/CenterRating @dirrmtry %%DATADIR%%/addons/skin.confluence/media @dirrmtry %%DATADIR%%/addons/skin.confluence/language/Welsh +@dirrmtry %%DATADIR%%/addons/skin.confluence/language/Vietnamese (Viet Nam) @dirrmtry %%DATADIR%%/addons/skin.confluence/language/Vietnamese @dirrmtry %%DATADIR%%/addons/skin.confluence/language/Uzbek @dirrmtry %%DATADIR%%/addons/skin.confluence/language/Ukrainian
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405300746.s4U7kYv6009323>