From owner-svn-ports-head@freebsd.org Sat Apr 16 18:03:18 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6CE65B10D33; Sat, 16 Apr 2016 18:03:18 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3FB8A1CCC; Sat, 16 Apr 2016 18:03:18 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3GI3HnD074585; Sat, 16 Apr 2016 18:03:17 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3GI3HPJ074583; Sat, 16 Apr 2016 18:03:17 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201604161803.u3GI3HPJ074583@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 16 Apr 2016 18:03:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413473 - in head/multimedia/plexhometheater: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Apr 2016 18:03:18 -0000 Author: riggs Date: Sat Apr 16 18:03:17 2016 New Revision: 413473 URL: https://svnweb.freebsd.org/changeset/ports/413473 Log: Fix build with recent libcec 3.1.0 update; bump PORTREVISION PR: 208161 Submitted by: mickael.maillot@gmail.com Approved by: woodsb02@gmail.com (maintainer) Added: head/multimedia/plexhometheater/files/patch-xbmc_peripherals_devices_PeripheralCecAdapter.cpp (contents, props changed) Modified: head/multimedia/plexhometheater/Makefile Modified: head/multimedia/plexhometheater/Makefile ============================================================================== --- head/multimedia/plexhometheater/Makefile Sat Apr 16 18:00:46 2016 (r413472) +++ head/multimedia/plexhometheater/Makefile Sat Apr 16 18:03:17 2016 (r413473) @@ -3,7 +3,7 @@ PORTNAME= plexhometheater PORTVERSION= 1.4.1 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX=v DISTVERSIONSUFFIX=.469-47a90f01 CATEGORIES= multimedia @@ -103,7 +103,7 @@ CEC_DESC= Control plexhometheater over H OPTIONS_DEFAULT= CEC LIRC -CEC_BUILD_DEPENDS= libcec>=2.2.0:multimedia/libcec +CEC_BUILD_DEPENDS= libcec>=3.0.0:multimedia/libcec CEC_LIB_DEPENDS= libcec.so:multimedia/libcec CEC_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_CEC:BOOL=true Added: head/multimedia/plexhometheater/files/patch-xbmc_peripherals_devices_PeripheralCecAdapter.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/plexhometheater/files/patch-xbmc_peripherals_devices_PeripheralCecAdapter.cpp Sat Apr 16 18:03:17 2016 (r413473) @@ -0,0 +1,38 @@ +--- xbmc/peripherals/devices/PeripheralCecAdapter.cpp.orig 2015-05-11 09:54:22 UTC ++++ xbmc/peripherals/devices/PeripheralCecAdapter.cpp +@@ -44,7 +44,7 @@ using namespace ANNOUNCEMENT; + using namespace CEC; + using namespace std; + +-#define CEC_LIB_SUPPORTED_VERSION 0x2100 ++#define CEC_LIB_SUPPORTED_VERSION LIBCEC_VERSION_TO_UINT(3, 0, 0) + + /* time in seconds to ignore standby commands from devices after the screensaver has been activated */ + #define SCREENSAVER_TIMEOUT 10 +@@ -282,7 +282,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->VersionToString(m_configuration.serverVersion).c_str()); + SetVersionInfo(m_configuration); + } + +@@ -295,7 +295,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->VersionToString(configuration.serverVersion).c_str(), configuration.iFirmwareVersion); + + // append firmware build date + if (configuration.iFirmwareBuildDate != CEC_FW_BUILD_UNKNOWN) +@@ -1303,7 +1303,7 @@ void CPeripheralCecAdapter::SetConfigura + void CPeripheralCecAdapter::SetConfigurationFromSettings(void) + { + // client version matches the version of libCEC that we originally used the API from +- m_configuration.clientVersion = CEC_CLIENT_VERSION_2_2_0; ++ m_configuration.clientVersion = LIBCEC_VERSION_TO_UINT(3, 0, 0); + + // device name 'XBMC' + snprintf(m_configuration.strDeviceName, 13, "%s", GetSettingString("device_name").c_str());