12:08 p.m.
Author: rathann
Update of /cvs/free/rpms/x265/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18329
Modified Files:
.cvsignore sources x265-detect_cpu_armhfp.patch
x265-test-shared.patch x265.spec
Removed Files:
x265-fix-soname.patch x265-pc-path.patch x265-pic.patch
Log Message:
update to 1.6 (ABI bump, rfbz#3593)
- release tarballs are now hosted on videolan.org
- drop obsolete patches
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x265/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 4 Sep 2014 10:54:39 -0000 1.2
+++ .cvsignore 15 Apr 2015 12:08:48 -0000 1.3
@@ -1 +1 @@
-1.2.tar.bz2
+x265_1.6.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/x265/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 4 Sep 2014 10:54:39 -0000 1.2
+++ sources 15 Apr 2015 12:08:48 -0000 1.3
@@ -1 +1 @@
-57a4b8300918c5412ceaa26bb8e0a0bb 1.2.tar.bz2
+32e4151f8b6a32b466b1055562ebfb4f x265_1.6.tar.gz
x265-detect_cpu_armhfp.patch:
CMakeLists.txt | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
Index: x265-detect_cpu_armhfp.patch
===================================================================
RCS file: /cvs/free/rpms/x265/devel/x265-detect_cpu_armhfp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x265-detect_cpu_armhfp.patch 18 Dec 2014 15:47:41 -0000 1.1
+++ x265-detect_cpu_armhfp.patch 15 Apr 2015 12:08:48 -0000 1.2
@@ -1,12 +1,12 @@
-diff -up multicoreware-x265-d6257335c537/source/CMakeLists.txt.armhfp
multicoreware-x265-d6257335c537/source/CMakeLists.txt
---- multicoreware-x265-d6257335c537/source/CMakeLists.txt.armhfp 2014-09-28
11:09:31.472787489 -0400
-+++ multicoreware-x265-d6257335c537/source/CMakeLists.txt 2014-09-28 11:14:12.970136458
-0400
-@@ -45,9 +45,13 @@ if("${SYSPROC}" STREQUAL "" OR X86MATCH
+diff -up x265_1.6/source/CMakeLists.txt.armhfp x265_1.6/source/CMakeLists.txt
+--- x265_1.6/source/CMakeLists.txt.armhfp 2015-04-15 13:26:46.995287699 +0200
++++ x265_1.6/source/CMakeLists.txt 2015-04-15 13:27:29.015472793 +0200
+@@ -51,9 +51,13 @@ if("${SYSPROC}" STREQUAL "" OR X86MATCH
add_definitions(-DX86_64=1)
endif()
elseif(${SYSPROC} STREQUAL "armv6l")
-- message(STATUS "Detected ARM system processor")
-+ message(STATUS "Detected ARMv6 system processor")
+- message(STATUS "Detected ARM target processor")
++ message(STATUS "Detected ARMv6 target processor")
set(ARM 1)
add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1)
+elseif(${SYSPROC} STREQUAL "armv7l")
x265-test-shared.patch:
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: x265-test-shared.patch
===================================================================
RCS file: /cvs/free/rpms/x265/devel/x265-test-shared.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x265-test-shared.patch 4 Sep 2014 10:54:39 -0000 1.1
+++ x265-test-shared.patch 15 Apr 2015 12:08:48 -0000 1.2
@@ -1,13 +1,12 @@
-diff -up multicoreware-x265-d6257335c537/source/test/CMakeLists.txt.r
multicoreware-x265-d6257335c537/source/test/CMakeLists.txt
---- multicoreware-x265-d6257335c537/source/test/CMakeLists.txt.r 2014-07-09
10:25:15.000000000 +0200
-+++ multicoreware-x265-d6257335c537/source/test/CMakeLists.txt 2014-07-10
12:10:15.171798782 +0200
-@@ -17,7 +17,7 @@ add_executable(TestBench ${YASM_SRC}
+diff -up x265_1.6/source/test/CMakeLists.txt.ts x265_1.6/source/test/CMakeLists.txt
+--- x265_1.6/source/test/CMakeLists.txt.ts 2015-04-15 12:50:14.244622449 +0200
++++ x265_1.6/source/test/CMakeLists.txt 2015-04-15 12:50:32.534702116 +0200
+@@ -22,7 +22,7 @@ add_executable(TestBench ${YASM_SRC}
mbdstharness.cpp mbdstharness.h
ipfilterharness.cpp ipfilterharness.h
intrapredharness.cpp intrapredharness.h)
-target_link_libraries(TestBench x265-static ${PLATFORM_LIBS})
+target_link_libraries(TestBench x265-shared ${PLATFORM_LIBS})
-
- add_executable(PoolTest testpool.cpp)
--target_link_libraries(PoolTest x265-static ${PLATFORM_LIBS})
-+target_link_libraries(PoolTest x265-shared ${PLATFORM_LIBS})
+ if(LINKER_OPTIONS)
+ set_target_properties(TestBench PROPERTIES LINK_FLAGS ${LINKER_OPTIONS})
+ endif()
Index: x265.spec
===================================================================
RCS file: /cvs/free/rpms/x265/devel/x265.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- x265.spec 18 Dec 2014 15:47:41 -0000 1.2
+++ x265.spec 15 Apr 2015 12:08:48 -0000 1.3
@@ -1,19 +1,11 @@
-%global commit d6257335c537
-
Summary: H.265/HEVC encoder
Name: x265
-Version: 1.2
-Release: 6%{?dist}
+Version: 1.6
+Release: 1%{?dist}
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-test-shared.patch
-# build with -fPIC on arm and i686, too
-Patch2: x265-pic.patch
-# don't create bogus soname
(https://bitbucket.org/multicoreware/x265/issue/62/linux-incorrect-symboli...)
-Patch3: x265-fix-soname.patch
Patch4: x265-detect_cpu_armhfp.patch
# source/Lib/TLibCommon - BSD
# source/Lib/TLibEncoder - BSD
@@ -51,23 +43,14 @@
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
-%patch3 -p1 -b .soname
%patch4 -p1 -b .armhfp
-f=doc/uncrustify/drag-uncrustify.bat
-tr -d '\r' < ${f} > ${f}.unix && \
-touch -r ${f} ${f}.unix && \
-mv ${f}.unix ${f}
%build
%cmake -G "Unix Makefiles" \
-DCMAKE_SKIP_RPATH:BOOL=YES \
+ -DENABLE_PIC:BOOL=ON \
-DENABLE_TESTS:BOOL=ON \
source
make %{?_smp_mflags}
@@ -79,8 +62,7 @@
%ifnarch %{arm}
%check
-LD_LIBRARY_PATH=$(pwd) test/PoolTest
-LD_LIBRARY_PATH=$(pwd) test/TestBench
+LD_LIBRARY_PATH=%{buildroot}%{_libdir} test/TestBench
%endif
%post libs -p /sbin/ldconfig
@@ -93,7 +75,7 @@
%files libs
%dir %{_pkgdocdir}
%{_pkgdocdir}/COPYING
-%{_libdir}/libx265.so.25
+%{_libdir}/libx265.so.51
%files devel
%doc doc/*
@@ -103,6 +85,11 @@
%{_libdir}/pkgconfig/x265.pc
%changelog
+* Wed Apr 15 2015 Dominik Mierzejewski <rpm(a)greysector.net> 1.6-1
+- update to 1.6 (ABI bump, rfbz#3593)
+- release tarballs are now hosted on videolan.org
+- drop obsolete patches
+
* Thu Dec 18 2014 Dominik Mierzejewski <rpm(a)greysector.net> 1.2-6
- fix build on armv7l arch (partially fix rfbz#3361, patch by Nicolas Chauvet)
- don't run tests on ARM for now (rfbz#3361)
--- x265-fix-soname.patch DELETED ---
--- x265-pc-path.patch DELETED ---
--- x265-pic.patch DELETED ---