tkurbad/tkurbad-overlay
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed tvheadend

Browse Source
This commit is contained in:
Torsten Kurbad
2025-10-01 16:01:01 +02:00
parent 062704968a
commit ef8349d83f
17 changed files with 726 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files
media-video/makemkv/files/makemkv-path.patch
+47
View File
@@ -0,0 +1,47 @@
diff -Naur makemkv-oss-1.9.10.orig/makemkvgui/src/api_posix.cpp makemkv-oss-1.9.10/makemkvgui/src/api_posix.cpp
--- makemkv-oss-1.9.10.orig/makemkvgui/src/api_posix.cpp 2016-04-15 21:35:36.000000000 +0100
+++ makemkv-oss-1.9.10/makemkvgui/src/api_posix.cpp 2016-05-08 13:51:48.761885862 +0100
@@ -54,8 +54,6 @@
if (AppName[0]==':')
{
- bool app_found = false;
- const char* const* app_locations = ApGetAppLocations();
const char* p_env = getenv("MAKEMKVCON");
AppName++;
@@ -63,6 +61,13 @@
if (p_env!=NULL)
{
strcpy(app_path,p_env);
+ } else {
+ strcpy(app_path,AppName);
+ }
+ } else {
+ strcpy(app_path,AppName);
+ }
+/*
app_found = true;
} else {
for (size_t i=0;app_locations[i]!=NULL;i++)
@@ -105,7 +110,7 @@
}
strcpy(p,AppName);
}
-
+*/
strcpy(str_guiserver,"guiserver");
strcpy(str_apver,verstr);
diff -Naur makemkv-oss-1.9.10.orig/makemkvgui/src/spawn_posix.cpp makemkv-oss-1.9.10/makemkvgui/src/spawn_posix.cpp
--- makemkv-oss-1.9.10.orig/makemkvgui/src/spawn_posix.cpp 2016-04-15 21:35:36.000000000 +0100
+++ makemkv-oss-1.9.10/makemkvgui/src/spawn_posix.cpp 2016-05-08 10:52:37.137598384 +0100
@@ -70,7 +70,7 @@
}
}
- err = posix_spawn(&pid,argv[0],&spawn_actions,&spawn_attr,argv,envp);
+ err = posix_spawnp(&pid,argv[0],&spawn_actions,&spawn_attr,argv,envp);
posix_spawn_file_actions_destroy(&spawn_actions);
posix_spawnattr_destroy(&spawn_attr);
media-video/makemkv/files/makemkv-qt6.patch
+206
View File
@@ -0,0 +1,206 @@
--- a/configure
+++ b/configure
@@ -662,8 +662,8 @@
QT_LIB
QT_CFLAGS
QT_INC
-qt5_LIBS
-qt5_CFLAGS
+qt6_LIBS
+qt6_CFLAGS
ffmpeg_LIBS
ffmpeg_CFLAGS
PKG_CONFIG_LIBDIR
@@ -777,7 +777,7 @@
with_sysroot
enable_libtool_lock
enable_gui
-enable_qt5
+enable_qt6
enable_noec
enable_debug
'
@@ -800,8 +800,8 @@
PKG_CONFIG_LIBDIR
ffmpeg_CFLAGS
ffmpeg_LIBS
-qt5_CFLAGS
-qt5_LIBS'
+qt6_CFLAGS
+qt6_LIBS'
# Initialize some variables set by options.
@@ -1431,7 +1431,7 @@
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--disable-gui do not build GUI (default is build GUI)
- --disable-qt5 do not use Qt5
+ --disable-qt6 do not use Qt6
--enable-noec use private ECDSA code (default - use openssl ECDSA
if available)
--enable-debug keep debug symbols in binarfies (default - strip
@@ -1471,8 +1471,8 @@
ffmpeg_CFLAGS
C compiler flags for ffmpeg, overriding pkg-config
ffmpeg_LIBS linker flags for ffmpeg, overriding pkg-config
- qt5_CFLAGS C compiler flags for qt5, overriding pkg-config
- qt5_LIBS linker flags for qt5, overriding pkg-config
+ qt6_CFLAGS C compiler flags for qt6, overriding pkg-config
+ qt6_LIBS linker flags for qt6, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -12545,12 +12545,12 @@
#AM_CONDITIONAL([ENABLE_GUI],[test "x$enable_gui" = "xyes"])
-# Check whether --enable-qt5 was given.
-if test ${enable_qt5+y}
+# Check whether --enable-qt6 was given.
+if test ${enable_qt6+y}
then :
- enableval=$enable_qt5;
+ enableval=$enable_qt6;
else $as_nop
- enable_qt5=yes
+ enable_qt6=yes
fi
@@ -17312,7 +17312,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- ax_cxx_compile_alternatives="11 0x" ax_cxx_compile_cxx11_required=true
+ ax_cxx_compile_alternatives="17" ax_cxx_compile_cxx11_required=true
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -18295,24 +18295,24 @@
if test "x$enable_gui" != "xno"
then :
- if test "x$enable_qt5" != "xno"
+ if test "x$enable_qt6" != "xno"
then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Qt5Core Qt5Gui Qt5Widgets Qt5DBus" >&5
-printf %s "checking for Qt5Core Qt5Gui Qt5Widgets Qt5DBus... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Qt6Core Qt6Gui Qt6Widgets Qt6DBus" >&5
+printf %s "checking for Qt6Core Qt6Gui Qt6Widgets Qt6DBus... " >&6; }
-if test -n "$qt5_CFLAGS"; then
- pkg_cv_qt5_CFLAGS="$qt5_CFLAGS"
+if test -n "$qt6_CFLAGS"; then
+ pkg_cv_qt6_CFLAGS="$qt6_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core Qt5Gui Qt5Widgets Qt5DBus\""; } >&5
- ($PKG_CONFIG --exists --print-errors "Qt5Core Qt5Gui Qt5Widgets Qt5DBus") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt6Core Qt6Gui Qt6Widgets Qt6DBus\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "Qt6Core Qt6Gui Qt6Widgets Qt6DBus") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_qt5_CFLAGS=`$PKG_CONFIG --cflags "Qt5Core Qt5Gui Qt5Widgets Qt5DBus" 2>/dev/null`
+ pkg_cv_qt6_CFLAGS=`$PKG_CONFIG --cflags "Qt6Core Qt6Gui Qt6Widgets Qt6DBus" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -18320,16 +18320,16 @@
else
pkg_failed=untried
fi
-if test -n "$qt5_LIBS"; then
- pkg_cv_qt5_LIBS="$qt5_LIBS"
+if test -n "$qt6_LIBS"; then
+ pkg_cv_qt6_LIBS="$qt6_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core Qt5Gui Qt5Widgets Qt5DBus\""; } >&5
- ($PKG_CONFIG --exists --print-errors "Qt5Core Qt5Gui Qt5Widgets Qt5DBus") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt6Core Qt6Gui Qt6Widgets Qt6DBus\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "Qt6Core Qt6Gui Qt6Widgets Qt6DBus") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_qt5_LIBS=`$PKG_CONFIG --libs "Qt5Core Qt5Gui Qt5Widgets Qt5DBus" 2>/dev/null`
+ pkg_cv_qt6_LIBS=`$PKG_CONFIG --libs "Qt6Core Qt6Gui Qt6Widgets Qt6DBus" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -18350,12 +18350,12 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- qt5_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5Core Qt5Gui Qt5Widgets Qt5DBus" 2>&1`
+ qt6_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt6Core Qt6Gui Qt6Widgets Qt6DBus" 2>&1`
else
- qt5_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5Core Qt5Gui Qt5Widgets Qt5DBus" 2>&1`
+ qt6_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt6Core Qt6Gui Qt6Widgets Qt6DBus" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$qt5_PKG_ERRORS" >&5
+ echo "$qt6_PKG_ERRORS" >&5
qt_ok=no
elif test $pkg_failed = untried; then
@@ -18363,16 +18363,16 @@
printf "%s\n" "no" >&6; }
qt_ok=no
else
- qt5_CFLAGS=$pkg_cv_qt5_CFLAGS
- qt5_LIBS=$pkg_cv_qt5_LIBS
+ qt6_CFLAGS=$pkg_cv_qt6_CFLAGS
+ qt6_LIBS=$pkg_cv_qt6_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- QT_INC="$qt5_CFLAGS";
+ QT_INC="$qt6_CFLAGS";
QT_CFLAGS="-fPIC";
- QT_LIB="$qt5_LIBS";
- qt5_host_bins=`$PKG_CONFIG --variable host_bins "Qt5Core" 2>/dev/null`;
- QT_MOC="$qt5_host_bins/moc";
+ QT_LIB="$qt6_LIBS";
+ qt6_libexecdir=`$PKG_CONFIG --variable libexecdir "Qt6Core" 2>/dev/null`;
+ QT_MOC="$qt6_libexecdir/moc";
qt_ok=yes
fi
--- a/makemkvgui/src/dirselectbox.cpp
+++ b/makemkvgui/src/dirselectbox.cpp
@@ -121,7 +121,7 @@
if ( (dir.at(dlen-(alen+1))==QLatin1Char('/')) ||
(dir.at(dlen-(alen+1))==QLatin1Char('\\')) )
{
- if (dir.endsWith(appendName)) {
+ if (dir.endsWith(*appendName)) {
dir.chop(alen+1);
}
}
--- a/makemkvgui/src/mainwnd.cpp
+++ b/makemkvgui/src/mainwnd.cpp
@@ -35,7 +35,7 @@
Qt::MacWindowToolBarButtonHint |
Qt::WindowMinMaxButtonsHint ;
#else
- 0;
+ Qt::Widget;
#endif
MainWnd::MainWnd(CGUIApClient* App,const char* AppDir)
--- a/makemkvgui/src/qtgui.h
+++ b/makemkvgui/src/qtgui.h
@@ -46,7 +46,7 @@
#include <QtWidgets/QProgressBar>
#include <QtWidgets/QStackedWidget>
#include <QtWidgets/QComboBox>
-#include <QtWidgets/QAction>
+#include <QtGui/QAction>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QBoxLayout>
media-video/makemkv/files/makemkvcon.1
+242
View File
@@ -0,0 +1,242 @@
'\" t
.\" Title: makemkvcon
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 05/20/2020
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
.TH "MAKEMKVCON" "1" "05/20/2020" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.\" http://bugs.debian.org/507673
.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
makemkvcon \- MakeMKV console application
.SH "SYNOPSIS"
.sp
\fBmakemkvcon\fR [\fIOPTIONS\fR] <backup|info|mkv> [\fIPARAMETERS\fR]
.SH "DESCRIPTION"
.sp
Command\-line options for MakeMKV\&.
.sp
Configuration options and setup keys are located in ~/\&.MakeMKV/
.SH "OPTIONS"
.sp
General options:
.PP
\fB\-\-messages=\fR\fIFILE\fR
.RS 4
Output all messgaes to a file\&. Special file names: stdout, stderr, null\&. Default is to stdout\&.
.RE
.PP
\fB\-\-progress=\fR\fIFILE\fR
.RS 4
Output all progress messages to a file\&. Special file names: stdout, stderr, null\&. Use
\fB\-same\fR
to use
\fB\-\-messages\fR
argument\&. Default is no output\&.
.RE
.PP
\fB\-\-debug\fR[=\fIFILE\fR]
.RS 4
Enables debug messages\&. Optionally saves to output file\&.
.RE
.PP
\fB\-\-directio=[true|false]\fR
.RS 4
Enables or disables direct disc access\&.
.RE
.PP
\fB\-\-noscan\fR
.RS 4
Don\(cqt access any media during disc scan and do not check for media insertion and removal\&. Helpful when other applications are already accessing discs in other drives\&.
.RE
.PP
\fB\-\-cache=\fR\fISIZE\fR
.RS 4
Specifies size of read cache in megabytes\&. By default program uses a huge amount of memory\&. About 128 MB is recommended for streaming and backup, 512MB for DVD conversion and 1024MB for Blu\-ray conversion\&.
.RE
.PP
\fB\-r, \-\-robot\fR
.RS 4
Enables automation mode\&. Program will output more information in a format that is easier to parse\&. All output is line\-based and output is flushed on line end\&. All strings are quoted, all control characters and quotes are backlash\-escaped\&. If you automate this program it is highly recommended to use this option\&. Some options make reference to apdefs\&.h file that can be found in MakeMKV open\-source package, included with version for Linux\&. These values will not change in future versions\&.
.RE
.sp
Backup options:
.PP
\fB\-\-decrypt\fR
.RS 4
Decrypt stream files during backup\&. Default: no decryption\&.
.RE
.PP
\fB\-\-minlength\fR=\fISECONDS\fR
.RS 4
Specify minimum title length\&. Default: program preferences\&.
.RE
.SH "COMMANDS"
.sp
\fBbackup\fR Backup disc\&.
.sp
\fBinfo\fR Display information about a disc\&.
.sp
\fBmkv\fR Copy titles from disc\&.
.sp
\fBf\fR Run universal firmware tool\&.
.SH "PARAMETERS"
.PP
\fBsource iso:\fR\fIFILENAME\fR
.RS 4
Open ISO image\&.
.RE
.PP
\fBsource file:\fR\fIDIRECTORY\fR
.RS 4
Open files in directory\&.
.RE
.PP
\fBsource disc:\fR\fIDISC ID\fR
.RS 4
Open disc with ID\&.
.RE
.PP
\fBsource dev:\fR\fIDEVICE\fR
.RS 4
Open disc with device name\&.
.RE
.SH "EXAMPLES"
.sp
Copy all titles from first disc and save as MKV files into current directory:
.sp
.if n \{\
.RS 4
.\}
.nf
makemkvcon mkv disc:0 all \&.
.fi
.if n \{\
.RE
.\}
.sp
List all available drives:
.sp
.if n \{\
.RS 4
.\}
.nf
makemkvcon \-r \-\-cache=1 info disc:9999
.fi
.if n \{\
.RE
.\}
.sp
Backup first disc decrypting all video files in automation mode with progress output:
.sp
.if n \{\
.RS 4
.\}
.nf
makemkvcon backup \-\-decrypt \-\-cache=16 \-\-noscan \-r \-\-progress=\-same disc:0 \&.
.fi
.if n \{\
.RE
.\}
.SH "MESSAGE FORMATS"
.sp
\fBMessage output\fR
.sp
MSG:code,flags,count,message,format,param0,param1,\&...
.sp
code \- unique message code, should be used to identify particular string in language\-neutral way\&.
.sp
flags \- message flags, see AP_UIMSG_xxx flags in apdefs\&.h
.sp
count \- number of parameters
.sp
message \- raw message string suitable for output
.sp
format \- format string used for message\&. This string is localized and subject to change, unlike message code\&.
.sp
paramX \- parameter for message
.sp
\fBCurrent and total progress title\fR
.sp
PRGC:code,id,name
.sp
PRGT:code,id,name
.sp
code \- unique message code
.sp
id \- operation sub\-id
.sp
name \- name string
.sp
\fBProgress bar values for current and total progress\fR
.sp
PRGV:current,total,max
.sp
current \- current progress value
.sp
total \- total progress value
.sp
max \- maximum possible value for a progress bar, constant
.sp
\fBDrive scan messages\fR
.sp
DRV:index,visible,enabled,flags,drive name,disc name
.sp
index \- drive index
.sp
visible \- set to 1 if drive is present
.sp
enabled \- set to 1 if drive is accessible
.sp
flags \- media flags, see AP_DskFsFlagXXX in apdefs\&.h
.sp
drive name \- drive name string
.sp
disc name \- disc name string
.sp
\fBDisc information output messages\fR
.sp
TCOUT:count
.sp
count \- titles count
.sp
\fBDisc, title and stream information\fR
.sp
CINFO:id,code,value
.sp
TINFO:id,code,value
.sp
SINFO:id,code,value
.sp
id \- attribute id, see AP_ItemAttributeId in apdefs\&.h
.sp
code \- message code if attribute value is a constant string
.sp
value \- attribute value
.SH "RESOURCES"
.sp
Console usage: https://www\&.makemkv\&.com/developers/usage\&.txt
.sp
MakeMKV for Linux forum: https://www\&.makemkv\&.com/forum/viewforum\&.php?f=3
.sp
Main web site: https://www\&.makemkv\&.com/