[SCM] x265/master: Remove obsolete patches
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Tue Apr 7 21:12:55 UTC 2015
The following commit has been merged in the master branch:
commit 2c107e3b75b412f1344db67d11c4df2a86b6996a
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Tue Apr 7 22:44:16 2015 +0200
Remove obsolete patches
diff --git a/debian/patches/hide-internal-symbols.patch b/debian/patches/hide-internal-symbols.patch
deleted file mode 100644
index b9fb28d..0000000
--- a/debian/patches/hide-internal-symbols.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Hide internal symbols
-Author: Sebastian Ramacher <sramacher at debian.org>
-Bug: https://bitbucket.org/multicoreware/x265/issue/105/defaultanalysisfilename-in-source-encoder
-Last-Update: 2015-02-18
-
-diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
-index 45ad5b1..38a0c76 100644
---- a/source/encoder/encoder.cpp
-+++ b/source/encoder/encoder.cpp
-@@ -51,7 +51,7 @@ static const char *summaryCSVHeader =
- "B count, B ave-QP, B kpbs, B-PSNR Y, B-PSNR U, B-PSNR V, B-SSIM (dB), "
- "Version\n";
-
--const char* defaultAnalysisFileName = "x265_analysis.dat";
-+static const char* defaultAnalysisFileName = "x265_analysis.dat";
-
- using namespace x265;
-
diff --git a/debian/patches/series b/debian/patches/series
index b85c1c9..63b1032 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
compile-flags.patch
-workaround-partial-SIMD-support.patch
-hide-internal-symbols.patch
diff --git a/debian/patches/workaround-partial-SIMD-support.patch b/debian/patches/workaround-partial-SIMD-support.patch
deleted file mode 100644
index 24cc1cd..0000000
--- a/debian/patches/workaround-partial-SIMD-support.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: remove buggy workarounds for partial SIMD support
- In the past, there were a number of primitives written in SIMD intrinsics that
- could work without compiling with YASM. Most of those are now gone, and we
- generally require YASM for SIMD support. This commit remoes support for using
- the few remaining SIMD intrinsics without having YASM to provide
- implementations of x265_emms(), x265_cpu_cpuid(), etc. Fixing a bug in the
- process.
-Origin: upstream,
- https://bitbucket.org/multicoreware/x265/commits/d7b5e73fc91ab20f86c36d5c1924632c1bcf3e68
-Bug: https://bitbucket.org/multicoreware/x265/issue/92/fails-to-build-on-x86-32-without-yasm
-Last-Update: 2015-02-18
-
---- a/source/common/common.h
-+++ b/source/common/common.h
-@@ -74,7 +74,7 @@
- #define ALIGN_VAR_16(T, var) T var __attribute__((aligned(16)))
- #define ALIGN_VAR_32(T, var) T var __attribute__((aligned(32)))
-
--#if X265_ARCH_X86 && !defined(X86_64)
-+#if ENABLE_ASSEMBLY && X265_ARCH_X86 && !defined(X86_64)
- extern "C" intptr_t x265_stack_align(void (*func)(), ...);
- #define x265_stack_align(func, ...) x265_stack_align((void (*)())func, __VA_ARGS__)
- #else
--
x265 packaging
More information about the pkg-multimedia-commits
mailing list