[SCM] x265/master: Refresh patches

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sun Dec 3 20:25:48 UTC 2017


The following commit has been merged in the master branch:
commit 3af254512ec5a99433a11506bd87a4be0fce458e
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Dec 3 21:20:32 2017 +0100

    Refresh patches

diff --git a/debian/patches/0001-Fix-arm-flags.patch b/debian/patches/0001-Fix-arm-flags.patch
index a58d518..469935f 100644
--- a/debian/patches/0001-Fix-arm-flags.patch
+++ b/debian/patches/0001-Fix-arm-flags.patch
@@ -7,7 +7,7 @@ Subject: Fix arm* flags
  1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
-index a012dd4..f52a4a0 100644
+index dfcef20..8a28c85 100644
 --- a/source/CMakeLists.txt
 +++ b/source/CMakeLists.txt
 @@ -72,7 +72,7 @@ elseif(ARMMATCH GREATER "-1")
@@ -19,7 +19,7 @@ index a012dd4..f52a4a0 100644
  else()
      message(STATUS "CMAKE_SYSTEM_PROCESSOR value `${CMAKE_SYSTEM_PROCESSOR}` is unknown")
      message(STATUS "Please add this value near ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}")
-@@ -217,12 +217,8 @@ if(GCC)
+@@ -225,12 +225,8 @@ if(GCC)
      if(ARM AND CROSS_COMPILE_ARM)
          set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
      elseif(ARM)
diff --git a/debian/patches/0002-Detect-x32-handle-as-non-x86-and-no-ASM-for-now-but-.patch b/debian/patches/0002-Detect-x32-handle-as-non-x86-and-no-ASM-for-now-but-.patch
index 6da9494..9eb206f 100644
--- a/debian/patches/0002-Detect-x32-handle-as-non-x86-and-no-ASM-for-now-but-.patch
+++ b/debian/patches/0002-Detect-x32-handle-as-non-x86-and-no-ASM-for-now-but-.patch
@@ -7,7 +7,7 @@ Subject: Detect x32, handle as non-x86 and no-ASM for now, but enable PIC
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
-index f52a4a0..f8ac7a6 100644
+index 8a28c85..3f3ef2f 100644
 --- a/source/CMakeLists.txt
 +++ b/source/CMakeLists.txt
 @@ -48,7 +48,10 @@ list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)
@@ -31,7 +31,7 @@ index f52a4a0..f8ac7a6 100644
  else()
      option(ENABLE_PIC "Enable Position Independent Code" OFF)
  endif(X64 AND NOT WIN32)
-@@ -204,7 +209,7 @@ if(GCC)
+@@ -212,7 +217,7 @@ if(GCC)
          else()
              add_definitions(-march=native)
          endif()

-- 
x265 packaging



More information about the pkg-multimedia-commits mailing list