Use current version of gcc (currently gcc7)

The build currently works with gcc7. In previous tests that I made,
there were periods that gcc7 worked well and then got broken by
upstream changes. Now it seems to work fine.

Since this is the development (-git) package, it's better to keep
gcc4.9 installed for a while just in case upstream breaks gcc7
support again.

3 files changed, 8 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f5cd51f2deb6..135e72fa009f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = intel-media-sdk-git
 	pkgdesc = API to access hardware-accelerated video decode, encode and filtering on Intel platforms with integrated graphics (git version)
-	pkgver = 1.2a.r44.gbb93dc5
-	pkgrel = 2
+	pkgver = 1.2a.r47.gc2ad93a
+	pkgrel = 1
 	url = https://github.com/Intel-Media-SDK/MediaSDK/
 	arch = x86_64
 	license = MIT
@@ -9,16 +9,13 @@ pkgbase = intel-media-sdk-git
 	makedepends = perl
 	makedepends = cmake
 	makedepends = git-lfs
-	makedepends = gcc49
 	depends = libva
 	depends = intel-media-driver-git
 	provides = intel-media-sdk
 	provides = libmfx
 	conflicts = intel-media-sdk
 	conflicts = libmfx
-	source = intel-media-sdk-change-gcc-version.patch
 	source = intel-media-sdk-detect-intel-opencl.patch
-	sha256sums = d9fc114d06624504891b545df2913b01d4b07edfb99512388490eae40f9b9ab7
 	sha256sums = 689ebc270532c0e1e5132d39898ff2a93fe3483a5a2673aea396a24fc07ad24c
 
 pkgname = intel-media-sdk-git
diff --git a/PKGBUILD b/PKGBUILD
index 0f2b461f9fb2..9bc454b6fad0 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Daniel Bermond < yahoo-com: danielbermond >
 
 pkgname=intel-media-sdk-git
-pkgver=1.2a.r44.gbb93dc5
-pkgrel=2
+pkgver=1.2a.r47.gc2ad93a
+pkgrel=1
 pkgdesc='API to access hardware-accelerated video decode, encode and filtering on Intel platforms with integrated graphics (git version)'
 arch=('x86_64')
 url='https://github.com/Intel-Media-SDK/MediaSDK/'
@@ -17,14 +17,12 @@ makedepends=(
     # official repositories:
         'git' 'perl' 'cmake'
     # AUR:
-        'git-lfs' 'gcc49'
+        'git-lfs'
 )
 provides=('intel-media-sdk' 'libmfx')
 conflicts=('intel-media-sdk' 'libmfx')
-source=('intel-media-sdk-change-gcc-version.patch'
-        'intel-media-sdk-detect-intel-opencl.patch')
-sha256sums=('d9fc114d06624504891b545df2913b01d4b07edfb99512388490eae40f9b9ab7'
-            '689ebc270532c0e1e5132d39898ff2a93fe3483a5a2673aea396a24fc07ad24c')
+source=('intel-media-sdk-detect-intel-opencl.patch')
+sha256sums=('689ebc270532c0e1e5132d39898ff2a93fe3483a5a2673aea396a24fc07ad24c')
 
 prepare() {
     # makepkg does not support cloning git-lfs repositories
@@ -40,8 +38,7 @@ prepare() {
         cd "$pkgname"
     fi
     
-    for _patch in intel-media-sdk-change-gcc-version.patch \
-                  intel-media-sdk-detect-intel-opencl.patch
+    for _patch in intel-media-sdk-detect-intel-opencl.patch
     do
         printf '%s\n' "Checking patch '${_patch}'"
         if patch -Np1 --dry-run -i "${srcdir}/${_patch}" >/dev/null
diff --git a/intel-media-sdk-change-gcc-version.patch b/intel-media-sdk-change-gcc-version.patch
deleted file mode 100644
index 6f24cdf26f7f..000000000000
--- a/intel-media-sdk-change-gcc-version.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur a/tools/builder/build_mfx.pl b/tools/builder/build_mfx.pl
---- a/tools/builder/build_mfx.pl	2018-01-16 13:39:37.000000000 -0200
-+++ b/tools/builder/build_mfx.pl	2018-01-16 13:41:24.973316378 -0200
-@@ -33,8 +33,8 @@
- my $clean            = 0;
- my $no_warn_as_error = 0;
- my %build = (
--    'cc'         => '',
--    'cxx'        => '',
-+    'cc'         => '/usr/bin/gcc-4.9',
-+    'cxx'        => '/usr/bin/g++-4.9',
-     'ipp'        => '',
-     'trace'      => '',
-     'prefix'     => '',