From nobody Fri Nov 01 00:44:10 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XfhvG5ypwz5bFTM; Fri, 01 Nov 2024 00:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XfhvG5VSJz4G8T; Fri, 1 Nov 2024 00:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730421850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5P1qIUpdEHrmKuLEDA0r+lxdgdRPtVOFPf04mG3ct38=; b=eLxGZnjU7uMYCWCyj+pxtlpOyuYFAr2Ei6YCjop8TBR3yxAOpcsK7HKVZ/67LG9XMKu1Hg E5AJIQDjs4+qrDEArJ58kLBvvWiqvj6P8JFYBGs6fmbBSMCQ8MPkBrrJrrPtb+NjkjAawk HwiFzrguf8HMAP44HiIU523vZw6x291Aijk7Uo7I5kkjiDOaTf5bPhWd9UHhSPywSa2h+B 3WcyNLbMbl7sz7JjZ3HMyC6jsmD9zYAzNJb1AqJD8IB25lULmixD7vO4MqxI7ACspZvG2R j2jnB6HCQqFOAsL2EO5vhxlmwdph1P8PeIK9KWGnbWYQ8RC+//KHFtxv7LLPsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730421850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5P1qIUpdEHrmKuLEDA0r+lxdgdRPtVOFPf04mG3ct38=; b=loEfD3IHiWC/8DmApEfqgencaZgiZH8AzOWxnE/oug7BoXQ8RRvm1+nhxwmRgowqC2SSwd KP8wybdfawrwrmUdjgjvmgJVsTXsI08ueMuBL3G9ICkJk9bKGGRy8D9GgleNQHEJ2+tO6o KVRuSH9DlW81EeT8+r3TkaLPSSAqRFc5mzTzsaSFZ591xzRziXVZJtUA27nTXlWAAwofMR kDf5jUeqSxOvrbj9/Tg3FO6m0/tnjKa+ogYKhm/goM0elJk0FpqOAB4vF9uOsfgBLWABLm 9uu9icq2+gVq9q1uamVM9vRkd9fQZje+Mt8T/JWPzXq2qjFRzmiFpBbgI7xPHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730421850; a=rsa-sha256; cv=none; b=XSKUx5wJ9A7wK9mIPNGT/jAwgDMWxfebgcZS1WvNZFWQSKsCMC8wl/nh/Dfr+F+dJsCIDN A7+rbRE90e0sd/7rP6vfPQwCnVHjVpMRo19MWbPSBmuRgXcaDpjZZTXGUVtR6OYoLXKBS8 AgSvdGuhboU5Gd5WyOVpbZMC2RfA0zLlIjO038Foh0fHGGaXAXRLjvfcJewJlCCYJow/5/ pd13YHewP7sOorwiqjvWsXVs6B8v7Vy+TXpc0hpXqDfWbLbKbwE+E3i4stxcRh5haHnCS/ qphrw+ne0BBOeqdCf+r0GybvpsHs3sKuO7qGPltEutfzUXCDJZ8/vk3FoXl8FA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XfhvG566pzyRD; Fri, 1 Nov 2024 00:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A10iA93052463; Fri, 1 Nov 2024 00:44:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A10iATw052460; Fri, 1 Nov 2024 00:44:10 GMT (envelope-from git) Date: Fri, 1 Nov 2024 00:44:10 GMT Message-Id: <202411010044.4A10iATw052460@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: df20ad1be59e - main - multimedia/vid.stab: Update to 1.1.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df20ad1be59e0cc30f9aa55c2e2ec5d456b73987 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=df20ad1be59e0cc30f9aa55c2e2ec5d456b73987 commit df20ad1be59e0cc30f9aa55c2e2ec5d456b73987 Author: Jason E. Hale AuthorDate: 2024-10-31 23:52:02 +0000 Commit: Jason E. Hale CommitDate: 2024-10-31 23:59:18 +0000 multimedia/vid.stab: Update to 1.1.1 - Take maintainership - Use pathfix instead of custom replacement - Fix CPU instruction set detection --- multimedia/vid.stab/Makefile | 21 +++---- multimedia/vid.stab/distinfo | 5 +- .../files/patch-CMakeModules_FindSSE.cmake | 70 +++++++++++----------- multimedia/vid.stab/pkg-plist | 2 +- 4 files changed, 48 insertions(+), 50 deletions(-) diff --git a/multimedia/vid.stab/Makefile b/multimedia/vid.stab/Makefile index e34d7e95f31c..e8c57824d64b 100644 --- a/multimedia/vid.stab/Makefile +++ b/multimedia/vid.stab/Makefile @@ -1,25 +1,22 @@ PORTNAME= vid.stab -PORTVERSION= 0.98.2 +DISTVERSIONPREFIX= v +DISTVERSION= 1.1.1 CATEGORIES= multimedia -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jhale@FreeBSD.org COMMENT= Video stabilization library WWW= http://public.hronopik.de/vid.stab/ -LICENSE= GPLv2 GPLv3 -LICENSE_COMB= dual - -PORTSCOUT= skipv:before_complex_transforms +LICENSE= GPLv2+ +USES= cmake pathfix +PATHFIX_CMAKELISTSTXT= create_pkgconfig_file.cmake USE_GITHUB= yes GH_ACCOUNT= georgmartius -GH_TAGNAME= release-0.98b - -USES= cmake USE_LDCONFIG= yes -pre-configure: - @${REINPLACE_CMD} -e 's,lib$${LIB_SUFFIX}/pkgconfig,libdata/pkgconfig,' \ - ${WRKSRC}/CMakeModules/create_pkgconfig_file.cmake +CMAKE_ARGS= -DCPUINFO:STRING="${MACHINE_CPU}" + +PORTSCOUT= skipv:before_complex_transforms .include diff --git a/multimedia/vid.stab/distinfo b/multimedia/vid.stab/distinfo index 6545cf17e130..82dc4dbaf22b 100644 --- a/multimedia/vid.stab/distinfo +++ b/multimedia/vid.stab/distinfo @@ -1,2 +1,3 @@ -SHA256 (georgmartius-vid.stab-0.98.2-release-0.98b_GH0.tar.gz) = 530f0bf7479ec89d9326af3a286a15d7d6a90fcafbb641e3b8bdb8d05637d025 -SIZE (georgmartius-vid.stab-0.98.2-release-0.98b_GH0.tar.gz) = 73582 +TIMESTAMP = 1730363156 +SHA256 (georgmartius-vid.stab-v1.1.1_GH0.tar.gz) = 9001b6df73933555e56deac19a0f225aae152abbc0e97dc70034814a1943f3d4 +SIZE (georgmartius-vid.stab-v1.1.1_GH0.tar.gz) = 80717 diff --git a/multimedia/vid.stab/files/patch-CMakeModules_FindSSE.cmake b/multimedia/vid.stab/files/patch-CMakeModules_FindSSE.cmake index b28220296b6d..d9dcbea59a93 100644 --- a/multimedia/vid.stab/files/patch-CMakeModules_FindSSE.cmake +++ b/multimedia/vid.stab/files/patch-CMakeModules_FindSSE.cmake @@ -1,39 +1,39 @@ ---- CMakeModules/FindSSE.cmake.orig 2014-03-12 19:42:49 UTC +--- CMakeModules/FindSSE.cmake.orig 2022-05-30 15:49:01 UTC +++ CMakeModules/FindSSE.cmake -@@ -40,6 +40,36 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux") - ELSE (SSE41_TRUE) - set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host") - ENDIF (SSE41_TRUE) -+ELSEIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") -+ EXEC_PROGRAM(make ARGS "-V MACHINE_CPU" OUTPUT_VARIABLE CPUINFO) +@@ -1,10 +1,32 @@ include(CheckCCompilerFlag) + # Check if SSE instructions are available by the compiler and target platform (be aware of cross compilation) + include(CheckCCompilerFlag) + +-check_c_compiler_flag(-msse2 HAVE_SSE2) +-check_c_compiler_flag(-msse3 HAVE_SSE3) +-check_c_compiler_flag(-mssse3 HAVE_SSSE3) +-check_c_compiler_flag(-msse4.1 HAVE_SSE4_1) ++if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") ++ string(REGEX MATCH "sse2" FREEBSD_SSE2 ${CPUINFO}) ++ if(FREEBSD_SSE2) ++ check_c_compiler_flag(-msse2 HAVE_SSE2) ++ endif() + -+ STRING(REGEX MATCH "(^|[^s])sse2" SSE2_TRUE ${CPUINFO}) -+ IF (SSE2_TRUE) -+ set(SSE2_FOUND true CACHE BOOL "SSE2 available on host") -+ ELSE (SSE2_TRUE) -+ set(SSE2_FOUND false CACHE BOOL "SSE2 available on host") -+ ENDIF (SSE2_TRUE) ++ string(REGEX MATCH "(^|[^s])sse3" FREEBSD_SSE3 ${CPUINFO}) ++ if(FREEBSD_SSE3) ++ check_c_compiler_flag(-msse3 HAVE_SSE3) ++ endif() + -+ STRING(REGEX MATCH "(^|[^s])sse3" SSE3_TRUE ${CPUINFO}) -+ IF (SSE3_TRUE) -+ set(SSE3_FOUND true CACHE BOOL "SSE3 available on host") -+ ELSE (SSE3_TRUE) -+ set(SSE3_FOUND false CACHE BOOL "SSE3 available on host") -+ ENDIF (SSE3_TRUE) ++ string(REGEX MATCH "ssse3" FREEBSD_SSSE3 ${CPUINFO}) ++ if(FREEBSD_SSSE3) ++ check_c_compiler_flag(-mssse3 HAVE_SSSE3) ++ endif() + -+ STRING(REGEX MATCH "ssse3" SSSE3_TRUE ${CPUINFO}) -+ IF (SSSE3_TRUE) -+ set(SSSE3_FOUND true CACHE BOOL "SSSE3 available on host") -+ ELSE (SSSE3_TRUE) -+ set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host") -+ ENDIF (SSSE3_TRUE) -+ -+ STRING(REGEX MATCH "sse41" SSE41_TRUE ${CPUINFO}) -+ IF (SSE41_TRUE) -+ set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host") -+ ELSE (SSE41_TRUE) -+ set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host") -+ ENDIF (SSE41_TRUE) - ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Darwin") - EXEC_PROGRAM("/usr/sbin/sysctl -n machdep.cpu.features" OUTPUT_VARIABLE - CPUINFO) ++ string(REGEX MATCH "sse41" FREEBSD_SSE41 ${CPUINFO}) ++ if(FREEBSD_SSE41) ++ check_c_compiler_flag(-msse4.1 HAVE_SSE4_1) ++ endif() ++else() ++ check_c_compiler_flag(-msse2 HAVE_SSE2) ++ check_c_compiler_flag(-msse3 HAVE_SSE3) ++ check_c_compiler_flag(-mssse3 HAVE_SSSE3) ++ check_c_compiler_flag(-msse4.1 HAVE_SSE4_1) ++endif() + + # Some compilers understand SSE flags, even when target platform doesn't support it (Clang with arm target) + # It is necessary try to compile actual code diff --git a/multimedia/vid.stab/pkg-plist b/multimedia/vid.stab/pkg-plist index 90cefc4efbe5..b13e2086e804 100644 --- a/multimedia/vid.stab/pkg-plist +++ b/multimedia/vid.stab/pkg-plist @@ -15,5 +15,5 @@ include/vid.stab/transformtype_operations.h include/vid.stab/vidstabdefines.h include/vid.stab/vsvector.h lib/libvidstab.so -lib/libvidstab.so.0.9 +lib/libvidstab.so.1.2 libdata/pkgconfig/vidstab.pc