[arch-commits] Commit in plex-home-theater/repos (10 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Mon Dec 21 18:29:48 UTC 2015
Date: Monday, December 21, 2015 @ 19:29:48
Author: bpiotrowski
Revision: 154017
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
plex-home-theater/repos/community-staging-i686/
plex-home-theater/repos/community-staging-i686/PKGBUILD
(from rev 154016, plex-home-theater/trunk/PKGBUILD)
plex-home-theater/repos/community-staging-i686/plex-ffmpeg-compat.patch
(from rev 154016, plex-home-theater/trunk/plex-ffmpeg-compat.patch)
plex-home-theater/repos/community-staging-i686/plex-libcec.patch
(from rev 154016, plex-home-theater/trunk/plex-libcec.patch)
plex-home-theater/repos/community-staging-i686/plexhometheater.sh
(from rev 154016, plex-home-theater/trunk/plexhometheater.sh)
plex-home-theater/repos/community-staging-x86_64/
plex-home-theater/repos/community-staging-x86_64/PKGBUILD
(from rev 154016, plex-home-theater/trunk/PKGBUILD)
plex-home-theater/repos/community-staging-x86_64/plex-ffmpeg-compat.patch
(from rev 154016, plex-home-theater/trunk/plex-ffmpeg-compat.patch)
plex-home-theater/repos/community-staging-x86_64/plex-libcec.patch
(from rev 154016, plex-home-theater/trunk/plex-libcec.patch)
plex-home-theater/repos/community-staging-x86_64/plexhometheater.sh
(from rev 154016, plex-home-theater/trunk/plexhometheater.sh)
---------------------------------------------------+
community-staging-i686/PKGBUILD | 77 ++++++++++++++++++++
community-staging-i686/plex-ffmpeg-compat.patch | 29 +++++++
community-staging-i686/plex-libcec.patch | 63 ++++++++++++++++
community-staging-i686/plexhometheater.sh | 5 +
community-staging-x86_64/PKGBUILD | 77 ++++++++++++++++++++
community-staging-x86_64/plex-ffmpeg-compat.patch | 29 +++++++
community-staging-x86_64/plex-libcec.patch | 63 ++++++++++++++++
community-staging-x86_64/plexhometheater.sh | 5 +
8 files changed, 348 insertions(+)
Copied: plex-home-theater/repos/community-staging-i686/PKGBUILD (from rev 154016, plex-home-theater/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-12-21 18:29:48 UTC (rev 154017)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Daniel Wallace <daniel.wallace at gatech.edu>
+
+pkgname=plex-home-theater
+pkgver=1.4.1.469
+_pkghash=47a90f01
+pkgrel=7
+pkgdesc='Plex Home Theater'
+arch=('i686' 'x86_64')
+url='http://www.plexapp.com/'
+license=('GPL2')
+depends=('alsa-lib' 'avahi' 'boost-libs' 'curl' 'expat' 'freetype2' 'fribidi'
+ 'gcc-libs' 'glew' 'glibc' 'glu' 'libcdio' 'libgl' 'libjpeg' 'libmad'
+ 'libmicrohttpd' 'libmpeg2' 'libpng' 'libpulse' 'libsamplerate'
+ 'libssh' 'libtiff' 'libusb-compat' 'libva' 'libvdpau' 'libx11'
+ 'libxext' 'libxrandr' 'lzo' 'pcre' 'python2' 'sdl' 'sdl_image'
+ 'sdl_mixer' 'sqlite' 'smbclient' 'taglib' 'tinyxml' 'yajl' 'zlib'
+ 'libavcodec.so' 'libavfilter.so' 'libavformat.so' 'libavutil.so'
+ 'libpostproc.so' 'libswresample.so' 'libswscale.so')
+makedepends=('boost' 'cmake' 'doxygen' 'ffmpeg-compat' 'git' 'java-environment'
+ 'libcec' 'libplist' 'libshairport' 'nasm' 'swig' 'unzip' 'zip')
+optdepends=('libplist: AirPlay support'
+ 'libshairport: AirPlay support'
+ 'libcec: Pulse-Eight USB-CEC adapter support'
+ 'pulseaudio: PulseAudio support')
+source=("https://github.com/plexinc/plex-home-theater-public/archive/v${pkgver}-${_pkghash}.tar.gz"
+ 'plex-ffmpeg-compat.patch'
+ 'plex-libcec.patch'
+ 'plexhometheater.sh')
+sha256sums=('82a0b3314de18e0f1bdb123c6fe4d411e147b052a09219a9d2057459dc0f36b3'
+ '5b370e4dec6998130df46ad6bd5ca6258e3a040dd6c6cc4085c335dc3d6050bd'
+ '7e5f6c1e07184a0b0affe4ef7c0bd06d1094f7a28cf5baa35d31a69cf488a9db'
+ 'dc6bd394c07a2ececbb2f8c53cb54afd5d78f7c00a0b34acab3e71217da085fb')
+
+prepare() {
+ cd plex-home-theater-public-${pkgver}-${_pkghash}
+
+ patch -Np1 -i ../plex-libcec.patch
+ patch -Np1 -i ../plex-ffmpeg-compat.patch
+}
+
+build() {
+ cd plex-home-theater-public-${pkgver}-${_pkghash}
+
+ if [[ -d build ]]; then
+ rm -rf build
+ fi
+ mkdir build && cd build
+
+ cmake .. \
+ -DCMAKE_INSTALL_PREFIX='/usr' \
+ -DCMAKE_C_FLAGS="$CMAKE_C_FLAGS -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include" \
+ -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include" \
+ -DCREATE_BUNDLE='FALSE' \
+ -DDUMP_SYMBOLS='FALSE' \
+ -DENABLE_AUTOUPDATE='FALSE' \
+ -DENABLE_PYTHON='TRUE' \
+ -DPYTHON_EXEC='/usr/bin/python2' \
+ -DUSE_INTERNAL_FFMPEG='FALSE'
+ make
+}
+
+package() {
+ cd plex-home-theater-public-${pkgver}-${_pkghash}/build
+
+ make DESTDIR="${pkgdir}" install
+ install -dm 755 "${pkgdir}"/usr/{lib/plexhometheater,share/{applications,pixmaps}}
+ mv "${pkgdir}"/usr/bin/{system,xbmc-xrandr} "${pkgdir}"/usr/lib/plexhometheater/
+ mv "${pkgdir}"/usr/share/XBMC "${pkgdir}"/usr/share/plexhometheater
+ rm -rf "${pkgdir}"/usr/bin/*.so
+ install -m 755 "${srcdir}"/plexhometheater.sh "${pkgdir}"/usr/bin/
+ install -m 644 ../plex/Resources/plexhometheater.desktop "${pkgdir}"/usr/share/applications/
+ install -m 644 ../plex/Resources/plex-icon-256.png "${pkgdir}"/usr/share/pixmaps/plexhometheater.png
+}
+
+# vim: ts=2 sw=2 et:
Copied: plex-home-theater/repos/community-staging-i686/plex-ffmpeg-compat.patch (from rev 154016, plex-home-theater/trunk/plex-ffmpeg-compat.patch)
===================================================================
--- community-staging-i686/plex-ffmpeg-compat.patch (rev 0)
+++ community-staging-i686/plex-ffmpeg-compat.patch 2015-12-21 18:29:48 UTC (rev 154017)
@@ -0,0 +1,29 @@
+diff -rupN plex-home-theater.orig/plex/CMakeModules/FindFFmpeg.cmake plex-home-theater/plex/CMakeModules/FindFFmpeg.cmake
+--- plex-home-theater.orig/plex/CMakeModules/FindFFmpeg.cmake 2014-09-15 11:46:21.751638700 +0200
++++ plex-home-theater/plex/CMakeModules/FindFFmpeg.cmake 2014-09-15 11:43:25.678039000 +0200
+@@ -41,7 +41,7 @@ MACRO(FFMPEG_FIND varname shortname head
+ /opt/csw/include # Blastwave
+ /opt/include
+ /usr/freeware/include
+- PATH_SUFFIXES ffmpeg
++ PATH_SUFFIXES ffmpeg-compat
+ DOC "Location of FFMPEG Headers"
+ )
+
+@@ -62,7 +62,7 @@ MACRO(FFMPEG_FIND varname shortname head
+ /opt/csw/include # Blastwave
+ /opt/include
+ /usr/freeware/include
+- PATH_SUFFIXES ffmpeg
++ PATH_SUFFIXES ffmpeg-compat
+ DOC "Location of FFMPEG Headers"
+ )
+ ENDIF(NOT FFMPEG_${varname}_INCLUDE_DIRS)
+@@ -85,6 +85,7 @@ MACRO(FFMPEG_FIND varname shortname head
+ /opt/csw/lib
+ /opt/lib
+ /usr/freeware/lib64
++ PATH_SUFFIXES ffmpeg-compat
+ DOC "Location of FFMPEG Libraries"
+ )
+
Copied: plex-home-theater/repos/community-staging-i686/plex-libcec.patch (from rev 154016, plex-home-theater/trunk/plex-libcec.patch)
===================================================================
--- community-staging-i686/plex-libcec.patch (rev 0)
+++ community-staging-i686/plex-libcec.patch 2015-12-21 18:29:48 UTC (rev 154017)
@@ -0,0 +1,63 @@
+diff -rupN plex-home-theater-public-1.4.1.469-47a90f01.orig/system/peripherals.xml plex-home-theater-public-1.4.1.469-47a90f01/system/peripherals.xml
+--- plex-home-theater-public-1.4.1.469-47a90f01.orig/system/peripherals.xml 2015-07-22 11:09:33.213307552 +0200
++++ plex-home-theater-public-1.4.1.469-47a90f01/system/peripherals.xml 2015-07-22 11:09:47.349594239 +0200
+@@ -28,7 +28,7 @@
+ <setting key="device_type" type="int" value="1" configurable="0" />
+ <setting key="wake_devices_advanced" type="string" value="" configurable="0" />
+ <setting key="standby_devices_advanced" type="string" value="" configurable="0" />
+- <setting key="double_tap_timeout_ms" type="int" min="0" value="2000" configurable="0" />
++ <setting key="double_tap_timeout_ms" type="int" min="0" value="300" configurable="0" />
+ </peripheral>
+
+ <peripheral vendor_product="2548:1001,2548:1002" bus="usb" name="Pulse-Eight CEC Adapter" mapTo="cec">
+diff -rupN plex-home-theater-public-1.4.1.469-47a90f01.orig/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp plex-home-theater-public-1.4.1.469-47a90f01/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp
+--- plex-home-theater-public-1.4.1.469-47a90f01.orig/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp 2015-07-22 11:09:32.826651274 +0200
++++ plex-home-theater-public-1.4.1.469-47a90f01/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp 2015-07-22 11:09:47.349594239 +0200
+@@ -101,6 +101,8 @@ bool CPeripheralBusCEC::PerformDeviceSca
+ break;
+ case ADAPTERTYPE_RPI:
+ result.m_mappedBusType = PERIPHERAL_BUS_RPI;
++ // the Pi's adapter cannot be removed, no need to rescan
++ m_bNeedsPolling = false;
+ break;
+ default:
+ break;
+diff -rupN plex-home-theater-public-1.4.1.469-47a90f01.orig/xbmc/peripherals/devices/PeripheralCecAdapter.cpp plex-home-theater-public-1.4.1.469-47a90f01/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+--- plex-home-theater-public-1.4.1.469-47a90f01.orig/xbmc/peripherals/devices/PeripheralCecAdapter.cpp 2015-07-22 11:09:32.826651274 +0200
++++ plex-home-theater-public-1.4.1.469-47a90f01/xbmc/peripherals/devices/PeripheralCecAdapter.cpp 2015-07-22 11:13:05.310907421 +0200
+@@ -282,7 +283,7 @@ bool CPeripheralCecAdapter::InitialiseFe
+ }
+ else
+ {
+- CLog::Log(LOGDEBUG, "%s - using libCEC v%s", __FUNCTION__, m_cecAdapter->ToString((cec_server_version)m_configuration.serverVersion));
++ CLog::Log(LOGDEBUG, "%s - using libCEC v%s", __FUNCTION__, m_cecAdapter->ToString((cec_version)m_configuration.serverVersion));
+ SetVersionInfo(m_configuration);
+ }
+
+@@ -295,7 +296,7 @@ bool CPeripheralCecAdapter::InitialiseFe
+
+ void CPeripheralCecAdapter::SetVersionInfo(const libcec_configuration &configuration)
+ {
+- m_strVersionInfo.Format("libCEC %s - firmware v%d", m_cecAdapter->ToString((cec_server_version)configuration.serverVersion), configuration.iFirmwareVersion);
++ m_strVersionInfo.Format("libCEC %s - firmware v%d", m_cecAdapter->ToString((cec_version)configuration.serverVersion), configuration.iFirmwareVersion);
+
+ // append firmware build date
+ if (configuration.iFirmwareBuildDate != CEC_FW_BUILD_UNKNOWN)
+@@ -1303,7 +1304,7 @@ void CPeripheralCecAdapter::SetConfigura
+ void CPeripheralCecAdapter::SetConfigurationFromSettings(void)
+ {
+ // use the same client version as libCEC version
+- m_configuration.clientVersion = CEC_CLIENT_VERSION_CURRENT;
++ m_configuration.clientVersion = LIBCEC_VERSION_CURRENT;
+
+ // device name 'XBMC'
+ snprintf(m_configuration.strDeviceName, 13, "%s", GetSettingString("device_name").c_str());
+@@ -1379,7 +1380,7 @@ void CPeripheralCecAdapter::SetConfigura
+ m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0;
+
+ // double tap prevention timeout in ms
+- m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms");
++ m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50;
+ }
+
+ void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses)
Copied: plex-home-theater/repos/community-staging-i686/plexhometheater.sh (from rev 154016, plex-home-theater/trunk/plexhometheater.sh)
===================================================================
--- community-staging-i686/plexhometheater.sh (rev 0)
+++ community-staging-i686/plexhometheater.sh 2015-12-21 18:29:48 UTC (rev 154017)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export XBMC_BIN_HOME='/usr/lib/plexhometheater'
+export XBMC_HOME='/usr/share/plexhometheater'
+exec plexhometheater
Copied: plex-home-theater/repos/community-staging-x86_64/PKGBUILD (from rev 154016, plex-home-theater/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2015-12-21 18:29:48 UTC (rev 154017)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Daniel Wallace <daniel.wallace at gatech.edu>
+
+pkgname=plex-home-theater
+pkgver=1.4.1.469
+_pkghash=47a90f01
+pkgrel=7
+pkgdesc='Plex Home Theater'
+arch=('i686' 'x86_64')
+url='http://www.plexapp.com/'
+license=('GPL2')
+depends=('alsa-lib' 'avahi' 'boost-libs' 'curl' 'expat' 'freetype2' 'fribidi'
+ 'gcc-libs' 'glew' 'glibc' 'glu' 'libcdio' 'libgl' 'libjpeg' 'libmad'
+ 'libmicrohttpd' 'libmpeg2' 'libpng' 'libpulse' 'libsamplerate'
+ 'libssh' 'libtiff' 'libusb-compat' 'libva' 'libvdpau' 'libx11'
+ 'libxext' 'libxrandr' 'lzo' 'pcre' 'python2' 'sdl' 'sdl_image'
+ 'sdl_mixer' 'sqlite' 'smbclient' 'taglib' 'tinyxml' 'yajl' 'zlib'
+ 'libavcodec.so' 'libavfilter.so' 'libavformat.so' 'libavutil.so'
+ 'libpostproc.so' 'libswresample.so' 'libswscale.so')
+makedepends=('boost' 'cmake' 'doxygen' 'ffmpeg-compat' 'git' 'java-environment'
+ 'libcec' 'libplist' 'libshairport' 'nasm' 'swig' 'unzip' 'zip')
+optdepends=('libplist: AirPlay support'
+ 'libshairport: AirPlay support'
+ 'libcec: Pulse-Eight USB-CEC adapter support'
+ 'pulseaudio: PulseAudio support')
+source=("https://github.com/plexinc/plex-home-theater-public/archive/v${pkgver}-${_pkghash}.tar.gz"
+ 'plex-ffmpeg-compat.patch'
+ 'plex-libcec.patch'
+ 'plexhometheater.sh')
+sha256sums=('82a0b3314de18e0f1bdb123c6fe4d411e147b052a09219a9d2057459dc0f36b3'
+ '5b370e4dec6998130df46ad6bd5ca6258e3a040dd6c6cc4085c335dc3d6050bd'
+ '7e5f6c1e07184a0b0affe4ef7c0bd06d1094f7a28cf5baa35d31a69cf488a9db'
+ 'dc6bd394c07a2ececbb2f8c53cb54afd5d78f7c00a0b34acab3e71217da085fb')
+
+prepare() {
+ cd plex-home-theater-public-${pkgver}-${_pkghash}
+
+ patch -Np1 -i ../plex-libcec.patch
+ patch -Np1 -i ../plex-ffmpeg-compat.patch
+}
+
+build() {
+ cd plex-home-theater-public-${pkgver}-${_pkghash}
+
+ if [[ -d build ]]; then
+ rm -rf build
+ fi
+ mkdir build && cd build
+
+ cmake .. \
+ -DCMAKE_INSTALL_PREFIX='/usr' \
+ -DCMAKE_C_FLAGS="$CMAKE_C_FLAGS -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include" \
+ -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include" \
+ -DCREATE_BUNDLE='FALSE' \
+ -DDUMP_SYMBOLS='FALSE' \
+ -DENABLE_AUTOUPDATE='FALSE' \
+ -DENABLE_PYTHON='TRUE' \
+ -DPYTHON_EXEC='/usr/bin/python2' \
+ -DUSE_INTERNAL_FFMPEG='FALSE'
+ make
+}
+
+package() {
+ cd plex-home-theater-public-${pkgver}-${_pkghash}/build
+
+ make DESTDIR="${pkgdir}" install
+ install -dm 755 "${pkgdir}"/usr/{lib/plexhometheater,share/{applications,pixmaps}}
+ mv "${pkgdir}"/usr/bin/{system,xbmc-xrandr} "${pkgdir}"/usr/lib/plexhometheater/
+ mv "${pkgdir}"/usr/share/XBMC "${pkgdir}"/usr/share/plexhometheater
+ rm -rf "${pkgdir}"/usr/bin/*.so
+ install -m 755 "${srcdir}"/plexhometheater.sh "${pkgdir}"/usr/bin/
+ install -m 644 ../plex/Resources/plexhometheater.desktop "${pkgdir}"/usr/share/applications/
+ install -m 644 ../plex/Resources/plex-icon-256.png "${pkgdir}"/usr/share/pixmaps/plexhometheater.png
+}
+
+# vim: ts=2 sw=2 et:
Copied: plex-home-theater/repos/community-staging-x86_64/plex-ffmpeg-compat.patch (from rev 154016, plex-home-theater/trunk/plex-ffmpeg-compat.patch)
===================================================================
--- community-staging-x86_64/plex-ffmpeg-compat.patch (rev 0)
+++ community-staging-x86_64/plex-ffmpeg-compat.patch 2015-12-21 18:29:48 UTC (rev 154017)
@@ -0,0 +1,29 @@
+diff -rupN plex-home-theater.orig/plex/CMakeModules/FindFFmpeg.cmake plex-home-theater/plex/CMakeModules/FindFFmpeg.cmake
+--- plex-home-theater.orig/plex/CMakeModules/FindFFmpeg.cmake 2014-09-15 11:46:21.751638700 +0200
++++ plex-home-theater/plex/CMakeModules/FindFFmpeg.cmake 2014-09-15 11:43:25.678039000 +0200
+@@ -41,7 +41,7 @@ MACRO(FFMPEG_FIND varname shortname head
+ /opt/csw/include # Blastwave
+ /opt/include
+ /usr/freeware/include
+- PATH_SUFFIXES ffmpeg
++ PATH_SUFFIXES ffmpeg-compat
+ DOC "Location of FFMPEG Headers"
+ )
+
+@@ -62,7 +62,7 @@ MACRO(FFMPEG_FIND varname shortname head
+ /opt/csw/include # Blastwave
+ /opt/include
+ /usr/freeware/include
+- PATH_SUFFIXES ffmpeg
++ PATH_SUFFIXES ffmpeg-compat
+ DOC "Location of FFMPEG Headers"
+ )
+ ENDIF(NOT FFMPEG_${varname}_INCLUDE_DIRS)
+@@ -85,6 +85,7 @@ MACRO(FFMPEG_FIND varname shortname head
+ /opt/csw/lib
+ /opt/lib
+ /usr/freeware/lib64
++ PATH_SUFFIXES ffmpeg-compat
+ DOC "Location of FFMPEG Libraries"
+ )
+
Copied: plex-home-theater/repos/community-staging-x86_64/plex-libcec.patch (from rev 154016, plex-home-theater/trunk/plex-libcec.patch)
===================================================================
--- community-staging-x86_64/plex-libcec.patch (rev 0)
+++ community-staging-x86_64/plex-libcec.patch 2015-12-21 18:29:48 UTC (rev 154017)
@@ -0,0 +1,63 @@
+diff -rupN plex-home-theater-public-1.4.1.469-47a90f01.orig/system/peripherals.xml plex-home-theater-public-1.4.1.469-47a90f01/system/peripherals.xml
+--- plex-home-theater-public-1.4.1.469-47a90f01.orig/system/peripherals.xml 2015-07-22 11:09:33.213307552 +0200
++++ plex-home-theater-public-1.4.1.469-47a90f01/system/peripherals.xml 2015-07-22 11:09:47.349594239 +0200
+@@ -28,7 +28,7 @@
+ <setting key="device_type" type="int" value="1" configurable="0" />
+ <setting key="wake_devices_advanced" type="string" value="" configurable="0" />
+ <setting key="standby_devices_advanced" type="string" value="" configurable="0" />
+- <setting key="double_tap_timeout_ms" type="int" min="0" value="2000" configurable="0" />
++ <setting key="double_tap_timeout_ms" type="int" min="0" value="300" configurable="0" />
+ </peripheral>
+
+ <peripheral vendor_product="2548:1001,2548:1002" bus="usb" name="Pulse-Eight CEC Adapter" mapTo="cec">
+diff -rupN plex-home-theater-public-1.4.1.469-47a90f01.orig/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp plex-home-theater-public-1.4.1.469-47a90f01/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp
+--- plex-home-theater-public-1.4.1.469-47a90f01.orig/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp 2015-07-22 11:09:32.826651274 +0200
++++ plex-home-theater-public-1.4.1.469-47a90f01/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp 2015-07-22 11:09:47.349594239 +0200
+@@ -101,6 +101,8 @@ bool CPeripheralBusCEC::PerformDeviceSca
+ break;
+ case ADAPTERTYPE_RPI:
+ result.m_mappedBusType = PERIPHERAL_BUS_RPI;
++ // the Pi's adapter cannot be removed, no need to rescan
++ m_bNeedsPolling = false;
+ break;
+ default:
+ break;
+diff -rupN plex-home-theater-public-1.4.1.469-47a90f01.orig/xbmc/peripherals/devices/PeripheralCecAdapter.cpp plex-home-theater-public-1.4.1.469-47a90f01/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+--- plex-home-theater-public-1.4.1.469-47a90f01.orig/xbmc/peripherals/devices/PeripheralCecAdapter.cpp 2015-07-22 11:09:32.826651274 +0200
++++ plex-home-theater-public-1.4.1.469-47a90f01/xbmc/peripherals/devices/PeripheralCecAdapter.cpp 2015-07-22 11:13:05.310907421 +0200
+@@ -282,7 +283,7 @@ bool CPeripheralCecAdapter::InitialiseFe
+ }
+ else
+ {
+- CLog::Log(LOGDEBUG, "%s - using libCEC v%s", __FUNCTION__, m_cecAdapter->ToString((cec_server_version)m_configuration.serverVersion));
++ CLog::Log(LOGDEBUG, "%s - using libCEC v%s", __FUNCTION__, m_cecAdapter->ToString((cec_version)m_configuration.serverVersion));
+ SetVersionInfo(m_configuration);
+ }
+
+@@ -295,7 +296,7 @@ bool CPeripheralCecAdapter::InitialiseFe
+
+ void CPeripheralCecAdapter::SetVersionInfo(const libcec_configuration &configuration)
+ {
+- m_strVersionInfo.Format("libCEC %s - firmware v%d", m_cecAdapter->ToString((cec_server_version)configuration.serverVersion), configuration.iFirmwareVersion);
++ m_strVersionInfo.Format("libCEC %s - firmware v%d", m_cecAdapter->ToString((cec_version)configuration.serverVersion), configuration.iFirmwareVersion);
+
+ // append firmware build date
+ if (configuration.iFirmwareBuildDate != CEC_FW_BUILD_UNKNOWN)
+@@ -1303,7 +1304,7 @@ void CPeripheralCecAdapter::SetConfigura
+ void CPeripheralCecAdapter::SetConfigurationFromSettings(void)
+ {
+ // use the same client version as libCEC version
+- m_configuration.clientVersion = CEC_CLIENT_VERSION_CURRENT;
++ m_configuration.clientVersion = LIBCEC_VERSION_CURRENT;
+
+ // device name 'XBMC'
+ snprintf(m_configuration.strDeviceName, 13, "%s", GetSettingString("device_name").c_str());
+@@ -1379,7 +1380,7 @@ void CPeripheralCecAdapter::SetConfigura
+ m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0;
+
+ // double tap prevention timeout in ms
+- m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms");
++ m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50;
+ }
+
+ void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses)
Copied: plex-home-theater/repos/community-staging-x86_64/plexhometheater.sh (from rev 154016, plex-home-theater/trunk/plexhometheater.sh)
===================================================================
--- community-staging-x86_64/plexhometheater.sh (rev 0)
+++ community-staging-x86_64/plexhometheater.sh 2015-12-21 18:29:48 UTC (rev 154017)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export XBMC_BIN_HOME='/usr/lib/plexhometheater'
+export XBMC_HOME='/usr/share/plexhometheater'
+exec plexhometheater
More information about the arch-commits
mailing list