Project import/x265-restricted - Diff 01611411c7...264dc12b09

... ... --- a/.abf.yml
... ... +++ b/.abf.yml
... ... @@ -1,2 +1,2 @@
1 1
sources:
2
  x265-1.8.tar.gz: 02445c8ec5416b702821aa69810cfdc52645be86
2
  x265-2.7.tar.gz: bd855ca6a371dfb3e65a572beb92a01698c45e42
view file @ 01611411c7
... ... --- a/x265-1.8-opt.patch
... ... +++ /dev/null
... ... @@ -1,19 +0,0 @@
0
diff -urN x265-1.8/source/CMakeLists.txt x265-1.8-patched/source/CMakeLists.txt
1
--- x265-1.8/source/CMakeLists.txt	2015-09-22 18:10:07.000000000 +1000
2
+++ x265-1.8-patched/source/CMakeLists.txt	2015-11-24 04:05:47.483617547 +1000
3
@@ -160,15 +160,6 @@
4
     if(ENABLE_PIC)
5
          add_definitions(-fPIC)
6
     endif(ENABLE_PIC)
7
-    if(NATIVE_BUILD)
8
-        if(INTEL_CXX)
9
-            add_definitions(-xhost)
10
-        else()
11
-            add_definitions(-march=native)
12
-        endif()
13
-    elseif(X86 AND NOT X64)
14
-        add_definitions(-march=i686)
15
-    endif()
16
     if(ARM)
17
         add_definitions(-march=armv6 -mfloat-abi=hard -mfpu=vfp)
18
     endif()
... ... --- a/x265.spec
... ... +++ b/x265.spec
... ... @@ -1,6 +1,6 @@
1 1
%define distsuffix plf
2 2
3
%define major 68
3
%define major 151
4 4
5 5
%define libname %mklibname %{name}_ %{major}
6 6
%define devname %mklibname %{name} -d
... ... @@ -8,15 +8,13 @@
8 8
9 9
Summary:	H265/HEVC encoder
10 10
Name:		x265
11
Version:	1.8
12
Release:	3
11
Version:	2.7
12
Release:	1
13 13
License:	GPLv2+
14 14
Group:		Video
15 15
Url:		http://x265.org/
16
# https://github.com/videolan/x265/archive/%{version}.tar.gz
17
Source0:	%{name}-%{version}.tar.gz
16
Source0:	https://github.com/videolan/x265/archive/%{version}.tar.gz?/%{name}-%{version}.tar.gz
18 17
Patch0:		x265-1.8-pkgconfig-dir.patch
19
Patch1:		x265-1.8-opt.patch
20 18
BuildRequires:	cmake
21 19
BuildRequires:	yasm
22 20
BuildRequires:	glibc-devel
... ... @@ -29,6 +27,7 @@ This package is in Restricted repository as the video encoder may be covered
27 27
by software patents.
28 28
29 29
%files
30
%doc COPYING
30 31
%{_bindir}/%{name}
31 32
32 33
#----------------------------------------------------------------------------
... ... @@ -41,6 +40,7 @@ Group: System/Libraries
40 40
x265 dynamic libraries.
41 41
42 42
%files -n %{libname}
43
%doc COPYING
43 44
%{_libdir}/libx265.so.%{major}
44 45
45 46
#----------------------------------------------------------------------------
... ... @@ -56,6 +56,7 @@ x265 is an open-source project and free application library for encoding video
56 56
streams into the H.265/High Efficiency Video Coding (HEVC) format.
57 57
58 58
%files -n %{devname}
59
%doc COPYING
59 60
%{_libdir}/libx265.so
60 61
%{_includedir}/*.h
61 62
%{_libdir}/pkgconfig/*.pc
... ... @@ -72,6 +73,7 @@ Provides: %{name}-static-devel = %{EVRD}
73 73
Static library for the x265 H265/HEVC encoding library.
74 74
75 75
%files -n %{static}
76
%doc COPYING
76 77
%{_libdir}/libx265.a
77 78
78 79
#----------------------------------------------------------------------------
... ... @@ -79,7 +81,6 @@ Static library for the x265 H265/HEVC encoding library.
81 81
%prep
82 82
%setup -q
83 83
%patch0 -p1
84
%patch1 -p1
85 84
86 85
%build
87 86
pushd source
... ... @@ -89,4 +90,3 @@ popd
90 90
91 91
%install
92 92
%makeinstall_std -C source/build
93