Request 2041 (accepted)

avidemux3.changes Changed

@@ -1,13 +1,40 @@
 -------------------------------------------------------------------
+Sat Jul 11 2015 - joerg.lorenzen@ki.tng.de
+
+- Update to version 2.6.10
+  * Re-added translations
+  * Re-added avsproxy
+  * Fixed multi passes with x264 when file has non ascii chars
+  * Added experimental Qt5 build for mac
+  * Fixed a bug with filler frames (fraps)
+- update internal ffmpeg to version 2.7.1
+
+- Version 2.6.9
+  * x265 support by KoolAidMan.
+  * Qt4 and Qt5 support.
+  * Compatibility with newer VAAPI.
+  * Updated ffmpeg libraries.
+  * Simple support for nvenc (linux).
+  * Better compatibility with Dash file, Flv.
+  * AvsProxy improvements (hinterwaeldler).
+  * Misc fixes (asjchult).
+  * Plenty of bugfixes and new bugs.
+  * Win32 and Win64 builds are now using winbuilds.org, Xp no
+    longer supported.
+
+-------------------------------------------------------------------
 Sat May 02 2015 - joerg.lorenzen@ki.tng.de
+
 - fixed build for openSUSE = 11.4
 
 -------------------------------------------------------------------
 Thu Feb 26 2015 - joerg.lorenzen@ki.tng.de
+
 - update internal ffmpeg to version 1.2.12
 
 -------------------------------------------------------------------
 Tue Dec 23 2014 - joerg.lorenzen@ki.tng.de
+
 - update internal ffmpeg to version 1.2.11
 - removed workaround for build on arm armv6l/armv6hl, the problem
   is caused by additional RaspberryPi repository and should be
@@ -20,33 +47,40 @@
 
 -------------------------------------------------------------------
 Sat Nov 08 2014 - joerg.lorenzen@ki.tng.de
+
 - added patch and dependencies to enable build on ARM CPU
 - removed some unneeded dependencies
 
 -------------------------------------------------------------------
 Wed Nov 05 2014 - joerg.lorenzen@ki.tng.de
+
 - update internal ffmpeg to version 1.2.10
 
 -------------------------------------------------------------------
 Fri Oct 17 2014 - joerg.lorenzen@ki.tng.de
+
 - changed BuildRequires to pkgconfig where possible
 - enable build for SLES, unfortunately without frontends qt and gtk
   because SLES doesn't provide gtk3 and qt >= 4.7
 
 -------------------------------------------------------------------
 Fri Oct 10 2014 - joerg.lorenzen@ki.tng.de
+
 - update internal ffmpeg to version 1.2.9
 
 -------------------------------------------------------------------
 Fri Aug 22 2014 - joerg.lorenzen@ki.tng.de
+
 - update internal ffmpeg to version 1.2.8
 
 -------------------------------------------------------------------
 Tue Jun 24 2014 - joerg.lorenzen@ki.tng.de
+
 - update internal ffmpeg to version 1.2.7
 
 -------------------------------------------------------------------
 Fri Mar 14 2014 - joerg.lorenzen@ki.tng.de
+
 - Update to version 2.6.8
   * Image/export: Proper initialization of Qz for jpeg export
   * UI : Add an override menu to force language
@@ -74,14 +108,17 @@
 
 -------------------------------------------------------------------
 Wed Mar 12 2014 - joerg.lorenzen@ki.tng.de
+
 - update internal ffmpeg to version 1.2.6
 
 -------------------------------------------------------------------
 Sat Feb 01 2014 - joerg.lorenzen@ki.tng.de
+
 - update internal ffmpeg to version 1.2.5
 
 -------------------------------------------------------------------
 Mon Dec 09 2013 - joerg.lorenzen@ki.tng.de
+
 - Update to version 2.6.7
   * [MKV] Fix seeking in h264
   * [TS/H264] Split on NALU boundaries, it was off by one byte
@@ -94,8 +131,10 @@
 
 -------------------------------------------------------------------
 Sat Nov 02 2013 - joerg.lorenzen@ki.tng.de
+
 - changes in spec file to enable build for openSUSE 11.4 and 12.1
 
 -------------------------------------------------------------------
 Wed Oct 30 2013 - joerg.lorenzen@ki.tng.de
+
 - Initial package, version 2.6.6

avidemux3.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package avidemux3
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,25 +16,31 @@
 #
 
 
-%define         ffmpeg_version 1.2.12
+%define         ffmpeg_version 2.7.1
 
 Name:           avidemux3
 Summary:        Graphical video editing and transcoding tool
-Version:        2.6.8
+Version:        2.6.10
 Release:        1
-Url:            http://www.avidemux.org
+Url:            http://avidemux.sourceforge.net/
 Source0:        avidemux_%{version}.tar.gz
 Source1:        avidemux3-qt4.desktop
 Source2:        avidemux3-gtk.desktop
 Source3:        ffmpeg-%{ffmpeg_version}.tar.bz2
 Source4:        config.mak.diff
-Source5:        xvba_support_from_xbmc_xvba.patch
+Source5:        libavcodec_put_bits.h.patch
+Source6:        xvba_support_from_xbmc_xvba.patch
+Source7:        libavcodec_x86_fmtconvert_init.c.patch
+Source8:        libavcodec_mpegvideo_enc.c.patch
+Source9:        libavcodec_mpeg12enc.c.patch
 Patch0:         avidemux-cmake-2.8.8.patch
 Patch1:         avidemux-linking.patch
 Patch2:         avidemux-x264_plugins.patch
-Patch3:         avidemux-package_version.patch
-Patch4:         avidemux-bootStrap.patch
-Patch5:         avidemux-cpu_armel.patch
+Patch3:         avidemux-x265_plugins.patch
+Patch4:         avidemux-package_version.patch
+Patch5:         avidemux-bootStrap.patch
+Patch6:         avidemux-cpu_armel.patch
+Patch7:         avidemux-ADM_VERSION.patch
 License:        GPL-2.0
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 
@@ -76,8 +82,7 @@
 BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(vdpau)
 BuildRequires:  pkgconfig(xv)
-## newer version of libav are not compatible to avidemux
-%if 0%{?suse_version} < 1310
+%if 0%{?suse_version} >= 1310
 BuildRequires:  pkgconfig(libva)
 %endif
 
@@ -113,8 +118,10 @@
 BuildRequires:  pkgconfig(libass)
 %if 0%{?sles_version}
 BuildRequires:  libx264-devel
+BuildRequires:  libx265-devel
 %else
 BuildRequires:  pkgconfig(x264)
+BuildRequires:  pkgconfig(x265)
 %endif
 
 %if ! 0%{?sles_version}
@@ -186,8 +193,8 @@
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Provides:       avidemux3-frontend = %{version}-%{release}
 Requires:       avidemux3 = %{version}-%{release}
-Requires:       avidemux3-qt4-lang = %{version}-%{release}
 Requires:       avidemux3-help = %{version}-%{release}
+Recommends:     avidemux3-qt4-lang = %{version}-%{release}
 
 %description qt4
 Avidemux is a free video editor designed for simple cutting, filtering and
@@ -202,7 +209,24 @@
 
 This package contains the Qt graphical interface for avidemux.
 
-%lang_package -n avidemux3-qt4
+%package qt4-lang
+Summary:        Languages for package avidemux3-qt4
+Group:          System/Localization
+Requires:       avidemux3-qt4 = %{version}-%{release}
+BuildArch:      noarch
+
+%description qt4-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
+using projects, job queue and powerful scripting capabilities.
+
+Avidemux is available for Linux, BSD, Mac OS X and Microsoft Windows under
+the GNU GPL license. The program was written from scratch by Mean, but code
+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-qt4.
 
 %package help
 Summary:        Help files for avidemux
@@ -232,16 +256,30 @@
 echo 'from Config import *' >> %{_sourcedir}/avidemux3-rpmlintrc
 echo 'addFilter("libdir-macro-in-noarch-package")' >> %{_sourcedir}/avidemux3-rpmlintrc
 %endif
-find . -type f -exec dos2unix -q {} \;
-sed -i -e 's|set(FFMPEG_VERSION "1.2.1")|set(FFMPEG_VERSION "%{ffmpeg_version}")|g' cmake/admFFmpegBuild.cmake
-rm -f avidemux_core/ffmpeg_package/ffmpeg-1.2.1.tar.bz2
+find ./ -name '*.bash' -exec dos2unix -q {} \;
+find ./ -name '*.cmake' -exec dos2unix -q {} \;
+find ./ -name '*.cpp' -exec dos2unix -q {} \;
+find ./ -name '*.sh' -exec dos2unix -q {} \;
+find ./ -name '*.sql' -exec dos2unix -q {} \;
+find ./ -name '*.txt' -exec dos2unix -q {} \;
+find . -type f -exec sed -i -e 's|intfloat_readwrite.h|intfloat.h|g' {} \;
+sed -i -e 's|set(FFMPEG_VERSION "2.6.1")|set(FFMPEG_VERSION "%{ffmpeg_version}")|g' cmake/admFFmpegBuild.cmake
+rm -f avidemux_core/ffmpeg_package/ffmpeg-2.6.1.tar.bz2
 cp %{S:3} avidemux_core/ffmpeg_package/
 pushd avidemux_core/ffmpeg_package/patches
 rm -f config.mak.diff
+rm -f libavcodec_put_bits.h.patch
+rm -f libavcodec_x86_fmtconvert_init.c.patch
+rm -f libavcodec_mpegvideo_enc.c.patch
+rm -f libavcodec_mpeg12enc.c.patch
 cp %{S:4} .
+cp %{S:5} .
+cp %{S:7} .
+cp %{S:8} .
+cp %{S:9} .
 pushd xvba
 rm -f xvba_support_from_xbmc_xvba.patch
-cp %{S:5} .
+cp %{S:6} .
 popd
 popd
 %patch0 -p0
@@ -250,6 +288,10 @@
 %patch3 -p0
 %patch4 -p0
 %patch5 -p0
+%patch6 -p0
+%patch7 -p0
+chmod 755 bootStrap.bash
+chmod 644 AUTHORS COPYING README
 
 %build
 %if ! 0%{?sles_version}
@@ -258,7 +300,6 @@
 export CXXFLAGS="%optflags -D__STDC_CONSTANT_MACROS -fno-strict-aliasing"
 %endif
 
-chmod 755 bootStrap.bash
 %if ! 0%{?sles_version}
 ./bootStrap.bash --with-cli --with-gtk
 %else
@@ -283,6 +324,8 @@
 # delete devel file (only needed for build)
 rm -rf %{buildroot}%{_includedir}
 
+## find . -name "config.mak" -exec install -D -m644 {} %{buildroot}%{_datadir}/avidemux3/help/config.mak \;
+
 %fdupes %buildroot
 
 %post -p /sbin/ldconfig
@@ -305,11 +348,11 @@
 
 %files
 %defattr(-,root,root)
-%{_libdir}/libADM6avcodec.so.54
-%{_libdir}/libADM6avformat.so.54
-%{_libdir}/libADM6avutil.so.52
-%{_libdir}/libADM6postproc.so.52
-%{_libdir}/libADM6swscale.so.2
+%{_libdir}/libADM6avcodec.so.*
+%{_libdir}/libADM6avformat.so.*
+%{_libdir}/libADM6avutil.so.*
+%{_libdir}/libADM6postproc.so.*
+%{_libdir}/libADM6swscale.so.*
 %{_libdir}/libADM_audioParser6.so
 %{_libdir}/libADM_core6.so
 %{_libdir}/libADM_coreAudio6.so
@@ -321,7 +364,7 @@
 %{_libdir}/libADM_coreImage6.so
 %{_libdir}/libADM_coreImageLoader6.so
 %{_libdir}/libADM_coreJobs.so
-%if 0%{?suse_version} < 1310
+%if 0%{?suse_version} >= 1310
 %{_libdir}/libADM_coreLibVA6.so
 %endif
 %{_libdir}/libADM_coreMuxer6.so
@@ -410,9 +453,6 @@
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/veryFast.json
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/fast.json
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/iPhone.json
-%if ! 0%{?sles_version}
-%{_libdir}/ADM_plugins6/scriptEngines/libADM_script_qt.so
-%endif
 %{_libdir}/ADM_plugins6/scriptEngines/libADM_script_spiderMonkey.so
 %{_libdir}/ADM_plugins6/scriptEngines/libADM_script_tinyPy.so
 %{_libdir}/ADM_plugins6/videoDecoders/libADM_vd_vpx.so
@@ -465,11 +505,11 @@
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vflip.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_yadif.so
-%if ! 0%{?sles_version}
 %dir %{_datadir}/ADM6_addons
 %dir %{_datadir}/ADM6_addons/avsfilter
 %{_datadir}/ADM6_addons/avsfilter/avsload.exe
 %{_datadir}/ADM6_addons/avsfilter/pipe_source.dll
+%if ! 0%{?sles_version}
 %{_datadir}/pixmaps/avidemux3.png
 %endif
 %{_mandir}/man1/avidemux.1.gz
@@ -481,13 +521,15 @@
 %{_libdir}/libADM_render6_cli.so
 %{_libdir}/libADM_UI_Cli6.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_x264_cli.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_chromaShiftCli.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_contrastCli.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_CropCli.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_eq2Cli.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_HueCli.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_mpdelogoCli.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_swscaleResize_cli.so
+%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_x265_cli.so
+%dir %{_libdir}/ADM_plugins6/videoFilters/cli
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_chromaShiftCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_contrastCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_CropCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_eq2Cli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_HueCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_mpdelogoCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_swscaleResize_cli.so
 
 %if ! 0%{?sles_version}
 %files gtk
@@ -540,40 +582,48 @@
 %{_libdir}/ADM_glade/videoFilter/up.png
 %{_libdir}/ADM_glade/videoFilter/videoFilter.gtkBuilder
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_x264_gtk.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_asharpGtk.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_chromaShiftGtk.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_contrastGtk.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_cropGtk.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_eq2Gtk.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_HueGtk.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_swscaleResize_gtk.so
+%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_x265_gtk.so
+%dir %{_libdir}/ADM_plugins6/videoFilters/gtk
+%{_libdir}/ADM_plugins6/videoFilters/gtk/libADM_vf_asharpGtk.so
+%{_libdir}/ADM_plugins6/videoFilters/gtk/libADM_vf_chromaShiftGtk.so
+%{_libdir}/ADM_plugins6/videoFilters/gtk/libADM_vf_contrastGtk.so
+%{_libdir}/ADM_plugins6/videoFilters/gtk/libADM_vf_cropGtk.so
+%{_libdir}/ADM_plugins6/videoFilters/gtk/libADM_vf_eq2Gtk.so
+%{_libdir}/ADM_plugins6/videoFilters/gtk/libADM_vf_HueGtk.so
+%{_libdir}/ADM_plugins6/videoFilters/gtk/libADM_vf_swscaleResize_gtk.so
 %{_datadir}/applications/avidemux3-gtk.desktop
 
 %files qt4
 %defattr(-,root,root)
-%{_bindir}/avidemux3_jobs
+%{_bindir}/avidemux3_jobs_qt4
 %{_bindir}/avidemux3_qt4
-%{_libdir}/libADM_render6_qt4.so
+%{_libdir}/libADM_render6_QT4.so
 %{_libdir}/libADM_UIQT46.so
-%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_x264_qt4.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_asharpQt4.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_chromaShiftQt4.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_contrastQt4.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_cropQt4.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_eq2Qt4.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_glBenchmark.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_glResize.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_HueQt4.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_mpdelogoQt4.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_rotateGlFrag2.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_sampleGlFrag2.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_sampleGlVertex.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_swscaleResize_qt4.so
+%dir %{_libdir}/ADM_plugins6/scriptEngines/qt4
+%dir %{_libdir}/ADM_plugins6/videoEncoders/qt4
+%dir %{_libdir}/ADM_plugins6/videoFilters/qt4
+%{_libdir}/ADM_plugins6/scriptEngines/qt4/libadm_script_QT4.so
+%{_libdir}/ADM_plugins6/videoEncoders/qt4/libADM_ve_x264_QT4.so
+%{_libdir}/ADM_plugins6/videoEncoders/qt4/libADM_ve_x265_QT4.so
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_asharpQT4.so
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_chromaShiftQT4.so
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_contrastQT4.so
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_cropQT4.so
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_eq2QT4.so
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_glBenchmark.so
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_glResize.so
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_HueQT4.so
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_mpdelogoQT4.so
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_rotateGlFrag2.so
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_sampleGlFrag2.so
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_sampleGlVertex.so
+%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_swscaleResizeQT4.so
 %{_datadir}/applications/avidemux3-qt4.desktop
 
 %files -n avidemux3-qt4-lang
 %defattr(-,root,root)
-%{_datadir}/avidemux3/i18n/
+%dir %{_datadir}/avidemux3/qt4
+%{_datadir}/avidemux3/qt4/i18n/
 
 %files help
 %defattr(-,root,root)

avidemux-ADM_VERSION.patch Added

avidemux-bootStrap.patch Changed

avidemux-cmake-2.8.8.patch Changed

avidemux-cpu_armel.patch Changed

avidemux-linking.patch Changed

@@ -1,6 +1,6 @@
---- avidemux/cli/CMakeLists.txt.orig	2013-12-06 07:33:08.000000000 +0100
-+++ avidemux/cli/CMakeLists.txt	2013-12-09 11:37:09.197249000 +0100
-@@ -102,6 +102,16 @@
+--- avidemux/cli/CMakeLists.txt.orig	2014-11-28 22:27:34.737989374 +0100
++++ avidemux/cli/CMakeLists.txt	2014-11-28 22:27:19.740246591 +0100
+@@ -80,6 +80,16 @@
  )
  
  ###########################################
@@ -17,8 +17,8 @@
  # External libs
  ###########################################
  # gettext
---- avidemux/gtk/CMakeLists.txt.orig	2013-12-06 07:33:08.000000000 +0100
-+++ avidemux/gtk/CMakeLists.txt	2013-12-09 11:37:11.447018600 +0100
+--- avidemux/gtk/CMakeLists.txt.orig	2014-11-28 22:27:34.739989392 +0100
++++ avidemux/gtk/CMakeLists.txt	2014-11-28 22:27:19.744246523 +0100
 @@ -102,6 +102,16 @@
  )
  
@@ -36,15 +36,15 @@
  # External libs
  ###########################################
  # gettext
---- avidemux/qt4/CMakeLists.txt.orig	2013-12-06 07:33:08.000000000 +0100
-+++ avidemux/qt4/CMakeLists.txt	2013-12-09 11:37:13.759281800 +0100
-@@ -140,6 +140,16 @@
+--- avidemux/qt4/CMakeLists.txt.orig	2014-11-28 22:27:34.741989405 +0100
++++ avidemux/qt4/CMakeLists.txt	2014-11-28 22:27:19.746246489 +0100
+@@ -118,6 +118,16 @@
  )
  
  ###########################################
 +# Missing libs
 +###########################################
-+TARGET_LINK_LIBRARIES(avidemux3_qt4
++TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION}
 +	ADM_coreSqlLight3
 +	ADM_libswscale
 +	ADM_libpostproc
@@ -55,16 +55,16 @@
  # External libs
  ###########################################
  # gettext
---- avidemux/qt4/ADM_jobs/src/CMakeLists.txt.orig	2013-12-06 07:33:08.000000000 +0100
-+++ avidemux/qt4/ADM_jobs/src/CMakeLists.txt	2013-12-09 11:37:16.040298200 +0100
-@@ -90,6 +90,16 @@
- TARGET_LINK_LIBRARIES(avidemux3_jobs ADM_coreJobs)
- TARGET_LINK_LIBRARIES(avidemux3_jobs ADM_coreUtils6)
- TARGET_LINK_LIBRARIES(avidemux3_jobs ADM_core6)
+--- avidemux/qt4/ADM_jobs/src/CMakeLists.txt.orig	2015-02-10 07:29:57.000000000 +0100
++++ avidemux/qt4/ADM_jobs/src/CMakeLists.txt	2015-02-11 13:46:33.536379900 +0100
+@@ -67,6 +67,16 @@
+ TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreJobs)
+ TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreUtils6)
+ TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_core6)
 +###########################################
 +# Missing libs
 +###########################################
-+TARGET_LINK_LIBRARIES(avidemux3_jobs
++TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION}
 +	ADM_coreSqlLight3
 +	ADM_coreUI6
 +	ADM_libavcodec
@@ -72,5 +72,5 @@
 +)
 +
  #
- target_link_libraries(avidemux3_jobs "-lm -lstdc++")
+ target_link_libraries(avidemux3_jobs_${QT_EXTENSION} "-lm -lstdc++")
  #

avidemux-package_version.patch Changed

@@ -1,22 +1,6 @@
---- avidemux/qt4/ADM_userInterfaces/ui_support.cpp.orig	2014-03-14 13:16:11.948145100 +0100
-+++ avidemux/qt4/ADM_userInterfaces/ui_support.cpp	2014-03-14 13:34:19.661718900 +0100
-@@ -95,12 +95,12 @@
-         }
-         ADM_info("Initializing language %s\n",lang);
- #ifdef __APPLE__
--	QString appdir = QCoreApplication::applicationDirPath() + "/../share/avidemux6/i18n/";
-+	QString appdir = QCoreApplication::applicationDirPath() + "/../share/avidemux3/i18n/";
-                 
- #elif defined(_WIN32)
- 	QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";
- #else
--	QString appdir = ADM_getInstallRelativePath("share","avidemux6","i18n");
-+	QString appdir = ADM_getInstallRelativePath("share","avidemux3","i18n");
- #endif
-         QString languageFile=QString(lang);
-     int nbLoaded=0;
---- avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp.orig	2014-03-14 13:19:05.743017000 +0100
-+++ avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2014-03-14 13:34:21.849218900 +0100
+diff -uNr avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp.orig avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp
+--- avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp.orig	2015-03-07 18:10:59.000000000 +0100
++++ avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2015-03-07 18:51:50.109120416 +0100
 @@ -143,7 +143,7 @@
      QString referenceFile = QCoreApplication::applicationDirPath() + "/help/" + ((FileAction*)sender())->filePath();
  #else
@@ -26,8 +10,27 @@
  #endif
  
      QDesktopServices::openUrl(QUrl("file:///" + referenceFile, QUrl::TolerantMode));
---- avidemux_core/ADM_core/src/ADM_fileio.cpp.orig	2014-03-14 13:21:28.788976500 +0100
-+++ avidemux_core/ADM_core/src/ADM_fileio.cpp	2014-03-14 13:34:24.302343900 +0100
+diff -uNr avidemux/qt4/ADM_userInterfaces/ui_support.cpp.orig avidemux/qt4/ADM_userInterfaces/ui_support.cpp
+--- avidemux/qt4/ADM_userInterfaces/ui_support.cpp.orig	2015-03-07 18:10:59.000000000 +0100
++++ avidemux/qt4/ADM_userInterfaces/ui_support.cpp	2015-03-07 18:51:50.163119306 +0100
+@@ -104,12 +104,12 @@
+                 
+                 
+ #ifdef __APPLE__
+-	QString appdir = QCoreApplication::applicationDirPath() + "/../share/avidemux6/"+QString(partialPath.c_str());
++	QString appdir = QCoreApplication::applicationDirPath() + "/../share/avidemux3/"+QString(partialPath.c_str());
+                 
+ #elif defined(_WIN32)
+ 	QString appdir = QCoreApplication::applicationDirPath() + QString(partialPath.c_str());
+ #else
+-	QString appdir = ADM_getInstallRelativePath("share","avidemux6",partialPath.c_str());
++	QString appdir = ADM_getInstallRelativePath("share","avidemux3",partialPath.c_str());
+ #endif
+         QString languageFile=QString(lang);
+     int nbLoaded=0;
+diff -uNr avidemux_core/ADM_core/src/ADM_fileio.cpp.orig avidemux_core/ADM_core/src/ADM_fileio.cpp
+--- avidemux_core/ADM_core/src/ADM_fileio.cpp.orig	2015-03-07 18:10:59.000000000 +0100
++++ avidemux_core/ADM_core/src/ADM_fileio.cpp	2015-03-07 18:51:50.858105023 +0100
 @@ -463,9 +463,9 @@
  		else
  			ADM_DIR_NAME = "avidemux";
@@ -40,8 +43,9 @@
  #endif
  
  		strcat(ADM_basedir, ADM_DIR_NAME);
---- avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp.orig	2014-03-14 13:23:56.381781900 +0100
-+++ avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2014-03-14 13:34:26.489843900 +0100
+diff -uNr avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp.orig avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp
+--- avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp.orig	2015-03-07 18:10:59.000000000 +0100
++++ avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2015-03-07 18:51:54.903021895 +0100
 @@ -260,7 +260,7 @@
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1,
  			(string("Executing ") + string(name) + string("...")).c_str());
@@ -51,9 +55,10 @@
  
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1, "Done");
  
---- cmake/se_plugin.cmake.orig	2014-03-14 13:26:16.005888300 +0100
-+++ cmake/se_plugin.cmake	2014-03-14 13:34:28.724218900 +0100
-@@ -12,7 +12,7 @@
+diff -uNr cmake/se_plugin.cmake.orig cmake/se_plugin.cmake
+--- cmake/se_plugin.cmake.orig	2015-03-07 18:10:59.000000000 +0100
++++ cmake/se_plugin.cmake	2015-03-07 18:51:56.589987225 +0100
+@@ -15,7 +15,7 @@
  if (WIN32)
      set(helpDir "${CMAKE_INSTALL_PREFIX}/help/${_engineName}")
  else (WIN32)
@@ -61,22 +66,24 @@
 +    set(helpDir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/help/${_engineName}")
  endif (WIN32)
  
-     install(DIRECTORY "${_sourceDirectory}" DESTINATION "${helpDir}")
---- cmake/Ts.cmake.orig	2014-03-14 13:30:09.942968900 +0100
-+++ cmake/Ts.cmake	2014-03-14 13:34:30.583593900 +0100
-@@ -41,7 +41,7 @@
-         IF(WIN32)
-                 SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")
-         ELSE(WIN32)
--                SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux6/i18n")
-+                SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/i18n")
-         ENDIF(WIN32)
-         INSTALL(FILES ${_files} DESTINATION "${i18dir}")
- ENDMACRO(INSTALL_I18N _files)
---- cmake/sql/update.sh.orig	2014-03-14 13:31:34.614843900 +0100
-+++ cmake/sql/update.sh	2014-03-14 13:34:32.864843900 +0100
+     install(DIRECTORY "${_sourceDirectory}" DESTINATION "${helpDir}" COMPONENT plugins)
+diff -uNr cmake/sql/update.sh.orig cmake/sql/update.sh
+--- cmake/sql/update.sh.orig	2015-03-07 18:10:59.000000000 +0100
++++ cmake/sql/update.sh	2015-03-07 18:51:56.393991253 +0100
 @@ -1,3 +1,3 @@
 -sqlite3 ~/.avidemux6/jobs.sql .d > dump
 +sqlite3 ~/.avidemux3/jobs.sql .d > dump
  #sql2class -sqlite -global -license -wrapped  -lib $PWD dump
  sql2class -sqlite -build -global -prefix $PWD -lib sqlJobs -namespace db -overwrite dump
+diff -uNr cmake/Ts.cmake.orig cmake/Ts.cmake
+--- cmake/Ts.cmake.orig	2015-03-07 18:10:59.000000000 +0100
++++ cmake/Ts.cmake	2015-03-07 18:51:56.421990678 +0100
+@@ -41,7 +41,7 @@
+         IF(WIN32)
+                 SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")
+         ELSE(WIN32)
+-                SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux6/${QT_EXTENSION}/i18n")
++                SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/${QT_EXTENSION}/i18n")
+         ENDIF(WIN32)
+         INSTALL(FILES ${_files} DESTINATION "${i18dir}" COMPONENT runtime)
+ ENDMACRO(INSTALL_I18N _files)

avidemux-x264_plugins.patch Changed

avidemux-x265_plugins.patch Added

@@ -0,0 +1,38 @@
+--- avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt.orig	2015-02-23 18:53:40.000000000 +0100
++++ avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt	2015-02-26 14:06:03.794031200 +0100
+@@ -27,15 +27,26 @@
+     INSTALL_VIDEO_ENCODER_QT4(ADM_ve_x265_${QT_LIBRARY_EXTENSION})
+   endif(DO_QT4)
+   #-----------------------/QT4 VERSION---------------------
+-  #-----------------------GTK or CLI VERSION---------------------
+-  if((DO_GTK) OR (DO_CLI))
+-    ADD_VIDEO_ENCODER(ADM_ve_x265_other   ADM_x265_noui.cpp ${x265_SRCS})
+-    ADD_TARGET_CFLAGS(ADM_ve_x265_other "-DADM_UI_TYPE_BUILD=1") # CLI!
+-    TARGET_LINK_LIBRARIES(ADM_ve_x265_other "${X265_LIBRARY_DIR}")
+-    TARGET_LINK_LIBRARIES(ADM_ve_x265_other ADM_core6)
+-    INIT_VIDEO_ENCODER(ADM_ve_x265_other)
+-    INSTALL_VIDEO_ENCODER(ADM_ve_x265_other)
+-  endif((DO_GTK) OR (DO_CLI))
++  #-----------------------CLI VERSION----------------------
++  if(DO_CLI)
++    ADD_VIDEO_ENCODER(ADM_ve_x265_cli   ADM_x265_noui.cpp ${x265_SRCS})
++    ADD_TARGET_CFLAGS(ADM_ve_x265_cli "-DADM_UI_TYPE_BUILD=1") # CLI!
++    TARGET_LINK_LIBRARIES(ADM_ve_x265_cli "${X265_LIBRARY_DIR}")
++    TARGET_LINK_LIBRARIES(ADM_ve_x265_cli ADM_core6)
++    INIT_VIDEO_ENCODER(ADM_ve_x265_cli)
++    INSTALL_VIDEO_ENCODER(ADM_ve_x265_cli)
++  endif(DO_CLI)
++  #-----------------------/CLI VERSION---------------------
++  #-----------------------GTK VERSION----------------------
++  if(DO_GTK)
++    ADD_VIDEO_ENCODER(ADM_ve_x265_gtk   ADM_x265_noui.cpp ${x265_SRCS})
++    ADD_TARGET_CFLAGS(ADM_ve_x265_gtk "-DADM_UI_TYPE_BUILD=1") # GTK!
++    TARGET_LINK_LIBRARIES(ADM_ve_x265_gtk "${X265_LIBRARY_DIR}")
++    TARGET_LINK_LIBRARIES(ADM_ve_x265_gtk ADM_core6)
++    INIT_VIDEO_ENCODER(ADM_ve_x265_gtk)
++    INSTALL_VIDEO_ENCODER(ADM_ve_x265_gtk)
++  endif(DO_GTK)
++  #-----------------------/GTK VERSION---------------------
+   # ------------- PRESET -----------
+   if(DO_SETTINGS)
+     FILE(GLOB json_files ${CMAKE_CURRENT_SOURCE_DIR}/preset/*.json)

config.mak.diff Changed

libavcodec_mpeg12enc.c.patch Added

@@ -0,0 +1,159 @@
+--- libavcodec/mpeg12enc.c.orig	2015-06-10 23:35:03.625383207 +0200
++++ libavcodec/mpeg12enc.c	2015-06-10 23:35:03.661382526 +0200
+@@ -254,7 +254,7 @@
+ 
+         put_sbits(&s->pb, 12, s->width  & 0xFFF);
+         put_sbits(&s->pb, 12, s->height & 0xFFF);
+-
++#if 0 // MEANX
+         for (i = 1; i < 15; i++) {
+             int64_t error = aspect_ratio.num * (1LL<<32) / aspect_ratio.den;
+             if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO || i <= 1)
+@@ -269,12 +269,41 @@
+                 s->aspect_ratio_info = i;
+             }
+         }
++#endif // MEANX
++            // MEANX put_bits(&s->pb, 4, s->aspect_ratio_info);
++            // MEANX put_bits(&s->pb, 4, s->frame_rate_index);
++ // MEANX 4:3
++   if(s->avctx->sample_aspect_ratio.num==16 && s->avctx->sample_aspect_ratio.den==9)
++             {
++                 //printf("FFmpeg : Wide\n");
++                 put_bits(&s->pb,4,3); //16:9
++             }
++             else        //4:3
++             {
++               if(s->codec_id == CODEC_ID_MPEG2VIDEO)
++                 put_bits(&s->pb, 4, 2);
++               else
++                 put_bits(&s->pb, 4, 12); // MPEG1
++             }
++ // /MEANX
++// MEANX : Pulldown
++            if((s->avctx->flags2 & CODEC_FLAG2_32_PULLDOWN) && (s->codec_id == CODEC_ID_MPEG2VIDEO))
++             {           
++                 put_bits(&s->pb, 4,4);
++             }
++             else
++             {                                  
++                 put_bits(&s->pb, 4, s->frame_rate_index);
++             } //MEANX pulldown
++
++            // MEANX if(s->avctx->rc_max_rate){
++                // MEANX v = (s->avctx->rc_max_rate + 399) / 400;
++           // MEANX  if(s->avctx->rc_max_rate_header){ //MEANX we use header
++           // MEANX      v = (s->avctx->rc_max_rate_header + 399) / 400;
++            if(s->avctx->rc_buffer_size_header) // MEANX we use header
++            {
++                vbv_buffer_size = s->avctx->rc_buffer_size_header;
+ 
+-        put_bits(&s->pb, 4, s->aspect_ratio_info);
+-        put_bits(&s->pb, 4, s->frame_rate_index);
+-
+-        if (s->avctx->rc_max_rate) {
+-            v = (s->avctx->rc_max_rate + 399) / 400;
+             if (v > 0x3ffff && s->codec_id == AV_CODEC_ID_MPEG1VIDEO)
+                 v = 0x3ffff;
+         } else {
+@@ -324,7 +353,19 @@
+             put_bits(&s->pb, 3, s->avctx->profile); // profile
+             put_bits(&s->pb, 4, s->avctx->level);   // level
+ 
+-            put_bits(&s->pb, 1, s->progressive_sequence);
++   // MEANX pulldown put_bits(&s->pb, 1, s->progressive_sequence);
++  // MEANX Pulldown
++ if(s->avctx->flags2 & CODEC_FLAG2_32_PULLDOWN) //MEANX
++                        put_bits(&s->pb, 1, 0);
++                else
++                        put_bits(&s->pb, 1, s->progressive_sequence);
++
++
++// /MEANX
++
++
++
++// MEANX                 put_bits(&s->pb, 1, s->progressive_sequence);
+             put_bits(&s->pb, 2, s->chroma_format);
+             put_bits(&s->pb, 2, s->width  >> 12);
+             put_bits(&s->pb, 2, s->height >> 12);
+@@ -425,6 +466,7 @@
+ 
+ void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number)
+ {
++    int tff, rff; //MEANX
+     AVFrameSideData *side_data;
+     mpeg1_encode_sequence_header(s);
+ 
+@@ -463,6 +505,46 @@
+ 
+     s->frame_pred_frame_dct = 1;
+     if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
++// MEANX
++        if(s->avctx->flags2 & CODEC_FLAG2_32_PULLDOWN)
++        {
++        
++                switch((s->picture_number - 
++                          s->gop_picture_number)&3)
++                {
++                        case 0:
++                        default:
++                                rff=1;
++                                tff=1;
++                                break;
++                        case 1:
++                                rff=0;
++                                tff=0;
++                                break;
++                        case 2:
++                                rff=1;
++                                tff=0;
++                                break;
++                        case 3:
++                                rff=0;
++                                tff=1;
++                                break;
++                }               
++           }
++        else
++        {
++                if (s->progressive_sequence) 
++                {
++                        tff=0; /* no repeat */
++                } else 
++                {
++                        tff=s->current_picture_ptr->f->top_field_first;
++                }
++                rff=s->repeat_first_field;
++        
++        }
++
++// /MEANX
+         put_header(s, EXT_START_CODE);
+         put_bits(&s->pb, 4, 8);                 /* pic ext */
+         if (s->pict_type == AV_PICTURE_TYPE_P ||
+@@ -482,10 +564,14 @@
+ 
+         av_assert0(s->picture_structure == PICT_FRAME);
+         put_bits(&s->pb, 2, s->picture_structure);
++#if 0 // MEANX
+         if (s->progressive_sequence)
+             put_bits(&s->pb, 1, 0);             /* no repeat */
+         else
+             put_bits(&s->pb, 1, s->current_picture_ptr->f->top_field_first);
++#endif // MEANX
++        put_bits(&s->pb, 1, tff);  //MEANX PULLDOWN
++
+         /* XXX: optimize the generation of this flag with entropy measures */
+         s->frame_pred_frame_dct = s->progressive_sequence;
+ 
+@@ -494,7 +580,8 @@
+         put_bits(&s->pb, 1, s->q_scale_type);
+         put_bits(&s->pb, 1, s->intra_vlc_format);
+         put_bits(&s->pb, 1, s->alternate_scan);
+-        put_bits(&s->pb, 1, s->repeat_first_field);
++        // MEANX put_bits(&s->pb, 1, s->top_field_first);
++        put_bits(&s->pb, 1, rff); // MEANX
+         s->progressive_frame = s->progressive_sequence;
+         /* chroma_420_type */
+         put_bits(&s->pb, 1, s->chroma_format ==

libavcodec_mpegvideo_enc.c.patch Added

@@ -0,0 +1,37 @@
+--- libavcodec/mpegvideo_enc.c.orig	2015-06-10 20:53:04.066303738 +0200
++++ libavcodec/mpegvideo_enc.c	2015-06-10 20:57:27.692337620 +0200
+@@ -469,14 +469,14 @@
+                "Warning vbv_delay will be set to 0xFFFF (=VBR) as the "
+                "specified vbv buffer is too large for the given bitrate!\n");
+     }
+-
++#if 0 // MEANX
+     if ((s->avctx->flags & CODEC_FLAG_4MV) && s->codec_id != AV_CODEC_ID_MPEG4 &&
+         s->codec_id != AV_CODEC_ID_H263 && s->codec_id != AV_CODEC_ID_H263P &&
+         s->codec_id != AV_CODEC_ID_FLV1) {
+         av_log(avctx, AV_LOG_ERROR, "4MV not supported by codec\n");
+         return -1;
+     }
+-
++#endif
+     if (s->obmc && s->avctx->mb_decision != FF_MB_DECISION_SIMPLE) {
+         av_log(avctx, AV_LOG_ERROR,
+                "OBMC is only supported with simple mb decision\n");
+@@ -568,7 +568,7 @@
+         av_log(avctx, AV_LOG_ERROR, "interlacing not supported by codec\n");
+         return -1;
+     }
+-
++#if 0 // MEANX
+     // FIXME mpeg2 uses that too
+     if (s->mpeg_quant && (   s->codec_id != AV_CODEC_ID_MPEG4
+                           && s->codec_id != AV_CODEC_ID_MPEG2VIDEO)) {
+@@ -576,7 +576,7 @@
+                "mpeg2 style quantization not supported by codec\n");
+         return -1;
+     }
+-
++#endif
+     if ((s->mpv_flags & FF_MPV_FLAG_CBP_RD) && !avctx->trellis) {
+         av_log(avctx, AV_LOG_ERROR, "CBP RD needs trellis quant\n");
+         return -1;

libavcodec_put_bits.h.patch Added

libavcodec_x86_fmtconvert_init.c.patch Added

avidemux_2.6.8.tar.gz -> avidemux_2.6.10.tar.gz Changed

ffmpeg-1.2.12.tar.bz2 -> ffmpeg-2.7.1.tar.bz2 Changed

Overview

Request 2041 (accepted)

Request History