- cmake-sle12.patch

* needed for cmake 3.5.2 on sle12-sp5 
- specfile: sle12-sp5 needs gcc7

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libmfx?expand=0&rev=6
This commit is contained in:
Stefan Dirsch 2019-06-07 14:32:36 +00:00 committed by Git OBS Bridge
parent e9d0cbe5d8
commit 8e3e3e39a3
3 changed files with 42 additions and 2 deletions

22
cmake-sle12.patch Normal file
View File

@ -0,0 +1,22 @@
--- MediaSDK-intel-mediasdk-19.1.0/CMakeLists.txt.orig 2019-06-07 14:12:27.554638245 +0000
+++ MediaSDK-intel-mediasdk-19.1.0/CMakeLists.txt 2019-06-07 14:08:03.833212595 +0000
@@ -18,7 +18,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-cmake_minimum_required( VERSION 3.6 )
+cmake_minimum_required( VERSION 3.5.2 )
project( mediasdk )
include(CMakeDependentOption)
--- MediaSDK-intel-mediasdk-19.1.0/api/mfx_dispatch/linux/CMakeLists.txt.orig 2019-06-07 14:12:10.042277959 +0000
+++ MediaSDK-intel-mediasdk-19.1.0/api/mfx_dispatch/linux/CMakeLists.txt 2019-06-07 14:09:37.611141937 +0000
@@ -18,7 +18,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-cmake_minimum_required( VERSION 3.6 FATAL_ERROR )
+cmake_minimum_required( VERSION 3.5.2 FATAL_ERROR )
project( mfx )
set( MFX_API_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/../../include )

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jun 7 14:26:01 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
- cmake-sle12.patch
* needed for cmake 3.5.2 on sle12-sp5
- specfile: sle12-sp5 needs gcc7
-------------------------------------------------------------------
Thu Jun 6 12:22:00 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -24,9 +24,13 @@ License: MIT
Group: Development/Languages/C and C++
Url: https://github.com/Intel-Media-SDK/MediaSDK
Source0: https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-%{version}.tar.gz
Patch0: cmake-sle12.patch
BuildRequires: cmake
%if 0%{?suse_version} < 1500
BuildRequires: gcc7-c++
%else
BuildRequires: gcc-c++
BuildRequires: libva-devel
%endif
BuildRequires: pkgconfig
BuildRequires: pkgconfig(libva)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -59,11 +63,18 @@ the Intel® Media SDK.
%prep
%setup -q -n MediaSDK-intel-mediasdk-%{version}
%if 0%{?suse_version} < 1500
%patch0 -p1
%endif
%build
mkdir -p build
pushd build
cmake -DCMAKE_INSTALL_PREFIX=/usr ..
cmake -DCMAKE_INSTALL_PREFIX=/usr \
%if 0%{?suse_version} < 1500
-DCMAKE_CXX_COMPILER=/usr/bin/g++-7 \
%endif
..
make %{?_smp_mflags}
popd