Cine-Encoder: bump version

This commit is contained in:
Gerasim Troeglazov
2021-11-02 20:39:48 +10:00
parent 037e4c2bb1
commit b4ceddf413
2 changed files with 29 additions and 27 deletions

View File

@@ -9,7 +9,7 @@ COPYRIGHT="Oleg Kozhukharenko"
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://github.com/CineEncoder/cine-encoder/archive/refs/tags/$portVersion.tar.gz"
CHECKSUM_SHA256="fcabefd308132b249566500e29a01b9355bcfc47a345b5f50d52da8883c09681"
CHECKSUM_SHA256="ef34601896257bb2f1d5b019809ffc9959c20c019797a43bc871f9dd9bf84d8e"
SOURCE_DIR="cine-encoder-$portVersion"
PATCHES="cine_encoder-$portVersion.patchset"
ADDITIONAL_FILES="cine_encoder.rdef.in"

View File

@@ -1,14 +1,14 @@
From 45529d3461d9cfc18fada9e4d3654e3977a77276 Mon Sep 17 00:00:00 2001
From 5ce0bf7c0eb56069a7113d553a26f38613014076 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 28 Jun 2021 22:41:30 +1000
Date: Tue, 2 Nov 2021 20:36:30 +1000
Subject: Fix for Haiku
diff --git a/app/dialog.cpp b/app/dialog.cpp
index 49ae585..a1915b4 100644
index be1468c..37955e6 100644
--- a/app/dialog.cpp
+++ b/app/dialog.cpp
@@ -25,7 +25,7 @@ void Dialog::setMessage(const QString &_message, bool *_acceptFlag) /*** Set p
@@ -38,7 +38,7 @@ void Dialog::setMessage(const QString &_message, bool *_acceptFlag) /*** Set p
QFont font;
font.setPointSize(10);
ui_dialog->label_title->setFont(font);
@@ -18,27 +18,31 @@ index 49ae585..a1915b4 100644
#else
QSound::play("/usr/share/sounds/cine-encoder.wav");
diff --git a/app/main.cpp b/app/main.cpp
index 79d8b58..1e5a2b5 100644
index 2b13819..5235fae 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -12,10 +12,11 @@ int main(int argc, char *argv[])
QCoreApplication::setOrganizationName("CineEncoder");
QCoreApplication::setApplicationName("CineEncoder");
QCoreApplication::setAttribute(Qt::AA_UseStyleSheetPropagationInWidgetStyles, true);
@@ -40,6 +40,7 @@ int main(int argc, char *argv[])
delete _settings;
/********************* Set Font ******************************/
+#ifndef Q_OS_HAIKU
QFont font = app.font();
font.setPointSize(8);
if (_fontSize == 0) {
_fontSize = 8;
@@ -49,7 +50,7 @@ int main(int argc, char *argv[])
}
font.setPointSize(_fontSize);
app.setFont(font);
-
+#endif
QPixmap pixmap(":/resources/images/splash.png");
QSplashScreen *splash = new QSplashScreen(pixmap);
splash->show();
/******************* Set Translate ****************************/
QString language = "";
QLocale locale = QLocale::system();
diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index 445adc9..94a0f2d 100644
index 7c63130..129ea41 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -32,6 +32,13 @@
@@ -41,6 +41,13 @@
using namespace MediaInfoDLL;
#endif
@@ -52,22 +56,20 @@ index 445adc9..94a0f2d 100644
Widget::Widget(QWidget *parent): QWidget(parent), ui(new Ui::Widget)
@@ -1662,6 +1669,10 @@ void Widget::make_preset() /*** Make preset ***/
@@ -2107,6 +2114,8 @@ void Widget::make_preset() /*** Make preset ***/
//QString intelQSV_VP9_preset = "-c:v vp9_qsv ";
#if defined (Q_OS_WIN64)
QString intelQSVhwaccel = " -hwaccel dxva2 -hwaccel_output_format dxva2_vld";
+#elif defined (Q_OS_HAIKU)
+ QString intelQSVhwaccel = " ";
#elif defined (Q_OS_UNIX)
QString intelQSVhwaccel = " -hwaccel vaapi -hwaccel_output_format vaapi";
#endif
+#ifdef Q_OS_HAIKU
+ QString intelQSVhwaccel = " ";
+#endif
+
/************************************* XDCAM presets **************************************/
QString xdcam_preset = "-pix_fmt yuv422p -c:v mpeg2video -profile:v 0 -flags ilme -top 1 "
diff --git a/app/taskcomplete.cpp b/app/taskcomplete.cpp
index 156e941..372fcce 100644
index 11668c4..b56cc49 100644
--- a/app/taskcomplete.cpp
+++ b/app/taskcomplete.cpp
@@ -35,7 +35,7 @@ void Taskcomplete::setMessage(const QString &_message, const bool &_timer_mode)
@@ -47,7 +47,7 @@ void Taskcomplete::setMessage(const QString &_message, const bool &_timer_mode)
}
else
{