|
@@ -1,18 +1,13 @@
|
|
|
-%global commit 9f0324125f53
|
|
|
-
|
|
|
Summary: H.265/HEVC encoder library
|
|
|
Name: x265
|
|
|
-Version: 1.5
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: 1.7
|
|
|
+Release: 1%{?_dist_release}
|
|
|
Group: System Environment/Libraries
|
|
|
URL: http://x265.org/
|
|
|
-Source0: https://bitbucket.org/multicoreware/x265/get/%{version}.tar.bz2
|
|
|
-# fix pkgconfig file installation path
|
|
|
-#Patch0: x265-pc-path.patch
|
|
|
+Source0: http://ftp.videolan.org/pub/videolan/x265/x265_%{version}.tar.gz
|
|
|
# link test binaries with shared library
|
|
|
-Patch1: x265-1.5-test-shared.patch
|
|
|
-# build with -fPIC on arm and i686, too
|
|
|
-Patch2: x265-pic.patch
|
|
|
+Patch1: x265-test-shared.patch
|
|
|
+Patch4: x265-detect_cpu_armhfp.patch
|
|
|
# source/Lib/TLibCommon - BSD
|
|
|
# source/Lib/TLibEncoder - BSD
|
|
|
# everything else - GPLv2+
|
|
@@ -39,22 +34,14 @@ highest performance on a wide variety of hardware platforms.
|
|
|
This package contains the shared library development files.
|
|
|
|
|
|
%prep
|
|
|
-%setup -q -n multicoreware-%{name}-%{commit}
|
|
|
-#%patch0 -p1 -b .p
|
|
|
-# tests are crashing on x86 if linked against shared libx265
|
|
|
-%ifnarch i686
|
|
|
+%setup -q -n x265_%{version}
|
|
|
%patch1 -p1 -b .ts
|
|
|
-%endif
|
|
|
-%patch2 -p1 -b .pic
|
|
|
-
|
|
|
-# f=doc/uncrustify/drag-uncrustify.bat
|
|
|
-# tr -d '\r' < ${f} > ${f}.unix && \
|
|
|
-# touch -r ${f} ${f}.unix && \
|
|
|
-# %__mv ${f}.unix ${f} || exit 1
|
|
|
+%patch4 -p1 -b .armhfp
|
|
|
|
|
|
%build
|
|
|
%cmake -G "Unix Makefiles" \
|
|
|
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
|
|
+ -DENABLE_PIC:BOOL=ON \
|
|
|
-DENABLE_TESTS:BOOL=ON \
|
|
|
source
|
|
|
%__make %{?_smp_mflags}
|
|
@@ -64,11 +51,10 @@ This package contains the shared library development files.
|
|
|
%__rm %{buildroot}%{_libdir}/libx265.a || exit 1
|
|
|
# %__install -Dpm644 COPYING %{buildroot}%{_pkgdocdir}/COPYING
|
|
|
|
|
|
+%ifnarch %{arm}
|
|
|
%check
|
|
|
-#LD_LIBRARY_PATH=$(pwd) test/PoolTest
|
|
|
-LD_LIBRARY_PATH=$(pwd) test/TestBench
|
|
|
-
|
|
|
-exit 0
|
|
|
+LD_LIBRARY_PATH=%{buildroot}%{_libdir} test/TestBench
|
|
|
+%endif
|
|
|
|
|
|
%post -p /sbin/ldconfig
|
|
|
|
|
@@ -76,10 +62,8 @@ exit 0
|
|
|
|
|
|
%files
|
|
|
%{_bindir}/x265
|
|
|
-# %dir %{_pkgdocdir}
|
|
|
-# %{_pkgdocdir}/COPYING
|
|
|
%doc COPYING
|
|
|
-%{_libdir}/libx265.so.43
|
|
|
+%{_libdir}/libx265.so.59
|
|
|
|
|
|
%files devel
|
|
|
%doc doc/*
|
|
@@ -89,6 +73,13 @@ exit 0
|
|
|
%{_libdir}/pkgconfig/x265.pc
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Jul 11 2015 Munehiro Yamamoto <munepi@vinelinux.org> 1.7-1
|
|
|
+- new upstream release (ABI 59)
|
|
|
+
|
|
|
+* Sat Jul 11 2015 Munehiro Yamamoto <munepi@vinelinux.org> 1.6-1
|
|
|
+- new upstream release (ABI 51)
|
|
|
+- release tarballs are now hosted on videolan.org
|
|
|
+
|
|
|
* Sat Feb 21 2015 Munehiro Yamamoto <munepi@vinelinux.org> 1.5-2
|
|
|
- rebuild
|
|
|
|