11:20 a.m.
Author: rathann
Update of /cvs/free/rpms/x265/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1200
Modified Files:
sources
Added Files:
x265-fix-soname.patch x265-pc-path.patch x265-pic.patch
x265-test-shared.patch x265.spec
Log Message:
initial import into f20 branch
x265-fix-soname.patch:
CMakeLists.txt | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
--- NEW FILE x265-fix-soname.patch ---
diff -up multicoreware-x265-d6257335c537/source/CMakeLists.txt.soname
multicoreware-x265-d6257335c537/source/CMakeLists.txt
--- multicoreware-x265-d6257335c537/source/CMakeLists.txt.soname 2014-08-08
11:55:36.315572972 +0200
+++ multicoreware-x265-d6257335c537/source/CMakeLists.txt 2014-08-08 11:55:36.316572975
+0200
@@ -276,15 +276,22 @@ if(ENABLE_SHARED)
else()
set_target_properties(x265-shared PROPERTIES OUTPUT_NAME x265)
endif()
- if(UNIX AND NOT APPLE)
- set_target_properties(x265-shared PROPERTIES LINK_FLAGS
"-Wl,-Bsymbolic,-znoexecstack")
+ if(UNIX)
+ set_target_properties(x265-shared PROPERTIES VERSION ${X265_BUILD})
+ if(NOT APPLE)
+ set_target_properties(x265-shared PROPERTIES LINK_FLAGS
"-Wl,-Bsymbolic,-znoexecstack")
+ endif()
endif()
+ set_target_properties(x265-shared PROPERTIES SOVERSION ${X265_BUILD})
if(X265_LATEST_TAG)
+ if(WINDOWS)
+ set_target_properties(x265-shared PROPERTIES VERSION ${X265_LATEST_TAG})
+ endif()
# shared library is not installed if a tag is not found
- set_target_properties(x265-shared PROPERTIES VERSION ${X265_LATEST_TAG} SOVERSION
${X265_BUILD})
install(TARGETS x265-shared
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR})
endif()
endif()
x265-pc-path.patch:
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE x265-pc-path.patch ---
diff -up multicoreware-x265-d6257335c537/source/CMakeLists.txt.r
multicoreware-x265-d6257335c537/source/CMakeLists.txt
--- multicoreware-x265-d6257335c537/source/CMakeLists.txt.r 2014-07-09 10:25:15.000000000
+0200
+++ multicoreware-x265-d6257335c537/source/CMakeLists.txt 2014-07-10 12:03:21.459088376
+0200
@@ -308,7 +308,7 @@ if(X265_LATEST_TAG)
# Produce a pkg-config file
configure_file("x265.pc.in" "x265.pc" @ONLY)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/x265.pc"
- DESTINATION
"${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/pkgconfig")
+ DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
endif()
if(NOT WIN32)
x265-pic.patch:
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE x265-pic.patch ---
diff -up multicoreware-x265-d6257335c537/source/CMakeLists.txt.pic
multicoreware-x265-d6257335c537/source/CMakeLists.txt
--- multicoreware-x265-d6257335c537/source/CMakeLists.txt.pic 2014-07-17
09:37:41.176441279 +0200
+++ multicoreware-x265-d6257335c537/source/CMakeLists.txt 2014-07-17 10:18:03.001014597
+0200
@@ -122,10 +122,10 @@ if(GCC)
add_definitions(-fPIC)
endif(X64 AND NOT WIN32)
if(X86 AND NOT X64)
- add_definitions(-march=i686)
+ add_definitions(-march=i686 -fPIC)
endif()
if(ARM)
- add_definitions(-march=armv6 -mfloat-abi=hard -mfpu=vfp)
+ add_definitions(-march=armv6 -mfloat-abi=hard -mfpu=vfp -fPIC)
endif()
check_cxx_compiler_flag(-Wno-narrowing CC_HAS_NO_NARROWING)
check_cxx_compiler_flag(-ffast-math CC_HAS_FAST_MATH)
x265-test-shared.patch:
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE x265-test-shared.patch ---
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}
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})
--- NEW FILE x265.spec ---
%global commit d6257335c537
Summary: H.265/HEVC encoder
Name: x265
Version: 1.2
Release: 5%{?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
# 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
# source/Lib/TLibCommon - BSD
# source/Lib/TLibEncoder - BSD
# everything else - GPLv2+
License: GPLv2+ and BSD
BuildRequires: cmake
BuildRequires: yasm
%description
The primary objective of x265 is to become the best H.265/HEVC encoder
available anywhere, offering the highest compression efficiency and the
highest performance on a wide variety of hardware platforms.
This package contains the command line encoder.
%package libs
Summary: H.265/HEVC encoder library
%description libs
The primary objective of x265 is to become the best H.265/HEVC encoder
available anywhere, offering the highest compression efficiency and the
highest performance on a wide variety of hardware platforms.
This package contains the shared library.
%package devel
Summary: H.265/HEVC encoder library development files
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel
The primary objective of x265 is to become the best H.265/HEVC encoder
available anywhere, offering the highest compression efficiency and the
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
%patch1 -p1 -b .ts
%endif
%patch2 -p1 -b .pic
%patch3 -p1 -b .soname
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_TESTS:BOOL=ON \
source
make %{?_smp_mflags}
%install
make DESTDIR=%{buildroot} install
rm %{buildroot}%{_libdir}/libx265.a
install -Dpm644 COPYING %{buildroot}%{_pkgdocdir}/COPYING
%check
LD_LIBRARY_PATH=$(pwd) test/PoolTest
LD_LIBRARY_PATH=$(pwd) test/TestBench
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files
%{_bindir}/x265
%files libs
%dir %{_pkgdocdir}
%{_pkgdocdir}/COPYING
%{_libdir}/libx265.so.25
%files devel
%doc doc/*
%{_includedir}/x265.h
%{_includedir}/x265_config.h
%{_libdir}/libx265.so
%{_libdir}/pkgconfig/x265.pc
%changelog
* Sun Aug 17 2014 Dominik Mierzejewski <rpm(a)greysector.net> 1.2-5
- don't include contributor agreement in doc
- make sure /usr/share/doc/x265 is owned
- add a comment noting which files are BSD-licenced
* Fri Aug 08 2014 Dominik Mierzejewski <rpm(a)greysector.net> 1.2-4
- don't create bogus soname (patch by Xavier)
* Thu Jul 17 2014 Dominik Mierzejewski <rpm(a)greysector.net> 1.2-3
- fix tr call to remove DOS EOL
- build the library with -fPIC on arm and i686, too
* Sun Jul 13 2014 Dominik Mierzejewski <rpm(a)greysector.net> 1.2-2
- use version in source URL
- update License tag
- fix EOL in drag-uncrustify.bat
- don't link test binaries with shared binary on x86 (segfault)
* Thu Jul 10 2014 Dominik Mierzejewski <rpm(a)greysector.net> 1.2-1
- initial build
- fix pkgconfig file install location
- link test binaries with shared library
Index: sources
===================================================================
RCS file: /cvs/free/rpms/x265/F-20/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 3 Sep 2014 21:29:50 -0000 1.1
+++ sources 4 Sep 2014 11:20:29 -0000 1.2
@@ -0,0 +1 @@
+57a4b8300918c5412ceaa26bb8e0a0bb 1.2.tar.bz2