commit: a15140358eb3abce4b784f83877860449fea4536 Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com> AuthorDate: Sun Mar 23 17:14:49 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Apr 12 20:57:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1514035
media-libs/vidstab: add 1.1.1_p20240615 Version bump to include long-awaited bugfix Folded actual seds into the patch that fixes build with CMake4 Also in same patch allowed building with modern C - there's no errors Removed USE=test and RESTRICT - tests now have no dependency on orc and should be run with just FEATURE=test Closes: https://bugs.gentoo.org/951900 Closes: https://bugs.gentoo.org/927886 Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com> Closes: https://github.com/gentoo/gentoo/pull/41243 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/vidstab/Manifest | 1 + .../files/vidstab-1.1.1_p20240615-cmake4.patch | 68 ++++++++++++++++++++++ media-libs/vidstab/vidstab-1.1.1_p20240615.ebuild | 54 +++++++++++++++++ 3 files changed, 123 insertions(+) diff --git a/media-libs/vidstab/Manifest b/media-libs/vidstab/Manifest index ba36a164a3e6..8a7c4c6fedcd 100644 --- a/media-libs/vidstab/Manifest +++ b/media-libs/vidstab/Manifest @@ -1 +1,2 @@ DIST vidstab-1.1.1.tar.gz 80717 BLAKE2B e2ce03d24358404c617816466ad3fd715999ef4d391617e9cec7923353ba2ce4ac3b3eedce67f3fadf3bd6fdfb2e4516a5b95c3fca9f613e367b1490ec78ae0a SHA512 b27ac95ab5302e9500af5a52cb09f557b9dacbdc4dc57a9781e2f9ae65a6ffea396f9819bca1f6a103f9d1896bf3061f1cb647166b14b8de8e89a1b15f010e5c +DIST vidstab-1.1.1_p20240615.tar.gz 130387 BLAKE2B 44be983d876ee6a8fb6fa109de1a8f4bdb245da91dacab61d0f7094f14cd1841cd72b7a1b05c26490fda7560de1adc3ec8f7d8363223fda0eef4f411d9d48a8b SHA512 1eede71abe0d116f4692b455b90740772afb4f7511e33417145920ee7224b9778887ccc0cfeb06e9b9a85b8c3bb900ca4b24ab788b066cd1131c16603e176afd diff --git a/media-libs/vidstab/files/vidstab-1.1.1_p20240615-cmake4.patch b/media-libs/vidstab/files/vidstab-1.1.1_p20240615-cmake4.patch new file mode 100644 index 000000000000..3ba49d0d163b --- /dev/null +++ b/media-libs/vidstab/files/vidstab-1.1.1_p20240615-cmake4.patch @@ -0,0 +1,68 @@ +diff '--color=auto' -ru vid.stab-8dff7ad3c10ac663745f2263037f6e42b993519c.old/CMakeLists.txt vid.stab-8dff7ad3c10ac663745f2263037f6e42b993519c/CMakeLists.txt +--- vid.stab-8dff7ad3c10ac663745f2263037f6e42b993519c.old/CMakeLists.txt 2025-03-23 20:06:53.533932957 +0300 ++++ vid.stab-8dff7ad3c10ac663745f2263037f6e42b993519c/CMakeLists.txt 2025-03-23 20:09:54.292559246 +0300 +@@ -1,9 +1,8 @@ +-cmake_minimum_required (VERSION 2.8.5) ++cmake_minimum_required (VERSION 3.5) + project (vid.stab C) + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules/") + +-include (FindSSE) + include (GNUInstallDirs) + # include (ExternalProject) # There must be a nicer way to include this + # include (sse2neon) +@@ -24,8 +23,6 @@ + + option(USE_OMP "use parallelization use OMP" ON) + +-set(CMAKE_C_STANDARD 99) +- + add_definitions(-Wall -Wno-pointer-sign) + + if(NOT WIN32) +diff '--color=auto' -ru vid.stab-8dff7ad3c10ac663745f2263037f6e42b993519c.old/tests/CMakeLists.txt vid.stab-8dff7ad3c10ac663745f2263037f6e42b993519c/tests/CMakeLists.txt +--- vid.stab-8dff7ad3c10ac663745f2263037f6e42b993519c.old/tests/CMakeLists.txt 2025-03-23 20:06:53.533426954 +0300 ++++ vid.stab-8dff7ad3c10ac663745f2263037f6e42b993519c/tests/CMakeLists.txt 2025-03-23 20:08:38.123424293 +0300 +@@ -2,13 +2,11 @@ + # very fast: faster than orc code at imgcompare without any options. + # library needs libimf.so (link statically?) + +-cmake_minimum_required (VERSION 2.6) ++cmake_minimum_required (VERSION 3.5) + project (vid.stab) + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../CMakeModules/") + +-include (FindSSE) +- + option(USE_OMP "use parallelization use OMP" ON) + + # Default to debug builds if no explicit build type specified. +@@ -16,7 +14,7 @@ + #_cmake_modify_IGNORE set(CMAKE_BUILD_TYPE "Debug") + endif() + +-add_definitions(-Wall -Wno-pointer-sign -DTESTING -std=gnu99) ++add_definitions(-Wall -Wno-pointer-sign -DTESTING) + + if(SSE2_FOUND) + add_definitions( -DUSE_SSE2 -msse2 -ffast-math -fno-show-column ) # -DUSE_SSE2_ASM +diff '--color=auto' -ru vid.stab-8dff7ad3c10ac663745f2263037f6e42b993519c.old/transcode/CMakeLists.txt vid.stab-8dff7ad3c10ac663745f2263037f6e42b993519c/transcode/CMakeLists.txt +--- vid.stab-8dff7ad3c10ac663745f2263037f6e42b993519c.old/transcode/CMakeLists.txt 2025-03-23 20:06:53.533932957 +0300 ++++ vid.stab-8dff7ad3c10ac663745f2263037f6e42b993519c/transcode/CMakeLists.txt 2025-03-23 20:09:17.748219962 +0300 +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 2.6) ++cmake_minimum_required (VERSION 3.5) + project (vid.stab.transcode) + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../CMakeModules/") +@@ -11,7 +11,7 @@ + #_cmake_modify_IGNORE set(CMAKE_BUILD_TYPE "Release") + endif() + +-add_definitions(-Wall -Wno-pointer-sign -DTRANSCODE -std=gnu99) ++add_definitions(-Wall -Wno-pointer-sign -DTRANSCODE) + + # here we should check for SSE2 + # our -DUSE_SSE2_ASM code does not work with fpic diff --git a/media-libs/vidstab/vidstab-1.1.1_p20240615.ebuild b/media-libs/vidstab/vidstab-1.1.1_p20240615.ebuild new file mode 100644 index 000000000000..bd21915d864b --- /dev/null +++ b/media-libs/vidstab/vidstab-1.1.1_p20240615.ebuild @@ -0,0 +1,54 @@ +# Copyright 2018-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib toolchain-funcs flag-o-matic + +DESCRIPTION="Video stabilization library" +HOMEPAGE="http://public.hronopik.de/vid.stab/"; + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/georgmartius/vid.stab.git"; + inherit git-r3 +else + COMMIT="8dff7ad3c10ac663745f2263037f6e42b993519c" + SRC_URI="https://github.com/georgmartius/vid.stab/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + S="${WORKDIR}/vid.stab-${COMMIT}" +fi + +LICENSE="GPL-2+" +SLOT="0" +IUSE="openmp cpu_flags_x86_sse2" + +PATCHES=( "${FILESDIR}/${P}-cmake4.patch" ) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_configure() { + local mycmakeargs=( + -DUSE_OMP="$(usex openmp)" + -DSSE2_FOUND="$(usex cpu_flags_x86_sse2)" + ) + cmake-multilib_src_configure +} + +multilib_src_test() { + local mycmakeargs=( + -DUSE_OMP="$(usex openmp)" + -DSSE2_FOUND="$(usex cpu_flags_x86_sse2)" + ) + append-cflags $(test-flags-CC -fopenmp) + local CMAKE_USE_DIR="${CMAKE_USE_DIR}/tests" + local BUILD_DIR="${BUILD_DIR}/tests" + cmake_src_configure + cmake_build + "${BUILD_DIR}"/tests || die +}
