[SCM] x265/master: Use gbp pq

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4f9818f95f6fb387cdb34d5e4691c30a0341bffe
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Apr 26 22:06:30 2017 +0200

    Use gbp pq

diff --git a/debian/patches/compile-flags.patch b/debian/patches/0001-Fix-arm-flags.patch
similarity index 71%
rename from debian/patches/compile-flags.patch
rename to debian/patches/0001-Fix-arm-flags.patch
index 57d7220..477225b 100644
--- a/debian/patches/compile-flags.patch
+++ b/debian/patches/0001-Fix-arm-flags.patch
@@ -1,12 +1,16 @@
-Description: Remove platform specific compile flags
- Do not set ARM defines until we find a better way to build the asm files, also
- always use runtime detection of NEON.
-Author: Sebastian Ramacher <sramacher at debian.org>
-Last-Update: 2014-11-30
+From: Sebastian Ramacher <sramacher at debian.org>
+Date: Wed, 26 Apr 2017 22:05:06 +0200
+Subject: Fix arm* flags
 
+---
+ source/CMakeLists.txt | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+index acdeb7b..2f3b6d6 100644
 --- a/source/CMakeLists.txt
 +++ b/source/CMakeLists.txt
-@@ -68,7 +68,7 @@
+@@ -72,7 +72,7 @@ elseif(ARMMATCH GREATER "-1")
      endif()
      message(STATUS "Detected ARM target processor")
      set(ARM 1)
@@ -15,7 +19,7 @@ Last-Update: 2014-11-30
  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}")
-@@ -189,12 +189,8 @@
+@@ -210,12 +210,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/fix-x32.patch b/debian/patches/0002-Detect-x32-handle-as-non-x86-and-no-ASM-for-now-but-.patch
similarity index 69%
rename from debian/patches/fix-x32.patch
rename to debian/patches/0002-Detect-x32-handle-as-non-x86-and-no-ASM-for-now-but-.patch
index 8790f18..9c0d6f7 100644
--- a/debian/patches/fix-x32.patch
+++ b/debian/patches/0002-Detect-x32-handle-as-non-x86-and-no-ASM-for-now-but-.patch
@@ -1,10 +1,16 @@
-Description: detect x32, handle as non-x86 and no-ASM for now, but enable PIC
-Author: Thorsen Glaser <tg at mirbsd.de>
-Last-Update: 2015-07-19
+From: Thorsten Glaser <tg at mirbsd.de>
+Date: Wed, 26 Apr 2017 22:02:38 +0200
+Subject: Detect x32, handle as non-x86 and no-ASM for now, but enable PIC
 
+---
+ source/CMakeLists.txt | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+index 2f3b6d6..6f6fd49 100644
 --- a/source/CMakeLists.txt
 +++ b/source/CMakeLists.txt
-@@ -49,7 +49,10 @@
+@@ -48,7 +48,10 @@ list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)
  if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")
      set(X86 1)
      add_definitions(-DX265_ARCH_X86=1)
@@ -16,7 +22,7 @@ Last-Update: 2015-07-19
          set(X64 1)
          add_definitions(-DX86_64=1)
          message(STATUS "Detected x86_64 target processor")
-@@ -112,6 +115,8 @@
+@@ -113,6 +116,8 @@ endif(UNIX)
  
  if(X64 AND NOT WIN32)
      option(ENABLE_PIC "Enable Position Independent Code" ON)
@@ -25,7 +31,7 @@ Last-Update: 2015-07-19
  else()
      option(ENABLE_PIC "Enable Position Independent Code" OFF)
  endif(X64 AND NOT WIN32)
-@@ -183,7 +188,7 @@
+@@ -197,7 +202,7 @@ if(GCC)
          else()
              add_definitions(-march=native)
          endif()
diff --git a/debian/patches/series b/debian/patches/series
index af01a27..27e6795 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-compile-flags.patch
-fix-x32.patch
+0001-Fix-arm-flags.patch
+0002-Detect-x32-handle-as-non-x86-and-no-ASM-for-now-but-.patch

-- 
x265 packaging