[SCM] x265/master: Brown paper bag release

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 300a816138a90b79ef897b11911d3be7cf4b0c2d
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Fri Dec 5 22:56:26 2014 +0100

    Brown paper bag release
    
    It's OR and not or.

diff --git a/debian/changelog b/debian/changelog
index b35385c..6b406e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x265 (1.4-4) unstable; urgency=medium
+
+  * debian/patches/atomic.patch: Fix a "typo": it's OR and not or.
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Fri, 05 Dec 2014 22:55:44 +0100
+
 x265 (1.4-3) unstable; urgency=medium
 
   * debian/patches:
diff --git a/debian/patches/atomic.patch b/debian/patches/atomic.patch
index c950b48..0496d8c 100644
--- a/debian/patches/atomic.patch
+++ b/debian/patches/atomic.patch
@@ -5,18 +5,18 @@ Bug: https://bitbucket.org/multicoreware/x265/issue/93/__sync_val_compare_exchan
 Bug-Debian: https://bugs.debian.org/771556
 Last-Update: 2014-12-05
 
---- x265-1.4.orig/source/CMakeLists.txt
-+++ x265-1.4/source/CMakeLists.txt
-@@ -50,6 +50,8 @@ elseif(${SYSPROC} STREQUAL "armv6l")
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -50,6 +50,8 @@
      message(STATUS "Detected ARM target processor")
      set(ARM 1)
      add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1)
-+elseif("${SYSPROC}" STREQUAL "ppc" or "${SYSPROC}" STREQUAL "mips")
++elseif("${SYSPROC}" STREQUAL "ppc" OR "${SYSPROC}" STREQUAL "mips")
 +    set(NEEDS_ATOMIC 1)
  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}")
-@@ -61,6 +63,9 @@ if(UNIX)
+@@ -61,6 +63,9 @@
      if(LIBRT)
          set(PLATFORM_LIBS ${PLATFORM_LIBS} rt)
      endif()
@@ -26,8 +26,8 @@ Last-Update: 2014-12-05
  endif(UNIX)
  
  # Compiler detection
---- x265-1.4.orig/source/common/threading.h
-+++ x265-1.4/source/common/threading.h
+--- a/source/common/threading.h
++++ b/source/common/threading.h
 @@ -51,8 +51,15 @@
  
  #define CLZ32(id, x)                        id = (unsigned long)__builtin_clz(x) ^ 31

-- 
x265 packaging