- up to 2.6.20

diff --git a/avidemux-x32.patch b/avidemux-x32.patch
index ad667b6d720e005f64fb03f3f9ee42e358b6fae5..2e933c96e7d19077f17ff15da3deee9aab65cb39 100644 (file)
--- a/avidemux-x32.patch
+++ b/avidemux-x32.patch
@@ -1,24 +1,24 @@
 --- 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;
+     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;
+     long a, c;
  
-  __asm__ __volatile__ (
---- avidemux_2.6.10/cmake/admFFmpegBuild.cmake.orig    2015-10-19 20:07:00.923333350 +0200
-+++ avidemux_2.6.10/cmake/admFFmpegBuild.cmake 2015-10-19 20:34:06.114456242 +0200
+     __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")
+     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}")
+-    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

diff --git a/avidemux.spec b/avidemux.spec
index d8d048c0ae2aba389f96d0f95440949cdfc8bd27..f2c5864cddf93957858d72f094875f9224e4b042 100644 (file)
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -19,18 +19,17 @@
 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.11
-Release:       5
+Version:       2.6.20
+Release:       0.1
 License:       GPL v2+
 Group:         X11/Applications/Multimedia
 Source0:       http://downloads.sourceforge.net/avidemux/%{name}_%{version}.tar.gz
-# Source0-md5: e4c753a8a2c7884270318c1951e7c00e
+# Source0-md5: 52be64ae608c9195454b5393ba684fc0
 Source1:       %{name}.desktop
 Source2:       %{name}-qt4.desktop
 Source3:       %{name}-qt5.desktop
 Patch0:                build.patch
 Patch1:                no-qt-in-gtk.patch
-Patch2:                gtk-build.patch
 Patch3:                %{name}-x32.patch
 URL:           http://fixounet.free.fr/avidemux/
 %{?with_qt5:BuildRequires:     Qt5Gui-devel >= %{qt5_version}}
@@ -150,7 +149,6 @@ Interfejs użytkownika Qt 5 do edytora Avidemux.
 find '(' -name '*.js' -o -name '*.cpp' -o -name '*.h' -o -name '*.cmake' -o -name '*.txt' ')' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 
 %build

diff --git a/build.patch b/build.patch
index 8a663dcb2dbfee83ceb63a4fa2ebc047fc47618d..c5802fc076eb63ef707e13bf3e6c3ce0ec4ed04c 100644 (file)
--- a/build.patch
+++ b/build.patch
@@ -3,7 +3,7 @@
 @@ -34,7 +34,7 @@
          mkdir $BUILDDIR || fail mkdir
          cd $BUILDDIR 
-         cmake $PKG $FAKEROOT $QT_FLAVOR -DCMAKE_EDIT_COMMAND=vim -DAVIDEMUX_SOURCE_DIR=$TOP -DCMAKE_INSTALL_PREFIX=/usr $EXTRA $DEBUG -G "$BUILDER" $SOURCEDIR || fail cmakeZ
+         cmake $COMPILER $PKG $FAKEROOT $QT_FLAVOR -DCMAKE_EDIT_COMMAND=vim $INSTALL_PREFIX $EXTRA $BUILD_QUIRKS $ASAN $DEBUG -G "$BUILDER" $SOURCEDIR || fail cmakeZ
 -        make  $PARAL >& /tmp/log$BUILDDIR || fail "make, result in /tmp/log$BUILDDIR"
 +        make  $PARAL || fail "make, result in /tmp/log$BUILDDIR"
        if  [ "x$PKG" != "x" ] ; then

diff --git a/gtk-build.patch b/gtk-build.patch
deleted file mode 100644 (file)
index 6b4b402..0000000
--- a/gtk-build.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- avidemux_2.6.9/avidemux/gtk/CMakeLists.txt~        2015-05-24 11:48:10.000000000 +0200
-+++ avidemux_2.6.9/avidemux/gtk/CMakeLists.txt 2015-05-24 11:56:38.844485490 +0200
-@@ -33,7 +33,7 @@
- ADD_SUBDIRECTORY(ADM_userInterfaces ./ADM_userInterfacesGtk)
- 
- SDLify(../common/main.cpp)
--ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")
-+ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\""  "-DADM_VERSION='\"${AVIDEMUX_VERSION}\"'")
- 
- ###########################################
- # Version Info
---- avidemux_2.6.11/avidemux/gtk/ADM_userInterfaces/ADM_gui2/GUI_gtkRender.cpp.orig    2016-01-30 08:54:43.917653247 +0100
-+++ avidemux_2.6.11/avidemux/gtk/ADM_userInterfaces/ADM_gui2/GUI_gtkRender.cpp 2016-01-30 10:22:47.504098179 +0100
-@@ -110,9 +110,9 @@
-               xinfo->display = (void*)GDK_WINDOW_HWND(win);
- #elif defined(__APPLE__)
-               xinfo->display = 0;
--              xinfo->window = getMainNSWindow();
-+              xinfo->systemWindowId = getMainNSWindow();
- #else
--              xinfo->window = GDK_WINDOW_XID(win);
-+              xinfo->systemWindowId = GDK_WINDOW_XID(win);
-               xinfo->display = GDK_WINDOW_XDISPLAY(parentWin);
- #endif
- 
---- avidemux_2.6.11/avidemux/gtk/ADM_userInterfaces/ADM_gui2/GUI_bindings.cpp.orig     2016-01-30 10:29:43.714080713 +0100
-+++ avidemux_2.6.11/avidemux/gtk/ADM_userInterfaces/ADM_gui2/GUI_bindings.cpp  2016-01-30 19:32:06.962714994 +0100
-@@ -1387,6 +1387,19 @@
-     };
- 
- /**
-+ * \fn UI_reset
-+ * \brief reset
-+ * @return 
-+ */
-+bool          UI_reset(void)
-+{
-+    UI_setVideoCodec(0);
-+    UI_setAudioCodec(0);
-+    UI_setCurrentPreview(false);
-+    return true;
-+}
-+
-+/**
-  *      \fn UI_Init
-  *      \brief Entry point. Initialize renderLib.
-  *
-@@ -1596,6 +1596,15 @@
-     return true;
- }
- /**
-+ * \fn UI_setDisplayName
-+ * \brief display current displayEngine name
-+ */
-+bool UI_setDisplayName(const char *name)
-+{
-+    // TODO?
-+    return true;
-+}
-+/**
-       \fn UI_setTimeShift
- 
- */