commit 0e0012675dc296eeeb7ed613edfc31a025b8cd95
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Tue Dec 26 17:16:58 2017 +0100
- updated to 2.7.0
- updated x32 patch
- added ffmpeg-make patch (disable silent options for ffmpeg)
avidemux-ffmpeg-make.patch | 11 ++++
avidemux-x32.patch | 51 ++++++------------
avidemux.spec | 131 ++++++++++++++++++++++++++++-----------------
3 files changed, 109 insertions(+), 84 deletions(-)
---
diff --git a/avidemux.spec b/avidemux.spec
index b8b5515..4caab4c 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -6,12 +6,16 @@
# - nvenc (on bcond)?
#
# Conditional build:
-%bcond_with arts # aRts audio output
-%bcond_with esd # EsounD audio output
-%bcond_without amr # Adaptive Multi Rate (AMR) speech codec support
-%bcond_without qt4 # Qt 4 interface
-%bcond_without qt5 # Qt 5 interface
-%bcond_with gtk # GTK+ interface
+%bcond_with arts # aRts audio output
+%bcond_with esd # EsounD audio output
+%bcond_without amr # Adaptive Multi Rate (AMR) speech codec support
+%bcond_without qt4 # Qt 4 interface
+%bcond_without qt5 # Qt 5 interface
+%bcond_without system_liba52 # system liba52 library
+%bcond_without system_libass # system libass library
+%bcond_without system_libmad # system libmad library
+%bcond_without system_mp4v2 # system mp4v2 library
+%bcond_with gtk # GTK+ interface
%define qt4_version 4.6
%define qt5_version 5.3
@@ -19,49 +23,57 @@
Summary: A small audio/video editing software for Linux
Summary(pl.UTF-8): Mały edytor audio/wideo dla Linuksa
Name: avidemux
-Version: 2.6.20
-Release: 2
+Version: 2.7.0
+Release: 1
License: GPL v2+
Group: X11/Applications/Multimedia
Source0:
http://downloads.sourceforge.net/avidemux/%{name}_%{version}.tar.gz
-# Source0-md5: 52be64ae608c9195454b5393ba684fc0
+# Source0-md5: dc4e74516dde4c71cae7abff8ed2bf9b
Source1: %{name}.desktop
Source2: %{name}-qt4.desktop
Source3: %{name}-qt5.desktop
Patch0: build.patch
Patch1: no-qt-in-gtk.patch
+Patch2: %{name}-ffmpeg-make.patch
Patch3: %{name}-x32.patch
URL: http://fixounet.free.fr/avidemux/
+%{?with_qt5:BuildRequires: Qt5Core-devel >= %{qt5_version}}
%{?with_qt5:BuildRequires: Qt5Gui-devel >= %{qt5_version}}
%{?with_qt5:BuildRequires: Qt5OpenGL-devel >= %{qt5_version}}
%{?with_qt5:BuildRequires: Qt5Script-devel >= %{qt5_version}}
%{?with_qt5:BuildRequires: Qt5Widgets-devel >= %{qt5_version}}
+%{?with_qt4:BuildRequires: QtCore-devel >= %{qt4_version}}
%{?with_qt4:BuildRequires: QtGui-devel >= %{qt4_version}}
%{?with_qt4:BuildRequires: QtOpenGL-devel >= %{qt4_version}}
%{?with_qt4:BuildRequires: QtScript-devel >= %{qt4_version}}
-BuildRequires: SDL-devel
-BuildRequires: aften-devel
+BuildRequires: SDL2-devel >= 2
+%{?with_system_liba52:BuildRequires: a52dec-libs-devel}
+BuildRequires: aften-devel >= 0.0.8
BuildRequires: alsa-lib-devel >= 1.0
%{?with_arts:BuildRequires: artsc-devel}
BuildRequires: bash
-BuildRequires: cmake >= 2.6.2
+BuildRequires: cmake >= 3.0
BuildRequires: dcaenc-devel
BuildRequires: doxygen
%{?with_esd:BuildRequires: esound-devel}
BuildRequires: faac-devel
-BuildRequires: faad2-devel
+BuildRequires: faad2-devel >= 2
+BuildRequires: fdk-aac-devel
BuildRequires: fontconfig-devel
BuildRequires: freetype-devel >= 2.0.0
BuildRequires: fribidi-devel >= 0.19
+%{?with_gtk:BuildRequires: gdk-pixbuf2-devel >= 2.0}
BuildRequires: gettext-tools
-%{?with_gtk:BuildRequires: gtk+2-devel >= 1:2.6.0}
+%{?with_gtk:BuildRequires: gtk+3-devel >= 3.0}
BuildRequires: gtk+3-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: lame-libs-devel
+%{?with_system_libass:BuildRequires: libass-devel}
BuildRequires: libdts-devel >= 0.0.5
+%{?with_system_libmad:BuildRequires: libmad-devel}
BuildRequires: libpng-devel
BuildRequires: libsamplerate-devel
-BuildRequires: libstdc++-devel
+BuildRequires: libstdc++-devel >= 6:4.7
BuildRequires: libva-devel
BuildRequires: libva-x11-devel
BuildRequires: libvdpau-devel
@@ -73,15 +85,13 @@ BuildRequires: libx264-devel
BuildRequires: libx265-devel
BuildRequires: libxml2-devel
%{?with_qt4:BuildRequires: libxslt-progs}
-BuildRequires: opus-devel
-BuildRequires: rpm-pythonprov
-BuildRequires: sqlite3-devel >= 3
-BuildRequires: twolame-devel
+%{?with_system_mp4v2:BuildRequires: mp4v2-devel}
%ifarch %{ix86} %{x8664} x32
BuildRequires: nasm >= 0.98.32
BuildRequires: yasm
%endif
%{?with_amr:BuildRequires: opencore-amr-devel}
+BuildRequires: opus-devel
BuildRequires: pkgconfig
BuildRequires: pulseaudio-devel
%{?with_qt4:BuildRequires: qt4-build >= %{qt4_version}}
@@ -90,13 +100,17 @@ BuildRequires: pulseaudio-devel
%{?with_qt5:BuildRequires: qt5-build >= %{qt5_version}}
%{?with_qt5:BuildRequires: qt5-linguist >= %{qt5_version}}
%{?with_qt5:BuildRequires: qt5-qmake >= %{qt5_version}}
+BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.600
BuildRequires: sed >= 4.0
+BuildRequires: sqlite3-devel >= 3
+BuildRequires: twolame-devel
BuildRequires: xorg-lib-libXv-devel
BuildRequires: xorg-proto-xextproto-devel
BuildRequires: xvid-devel >= 1:1.0
-BuildRequires: xvidcore-devel
BuildRequires: zlib-devel
+# see cmake/admDetermineSystem.cmake
+ExclusiveArch: %{ix86} %{x8664} x32 %{arm}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -150,6 +164,7 @@ find '(' -name '*.js' -o -name '*.cpp' -o -name '*.h' -o
-name '*.cmake' -o -nam
%patch0 -p1
%patch1 -p1
%patch3 -p1
+%patch2 -p1
%build
install -d buildCore buildCli buildQt4 buildQt5 buildGtk buildPluginsCommon
buildPluginsCLI buildPluginsSettings buildPluginsQt4 buildPluginsQt5
buildPluginsGtk
@@ -174,7 +189,8 @@ cd buildCli
-DFAKEROOT=$FAKEROOT_DIR \
../avidemux/cli
%{__make}
-%{__make} install DESTDIR=$FAKEROOT_DIR
+%{__make} install \
+ DESTDIR=$FAKEROOT_DIR
cd ..
cd buildPluginsCommon
%cmake \
@@ -183,9 +199,14 @@ cd buildPluginsCommon
%{!?with_esd:-DESD=OFF} \
-DFAKEROOT=$FAKEROOT_DIR \
-DPLUGIN_UI=COMMON \
+ %{?with_system_liba52:-DUSE_EXTERNAL_LIBA52=ON} \
+ %{?with_system_libass:-DUSE_EXTERNAL_LIBASS=ON} \
+ %{?with_system_libmad:-DUSE_EXTERNAL_LIBMAD=ON} \
+ %{?with_system_mp4v2:-DUSE_EXTERNAL_MP4V2=ON} \
../avidemux_plugins
%{__make}
-%{__make} install DESTDIR=$FAKEROOT_DIR
+%{__make} install \
+ DESTDIR=$FAKEROOT_DIR
cd ..
cd buildPluginsCLI
%cmake \
@@ -203,7 +224,8 @@ cd buildPluginsSettings
-DPLUGIN_UI=SETTINGS \
../avidemux_plugins
%{__make}
-%{__make} install DESTDIR=$FAKEROOT_DIR
+%{__make} install \
+ DESTDIR=$FAKEROOT_DIR
cd ..
%if %{with qt4}
@@ -213,7 +235,8 @@ cd buildQt4
-DFAKEROOT=$FAKEROOT_DIR \
../avidemux/qt4
%{__make}
-%{__make} install DESTDIR=$FAKEROOT_DIR
+%{__make} install \
+ DESTDIR=$FAKEROOT_DIR
cd ..
cd buildPluginsQt4
%cmake \
@@ -222,7 +245,8 @@ cd buildPluginsQt4
-DPLUGIN_UI=QT4 \
../avidemux_plugins
%{__make}
-%{__make} install DESTDIR=$FAKEROOT_DIR
+%{__make} install \
+ DESTDIR=$FAKEROOT_DIR
cd ..
%endif
@@ -234,7 +258,8 @@ cd buildQt5
-DFAKEROOT=$FAKEROOT_DIR \
../avidemux/qt4
%{__make}
-%{__make} install DESTDIR=$FAKEROOT_DIR
+%{__make} install \
+ DESTDIR=$FAKEROOT_DIR
cd ..
cd buildPluginsQt5
%cmake \
@@ -244,7 +269,8 @@ cd buildPluginsQt5
-DPLUGIN_UI=QT4 \
../avidemux_plugins
%{__make}
-%{__make} install DESTDIR=$FAKEROOT_DIR
+%{__make} install \
+ DESTDIR=$FAKEROOT_DIR
cd ..
%endif
@@ -255,7 +281,8 @@ cd buildGtk
-DFAKEROOT=$FAKEROOT_DIR \
../avidemux/gtk
%{__make}
-%{__make} install DESTDIR=$FAKEROOT_DIR
+%{__make} install \
+ DESTDIR=$FAKEROOT_DIR
cd ..
cd buildPluginsGtk
%cmake \
@@ -264,7 +291,8 @@ cd buildPluginsGtk
-DPLUGIN_UI=GTK \
../avidemux_plugins
%{__make}
-%{__make} install DESTDIR=$FAKEROOT_DIR
+%{__make} install \
+ DESTDIR=$FAKEROOT_DIR
cd ..
%endif
@@ -279,9 +307,9 @@ chmod +x $RPM_BUILD_ROOT%{_libdir}/lib*.so*
%{__mv} $RPM_BUILD_ROOT%{_bindir}/avidemux3{_cli,}
cp -a man/avidemux.1 $RPM_BUILD_ROOT%{_mandir}/man1
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}-gtk.desktop
-cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/%{name}-qt4.desktop
-cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/%{name}-qt5.desktop
+%{?with_gtk:cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}-gtk.desktop}
+%{?with_qt4:cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/%{name}-qt4.desktop}
+%{?with_qt5:cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/%{name}-qt5.desktop}
cp -a avidemux_icon.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
%{__rm} -r $RPM_BUILD_ROOT%{_includedir}
@@ -331,21 +359,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libADM_coreVideoFilter6.so
%dir %{_libdir}/ADM_plugins6
-%dir %{_libdir}/ADM_plugins6/audioDecoder
-%dir %{_libdir}/ADM_plugins6/audioDevices
-%dir %{_libdir}/ADM_plugins6/audioEncoders
-%dir %{_libdir}/ADM_plugins6/videoDecoders
-%dir %{_libdir}/ADM_plugins6/videoEncoders
-%dir %{_libdir}/ADM_plugins6/videoFilters
-%dir %{_libdir}/ADM_plugins6/autoScripts
-%dir %{_libdir}/ADM_plugins6/autoScripts/lib
-%dir %{_libdir}/ADM_plugins6/demuxers
-%dir %{_libdir}/ADM_plugins6/muxers
-%dir %{_libdir}/ADM_plugins6/pluginSettings
-%dir %{_libdir}/ADM_plugins6/pluginSettings/x264
-%dir %{_libdir}/ADM_plugins6/pluginSettings/x264/3
-%dir %{_libdir}/ADM_plugins6/scriptEngines
+%dir %{_libdir}/ADM_plugins6/audioDecoder
%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_Mad.so
%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_a52.so
# R: libdts
@@ -367,6 +382,7 @@ rm -rf $RPM_BUILD_ROOT
# R: libvorbis
%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_vorbis.so
+%dir %{_libdir}/ADM_plugins6/audioDevices
# R: alsa-lib
%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDevices/libADM_av_alsaDMix.so
# R: alsa-lib
@@ -383,12 +399,15 @@ rm -rf $RPM_BUILD_ROOT
# R: pulseaudio-libs
%attr(755,root,root)
%{_libdir}/ADM_plugins6/audioDevices/libADM_av_pulseAudioSimple.so
+%dir %{_libdir}/ADM_plugins6/audioEncoders
# R: aften
%attr(755,root,root) %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_aften.so
# R: dcaenc
%attr(755,root,root) %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_dcaenc.so
# R: faac-libs
%attr(755,root,root) %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_faac.so
+# R: fdk-aac
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_fdk_aac.so
# R: lame-libs
%attr(755,root,root) %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_lame.so
%attr(755,root,root) %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_lav_aac.so
@@ -400,9 +419,11 @@ rm -rf $RPM_BUILD_ROOT
# R: libvorbis
%attr(755,root,root) %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_vorbis.so
-# R: libvpx
-%attr(755,root,root) %{_libdir}/ADM_plugins6/videoDecoders/libADM_vd_vpx.so
+#%dir %{_libdir}/ADM_plugins6/videoDecoders
+# R: libvpx [2.7.0: disabled in CMakeLists.txt]
+#%attr(755,root,root) %{_libdir}/ADM_plugins6/videoDecoders/libADM_vd_vpx.so
+%dir %{_libdir}/ADM_plugins6/videoEncoders
%attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffDv.so
%attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffFlv1.so
%attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg2.so
@@ -419,7 +440,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_xvid4.so
%attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_yv12.so
+%dir %{_libdir}/ADM_plugins6/videoFilters
%attr(755,root,root)
%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_addBorders.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_admIvtc.so
%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_ascii.so
%attr(755,root,root)
%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_avsfilter.so
%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_black.so
@@ -471,15 +494,18 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root)
%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_msharpenCli.so
%attr(755,root,root)
%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_swscaleResize_cli.so
+%dir %{_libdir}/ADM_plugins6/autoScripts
%attr(755,root,root) %{_libdir}/ADM_plugins6/autoScripts/720p.py
%attr(755,root,root) %{_libdir}/ADM_plugins6/autoScripts/PSP.py
%attr(755,root,root) %{_libdir}/ADM_plugins6/autoScripts/check24fps.py
%attr(755,root,root) %{_libdir}/ADM_plugins6/autoScripts/dvd.py
+%dir %{_libdir}/ADM_plugins6/autoScripts/lib
%attr(755,root,root) %{_libdir}/ADM_plugins6/autoScripts/lib/ADM_image.py
%attr(755,root,root) %{_libdir}/ADM_plugins6/autoScripts/lib/ADM_imageInfo.py
%attr(755,root,root) %{_libdir}/ADM_plugins6/autoScripts/svcd.py
%attr(755,root,root) %{_libdir}/ADM_plugins6/autoScripts/vcd.py
+%dir %{_libdir}/ADM_plugins6/demuxers
%attr(755,root,root) %{_libdir}/ADM_plugins6/demuxers/libADM_dm_asf.so
%attr(755,root,root) %{_libdir}/ADM_plugins6/demuxers/libADM_dm_avsproxy.so
%attr(755,root,root) %{_libdir}/ADM_plugins6/demuxers/libADM_dm_flv.so
@@ -490,6 +516,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/ADM_plugins6/demuxers/libADM_dm_pic.so
%attr(755,root,root) %{_libdir}/ADM_plugins6/demuxers/libADM_dm_ps.so
%attr(755,root,root) %{_libdir}/ADM_plugins6/demuxers/libADM_dm_ts.so
+
+%dir %{_libdir}/ADM_plugins6/muxers
%attr(755,root,root) %{_libdir}/ADM_plugins6/muxers/libADM_mx_Mkv.so
%attr(755,root,root) %{_libdir}/ADM_plugins6/muxers/libADM_mx_Webm.so
%attr(755,root,root) %{_libdir}/ADM_plugins6/muxers/libADM_mx_avi.so
@@ -500,11 +528,17 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/ADM_plugins6/muxers/libADM_mx_mp4.so
%attr(755,root,root) %{_libdir}/ADM_plugins6/muxers/libADM_mx_mp4v2.so
%attr(755,root,root) %{_libdir}/ADM_plugins6/muxers/libADM_mx_raw.so
+
+%dir %{_libdir}/ADM_plugins6/pluginSettings
+%dir %{_libdir}/ADM_plugins6/pluginSettings/x264
+%dir %{_libdir}/ADM_plugins6/pluginSettings/x264/3
%{_libdir}/ADM_plugins6/pluginSettings/x264/3/PSP.json
%{_libdir}/ADM_plugins6/pluginSettings/x264/3/fast.json
%{_libdir}/ADM_plugins6/pluginSettings/x264/3/iPhone.json
%{_libdir}/ADM_plugins6/pluginSettings/x264/3/ultraFast.json
%{_libdir}/ADM_plugins6/pluginSettings/x264/3/veryFast.json
+
+%dir %{_libdir}/ADM_plugins6/scriptEngines
%attr(755,root,root)
%{_libdir}/ADM_plugins6/scriptEngines/libADM_script_tinyPy.so
%dir %{_libdir}/ADM_plugins6/shaderDemo
@@ -595,6 +629,7 @@ rm -rf $RPM_BUILD_ROOT
%lang(hu) %{_datadir}/%{name}6/qt4/i18n/*_hu.qm
%lang(it) %{_datadir}/%{name}6/qt4/i18n/*_it.qm
%lang(ja) %{_datadir}/%{name}6/qt4/i18n/*_ja.qm
+%lang(ko) %{_datadir}/%{name}6/qt4/i18n/*_ko.qm
%lang(pl) %{_datadir}/%{name}6/qt4/i18n/*_pl.qm
%lang(pt) %{_datadir}/%{name}6/qt4/i18n/*_pt.qm
%lang(pt_BR) %{_datadir}/%{name}6/qt4/i18n/*_pt_BR.qm
diff --git a/avidemux-ffmpeg-make.patch b/avidemux-ffmpeg-make.patch
new file mode 100644
index 0000000..a955eac
--- /dev/null
+++ b/avidemux-ffmpeg-make.patch
@@ -0,0 +1,11 @@
+--- avidemux_2.7.0/cmake/admFFmpegBuild_helpers.cmake.orig 2017-12-25
10:11:38.555601657 +0100
++++ avidemux_2.7.0/cmake/admFFmpegBuild_helpers.cmake 2017-12-25
14:01:39.232110743 +0100
+@@ -304,7 +304,7 @@
+ SET(PARRALLEL "-j4")
+ endif(NOT MSVC)
+ add_custom_target( libavutil_dummy ALL
+- COMMAND ${CMAKE_BUILD_TOOL}
${PARRALLEL} # We assume make or gnumake when host is unix
++ COMMAND ${CMAKE_BUILD_TOOL} "V=1" # We
assume make or gnumake when host is unix
+ WORKING_DIRECTORY
"${FFMPEG_BINARY_DIR}"
+ COMMENT "Compiling FFmpeg")
+ ENDMACRO(ADM_FF_ADD_DUMMY_TARGET)
diff --git a/avidemux-x32.patch b/avidemux-x32.patch
index 2e933c9..5350ce4 100644
--- a/avidemux-x32.patch
+++ b/avidemux-x32.patch
@@ -1,25 +1,3 @@
---- avidemux_2.6.10/avidemux_core/ADM_core/src/ADM_cpuCap.cpp.orig
2015-10-19 19:08:06.986346394 +0200
-+++ avidemux_2.6.10/avidemux_core/ADM_core/src/ADM_cpuCap.cpp 2015-10-19
19:41:57.745216176 +0200
-@@ -61,7 +61,7 @@
- int eax, ebx, ecx, edx;
- int max_std_level, max_ext_level;
-
--#if !defined(ADM_CPU_64BIT) // 64 bits CPU have all cpuid
-+#if !defined(ADM_CPU_X86_64) // x86_64 CPUs have all cpuid
- long a, c;
-
- __asm__ __volatile__ (
---- avidemux_2.6.10/cmake/admFFmpegBuild_helpers.cmake.orig 2015-10-19
20:07:00.923333350 +0200
-+++ avidemux_2.6.10/cmake/admFFmpegBuild_helpers.cmake 2015-10-19
20:34:06.114456242 +0200
-@@ -259,7 +259,7 @@
-
- MESSAGE(STATUS "Configuring done, processing")
-
-- if (ADM_CPU_X86)
-+ if (ADM_CPU_X86_X32 OR (ADM_CPU_X86_64 AND ADM_CPU_64BIT))
- file(READ ${FFMPEG_BINARY_DIR}/config.h FF_CONFIG_H)
- string(REGEX MATCH "#define[ ]+HAVE_YASM[ ]+1" FF_YASM
"${FF_CONFIG_H}")
-
--- avidemux_2.6.10/cmake/admInstallDir.cmake.orig 2015-10-19
20:34:26.862201138 +0200
+++ avidemux_2.6.10/cmake/admInstallDir.cmake 2015-10-19 21:15:45.397657233
+0200
@@ -20,6 +20,8 @@
@@ -31,17 +9,18 @@
ELSE(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)")
SET(AVIDEMUX_RELATIVE_LIB_DIR lib)
ENDIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)")
---- avidemux_2.6.11/cmake/CMakeASM_YASMInformation.cmake.orig 2016-01-31
10:54:01.427419625 +0100
-+++ avidemux_2.6.11/cmake/CMakeASM_YASMInformation.cmake 2016-01-31
14:09:36.528371876 +0100
-@@ -10,7 +10,11 @@
- if(APPLE)
- set(ARGS -f macho64 -m amd64 -DPREFIX)
- elseif(UNIX AND NOT CYGWIN)
-+ if(ADM_CPU_64BIT)
- set(ARGS -f elf64 -m amd64)
-+ else(ADM_CPU_64BIT)
-+ set(ARGS -f elfx32 -m x32)
-+ endif(ADM_CPU_64BIT)
- else()
- set(ARGS -f win64 -m amd64)
- endif()
+--- avidemux_2.7.0/cmake/admYasm_gcc.cmake.orig 2017-12-24
14:39:56.979737709 +0100
++++ avidemux_2.7.0/cmake/admYasm_gcc.cmake 2017-12-25 09:22:40.292301873
+0100
+@@ -39,7 +39,11 @@
+
+
+ IF( ADM_CPU_X86_64 )
+- SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT} -m amd64 -DARCH_X86_64=1
-DARCH_X86_32=0")
++ IF( ADM_CPU_64BIT )
++ SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT} -m amd64 -DARCH_X86_64=1
-DARCH_X86_32=0")
++ ELSE( ADM_CPU_64BIT )
++ SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT} -m x32 -DARCH_X86_64=1
-DARCH_X86_32=0")
++ ENDIF( ADM_CPU_64BIT )
+ ELSE( ADM_CPU_X86_64 )
+ SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT} -DARCH_X86_64=0
-DARCH_X86_32=1")
+ ENDIF( ADM_CPU_X86_64 )
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/avidemux.git/commitdiff/0e0012675dc296eeeb7ed613edfc31a025b8cd95
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
