[SCM] x265/master: Build with -fPIC everywhere and remove arch specific compile flags

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sun Nov 30 16:59:17 UTC 2014


The following commit has been merged in the master branch:
commit d730cc4a1a56a1157c8408e50a00b268bfcb5535
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Nov 30 17:54:17 2014 +0100

    Build with -fPIC everywhere and remove arch specific compile flags

diff --git a/debian/patches/compile-flags.patch b/debian/patches/compile-flags.patch
new file mode 100644
index 0000000..931f5a2
--- /dev/null
+++ b/debian/patches/compile-flags.patch
@@ -0,0 +1,25 @@
+Description: Use -fPIC everywhere
+ Also remove platform specific gcc flags that do not match our defaults.
+Author: Sebastian Ramacher <sramacher at debian.org>
+Last-Update: 2014-11-30
+
+--- x265-1.4.orig/source/CMakeLists.txt
++++ x265-1.4/source/CMakeLists.txt
+@@ -121,15 +121,9 @@ endif()
+ if(GCC)
+     add_definitions(-Wall -Wextra -Wshadow)
+     add_definitions(-D__STDC_LIMIT_MACROS=1)
+-    if(X64 AND NOT WIN32)
++    if(NOT WIN32)
+         add_definitions(-fPIC)
+-    endif(X64 AND NOT WIN32)
+-    if(X86 AND NOT X64)
+-        add_definitions(-march=i686)
+-    endif()
+-    if(ARM)
+-        add_definitions(-march=armv6 -mfloat-abi=hard -mfpu=vfp)
+-    endif()
++    endif(NOT WIN32)
+     check_cxx_compiler_flag(-Wno-narrowing CC_HAS_NO_NARROWING) 
+     check_cxx_compiler_flag(-Wno-array-bounds CC_HAS_NO_ARRAY_BOUNDS) 
+     if (CC_HAS_NO_ARRAY_BOUNDS)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..63b1032
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+compile-flags.patch

-- 
x265 packaging



More information about the pkg-multimedia-commits mailing list