Request 4272 (accepted)

Overview

Request 4272 (accepted)

No description set

Created by Aloysius over 6 years ago
In state accepted
Package maintainer: microchip8

Submit turing

Submit package home:Aloysius:branches:Multimedia / turing to package Multimedia / turing

turing.changes Changed

turing.spec Changed

@@ -1,6 +1,7 @@
 #
 # spec file for package turing
 #
+# Copyright (c) 2018 Packman Team <packman@links2linux.de>
 # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
@@ -12,22 +13,38 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.links2linux.org/
 #
 
 
+%define _sover  0.0.0
+%define _somaj  0
 Name:           turing
 Version:        1.2.git.1499183039.72b085e
 Release:        0
 Summary:        H.265/HEVC video encoder/decoder
 License:        GPL-2.0
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-Url:            http://turingcodec.org/
+URL:            http://turingcodec.org/
 Source0:        %{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM turing-no-return-in-nonvoid.patch -- aloisio@gmx.com
+Patch0:         turing-no-return-in-nonvoid.patch
+# PATCH-FIX-OPENSUSE turing-system-boost.patch -- aloisio@gmx.com
+Patch1:         turing-system-boost.patch
+# PATCH-FIX-OPENSUSE turing-shared-libs.patch -- aloisio@gmx.com
+Patch2:         turing-shared-libs.patch
 BuildRequires:  cmake >= 2.8
 BuildRequires:  gcc-c++
 BuildRequires:  git
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} >= 1500
+BuildRequires:  libboost_chrono-devel
+BuildRequires:  libboost_filesystem-devel
+BuildRequires:  libboost_program_options-devel
+BuildRequires:  libboost_timer-devel
+%else
+BuildRequires:  boost-devel
+%endif
+BuildRequires:  pkgconfig
 ExclusiveArch:	x86_64
 
 %description
@@ -35,36 +52,70 @@
 The codec is optimised for fast encoding of large resolution video content while at the same time
 preserving high perceptual qualities of the generated compressed video streams.
 
-%package -n %{name}-devel
+%package        devel
 Summary:        Include files for the Turing codec
 Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}-%{release}
-Obsoletes:      %{name}-devel < %{version}-%{release}
-Provides:       %{name}-devel = %{version}-%{release}
+Requires:       lib%{name}%{_somaj} = %{version}
+Requires:       libhavoc%{_somaj} = %{version}
 
-%description -n %{name}-devel
+%description devel
 This package provides the development header files for the Turing codec.
 
+%package     -n libhavoc%{_somaj}
+Summary:        H.265/HEVC video encoder/decoder
+Group:          System/Libraries
+
+%description -n libhavoc%{_somaj}
+The Turing codec is an H.265/HEVC software video encoder and decoder for efficient video compression.
+The codec is optimised for fast encoding of large resolution video content while at the same time
+preserving high perceptual qualities of the generated compressed video streams.
+
+%package     -n lib%{name}%{_somaj}
+Summary:        H.265/HEVC video encoder/decoder
+Group:          System/Libraries
+
+%description -n lib%{name}%{_somaj}
+The Turing codec is an H.265/HEVC software video encoder and decoder for efficient video compression.
+The codec is optimised for fast encoding of large resolution video content while at the same time
+preserving high perceptual qualities of the generated compressed video streams.
+
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+sed -e 's/__SOVERSION__/%{_somaj}/' \
+    -e 's/__VERSION__/%{_sover}/' \
+    -i turing/CMakeLists.txt havoc/CMakeLists.txt
 
 %build
-%{__cmake} .
+%cmake -DUSE_SYSTEM_BOOST=1 -DTURING_VERSION=%{version}
 make %{?_smp_mflags}
 
 %install
-install -Dsm 755 %{name}/%{name} %{buildroot}%{_bindir}/%{name}
-install -Dsm 755 havoc/havoc %{buildroot}%{_bindir}/havoc
-install -Dm 644 %{name}/%{name}.h %{buildroot}%{_includedir}/%{name}.h
+%cmake_install
 
+%post   -n libhavoc%{_somaj} -p /sbin/ldconfig
+%postun -n libhavoc%{_somaj} -p /sbin/ldconfig
+%post   -n lib%{name}%{_somaj} -p /sbin/ldconfig
+%postun -n lib%{name}%{_somaj} -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
-%{_bindir}/*
-%doc README.md COPYING
+%doc README.md
+%license COPYING
+%{_bindir}/%{name}
+%{_bindir}/havoc
+
+%files devel
+%{_includedir}/%{name}.h
+%{_libdir}/libhavoc.so
+%{_libdir}/lib%{name}.so
+%{_libdir}/pkgconfig/lib%{name}.pc
+
+%files -n libhavoc%{_somaj}
+%{_libdir}/libhavoc.so.%{_somaj}*
 
-%files -n %{name}-devel
-%defattr(-,root,root)
-%{_includedir}/*.h
+%files -n lib%{name}%{_somaj}
+%{_libdir}/lib%{name}.so.%{_somaj}*
 
 %changelog

turing-no-return-in-nonvoid.patch Added

turing-shared-libs.patch Added

@@ -0,0 +1,61 @@
+Index: turing-1.2.git.1499183039.72b085e/havoc/CMakeLists.txt
+===================================================================
+--- turing-1.2.git.1499183039.72b085e.orig/havoc/CMakeLists.txt
++++ turing-1.2.git.1499183039.72b085e/havoc/CMakeLists.txt
+@@ -57,6 +57,10 @@ unset(CMAKE_IMPORT_LIBRARY_SUFFIX)
+ 
+ target_link_libraries(havoc-exe havoc)
+ 
++set_target_properties(havoc PROPERTIES SOVERSION __SOVERSION__ VERSION __VERSION__)
++
+ set_target_properties(havoc-exe PROPERTIES OUTPUT_NAME havoc)
+ 
+-install(TARGETS havoc LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
++install(TARGETS havoc-exe DESTINATION bin)
++
++install(TARGETS havoc LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
+Index: turing-1.2.git.1499183039.72b085e/turing/CMakeLists.txt
+===================================================================
+--- turing-1.2.git.1499183039.72b085e.orig/turing/CMakeLists.txt
++++ turing-1.2.git.1499183039.72b085e/turing/CMakeLists.txt
+@@ -222,6 +222,8 @@ unset(CMAKE_IMPORT_LIBRARY_SUFFIX)
+ 
+ add_executable (turing-exe main.cpp)
+ 
++set_target_properties(turing PROPERTIES SOVERSION __SOVERSION__ VERSION __VERSION__)
++
+ set_target_properties(turing-exe PROPERTIES OUTPUT_NAME turing)
+ 
+ target_link_libraries (turing-exe LINK_PUBLIC turing ${LINK_LIBRARIES})
+@@ -230,9 +232,10 @@ if(UNIX)
+ 	include(FindPkgConfig QUIET)
+ 	if(PKG_CONFIG_FOUND)
+ 		configure_file("libturing.pc.in" "libturing.pc" @ONLY)
+-		install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libturing.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
++		install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libturing.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig")
+ 	endif()
+ endif()
+ 
+-install(TARGETS turing LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
++install(TARGETS turing-exe DESTINATION bin)
++install(TARGETS turing LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
+ install(FILES turing.h DESTINATION include)
+Index: turing-1.2.git.1499183039.72b085e/turing/libturing.pc.in
+===================================================================
+--- turing-1.2.git.1499183039.72b085e.orig/turing/libturing.pc.in
++++ turing-1.2.git.1499183039.72b085e/turing/libturing.pc.in
+@@ -1,11 +1,11 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/lib@LIB_SUFFIX@
+ includedir=${prefix}/include
+ 
+ Name: @CMAKE_PROJECT_NAME@
+ Description: Turing codec library
+-Version: @GIT_DESCRIBE@
++Version: @TURING_VERSION@
+ Libs: -L${libdir}  -lturing -lhavoc
+-Libs.private: -lstdc++ -L@CMAKE_INSTALL_PREFIX@/lib/boost -lboost_program_options -lboost_timer -lboost_system -lboost_filesystem -lboost_chrono
++Libs.private: -lstdc++ -lboost_program_options -lboost_timer -lboost_system -lboost_filesystem -lboost_chrono
+ Cflags: -I${includedir}

turing-system-boost.patch Added

@@ -0,0 +1,25 @@
+Index: turing-1.2.git.1499183039.72b085e/turing/CMakeLists.txt
+===================================================================
+--- turing-1.2.git.1499183039.72b085e.orig/turing/CMakeLists.txt
++++ turing-1.2.git.1499183039.72b085e/turing/CMakeLists.txt
+@@ -216,7 +216,7 @@ endif (CMAKE_COMPILER_IS_GNUCC)
+ 
+ source_group(SEI FILES ${SEI_HEADERS})
+ 
+-target_link_libraries (turing LINK_PUBLIC havoc)
++target_link_libraries (turing LINK_PUBLIC havoc ${LINK_LIBRARIES})
+ 
+ unset(CMAKE_IMPORT_LIBRARY_SUFFIX)
+ 
+@@ -231,11 +231,6 @@ if(UNIX)
+ 	if(PKG_CONFIG_FOUND)
+ 		configure_file("libturing.pc.in" "libturing.pc" @ONLY)
+ 		install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libturing.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
+-		install(FILES "${CMAKE_CURRENT_BINARY_DIR}/../boost/libs/chrono/src/libboost_chrono.a" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/boost")
+-		install(FILES "${CMAKE_CURRENT_BINARY_DIR}/../boost/libs/filesystem/src/libboost_filesystem.a" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/boost")
+-		install(FILES "${CMAKE_CURRENT_BINARY_DIR}/../boost/libs/program_options/src/libboost_program_options.a" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/boost")
+-		install(FILES "${CMAKE_CURRENT_BINARY_DIR}/../boost/libs/system/src/libboost_system.a" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/boost")
+-		install(FILES "${CMAKE_CURRENT_BINARY_DIR}/../boost/libs/timer/src/libboost_timer.a" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/boost")
+ 	endif()
+ endif()
+

Build Results
RPM Lint

Refresh

Comments for request 4272 0

Request History

Aloysius created request over 6 years ago

olh accepted request over 6 years ago