From: Jan Palus Date: Tue, 12 Jun 2018 23:24:06 +0000 (+0200) Subject: up to 0.3.11 X-Git-Tag: auto/th/simplescreenrecorder-0.3.11-1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fsimplescreenrecorder.git;a=commitdiff_plain;h=06f1913 up to 0.3.11 - ffmpeg4 patch no longer necessary - switched to cmake --- diff --git a/ffmpeg4.patch b/ffmpeg4.patch deleted file mode 100644 index ed2e886..0000000 --- a/ffmpeg4.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- ssr-0.3.6/src/Global.h~ 2015-11-02 22:13:49.000000000 +0100 -+++ ssr-0.3.6/src/Global.h 2018-04-29 19:51:10.866406546 +0200 -@@ -326,9 +326,6 @@ - inline double ToDouble(const AVRational& r) { - return (double) r.num / (double) r.den; - } --inline double ToDouble(const AVFrac& f) { -- return (double) f.val + (double) f.num / (double) f.den; --} - - inline void GroupEnabled(std::initializer_list actions, bool enabled) { - for(QAction *a : actions) { ---- ssr-0.3.6/src/AV/Output/AudioEncoder.cpp~ 2015-11-02 22:13:49.000000000 +0100 -+++ ssr-0.3.6/src/AV/Output/AudioEncoder.cpp 2018-04-29 19:52:26.060460580 +0200 -@@ -59,7 +59,7 @@ - - unsigned int AudioEncoder::GetFrameSize() { - #if SSR_USE_AVCODEC_ENCODE_AUDIO2 -- return (GetStream()->codec->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)? DEFAULT_FRAME_SAMPLES : GetStream()->codec->frame_size; -+ return (GetStream()->codec->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)? DEFAULT_FRAME_SAMPLES : GetStream()->codec->frame_size; - #else - return (GetStream()->codec->frame_size <= 1)? DEFAULT_FRAME_SAMPLES : GetStream()->codec->frame_size; - #endif -@@ -121,7 +121,7 @@ - if(key == "threads") { - stream->codec->thread_count = ParseCodecOptionInt(key, value, 1, 100); - } else if(key == "qscale") { -- stream->codec->flags |= CODEC_FLAG_QSCALE; -+ stream->codec->flags |= AV_CODEC_FLAG_QSCALE; - stream->codec->global_quality = lrint(ParseCodecOptionDouble(key, value, -1.0e6, 1.0e6, FF_QP2LAMBDA)); - } else if(key == "sampleformat") { - sample_format_name = value; ---- ssr-0.3.6/src/AV/Output/BaseEncoder.cpp~ 2015-11-02 22:13:49.000000000 +0100 -+++ ssr-0.3.6/src/AV/Output/BaseEncoder.cpp 2018-04-29 19:52:56.784084323 +0200 -@@ -207,7 +207,7 @@ - } - - // flush the encoder -- if(!m_should_stop && (m_stream->codec->codec->capabilities & CODEC_CAP_DELAY)) { -+ if(!m_should_stop && (m_stream->codec->codec->capabilities & AV_CODEC_CAP_DELAY)) { - Logger::LogInfo("[BaseEncoder::EncoderThread] " + Logger::tr("Flushing encoder ...")); - while(!m_should_stop) { - if(EncodeFrame(NULL)) { ---- ssr-0.3.6/src/AV/Output/Muxer.cpp~ 2015-11-02 22:13:49.000000000 +0100 -+++ ssr-0.3.6/src/AV/Output/Muxer.cpp 2018-04-29 19:54:03.428041137 +0200 -@@ -289,10 +289,10 @@ - - // not sure why this is needed, but it's in the example code and it doesn't work without this - if(m_format_context->oformat->flags & AVFMT_GLOBALHEADER) -- stream->codec->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ stream->codec->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - - // if the codec is experimental, allow it -- if(codec->capabilities & CODEC_CAP_EXPERIMENTAL) { -+ if(codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) { - Logger::LogWarning("[Muxer::AddStream] " + Logger::tr("Warning: This codec is considered experimental by libav/ffmpeg.")); - stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL; - } ---- ssr-0.3.6/src/AV/Output/VideoEncoder.cpp~ 2015-11-02 22:13:49.000000000 +0100 -+++ ssr-0.3.6/src/AV/Output/VideoEncoder.cpp 2018-04-29 19:54:53.401837201 +0200 -@@ -147,7 +147,7 @@ - if(key == "threads") { - stream->codec->thread_count = ParseCodecOptionInt(key, value, 1, 100); - } else if(key == "qscale") { -- stream->codec->flags |= CODEC_FLAG_QSCALE; -+ stream->codec->flags |= AV_CODEC_FLAG_QSCALE; - stream->codec->global_quality = lrint(ParseCodecOptionDouble(key, value, -1.0e6, 1.0e6, FF_QP2LAMBDA)); - } else if(key == "minrate") { - stream->codec->rc_min_rate = ParseCodecOptionInt(key, value, 1, 1000000, 1024); // kbps diff --git a/simplescreenrecorder.spec b/simplescreenrecorder.spec index 1459043..bf04651 100644 --- a/simplescreenrecorder.spec +++ b/simplescreenrecorder.spec @@ -1,14 +1,13 @@ Summary: Screen recorder for Linux Summary(pl.UTF-8): Nagrywarka ekranu dla Linuksa Name: simplescreenrecorder -Version: 0.3.6 -Release: 3 +Version: 0.3.11 +Release: 1 License: GPL v3 Group: Applications Source0: https://github.com/MaartenBaert/ssr/archive/%{version}/ssr-%{version}.tar.gz -# Source0-md5: 3c0dcf288c0cc1b21f4cd2010c73d5ae +# Source0-md5: 035dcd0a73667d27f890c9ad242d4cf0 Patch0: build.patch -Patch1: ffmpeg4.patch URL: http://www.maartenbaert.be/simplescreenrecorder/ BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -17,11 +16,9 @@ BuildRequires: Qt5Gui-devel BuildRequires: Qt5Widgets-devel BuildRequires: Qt5X11Extras-devel BuildRequires: alsa-lib-devel -BuildRequires: autoconf -BuildRequires: automake +BuildRequires: cmake >= 3.1 BuildRequires: ffmpeg-devel BuildRequires: jack-audio-connection-kit-devel -BuildRequires: libtool BuildRequires: pulseaudio-devel BuildRequires: qt5-build BuildRequires: qt5-linguist @@ -49,20 +46,13 @@ OpenGL applications, for use with the SimpleScreenRecorder. %prep %setup -q -n ssr-%{version} %patch0 -p1 -%patch1 -p1 %build -%{__libtoolize} -%{__aclocal} -%{__autoconf} -%{__autoheader} -%{__automake} - -%configure \ - CXXFLAGS="%{rpmcxxflags} -fPIC" \ - --with-qt5 \ - --with-pulseaudio \ - --with-jack +%cmake \ + -DLRELEASE=/usr/bin/lrelease-qt5 \ + -DWITH_JACK=ON \ + -DWITH_PULSEAUDIO=ON \ + -DWITH_QT5=ON %{__make} @@ -72,8 +62,6 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT%{_libdir}/libssr-glinject.la - %find_lang %{name} --with-qm %clean @@ -91,6 +79,7 @@ rm -rf $RPM_BUILD_ROOT %{_iconsdir}/*/*/apps/simplescreenrecorder*.png %{_iconsdir}/hicolor/scalable/apps/simplescreenrecorder*.svg %{_desktopdir}/simplescreenrecorder.desktop +%{_datadir}/appdata/simplescreenrecorder.appdata.xml %files glinject %defattr(644,root,root,755)