Date: Mon, 20 Jan 2020 20:09:45 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r523652 - in head/multimedia/libcec: . files Message-ID: <202001202009.00KK9jJi092232@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Mon Jan 20 20:09:45 2020 New Revision: 523652 URL: https://svnweb.freebsd.org/changeset/ports/523652 Log: Fix hardcoded version in src/libcec/cmake/SetBuildInfo.cmake patch - Use USES=pathfix - Convert to options helper - Sort PLIST - Take maintainership Modified: head/multimedia/libcec/Makefile head/multimedia/libcec/files/patch-src_libcec_cmake_SetBuildInfo.cmake head/multimedia/libcec/pkg-plist Modified: head/multimedia/libcec/Makefile ============================================================================== --- head/multimedia/libcec/Makefile Mon Jan 20 20:09:39 2020 (r523651) +++ head/multimedia/libcec/Makefile Mon Jan 20 20:09:45 2020 (r523652) @@ -3,11 +3,11 @@ PORTNAME= libcec PORTVERSION= 4.0.4 +DISTVERSIONPREFIX= libcec- PORTREVISION= 1 -DISTVERSIONPREFIX= ${PORTNAME}- CATEGORIES= multimedia -MAINTAINER= ports@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Library to control Pulse-Eight's HDMI-CEC adapter LICENSE= GPLv2 @@ -15,20 +15,23 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libp8-platform.so:devel/p8-platform +USES= alias cmake compiler:c++11-lib pathfix pkgconfig shebangfix + +CMAKE_ARGS= -DCMAKE_REQUIRED_INCLUDES=${LOCALBASE}/include \ + -DCMAKE_REQUIRED_FLAGS=-L${LOCALBASE}/lib \ + -DGIT_REVISION=libcec-${PORTVERSION} +USE_LDCONFIG= yes + +PLIST_SUB= PORTVERSION=${PORTVERSION} \ + PORTVERSION_MAJOR=${PORTVERSION:C/([0-9]).*/\1/1} + USE_GITHUB= yes GH_ACCOUNT= Pulse-Eight -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_DEFAULT=PYTHON X11 OPTIONS_DEFINE_armv6= RPI OPTIONS_DEFAULT_armv6= RPI OPTIONS_EXCLUDE_armv6= X11 @@ -36,35 +39,18 @@ OPTIONS_DEFINE_armv7= RPI OPTIONS_DEFAULT_armv7= RPI OPTIONS_EXCLUDE_armv7= X11 OPTIONS_SUB= yes +PYTHON_DESC= Build python wrapper +RPI_DESC= Build libcec support for Raspberry Pi -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 +PYTHON_BUILD_DEPENDS= swig3.0:devel/swig30 +PYTHON_CMAKE_BOOL_OFF= SKIP_PYTHON_WRAPPER +PYTHON_USES= python:build +RPI_CMAKE_ON= -DRPI_INCLUDE_DIR=${LOCALBASE}/include -DRPI_LIB_DIR=${LOCALBASE}/lib RPI_LIB_DEPENDS= libbcm_host.so:misc/raspberrypi-userland +X11_USE_OFF= XORG=x11,xorgproto,xrandr +X11_USES_OFF= xorg -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MPYTHON} -USES+= python:build -.else -CMAKE_ARGS+= -DSKIP_PYTHON_WRAPPER:BOOL=true -.endif - -.if ${PORT_OPTIONS:MX11} -USES+= xorg -USE_XORG= x11 xorgproto 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}/pkgconfig|libdata/pkgconfig|' \ - ${WRKSRC}/src/libcec/CMakeLists.txt -.if ! ${PORT_OPTIONS:MPYTHON} - @${REINPLACE_CMD} '/pyCecClient/d' \ - ${WRKSRC}/CMakeLists.txt -.endif +post-patch-PYTHON-off: + @${REINPLACE_CMD} '/pyCecClient/d' ${WRKSRC}/CMakeLists.txt .include <bsd.port.mk> Modified: head/multimedia/libcec/files/patch-src_libcec_cmake_SetBuildInfo.cmake ============================================================================== --- head/multimedia/libcec/files/patch-src_libcec_cmake_SetBuildInfo.cmake Mon Jan 20 20:09:39 2020 (r523651) +++ head/multimedia/libcec/files/patch-src_libcec_cmake_SetBuildInfo.cmake Mon Jan 20 20:09:45 2020 (r523652) @@ -1,18 +1,13 @@ ---- src/libcec/cmake/SetBuildInfo.cmake.orig 2017-01-28 22:51:30 UTC +--- src/libcec/cmake/SetBuildInfo.cmake.orig 2018-12-21 21:34:45 UTC +++ src/libcec/cmake/SetBuildInfo.cmake -@@ -14,14 +14,7 @@ else() - set(LIB_INFO "") +@@ -15,10 +15,6 @@ else() # add git revision to compile info -- find_program(HAVE_GIT_BIN git /bin /usr/bin /usr/local/bin) + find_program(HAVE_GIT_BIN git /bin /usr/bin /usr/local/bin) - if(HAVE_GIT_BIN) - 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},") -- endif() -+ set(LIB_INFO "git revision: 4.0.4,") - - # add compilation date to compile info - find_program(HAVE_DATE_BIN date /bin /usr/bin /usr/local/bin) + if (GIT_REVISION) + set(LIB_INFO "git revision: ${GIT_REVISION},") + endif() Modified: head/multimedia/libcec/pkg-plist ============================================================================== --- head/multimedia/libcec/pkg-plist Mon Jan 20 20:09:39 2020 (r523651) +++ head/multimedia/libcec/pkg-plist Mon Jan 20 20:09:45 2020 (r523652) @@ -5,13 +5,13 @@ bin/cecc-client-%%PORTVERSION%% %%PYTHON%%bin/pyCecClient include/libcec/cec.h include/libcec/cecc.h -include/libcec/cecloader.h include/libcec/ceccloader.h +include/libcec/cecloader.h include/libcec/cectypes.h include/libcec/version.h lib/libcec.so lib/libcec.so.%%PORTVERSION_MAJOR%% lib/libcec.so.%%PORTVERSION%% -%%PYTHON%%%%PYTHON_SITELIBDIR%%/cec.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/_cec.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/cec.py libdata/pkgconfig/libcec.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001202009.00KK9jJi092232>