[SCM] x265/master: Refresh patches

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Mon Jul 17 18:06:25 UTC 2017


The following commit has been merged in the master branch:
commit d4a0eee2b7217f423f7b58f85c5f94b0c404a797
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Jul 17 20:05:22 2017 +0200

    Refresh patches

diff --git a/debian/patches/0001-Fix-arm-flags.patch b/debian/patches/0001-Fix-arm-flags.patch
index 477225b..a58d518 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 acdeb7b..2f3b6d6 100644
+index a012dd4..f52a4a0 100644
 --- a/source/CMakeLists.txt
 +++ b/source/CMakeLists.txt
 @@ -72,7 +72,7 @@ elseif(ARMMATCH GREATER "-1")
@@ -19,7 +19,7 @@ index acdeb7b..2f3b6d6 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}")
-@@ -210,12 +210,8 @@ if(GCC)
+@@ -217,12 +217,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 9c0d6f7..6da9494 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 2f3b6d6..6f6fd49 100644
+index f52a4a0..f8ac7a6 100644
 --- a/source/CMakeLists.txt
 +++ b/source/CMakeLists.txt
 @@ -48,7 +48,10 @@ list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)
@@ -31,7 +31,7 @@ index 2f3b6d6..6f6fd49 100644
  else()
      option(ENABLE_PIC "Enable Position Independent Code" OFF)
  endif(X64 AND NOT WIN32)
-@@ -197,7 +202,7 @@ if(GCC)
+@@ -204,7 +209,7 @@ if(GCC)
          else()
              add_definitions(-march=native)
          endif()

-- 
x265 packaging



More information about the pkg-multimedia-commits mailing list