From cb795516bfa849905b99371403a2e17ace10d790 Mon Sep 17 00:00:00 2001 From: Po-Chuan Hsieh Date: Fri, 14 Mar 2025 17:38:25 +0800 Subject: [PATCH] multimedia/libcec: Update to 7.0.0 - Update LICENSE_FILE - Bump PORTREVISION of dependent ports for shlib change Changes: https://github.com/Pulse-Eight/libcec/releases --- games/moonlight-embedded-devel/Makefile | 2 +- games/moonlight-embedded/Makefile | 2 +- multimedia/jellyfin-media-player/Makefile | 1 + multimedia/kodi/Makefile | 2 +- multimedia/libcec/Makefile | 5 +- multimedia/libcec/distinfo | 6 +-- .../libcec/files/patch-include_cecloader.h | 20 -------- .../patch-src_libcec_cmake_SetBuildInfo.cmake | 47 ++++++++++++++----- multimedia/libcec/pkg-plist | 4 +- multimedia/py-cec/Makefile | 2 +- 10 files changed, 47 insertions(+), 44 deletions(-) delete mode 100644 multimedia/libcec/files/patch-include_cecloader.h diff --git a/games/moonlight-embedded-devel/Makefile b/games/moonlight-embedded-devel/Makefile index 77727d7511bc..7ef271e88118 100644 --- a/games/moonlight-embedded-devel/Makefile +++ b/games/moonlight-embedded-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= moonlight-embedded-devel DISTVERSION= 2.7.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= https://github.com/armin-25689/moonlight-embedded/releases/download/v${DISTVERSION}/ diff --git a/games/moonlight-embedded/Makefile b/games/moonlight-embedded/Makefile index e58577f4c425..8379e4774e08 100644 --- a/games/moonlight-embedded/Makefile +++ b/games/moonlight-embedded/Makefile @@ -1,6 +1,6 @@ PORTNAME= moonlight-embedded DISTVERSION= 2.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= https://github.com/moonlight-stream/moonlight-embedded/releases/download/v${DISTVERSION}/ diff --git a/multimedia/jellyfin-media-player/Makefile b/multimedia/jellyfin-media-player/Makefile index 1ea0bbfe7376..c79183bec190 100644 --- a/multimedia/jellyfin-media-player/Makefile +++ b/multimedia/jellyfin-media-player/Makefile @@ -1,6 +1,7 @@ PORTNAME= jellyfin-media-player DISTVERSIONPREFIX= v DISTVERSION= 1.11.1 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= bapt@FreeBSD.org diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile index d34fa6feb0a5..48157430df49 100644 --- a/multimedia/kodi/Makefile +++ b/multimedia/kodi/Makefile @@ -1,6 +1,6 @@ PORTNAME= kodi DISTVERSION= 21.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= multimedia java MASTER_SITES= http://mirrors.kodi.tv/build-deps/sources/ DISTFILES= apache-groovy-binary-${GROOVY_VERSION}.zip \ diff --git a/multimedia/libcec/Makefile b/multimedia/libcec/Makefile index 3ff823dd1793..f0d8bcd10e3a 100644 --- a/multimedia/libcec/Makefile +++ b/multimedia/libcec/Makefile @@ -1,7 +1,6 @@ PORTNAME= libcec -PORTVERSION= 6.0.2 +PORTVERSION= 7.0.0 DISTVERSIONPREFIX= libcec- -PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= sunpoet@FreeBSD.org @@ -10,7 +9,7 @@ WWW= https://libcec.pulse-eight.com/ \ https://github.com/Pulse-Eight/libcec LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_FILE= ${WRKSRC}/LICENSE.md LIB_DEPENDS= libp8-platform.so:devel/p8-platform diff --git a/multimedia/libcec/distinfo b/multimedia/libcec/distinfo index e2a713c05ae1..52ddeb2fcb77 100644 --- a/multimedia/libcec/distinfo +++ b/multimedia/libcec/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1595416529 -SHA256 (Pulse-Eight-libcec-libcec-6.0.2_GH0.tar.gz) = 090696d7a4fb772d7acebbb06f91ab92e025531c7c91824046b9e4e71ecb3377 -SIZE (Pulse-Eight-libcec-libcec-6.0.2_GH0.tar.gz) = 355807 +TIMESTAMP = 1740836028 +SHA256 (Pulse-Eight-libcec-libcec-7.0.0_GH0.tar.gz) = 7f9e57ae9fad37649adb6749b8f1310a71ccf3e92ae8b2d1cc9e8ae2d1da83f8 +SIZE (Pulse-Eight-libcec-libcec-7.0.0_GH0.tar.gz) = 362134 diff --git a/multimedia/libcec/files/patch-include_cecloader.h b/multimedia/libcec/files/patch-include_cecloader.h deleted file mode 100644 index 2f20942ce83b..000000000000 --- a/multimedia/libcec/files/patch-include_cecloader.h +++ /dev/null @@ -1,20 +0,0 @@ ---- include/cecloader.h.orig 2020-07-13 10:18:33 UTC -+++ include/cecloader.h -@@ -172,7 +172,7 @@ bool LibCecBootloader(const char *strLib = NULL) - if (!g_libCEC) - { - std::cout << dlerror() << std::endl; -- return NULL; -+ return false; - } - } - -@@ -181,7 +181,7 @@ bool LibCecBootloader(const char *strLib = NULL) - if (!LibCecBootloader) - { - std::cout << "cannot find CECStartBootloader" << std::endl; -- return NULL; -+ return false; - } - - bool bReturn = LibCecBootloader(); diff --git a/multimedia/libcec/files/patch-src_libcec_cmake_SetBuildInfo.cmake b/multimedia/libcec/files/patch-src_libcec_cmake_SetBuildInfo.cmake index 96a28ba1b5b4..776c896c46bc 100644 --- a/multimedia/libcec/files/patch-src_libcec_cmake_SetBuildInfo.cmake +++ b/multimedia/libcec/files/patch-src_libcec_cmake_SetBuildInfo.cmake @@ -1,13 +1,36 @@ ---- src/libcec/cmake/SetBuildInfo.cmake.orig 2018-12-21 21:34:45 UTC +--- src/libcec/cmake/SetBuildInfo.cmake.orig 2025-02-26 09:40:16 UTC +++ src/libcec/cmake/SetBuildInfo.cmake -@@ -15,10 +15,6 @@ else() - - # 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}/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() +@@ -34,7 +34,7 @@ else() + set(BUILD_USER "(reproducible)") + else() + if(HAVE_WHOAMI_BIN) +- execute_process(COMMAND bash -c "whoami" OUTPUT_VARIABLE BUILD_USER) ++ execute_process(COMMAND sh -c "whoami" OUTPUT_VARIABLE BUILD_USER) + string(STRIP ${BUILD_USER} BUILD_USER) + set(LIB_INFO "${LIB_INFO} by ${BUILD_USER}") + else() +@@ -48,9 +48,9 @@ else() + else() + find_program(HAVE_HOSTNAME_BIN hostname /bin /usr/bin /usr/local/bin) + if(HAVE_HOSTNAME_BIN) +- execute_process(COMMAND bash -c "hostname" ARGS -f OUTPUT_VARIABLE BUILD_HOST RESULT_VARIABLE RETURN_HOST) ++ execute_process(COMMAND sh -c "hostname" ARGS -f OUTPUT_VARIABLE BUILD_HOST RESULT_VARIABLE RETURN_HOST) + if (RETURN_HOST) +- execute_process(COMMAND bash -c "hostname" OUTPUT_VARIABLE BUILD_HOST) ++ execute_process(COMMAND sh -c "hostname" OUTPUT_VARIABLE BUILD_HOST) + endif() + string(STRIP ${BUILD_HOST} BUILD_HOST) + set(LIB_INFO "${LIB_INFO}@${BUILD_HOST}") +@@ -60,9 +60,9 @@ else() + # add host info on which this was built to compile info + find_program(HAVE_UNAME_BIN uname /bin /usr/bin /usr/local/bin) + if(HAVE_UNAME_BIN) +- execute_process(COMMAND bash -c "uname" ARGS -s OUTPUT_VARIABLE BUILD_SYSNAME) +- execute_process(COMMAND bash -c "uname" ARGS -r OUTPUT_VARIABLE BUILD_SYSVER) +- execute_process(COMMAND bash -c "uname" ARGS -m OUTPUT_VARIABLE BUILD_SYSARCH) ++ execute_process(COMMAND sh -c "uname" ARGS -s OUTPUT_VARIABLE BUILD_SYSNAME) ++ execute_process(COMMAND sh -c "uname" ARGS -r OUTPUT_VARIABLE BUILD_SYSVER) ++ execute_process(COMMAND sh -c "uname" ARGS -m OUTPUT_VARIABLE BUILD_SYSARCH) + string(STRIP ${BUILD_SYSNAME} BUILD_SYSNAME) + string(STRIP ${BUILD_SYSVER} BUILD_SYSVER) + string(STRIP ${BUILD_SYSARCH} BUILD_SYSARCH) diff --git a/multimedia/libcec/pkg-plist b/multimedia/libcec/pkg-plist index e5785c2c8787..c97b8450a8f7 100644 --- a/multimedia/libcec/pkg-plist +++ b/multimedia/libcec/pkg-plist @@ -10,8 +10,8 @@ include/libcec/cecloader.h include/libcec/cectypes.h include/libcec/version.h lib/libcec.so -lib/libcec.so.6 +lib/libcec.so.7 lib/libcec.so.%%PORTVERSION%% -%%PYTHON%%%%PYTHON_SITELIBDIR%%/_cec.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/_pycec.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/cec.py libdata/pkgconfig/libcec.pc diff --git a/multimedia/py-cec/Makefile b/multimedia/py-cec/Makefile index e3892e409be0..4e437ec0b82d 100644 --- a/multimedia/py-cec/Makefile +++ b/multimedia/py-cec/Makefile @@ -1,6 +1,6 @@ PORTNAME= cec PORTVERSION= 0.2.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}