@@ -1,4 +1,49 @@

 -------------------------------------------------------------------

+Tue Jun 05 20:27:49 UTC 2018 - enzokiel@kabelmail.de

+

+- Update to version 2.7.1

+  + Encoder:Add LibVA based HW accelerated H.264 encoder

+    (Intel/Linux)

+  + Decoder:Fix last frames of video not retrieved from decoder

+  + Decoder:Implement hardware accelerated decoding of H.264 on

+    macOS

+  + Decoder:Fix keyframe-based navigation in field-encoded MPEG-2

+    video

+  + Demuxer:Fix crash in the Matroska demuxer with high bitrate

+    audio

+  + Demuxer:Fix too short duration reported for MKV and MP4 with

+    B-frames

+  + Demuxer:Fix PTS delay calculation in the Matroska demuxer

+  + Demuxer:Fix audio delay ignored by the Mp4 demuxer

+  + Muxer:Improve resilience of FFmpeg based muxers against decode

+    timestamps irregularities

+  + Muxer:Allow to force display aspect ratio in the configuration

+    of the MP4 muxer

+  + Muxer:Fix crash in the AVI muxer on switch to OpenDML

+  + Images:Add PNG export, fix wrong colors with some colorspaces

+  + Images:Add feature to export selection as JPEG images

+  + Editor:Fix AVI with H.264 / HEVC without B-frames being not

+    seekable

+  + Editor:Make AVI with H.264 / HEVC containing B-frames seekable

+    by decoding the entire video

+  + New Filter:Still Image: generate video of specified duration out

+    of a single image

+  + Filter:Make eq2 video filter partializable

+  + Filter:Implement fade-in / fade-out transition for "Add logo"

+  + UI:Display selection duration in the UI, move filter preview

+    toggle to the toolbar

+  + UI:Warn right away if an edit would result in cuts being not on

+    keyframes

+  + UI:Improve time chooser dialog

+  + Audio:Add Opus encoder

+  + Audio:Allow LPCM in FFmpeg-based muxers

+  + Audio:Show duration for external audio tracks

+  + Miscellaneous:Improved overall polish and stability

+- Removed avidemux-glibc-2.27.patch, fixed upstream.

+- Removed all qt4 stuff.

+- Added avidemux-backport_Fix_threads_setup.patch.

+

+-------------------------------------------------------------------

 Sat Apr 07 14:05:21 UTC 2018 - enzokiel@kabelmail.de

 - Added avidemux-glibc-2.27.patch to Fix compilation with

​

@@ -16,27 +16,14 @@

 #

-%if 0%{?suse_version} > 1320 || 0%{?sle_version}

-%bcond_without  build_qt5

-%define         qtversion 5

-%else

-%bcond_with     build_qt5

-%define         qtversion 4

-%endif

-

-%if 0%{?suse_version} > 1320 || 0%{?sle_version} > 120100

-%bcond_without  with_vs

-%endif

-

 Name:           avidemux3

 Summary:        Graphical video editing and transcoding tool

-Version:        2.7.0

+Version:        2.7.1

 Release:        1

 Url:            http://avidemux.sourceforge.net/

 ExclusiveArch:  %ix86 x86_64

 Source0:        avidemux_%{version}.tar.gz

-Source1:        avidemux3-qt.desktop

-Source2:        avidemux3-vsproxy-qt.desktop

+Source1:        avidemux3.desktop

 Source3:        config.mak.diff

 Patch0:         avidemux-cmake-2.8.8.patch

 Patch1:         avidemux-linking.patch

@@ -46,7 +33,7 @@

 Patch5:         avidemux-bootStrap.patch

 Patch6:         avidemux-cmake-permissions.patch

 Patch7:         avidemux-cpu_armel.patch

-Patch8:         avidemux-glibc-2.27.patch

+Patch8:         avidemux-backport_Fix_threads_setup.patch

 License:        GPL-2.0

 Group:          Productivity/Multimedia/Video/Editors and Convertors

@@ -59,10 +46,8 @@

 BuildRequires:  fdupes

 BuildRequires:  dos2unix

 BuildRequires:  yasm

-%if %{with with_vs}

 BuildRequires:  pkgconfig(vapoursynth)

 BuildRequires:  pkgconfig(vapoursynth-script)

-%endif

 BuildRequires:  pkgconfig(fribidi)

 BuildRequires:  pkgconfig(libxslt)

 BuildRequires:  pkgconfig(libxml-2.0)

@@ -109,20 +94,15 @@

 BuildRequires:  pkgconfig(x264)

 BuildRequires:  pkgconfig(x265)

-%if %{with build_qt5}

-# QT5-GUI

+# GUI

 BuildRequires:  cmake(Qt5Core)

 BuildRequires:  cmake(Qt5LinguistTools)

 BuildRequires:  cmake(Qt5Network)

 BuildRequires:  cmake(Qt5OpenGL)

 BuildRequires:  cmake(Qt5Script)

 BuildRequires:  cmake(Qt5Widgets)

-%else

-# QT4-GUI

-BuildRequires:  pkgconfig(QtCore) >= 4.7

-%endif

-# Main package requires at least one frontend (cli or qt4)

+# Main package requires at least one frontend (cli or qt5)

 Requires:       avidemux3-frontend = %{version}-%{release}

 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

@@ -156,14 +136,14 @@

 This package provides a command-line interface to editing videos with avidemux.

-%package qt%{qtversion}

+%package qt5

 Summary:        Qt interface for avidemux

 Group:          Productivity/Multimedia/Video/Editors and Convertors

 Provides:       avidemux3-frontend = %{version}-%{release}

 Requires:       avidemux3 = %{version}-%{release}

-Recommends:     avidemux3-qt%{qtversion}-lang = %{version}-%{release}

+Recommends:     avidemux3-qt5-lang = %{version}-%{release}

-%description qt%{qtversion}

+%description qt5

 Avidemux is a free video editor designed for simple cutting, filtering and

 encoding tasks. It supports many file types, including AVI, DVD compatible

 MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated

@@ -176,13 +156,13 @@

 This package contains the Qt graphical interface for avidemux.

-%package qt%{qtversion}-lang

-Summary:        Languages for package avidemux3-qt%{qtversion}

+%package qt5-lang

+Summary:        Languages for package avidemux3-qt5

 Group:          System/Localization

-Requires:       avidemux3-qt%{qtversion} = %{version}-%{release}

+Requires:       avidemux3-qt5 = %{version}-%{release}

 BuildArch:      noarch

-%description qt%{qtversion}-lang

+%description qt5-lang

 Avidemux is a free video editor designed for simple cutting, filtering and

 encoding tasks. It supports many file types, including AVI, DVD compatible

 MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated

@@ -193,7 +173,7 @@

 from other people and projects has been used as well. Patches, translations

 and even bug reports are always welcome.

-This package provides translations for package avidemux3-qt%{qtversion}.

+This package provides translations for package avidemux3-qt5.

 %prep

@@ -209,40 +189,24 @@

 %patch5 -p0

 %patch6 -p0

 %patch7 -p0

-%if 0%{?suse_version} > 1500

-%patch8 -p0

-%endif

+%patch8 -p0 -R

 cp -f %{S:3} avidemux_core/ffmpeg_package/patches/

 chmod 755 bootStrap.bash

 chmod 644 AUTHORS COPYING README

 %build

 flags+="%optflags -fno-strict-aliasing "

-%if 0%{?suse_version} == 1320

-%ifarch %ix86

-flags+="-fno-stack-protector "

-%endif

-%endif

 export CXXFLAGS="$flags"

 options+="--with-cli "

-%if %{with build_qt5}

 options+="--with-qt "

-%else

-options+="--with-qt --enable-qt4 "

-%endif

 ./bootStrap.bash $options

 %install

 cp -r install/* %{buildroot}

 # Install desktop file

-install -D -m644 %{S:1} %{buildroot}%{_datadir}/applications/avidemux3-qt%{qtversion}.desktop

-sed -i -e 's|qtversion|%{qtversion}|g' %{buildroot}%{_datadir}/applications/avidemux3-qt%{qtversion}.desktop

-%if %{with with_vs}

-install -D -m644 %{S:2} %{buildroot}%{_datadir}/applications/vsproxy-qt%{qtversion}.desktop

-sed -i -e 's|qtversion|%{qtversion}|g' %{buildroot}%{_datadir}/applications/vsproxy-qt%{qtversion}.desktop

-%endif

+install -D -m644 %{S:1} %{buildroot}%{_datadir}/applications/avidemux3.desktop

 # Install icon

 install -D -m644 avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux3.png

@@ -263,19 +227,16 @@

 %postun cli -p /sbin/ldconfig

-%post qt%{qtversion}

+%post qt5

 /sbin/ldconfig

 %desktop_database_post

-%postun qt%{qtversion}

+%postun qt5

 /sbin/ldconfig

 %desktop_database_postun

 %files

 %defattr(-,root,root)

-%if %{with with_vs}

-%{_bindir}/vsProxy

-%endif

 %{_libdir}/libADM6avcodec.so.*

 %{_libdir}/libADM6avformat.so.*

 %{_libdir}/libADM6avutil.so.*

@@ -293,6 +254,7 @@

 %{_libdir}/libADM_coreImageLoader6.so

 %{_libdir}/libADM_coreJobs.so

 %{_libdir}/libADM_coreLibVA6.so

+%{_libdir}/libADM_coreLibVAEnc6.so

 %{_libdir}/libADM_coreMuxer6.so

 %{_libdir}/libADM_coreScript.so

 %{_libdir}/libADM_coreSocket6.so

@@ -344,6 +306,7 @@

 %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_lav_aac.so

 %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_lav_ac3.so

 %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_lav_mp2.so

+%{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_opus.so

 %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_pcm.so

 %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_twolame.so

 %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_vorbis.so

@@ -387,8 +350,8 @@

 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg4.so

 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_huff.so

 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_jpeg.so

+%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_libva.so

 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_null.so

-%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_png.so

 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_xvid4.so

 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_yv12.so

 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_ascii.so

@@ -420,18 +383,15 @@

 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_removePlane.so

 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_resampleFps.so

 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_rotate.so

-%if 0%{?suse_version} <= 1500

 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_ssa.so

-%endif

 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_separateField.so

 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_sharpen.so

 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_stackField.so

+%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_stillimage.so

 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_swapUV.so

 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_telecide.so

 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_unstackField.so

-%if %{with build_qt5}

 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vaapiFilter.so

-%endif

 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vdpauFilter.so

 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.so

 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vflip.so

@@ -462,54 +422,48 @@

 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_msharpenCli.so

 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_swscaleResize_cli.so

-%files qt%{qtversion}

+%files qt5

 %defattr(-,root,root)

-%{_bindir}/avidemux3_jobs_qt%{qtversion}

-%{_bindir}/avidemux3_qt%{qtversion}

-%if %{with with_vs}

-%{_bindir}/vsProxy_gui_qt%{qtversion}

-%endif

-%{_libdir}/libADM_openGLQT%{qtversion}6.so

-%{_libdir}/libADM_render6_QT%{qtversion}.so

-%{_libdir}/libADM_UIQT%{qtversion}6.so

+%{_bindir}/avidemux3_jobs_qt5

+%{_bindir}/avidemux3_qt5

+%{_libdir}/libADM_openGLQT56.so

+%{_libdir}/libADM_render6_QT5.so

+%{_libdir}/libADM_UIQT56.so

 %dir %{_libdir}/ADM_plugins6/shaderDemo

 %dir %{_libdir}/ADM_plugins6/shaderDemo/1

-%dir %{_libdir}/ADM_plugins6/videoEncoders/qt%{qtversion}

-%dir %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}

+%dir %{_libdir}/ADM_plugins6/videoEncoders/qt5

+%dir %{_libdir}/ADM_plugins6/videoFilters/qt5

 %{_libdir}/ADM_plugins6/shaderDemo/1/bump.shader

 %{_libdir}/ADM_plugins6/shaderDemo/1/lightning.shader

 %{_libdir}/ADM_plugins6/shaderDemo/1/ripple.shader

 %{_libdir}/ADM_plugins6/shaderDemo/1/zigzag.shader

-%{_libdir}/ADM_plugins6/videoEncoders/qt%{qtversion}/libADM_ve_x264_QT%{qtversion}.so

-%{_libdir}/ADM_plugins6/videoEncoders/qt%{qtversion}/libADM_ve_x265_QT%{qtversion}.so

-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_asharpQT%{qtversion}.so

-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_blackenBordersQT%{qtversion}.so

-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_chromaShiftQT%{qtversion}.so

-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_contrastQT%{qtversion}.so

-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_cropQT%{qtversion}.so

-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_eq2QT%{qtversion}.so

-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_glBenchmark.so

-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_glResize.so

-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_HueQT%{qtversion}.so

-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_logoQT%{qtversion}.so

-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_mpdelogoQT%{qtversion}.so

-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_msharpenQT%{qtversion}.so

-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_rotateGlFrag2.so

-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_sampleGlFrag2.so

-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_sampleGlVertex.so

-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_shaderLoaderGl.so

-%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_swscaleResizeQT%{qtversion}.so

-%{_datadir}/applications/avidemux3-qt%{qtversion}.desktop

-%if %{with with_vs}

-%{_datadir}/applications/vsproxy-qt%{qtversion}.desktop

-%endif

+%{_libdir}/ADM_plugins6/videoEncoders/qt5/libADM_ve_x264_QT5.so

+%{_libdir}/ADM_plugins6/videoEncoders/qt5/libADM_ve_x265_QT5.so

+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_asharpQT5.so

+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_blackenBordersQT5.so

+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_chromaShiftQT5.so

+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_contrastQT5.so

+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_cropQT5.so

+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_eq2QT5.so

+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_glBenchmark.so

+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_glResize.so

+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_HueQT5.so

+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_logoQT5.so

+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_mpdelogoQT5.so

+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_msharpenQT5.so

+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_rotateGlFrag2.so

+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_sampleGlFrag2.so

+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_sampleGlVertex.so

+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_shaderLoaderGl.so

+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_swscaleResizeQT5.so

+%{_datadir}/applications/avidemux3.desktop

 %{_datadir}/pixmaps/avidemux3.png

-%files qt%{qtversion}-lang

+%files qt5-lang

 %defattr(-,root,root)

 %dir %{_datadir}/avidemux3

-%dir %{_datadir}/avidemux3/qt%{qtversion}

-%dir %{_datadir}/avidemux3/qt%{qtversion}/i18n

-%{_datadir}/avidemux3/qt%{qtversion}/i18n/*.qm

+%dir %{_datadir}/avidemux3/qt5

+%dir %{_datadir}/avidemux3/qt5/i18n

+%{_datadir}/avidemux3/qt5/i18n/*.qm

 %changelog

​

@@ -0,0 +1,13 @@

+--- avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp.orig

++++ avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp

+@@ -88,8 +88,8 @@ bool x264Encoder::setup(void)

+   // Threads..

+   switch(x264Settings.general.threads)

+   {

+-    case 0: case 1: case 2:  param.i_threads = x264Settings.general.threads;break;

+-    case 99:break; //auto

++    case 1: case 2: case 4: param.i_threads = x264Settings.general.threads;break;

++    case 0: case 99: break; //auto

+     default: ADM_error("UNKNOWN NB OF THREADS\n");break;

+   }

+   param.i_width = getWidth();

​

@@ -1,11 +0,0 @@

---- avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp.orig

-+++ avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp

-@@ -35,7 +35,7 @@

- #elif defined(ADM_BSD_FAMILY) || defined(__sun__)

- #define POW10(x) powf(10.0,x)

- #else

--#define POW10(x)  pow10f(x)

-+#define POW10(x) exp10f(x)

- #endif

- 

- #define LINEAR_TO_DB(x) (20.*log10(x))

​

@@ -1,11 +0,0 @@

-[Desktop Entry]

-Name=vsProxy-qtqtversion

-GenericName=vsProxy-QTqtversion

-Comment=Video Editor

-Exec=vsProxy_gui_qtqtversion

-Icon=avidemux3

-Terminal=false

-Type=Application

-Categories=AudioVideo;AudioVideoEditing;

-X-KDE-StartupNotify=true

-X-SuSE-translate=true

​

@@ -1,8 +1,8 @@

 [Desktop Entry]

-Name=Avidemux3-qtqtversion

-GenericName=Avidemux3-QTqtversion

+Name=Avidemux3

+GenericName=Avidemux3

 Comment=Video Editor

-Exec=avidemux3_qtqtversion

+Exec=avidemux3_qt5

 MimeType=video/mpeg;video/quicktime;video/x-msvideo;video/x-anim;audio/x-mp3;audio/x-mp2;

 Icon=avidemux3

 Terminal=false

​