Index: head/multimedia/libcec/Makefile =================================================================== --- head/multimedia/libcec/Makefile (revision 437674) +++ head/multimedia/libcec/Makefile (revision 437675) @@ -1,61 +1,64 @@ # Created by: Manuel Creach # $FreeBSD$ PORTNAME= libcec -PORTVERSION= 3.1.0 -PORTREVISION= 1 +PORTVERSION= 4.0.2 DISTVERSIONPREFIX= ${PORTNAME}- CATEGORIES= multimedia MAINTAINER= manuel.creach@icloud.com COMMENT= Library to control Pulse-Eight's HDMI-CEC adapter LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libp8-platform.so:devel/p8-platform USE_GITHUB= yes GH_ACCOUNT= Pulse-Eight -USES= alias cmake compiler:c++11-lib pkgconfig +USES= alias cmake compiler:c++11-lib pkgconfig shebangfix +SHEBANG_FILES= src/pyCecClient/pyCecClient.py USE_LDCONFIG= yes CMAKE_ARGS= -DCMAKE_REQUIRED_INCLUDES:PATH="${LOCALBASE}/include" \ -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" +PLIST_SUB= PORTVERSION="${PORTVERSION}" \ + PORTVERSION_MAJOR="${PORTVERSION:C/([0-9]).*/\1/1}" + OPTIONS_DEFINE= PYTHON X11 OPTIONS_DEFAULT= PYTHON X11 OPTIONS_DEFINE_armv6= RPI OPTIONS_DEFAULT_armv6= OPTIONS_SUB= yes PYTHON_DESC= build python wrapper PYTHON_BUILD_DEPENDS+= swig3.0:devel/swig30 RPI_DESC= build libcec support for raspberrypi RPI_CMAKE_ON= -DRPI_INCLUDE_DIR=${LOCALBASE}/include -DRPI_LIB_DIR=${LOCALBASE}/lib RPI_LIB_DEPENDS= libbcm_host.so:misc/raspberrypi-userland .include .if ${PORT_OPTIONS:MPYTHON} USES+= python:build .else CMAKE_ARGS+= -DSKIP_PYTHON_WRAPPER:BOOL=true .endif .if ${PORT_OPTIONS:MX11} USE_XORG= x11 xproto xrandr .endif post-patch: @${REINPLACE_CMD} 's|$${GIT_REVISION}|${PORTVERSION}|g' \ ${WRKSRC}/src/libcec/cmake/SetBuildInfo.cmake @${REINPLACE_CMD} -e '/SOVERSION/ s|\.0||' \ - -e 's|$${CMAKE_INSTALL_LIBDIR_NOARCH}/pkgconfig|libdata/pkgconfig|' \ + -e 's|$${CMAKE_INSTALL_LIBDIR}/pkgconfig|libdata/pkgconfig|' \ ${WRKSRC}/src/libcec/CMakeLists.txt .if ! ${PORT_OPTIONS:MPYTHON} @${REINPLACE_CMD} '/pyCecClient/d' \ ${WRKSRC}/CMakeLists.txt .endif .include Index: head/multimedia/libcec/distinfo =================================================================== --- head/multimedia/libcec/distinfo (revision 437674) +++ head/multimedia/libcec/distinfo (revision 437675) @@ -1,2 +1,3 @@ -SHA256 (Pulse-Eight-libcec-libcec-3.1.0_GH0.tar.gz) = 09109d21a1b03f42c9e341d12600f2e4c41038d640269fa75408e2d36126f921 -SIZE (Pulse-Eight-libcec-libcec-3.1.0_GH0.tar.gz) = 1097121 +TIMESTAMP = 1485708686 +SHA256 (Pulse-Eight-libcec-libcec-4.0.2_GH0.tar.gz) = b8b8dd31f3ebdd5472f03ab7d401600ea0d959b1288b9ca24bf457ef60e2ba27 +SIZE (Pulse-Eight-libcec-libcec-4.0.2_GH0.tar.gz) = 334995 Index: head/multimedia/libcec/files/patch-src_libcec_cmake_SetBuildInfo.cmake =================================================================== --- head/multimedia/libcec/files/patch-src_libcec_cmake_SetBuildInfo.cmake (revision 437674) +++ head/multimedia/libcec/files/patch-src_libcec_cmake_SetBuildInfo.cmake (revision 437675) @@ -1,17 +1,18 @@ ---- src/libcec/cmake/SetBuildInfo.cmake.orig 2016-01-20 00:52:02 UTC +--- src/libcec/cmake/SetBuildInfo.cmake.orig 2017-01-28 22:51:30 UTC +++ src/libcec/cmake/SetBuildInfo.cmake @@ -14,14 +14,7 @@ else() set(LIB_INFO "") # add git revision to compile info - find_program(HAVE_GIT_BIN git /bin /usr/bin /usr/local/bin) - if(HAVE_GIT_BIN) -- exec_program(${CMAKE_CURRENT_SOURCE_DIR}/../../support/git-rev.sh HEAD OUTPUT_VARIABLE GIT_REVISION) +- exec_program(${CMAKE_CURRENT_SOURCE_DIR}/cmake/git-rev.sh HEAD OUTPUT_VARIABLE GIT_REVISION) - message(STATUS "git found: ${GIT_REVISION}") - endif() - if (GIT_REVISION) - set(LIB_INFO "git revision: ${GIT_REVISION},") +- set(LIB_INFO "git revision: ${GIT_REVISION},") - endif() ++ set(LIB_INFO "git revision: 4.0.2,") # add compilation date to compile info find_program(HAVE_DATE_BIN date /bin /usr/bin /usr/local/bin) Index: head/multimedia/libcec/pkg-plist =================================================================== --- head/multimedia/libcec/pkg-plist (revision 437674) +++ head/multimedia/libcec/pkg-plist (revision 437675) @@ -1,16 +1,16 @@ bin/cec-client -bin/cec-client-3.1.0 +bin/cec-client-%%PORTVERSION%% bin/cecc-client -bin/cecc-client-3.1.0 -%%PYTHON%%bin/pyCecClient.py +bin/cecc-client-%%PORTVERSION%% +%%PYTHON%%bin/pyCecClient include/libcec/cec.h include/libcec/cecc.h include/libcec/cecloader.h include/libcec/cectypes.h include/libcec/version.h lib/libcec.so -lib/libcec.so.3 -lib/libcec.so.3.1.0 -%%PYTHON%%%%PYTHON_LIBDIR%%/dist-packages/cec/__init__.py -%%PYTHON%%%%PYTHON_LIBDIR%%/dist-packages/cec/_cec.so +lib/libcec.so.%%PORTVERSION_MAJOR%% +lib/libcec.so.%%PORTVERSION%% +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cec/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cec/_cec.so libdata/pkgconfig/libcec.pc