mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
media-video/tsmuxer: add Qt6-based 2.7.0 and fix build w/ cmake-4
Closes: https://bugs.gentoo.org/957457 Closes: https://bugs.gentoo.org/956752 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -1 +1,2 @@
|
||||
DIST tsmuxer-2.6.16_p20220706.tar.gz 699612 BLAKE2B 101f97b0846a1051c7920878c304e62d6e4d42a3c85c0d1e0fe8cd7cf2ebfd49ad0c75966c0b5e171a6e878d19ff6a03481b29bac4d0b1994285c24893597349 SHA512 96ffaf04a02a0f7cc643a49b54d299648bff551aa03263547d17abeb7871cdb867d98d13becea6e69d1d5691afffc9011ce502a3e7e9bd78f5025bff79d3ad76
|
||||
DIST tsmuxer-2.7.0.tar.gz 713531 BLAKE2B f13d625e9ed75e607bdac8df0dc177b97dd4d6e8da8c97406edb36f52ca45a0e0d99ec6c182588d80c12dead9345d507c6153c41133b56db1beab6642c92739f SHA512 a6555635bdb7529d78534d1b00e5e5e9fdc73ea6aa1d4cd3fe173e32dc53c11f4cb3278c257e11eb5a80146ac742db78b22f09867cf79f6ea9cf673dbd46498a
|
||||
|
||||
105
media-video/tsmuxer/files/tsmuxer-2.7.0-cmake.patch
Normal file
105
media-video/tsmuxer/files/tsmuxer-2.7.0-cmake.patch
Normal file
@@ -0,0 +1,105 @@
|
||||
From 528da5cefecf86cae5867a940f51a5a208d0399b Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
Date: Fri, 5 Dec 2025 15:24:13 +0100
|
||||
Subject: [PATCH 1/2] Bump minimum CMake version to 3.10
|
||||
|
||||
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
libmediation/CMakeLists.txt | 2 +-
|
||||
tsMuxer/CMakeLists.txt | 2 +-
|
||||
tsMuxerGUI/CMakeLists.txt | 6 +-----
|
||||
4 files changed, 4 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index eaf429e..a3f70f9 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required (VERSION 3.1)
|
||||
+cmake_minimum_required (VERSION 3.10)
|
||||
project (tsmuxer_main CXX)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
diff --git a/libmediation/CMakeLists.txt b/libmediation/CMakeLists.txt
|
||||
index e766334..3d93bc3 100644
|
||||
--- a/libmediation/CMakeLists.txt
|
||||
+++ b/libmediation/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required (VERSION 3.1)
|
||||
+cmake_minimum_required (VERSION 3.10)
|
||||
project(mediation)
|
||||
|
||||
add_library(mediation STATIC
|
||||
diff --git a/tsMuxer/CMakeLists.txt b/tsMuxer/CMakeLists.txt
|
||||
index 61c4b2d..32ed84d 100644
|
||||
--- a/tsMuxer/CMakeLists.txt
|
||||
+++ b/tsMuxer/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required (VERSION 3.1)
|
||||
+cmake_minimum_required (VERSION 3.10)
|
||||
project (tsmuxer LANGUAGES CXX)
|
||||
|
||||
add_executable (tsmuxer
|
||||
diff --git a/tsMuxerGUI/CMakeLists.txt b/tsMuxerGUI/CMakeLists.txt
|
||||
index 2ebb2bd..e0ccb5e 100644
|
||||
--- a/tsMuxerGUI/CMakeLists.txt
|
||||
+++ b/tsMuxerGUI/CMakeLists.txt
|
||||
@@ -1,14 +1,10 @@
|
||||
-cmake_minimum_required (VERSION 3.1)
|
||||
+cmake_minimum_required (VERSION 3.10)
|
||||
project(tsMuxerGUI CXX)
|
||||
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
|
||||
-if(CMAKE_VERSION VERSION_LESS "3.7.0")
|
||||
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
-endif()
|
||||
-
|
||||
set(QT_VERSION 5 CACHE STRING "Qt version to use")
|
||||
set_property(CACHE QT_VERSION PROPERTY STRINGS 5 6)
|
||||
|
||||
--
|
||||
2.52.0
|
||||
|
||||
|
||||
From 1dd8433c09ae5a00de79e8528f3dcbe609b8574b Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
Date: Fri, 5 Dec 2025 15:26:55 +0100
|
||||
Subject: [PATCH 2/2] Disable git rev-parse
|
||||
|
||||
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
---
|
||||
CMakeLists.txt | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a3f70f9..414bcf8 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -5,13 +5,13 @@ set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
|
||||
set(CMAKE_CXX_EXTENSIONS FALSE)
|
||||
|
||||
-execute_process(
|
||||
- COMMAND git rev-parse --short HEAD
|
||||
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||
- RESULT_VARIABLE GIT_REV_SHORT_RV
|
||||
- OUTPUT_VARIABLE GIT_REV_SHORT
|
||||
- OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
-)
|
||||
+#execute_process(
|
||||
+# COMMAND git rev-parse --short HEAD
|
||||
+# WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||
+# RESULT_VARIABLE GIT_REV_SHORT_RV
|
||||
+# OUTPUT_VARIABLE GIT_REV_SHORT
|
||||
+# OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
+#)
|
||||
set(TSMUXER_RELEASE TRUE)
|
||||
set(VERSION_NUMBER "2.7.0")
|
||||
if(${TSMUXER_RELEASE})
|
||||
--
|
||||
2.52.0
|
||||
|
||||
42
media-video/tsmuxer/tsmuxer-2.7.0.ebuild
Normal file
42
media-video/tsmuxer/tsmuxer-2.7.0.ebuild
Normal file
@@ -0,0 +1,42 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
MY_PN="tsMuxer"
|
||||
inherit cmake xdg
|
||||
|
||||
DESCRIPTION="Utility to create and demux TS and M2TS files"
|
||||
HOMEPAGE="https://github.com/justdan96/tsMuxer"
|
||||
SRC_URI="https://github.com/justdan96/tsMuxer/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/${MY_PN}-${PV}"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="gui"
|
||||
|
||||
DEPEND="
|
||||
gui? (
|
||||
dev-qt/qtbase:6[gui,widgets]
|
||||
dev-qt/qtmultimedia:6
|
||||
)
|
||||
media-libs/freetype
|
||||
virtual/zlib:=
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
gui? ( dev-qt/qttools:6[linguist] )
|
||||
"
|
||||
|
||||
DOCS=( README.md )
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DQT_VERSION=6
|
||||
-DTSMUXER_STATIC_BUILD=OFF
|
||||
-DTSMUXER_GUI=$(usex gui)
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
Reference in New Issue
Block a user