diff options
| -rwxr-xr-x | abs/extra/openpht/PKGBUILD | 11 | ||||
| -rw-r--r-- | abs/extra/openpht/plex-libcec.patch | 63 |
2 files changed, 4 insertions, 70 deletions
diff --git a/abs/extra/openpht/PKGBUILD b/abs/extra/openpht/PKGBUILD index af04b97..6cecd42 100755 --- a/abs/extra/openpht/PKGBUILD +++ b/abs/extra/openpht/PKGBUILD @@ -1,7 +1,7 @@ pkgname=openpht -pkgver=1.5.0.502 -_pkghash=7563ca94 -pkgrel=2 +pkgver=1.5.1.508 +_pkghash=67218541 +pkgrel=1 pkgdesc='OpenPHT a community driven fork of Plex Home Theater' arch=('i686' 'x86_64') url='https://github.com/RasPlex/OpenPHT' @@ -21,14 +21,12 @@ optdepends=('libplist: AirPlay support' 'libcec: Pulse-Eight USB-CEC adapter support') source=("https://github.com/RasPlex/OpenPHT/archive/v${pkgver}-${_pkghash}.tar.gz" 'plex-ffmpeg-compat.patch' - 'plex-libcec.patch' 'plex_lib.conf' 'plexhometheater.sh') prepare() { cd OpenPHT-${pkgver}-${_pkghash} - patch -Np1 -i ../plex-libcec.patch patch -Np1 -i ../plex-ffmpeg-compat.patch } @@ -71,8 +69,7 @@ package() { } # vim: ts=2 sw=2 et: -md5sums=('48ab91fe4ce6c6e6c6a3177e12d733dc' +md5sums=('af14c64433c7424353a8cfbe6b0c5b5a' '6704244166497db7fa6b3ddd43a0e53b' - '0f753e1ebea13e5a2029a59b9db79877' 'c1eedd9f89ee727230833db9ef1e5d29' '4ceae60ed2f9e4304eda4f80d407e799') diff --git a/abs/extra/openpht/plex-libcec.patch b/abs/extra/openpht/plex-libcec.patch deleted file mode 100644 index 2087569..0000000 --- a/abs/extra/openpht/plex-libcec.patch +++ /dev/null @@ -1,63 +0,0 @@ -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) |