gentoo resync : 22.04.2018

4 files changed, 33 insertions, 2 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 74e03c5b0e4f..3d565adf1fdc 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 56c8ad27720e..e7031ba69d7d 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,7 +1,8 @@
+AUX ffmpeg4.patch 1301 BLAKE2B 7ce55736e3a6fd4b9e0ebc8515305a666cc042c8063eb86aa7efc87c5bad290e15c9778f1be383fbd1bc6e1ed49f537671d522966523ccccba4f7644f1c24447 SHA512 6500270c1d5c9d165a70ec44f30bb6fc3d921461554af0d92d79ff9f659993cfbb87459cb0e78d49d507cd27b39354c53d93fd9839068fa28bcd0c8eaf03245c
 AUX qwt.patch 2136 BLAKE2B 3ab69581d1dac006ebd493c82bebee7df34fc00accf7957411a143ce1ba6fffebdffe3468ada7c1e51375cb55adca5d1b28c7a6d1708355d60508f85422e2494 SHA512 4a9edac8565bc7a77644d9b6adeec61187c34dcf72f309066eb6575de7baef5cb59668c70bf5b51fb22a8e5bad00da4d664d279b1d22aae5dbb8fe07f69ae91b
 AUX tinyxml6.patch 870 BLAKE2B 2edfb3b8f3a2ec715f429bb982c8f33179d713206bd427d10e4f9277fcc48712c8be2683f9d1ed54447dfde3d055a4fdd87e779bb58918ea78e19dedd3ce6109 SHA512 819b67127e97abe0dfd2b145f8d4e1aab1a11d7a8d734f085d82b3c4b814a37498e2f6b913e6c4a3a558c0420fc6f5de3dae508e76c6465352a3e6e45292eec6
 DIST gazebo-8.2.0.tar.bz2 52513092 BLAKE2B d44c4ac837163331f50e266bb4880f42fff82037ccc9a7e1ac7ccea0a37415a2fc217c62b449358510308fc741e0c569e2613c70c328e323f6f018c5bc6f0b31 SHA512 d2561a6e5460ea068d9c84945e5955d986bc1f6f0d1ba16100aae53015c6e11da3a152ac6ecb906147d37261d4c680025bcc5f5587c6c09f127319dc184cf843
 DIST gazebo-9.0.0.tar.bz2 52779811 BLAKE2B a85c9fd0e4b805e28ea8fb71c068ad53f18db91a474631b5da73a2a565181c8c22270742c9fabf1656d322fd63ba1caac3286b992d7dc7b197a0582ed724d06e SHA512 52394445d34ce24b2036102be08b6b626fb7021dd0ebaab8e588b68e1e0790d2e26ed2af8ead8f37b0c2e2d37c3d7fc22f95b0b2a8bd95e8dcd77e7fb296dd50
 EBUILD gazebo-8.2.0-r1.ebuild 1871 BLAKE2B de6a0ab367d0e12fd886b64b2f88467d19b923c7d86399baf1254ae61875399ed08d733cf6b4ca9cdcb5f7971f3fb7bf44d253f72c823972d40e5fa10bc58127 SHA512 83bb680ebeb1f08fa09c9192acbf5ad744bc37fd4782f3d2387bfbaee50bc202eb891a0a7798d0255fc77cc1b137913b5ceba21fa0ed41cc07cf2bd910c10000
-EBUILD gazebo-9.0.0.ebuild 1836 BLAKE2B 01ef8b3926fb57be24d79c8c84d018ef9f382007c29e73fa597c22b1958c52fa4fa75f17c9f82de6dd4d0a8fd193e30d6a59121995e1e06b8cc3aea88966cd8e SHA512 286428641b606469bdc2887d3b0a0d8a5bbf9eb356daf08b5cb1810469dc1fcea52553b86d9eb2ec74d021360e369a5820ab7f839cb4eb1f61824e7512ac6dd2
+EBUILD gazebo-9.0.0.ebuild 1864 BLAKE2B eb60f9ede47bcf3d12a23472e59291d612d9528992f0f4ee9ff1a45911a305e9e2d38ef8b17090da9b61fafc16cf30c9147f8dae034c38a13f933cd767e4b909 SHA512 1b4b025892208067cd7276bebec5235f6708ef7e0d4ca9f2588c1a076dafcfa1d8b23489a5afbb32e49ce4cdc0778d5480b1d41641a629071d2bce92a675782b
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-electronics/gazebo/files/ffmpeg4.patch b/sci-electronics/gazebo/files/ffmpeg4.patch
new file mode 100644
index 000000000000..7bd8777dea3f
--- /dev/null
+++ b/sci-electronics/gazebo/files/ffmpeg4.patch
@@ -0,0 +1,30 @@
+Index: gazebo-9.0.0/gazebo/common/AudioDecoder.cc
+===================================================================
+--- gazebo-9.0.0.orig/gazebo/common/AudioDecoder.cc
++++ gazebo-9.0.0/gazebo/common/AudioDecoder.cc
+@@ -255,8 +255,8 @@ bool AudioDecoder::SetFile(const std::st
+     return false;
+   }
+ 
+-  if (this->codec->capabilities & CODEC_CAP_TRUNCATED)
+-    this->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
++  if (this->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++    this->codecCtx->flags |= AV_CODEC_FLAG_TRUNCATED;
+ 
+   // Open codec
+   if (avcodec_open2(this->codecCtx, this->codec, nullptr) < 0)
+Index: gazebo-9.0.0/gazebo/common/Video.cc
+===================================================================
+--- gazebo-9.0.0.orig/gazebo/common/Video.cc
++++ gazebo-9.0.0/gazebo/common/Video.cc
+@@ -143,8 +143,8 @@ bool Video::Load(const std::string &_fil
+ 
+   // Inform the codec that we can handle truncated bitstreams -- i.e.,
+   // bitstreams where frame boundaries can fall in the middle of packets
+-  if (codec->capabilities & CODEC_CAP_TRUNCATED)
+-    this->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
++  if (codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++    this->codecCtx->flags |= AV_CODEC_FLAG_TRUNCATED;
+ 
+   // Open codec
+   if (avcodec_open2(this->codecCtx, codec, nullptr) < 0)
diff --git a/sci-electronics/gazebo/gazebo-9.0.0.ebuild b/sci-electronics/gazebo/gazebo-9.0.0.ebuild
index 76ad65771aa8..77f42540c99b 100644
--- a/sci-electronics/gazebo/gazebo-9.0.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-9.0.0.ebuild
@@ -57,7 +57,7 @@ DEPEND="${RDEPEND}
 	test? ( dev-libs/libxslt )
 "
 CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/qwt.patch" )
+PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/ffmpeg4.patch" )
 
 src_configure() {
 	# doesnt build without it