cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 11.0.rc1

Browse Source 
New option: OSS experimental support

PR:		ports/165560
Submitted by:	Mickael Maillot <mickael.maillot@gmail.com> (maintainer)
Approved by:	glarkin@ (mentor) and wen@ (co-mentor)
This commit is contained in:
Carlo Strub 2012-03-06 15:01:19 +00:00
parent e7f06505a0
commit 1207416356
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=292830
5 changed files with 56 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
multimedia/xbmc/Makefile
View File

@ -6,11 +6,10 @@
#
PORTNAME= xbmc
PORTVERSION= 11.0.b2
PORTREVISION= 4
PORTVERSION= 11.0.rc1
CATEGORIES= multimedia
MASTER_SITES= http://mirrors.xbmc.org/releases/source/
DISTNAME= ${PORTNAME}-11.0-Eden_beta2
DISTNAME= ${PORTNAME}-11.0-Eden_rc1
MAINTAINER= mickael.maillot@gmail.com
COMMENT= XBMC is an award winning media center application
@ -26,8 +25,7 @@ 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 \
LIB_DEPENDS= ass.5:${PORTSDIR}/multimedia/libass \
boost_thread.4:${PORTSDIR}/devel/boost-libs \
cdio.13:${PORTSDIR}/sysutils/libcdio \
curl.6:${PORTSDIR}/ftp/curl \
@ -54,8 +52,7 @@ 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 \
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
glxinfo:${PORTSDIR}/graphics/mesa-demos \
${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \
xdpyinfo:${PORTSDIR}/x11/xdpyinfo
@ -67,7 +64,7 @@ USE_AUTOTOOLS= autoconf libtool automake libltdl
GNU_CONFIGURE= yes
USE_XORG= xt xmu xrandr xtst
USE_GL= glu
USE_SDL= image mixer sdl
USE_SDL= image sdl
USE_MYSQL= yes
USE_PYTHON= 2.5+
MAKE_JOBS_SAFE= yes
@ -75,13 +72,12 @@ NOPRECIOUSMAKEVARS= yes
INSTALLS_ICONS= yes
ONLY_FOR_ARCHS= i386 amd64
PLIST_SUB+= PYVER="${PYTHON_VERSION:S/python//:S/.//g}"
OPTIONS= AVAHI "Enable Avahi support" on \
LIBBLURAY "Enable libbluray support" on \
HAL "Enable HAL support" on \
LIRC "Enable lirc support" off \
NONFREE "Enable non-free components (rar, ccx, ffmpeg)" off \
OSS "Enable experimental OSS support" off \
PULSE "Enable PulseAudio support" off \
RTMP "RTMP support via librtmp" off \
VAAPI "Enable VAAPI support" off \
@ -144,6 +140,17 @@ NO_PACKAGE= ${NO_CDROM}
CONFIGURE_ARGS+= --disable-non-free
.endif
.if defined(WITH_OSS)
.if ${OSVERSION} <= 800096
IGNORE= requires sound rewrite from 8.0-RELEASE or later
.endif
CONFIGURE_ARGS+= --disable-alsa
.else
LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib
RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
USE_SDL+= mixer
.endif
.if defined(WITH_PULSE)
CONFIGURE_ARGS+= --enable-pulse
LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
@ -175,10 +182,8 @@ CONFIGURE_ARGS+= --disable-vdpau
.if defined(WITH_WEBSERVER)
CONFIGURE_ARGS+= --enable-webserver
LIB_DEPENDS+= microhttpd.23:${PORTSDIR}/www/libmicrohttpd
PLIST_SUB+= HTTPD=""
.else
CONFIGURE_ARGS+= --disable-webserver
PLIST_SUB+= HTTPD="@comment "
.endif
.if ${CC} == "clang" || ${CXX} == "clang++"
@ -188,6 +193,14 @@ PLIST_SUB+= RSXS="@comment "
PLIST_SUB+= RSXS=""
.endif
post-patch:
.if defined(WITH_OSS)
@(cd ${WRKSRC}; \
${BZCAT} ${FILESDIR}/extra-patch-oss.bz2 | ${PATCH} ${PATCH_DIST_ARGS})
@${RM} ${WRKSRC}/language/English/strings.xml.orig
@${RM} ${WRKSRC}/addons/skin.confluence/sounds/sounds.xml.orig
.endif
pre-configure:
cd ${WRKSRC} && ./bootstrap

4
multimedia/xbmc/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (xbmc-11.0-Eden_beta2.tar.gz) = 1f87e04b0444bb3587f055ae1b9d86e3f2fbf4284caeab8bc393e36e0e4c2ec6
SIZE (xbmc-11.0-Eden_beta2.tar.gz) = 56577092
SHA256 (xbmc-11.0-Eden_rc1.tar.gz) = 6a3d5caa3e983c3dbc8fa07dad282fc2bce446f72fc17531a90409ad1641ece2
SIZE (xbmc-11.0-Eden_rc1.tar.gz) = 59387977

BIN
multimedia/xbmc/files/extra-patch-oss.bz2 Normal file
View File

Binary file not shown.

20
multimedia/xbmc/files/patch-xbmc__settings__AdvancedSettings.cpp Normal file
View File

@ -0,0 +1,20 @@
diff --git xbmc/settings/AdvancedSettings.cpp xbmc/settings/AdvancedSettings.cpp
index d14b139..3275967 100644
--- xbmc/settings/AdvancedSettings.cpp
+++ xbmc/settings/AdvancedSettings.cpp
@@ -100,6 +100,7 @@ void CAdvancedSettings::Initialize()
m_DXVACheckCompatibilityPresent = false;
m_DXVAForceProcessorRenderer = true;
m_videoFpsDetect = 1;
+ m_videoDefaultLatency = 0.0;
m_musicUseTimeSeeking = true;
m_musicTimeSeekForward = 10;
@@ -542,7 +543,6 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
XMLUtils::GetInt(pElement, "fpsdetect", m_videoFpsDetect, 0, 2);
// Store global display latency settings
- m_videoDefaultLatency = 0;
TiXmlElement* pVideoLatency = pElement->FirstChildElement("latency");
if (pVideoLatency)
{

9
multimedia/xbmc/pkg-plist
View File

@ -297,6 +297,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
%%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/Arabic/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
@ -751,6 +752,8 @@ share/icons/hicolor/48x48/apps/xbmc.png
%%DATADIR%%/addons/weather.wunderground/changelog.txt
%%DATADIR%%/addons/weather.wunderground/default.py
%%DATADIR%%/addons/weather.wunderground/icon.png
%%DATADIR%%/addons/weather.wunderground/resources/language/Chinese (Simple)/strings.xml
%%DATADIR%%/addons/weather.wunderground/resources/language/Dutch/strings.xml
%%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
@ -790,6 +793,8 @@ share/icons/hicolor/48x48/apps/xbmc.png
%%DATADIR%%/addons/xbmc.python/script.xsd
%%DATADIR%%/language/Afrikaans/langinfo.xml
%%DATADIR%%/language/Afrikaans/strings.xml
%%DATADIR%%/language/Arabic/langinfo.xml
%%DATADIR%%/language/Arabic/strings.xml
%%DATADIR%%/language/Basque/langinfo.xml
%%DATADIR%%/language/Basque/strings.xml
%%DATADIR%%/language/Bosnian/langinfo.xml
@ -1051,6 +1056,7 @@ share/xsessions/XBMC.desktop
@dirrm %%DATADIR%%/language/Bulgarian
@dirrm %%DATADIR%%/language/Bosnian
@dirrm %%DATADIR%%/language/Basque
@dirrm %%DATADIR%%/language/Arabic
@dirrm %%DATADIR%%/language/Afrikaans
@dirrm %%DATADIR%%/language
@dirrm %%DATADIR%%/addons/xbmc.python
@ -1067,6 +1073,8 @@ share/xsessions/XBMC.desktop
@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/Dutch
@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Chinese (Simple)
@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language
@dirrm %%DATADIR%%/addons/weather.wunderground/resources/lib
@dirrm %%DATADIR%%/addons/weather.wunderground/resources
@ -1187,6 +1195,7 @@ share/xsessions/XBMC.desktop
@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/Arabic
@dirrm %%DATADIR%%/addons/skin.confluence/language/Afrikaans
@dirrm %%DATADIR%%/addons/skin.confluence/language
@dirrm %%DATADIR%%/addons/skin.confluence/fonts