commit 275ec1f5ec42dfe525aea3edebaeb3db37cf372f Author: Martin Gansser <mgansser(a)alice.de&gt; Date: Tue Aug 16 21:36:32 2016 +0200 Added Requirment ffmpeg, lame, rfbz #4188 clog | 2 -- vokoscreen-lrelease-qt4.patch | 24 +++++++++++++ vokoscreen-main.patch | 84 +++++++++++++++++++++---------------------- vokoscreen.spec | 19 +++++++--- 4 files changed, 79 insertions(+), 50 deletions(-) --- diff --git a/vokoscreen-lrelease-qt4.patch b/vokoscreen-lrelease-qt4.patch new file mode 100644 index 0000000..bd0566e --- /dev/null +++ b/vokoscreen-lrelease-qt4.patch @@ -0,0 +1,24 @@ +--- vokoscreen.pro.orig 2016-08-16 21:20:23.012199582 +0200 ++++ vokoscreen.pro 2016-08-16 21:23:07.219893639 +0200 +@@ -26,7 +26,7 @@ + # Um der Fehlermeldung entgegenzuwirken das keine *.qm Dateien vorhanden sind wird lrelease als Systemaufruf vorher aufgerufen. + # Das Script/Macro siehe weiter unten "# language packages" muß weiter bestehen bleiben damit "make clean" die *.qm Dateien löscht. + +-system(lrelease language/vokoscreen_*.ts) ++system(lrelease-qt4 language/vokoscreen_*.ts) + + RESOURCES += screencast.qrc + +@@ -36,10 +36,10 @@ + !isEmpty(TRANSLATIONS) { + isEmpty(QMAKE_LRELEASE) { + win32: QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe +- else: QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease ++ else: QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease-qt4 + } + isEmpty(TS_DIR):TS_DIR = language +- TSQM.name = lrelease ${QMAKE_FILE_IN} ++ TSQM.name = lrelease-qt4 ${QMAKE_FILE_IN} + TSQM.input = TRANSLATIONS + TSQM.output = $$TS_DIR/${QMAKE_FILE_BASE}.qm + TSQM.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} diff --git a/vokoscreen-main.patch b/vokoscreen-main.patch index 55223c0..4a1c1b8 100644 --- a/vokoscreen-main.patch +++ b/vokoscreen-main.patch @@ -1,43 +1,41 @@ ---- main.orig.cpp 2014-03-19 08:46:47.000000000 +0100 -+++ main.cpp 2014-09-20 11:51:16.903702078 +0200 -@@ -17,7 +17,7 @@ - - #include "screencast.h" - //#include <QSplashScreen> --#include <QtSingleApplication/qtsingleapplication.h> -+#include <qtsingleapplication.h> - #include <QDebug> - #include <QTranslator> - #include <QLocale> - ---- QtSingleApplication/qtsingleapplication.orig.pri 2014-03-19 08:46:47.000000000 +0100 -+++ QtSingleApplication/qtsingleapplication.pri 2014-09-20 12:19:44.953276406 +0200 -@@ -1,4 +1,4 @@ --INCLUDEPATH += $$PWD -+INCLUDEPATH += /usr/include - DEPENDPATH += $$PWD - QT *= network - -@@ -6,7 +6,7 @@ - LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME - } else { - SOURCES += $$PWD/qtsingleapplication.cpp $$PWD/qtlocalpeer.cpp -- HEADERS += $$PWD/qtsingleapplication.h $$PWD/qtlocalpeer.h -+ HEADERS += $$INCLUDEPATH/QtSolutions/qtsingleapplication.h $$PWD/qtlocalpeer.h - } - - win32 { - ---- libqxt/libqxt.orig.pri 2014-03-19 08:46:47.000000000 +0100 -+++ libqxt/libqxt.pri 2014-09-20 12:08:57.727640675 +0200 -@@ -1,6 +1,6 @@ - --INCLUDEPATH += $$PWD -+INCLUDEPATH += /usr/include - DEPENDPATH += $$PWD --HEADERS += $$PWD/qxtglobal.h $$PWD/qxtwindowsystem.h $$PWD/qxtglobalshortcut.h $$PWD/qxtglobalshortcut_p.h -+HEADERS += $$INCLUDEPATH/QxtCore/qxtglobal.h $$INCLUDEPATH/QxtGui/qxtwindowsystem.h $$INCLUDEPATH/QxtGui/qxtglobalshortcut.h $$INCLUDEPATH/QxtGui/qxtglobalshortcut_p.h - SOURCES += $$PWD/qxtglobal.cpp $$PWD/qxtwindowsystem_x11.cpp $$PWD/qxtglobalshortcut_x11.cpp $$PWD/qxtglobalshortcut.cpp --LIBS += -lX11 -\ No newline at end of file -+LIBS += -lX11 +--- main.cpp.orig 2016-08-16 20:41:18.050985770 +0200 ++++ main.cpp 2016-08-16 20:46:58.893225126 +0200 +@@ -17,6 +17,7 @@ + */ + + #include "screencast.h" ++#include <qtsingleapplication.h> + #include <QDebug> + #include <QTranslator> + #include <QLocale> + +--- QtSingleApplicationQt4/qtsingleapplication.pri.orig 2016-08-16 20:50:34.162031809 +0200 ++++ QtSingleApplicationQt4/qtsingleapplication.pri 2016-08-16 20:53:12.728134550 +0200 +@@ -1,4 +1,4 @@ +-INCLUDEPATH += $$PWD ++INCLUDEPATH += /usr/include + DEPENDPATH += $$PWD + QT *= network + +@@ -6,7 +6,7 @@ + LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME + } else { + SOURCES += $$PWD/qtsingleapplication.cpp $$PWD/qtlocalpeer.cpp +- HEADERS += $$PWD/qtsingleapplication.h $$PWD/qtlocalpeer.h ++ HEADERS += $$INCLUDEPATH/QtSolutions/qtsingleapplication.h $$PWD/qtlocalpeer.h + } + + win32 { +--- libqxtQt4/libqxt.pri.orig 2016-08-16 20:54:37.131153792 +0200 ++++ libqxtQt4/libqxt.pri 2016-08-16 20:56:08.420837342 +0200 +@@ -1,6 +1,6 @@ + +-INCLUDEPATH += $$PWD ++INCLUDEPATH += /usr/include + DEPENDPATH += $$PWD +-HEADERS += $$PWD/qxtglobal.h $$PWD/qxtwindowsystem.h $$PWD/qxtglobalshortcut.h $$PWD/qxtglobalshortcut_p.h ++HEADERS += $$INCLUDEPATH/QxtCore/qxtglobal.h $$INCLUDEPATH/QxtGui/qxtwindowsystem.h $$INCLUDEPATH/QxtGui/qxtglobalshortcut.h $$INCLUDEPATH/QxtGui/qxtglobalshortcut_p.h + SOURCES += $$PWD/qxtglobal.cpp $$PWD/qxtwindowsystem_x11.cpp $$PWD/qxtglobalshortcut_x11.cpp $$PWD/qxtglobalshortcut.cpp +-LIBS += -lX11 +\ No newline at end of file ++LIBS += -lX11 diff --git a/vokoscreen.spec b/vokoscreen.spec index 8710322..066f8fc 100644 --- a/vokoscreen.spec +++ b/vokoscreen.spec @@ -1,6 +1,6 @@ Name: vokoscreen Version: 2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Screencast creator License: GPLv2+ and BSD Group: Applications/Multimedia @@ -9,6 +9,8 @@ Url: https://github.com/vkohaupt/vokoscreen Source: %{name}-%{version}.tar.gz # patch to link directly against the system libs Patch0: %{name}-main.patch +# patch to avoid error message for non existing *.qm files +Patch1: %{name}-lrelease-qt4.patch BuildRequires: desktop-file-utils BuildRequires: alsa-lib-devel @@ -19,6 +21,8 @@ BuildRequires: opencv-devel BuildRequires: qt4-devel BuildRequires: qtsingleapplication-devel Requires: alsa-utils +Requires: ffmpeg +Requires: lame Requires: mkvtoolnix Requires: pulseaudio-utils Requires: v4l-utils-devel-tools @@ -29,16 +33,17 @@ videos, live recordings of browser, installation, videoconferences, etc. %prep %setup -q -#%patch0 -p0 +%patch0 -p0 +%patch1 -p0 # remove bundled libqxt + QtSingleApplication libraries -rm -f libqxt/*.h -rm -f QtSingleApplication/qtsingleapplication.h +rm -f libqxtQt4/*.h +rm -f QtSingleApplicationQt4/qtsingleapplication.h %build qmake-qt4 \ QMAKE_STRIP="" \ - QMAKE_LRELEASE=%{_libdir}/qt4/bin/lrelease \ + QMAKE_LRELEASE=%{_bindir}/lrelease-qt4 \ QMAKE_CFLAGS+="%{optflags} -I%{_includedir}/QxtCore -I%{_includedir}/QxtGui -I%{_includedir}/QtSolutions -I%{_includedir}/QtNetwork" \ QMAKE_CXXFLAGS+="%{optflags} -I%{_includedir}/QxtCore -I%{_includedir}/QxtGui -I%{_includedir}/QtSolutions -I%{_includedir}/QtNetwork" \ QMAKE_LIBS+="%{optflags} -L%{_libdir} -lQxtCore -lQxtGui -lQtNetwork -lQtSolutions_SingleApplication-2.6" @@ -64,6 +69,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %changelog +* Tue Aug 16 2016 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 2.4.0-2 +- Added Requirment ffmpeg, lame, rfbz #4188 +- Added %%{name}-lrelease-qt4.patch + * Mon Jul 20 2015 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 2.4.0-1 - Update to 2.4.0