gentoo resync : 10.11.2017

3 files changed, 55 insertions, 1 deletions

diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 8f16a6372c16..8db86aeb4fb4 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -17,11 +17,12 @@ AUX xmms2-0.8-rtvg.patch 1539 SHA256 a5486f791ee431171c3bf3a813165279f3218b2f2c6
 AUX xmms2-0.8-samba-4.patch 1125 SHA256 e453c2d3ecea7d95da393fce2d246a3372351cf25a60c0f1dedd61eb0ebf9d38 SHA512 f6a3ef39188b077217becc7317253e7ab652d6bd603bf26239a8398d8de6d34c62415f42baed78720fce9048f2499de90f0cca07d7219f281df8a441b16a7e01 WHIRLPOOL c3d2219eb5aa4979d5319776a14afb2a700d0a6d1e1249005dab057bbfa1e31776daba54812367b5657e8f18631a8ab9d5516c26810ca2c06aa7929f00ebb4e9
 AUX xmms2-0.8DrO_o-waflib-fix-perl.patch 1693 SHA256 92677d5cd31efa55cad5a0c9918b50be274f7de65065c3f491482ee95fb77b92 SHA512 0f7f86cebd0ff75ed53366776f8c93abb54adf5942f53d7424183a4bd6913b73493882d4d3caadba6a959ddf22da0a22fa53d0fc18ce5b8508eb5670482e8c92 WHIRLPOOL a7259c7071f70082f23044743302f96aa403e428fe93f4854f63ac900c7da948ebf1cc1332d8adbfd72a3862e888cb5d6b56481e8ec1e4e299e19c50c14bf34b
 AUX xmms2-0.8_p20161122-be-hash.patch 1075 SHA256 0a5a5bdef85c3169c0b0761b6b3e4b3ae1e27dcf506210501598cfee32c4a7c0 SHA512 051e22907315bb6bda201497e1c2ef84d919fc7d39aefac187b3616c5f6c41e768cdd79cfe197fbadfdda3863f9e9c96b5f72fa07d5e1655451328cde8ba5781 WHIRLPOOL a7e82bd247c7630dabcb95425a2db7b18feeafe90b5e613fce6baa7495bef09699b7dff18e74c902963bb06696f6561f6fe65525c1a1f59f2e3699a3d8bd0080
+AUX xmms2-0.8_p20161122-mac-4.patch 1632 SHA256 09d184a861bafa3acfa8f39854f0779bba50d374da72e77c3900a3ea738dee86 SHA512 d2fe5f9a0c59205c787386e7b219c3fa9a334c30787b9a343214cc1c4dbf9f5d47f5dad9b2efd7deac1e96a227c827cc66198215a89b0e788c9d856cff51b16b WHIRLPOOL 1820c09f7f0ddfa89cafcf7a0d80c9a297c0b62ab6a45549658deb8de9dcd996984c774221732428a896236fdc50f243d40b4d4f66c6088eb8c5e581ec61a544
 AUX xmms2-0.8_p20161122-tarball.patch 2764 SHA256 3de2d3c0cc8cf0a0ca28c4d51082c55fc7fe19839a54b8f2787335ff2f9bd7ba SHA512 5b03d129a55ac14462a68e47ecba29c2817eb83d122a3614c624c743ecc29a7bac066644aa61d5ac74f9cb59808d1a9bac077dc360c507da722c206b948301ac WHIRLPOOL 48567b17881749e0ebb933dd445c663b89ebb005d8e8c5c55ad97edfa3ebb249d69cd8812588a5a62e4272064375447940be04fca6259b9428b543a53954f9a3
 DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 SHA256 58bd62f1e3ca83d4d82ad6854ee769b97238fc1c89967262c0e9e9e20e35092e SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb WHIRLPOOL 438d33793b808dd151b27ac51af9998b819ffc03cbc0ce789d693192f8aa5cab3c48402ef83f2b8fe1442dd9130248f561b1fe466168c0569c2e017ee1a0ede3
 DIST xmms2-0.8DrO_o.tar.bz2 1670726 SHA256 c77e41e7bd5788889d5a2f78331ca8c748b8721bd2e59f36c36ad4c7cae8694a SHA512 478103d80264c0cb32912e828f74d0f5b2f10fe310f530a87ebecda7ca547a69e238cd572788f90bda29494494160d459fa6d1356b4fb87c7a8f0bf02e3b75f8 WHIRLPOOL 741dd85b8c065eea799675588a8d4c389c47fa3dcf129a9fd799bb5da0ffcb1eeffa45cfaca40af7c505908818b5e7960c1a54e947f53358edeb43841f2eaa5c
 EBUILD xmms2-0.8-r4.ebuild 7874 SHA256 471384c64f1a54c2dc421a44c6673f9d18b4b0841ed2459639aa18ba08efa2ad SHA512 529fb2aa5655d0acc7b8c76c50e51e336771eec912dd5b5c3c469c6f32942eab15c1ca6aa9716c06b5103a2e852729b295d1b3f862d4e8e1c3c24918fa7550ae WHIRLPOOL 378209b1ae3bbdbc31c891ee47a92c87bee5fc714854bdec209e9ed3afb66b5d29a2f0063f72c8d5b53c26817c3beeae214e01f461b40a2a1321cec33e0f11a2
-EBUILD xmms2-0.8_p20161122-r1.ebuild 7492 SHA256 ac947dea9d870ed6a876a37bcb222cea492eda3a0adc3f4a08417df77a9313c1 SHA512 a05b1284416709210ed396a95ee66e53687e3ed957c21827d7e9274efa3ba79e4522ede456ce07eb447d366898bfb66f5c056c7d6d110e3593a14535b7e096a1 WHIRLPOOL 147afe919b4e09803f7479caec286f74caa0d6596ec4787bb50da63fd1db20770eea462677b0a6963f90c1e80aed44e8a032451749d9caae77d74e601d577bf8
+EBUILD xmms2-0.8_p20161122-r1.ebuild 7565 SHA256 2420546531c17d2b293ce4b74510e020b5f2fe7e680753e76da51c3606aea334 SHA512 cd1d39d50f001baf36c7dcbd9b18296fedee8abcf8041f85c630d04d53a287d4a52d1d7d6608f559f8387ffc737551df09e9caf26fa2849bbd1b1e285126e0a9 WHIRLPOOL 812b51e54ccab3cc0385eba3193660347900fac0db84293ef29fbe3902d1c40deab4fc7e93ff486dc598094cced0b76a59673e85b4f0ee2d4c2e68f8618cd858
 EBUILD xmms2-0.8_p20161122.ebuild 7395 SHA256 3606e852697e31ca64d8888441ccad3f270ec4bff3fe0eb80453c8015d62a7ca SHA512 3b1afecead61985d6ff70bf85252fbfba891c07d14cf2557cd992b42a04b69c79d44a48d2a55768d77c2cee85079e5dac132c71d94859f775ce28d593a8acf98 WHIRLPOOL f82ff2cfe21680175049af774a636020d7befc28f70dcfb9305507fcfbc435e8bb44f96b1e6ad869265a68b32f002e2052db7fbfde94d8861f64ac0fd1a0d032
 MISC ChangeLog 6165 SHA256 38f2d2683f2a7fc4c39fa78ee02ebae2589538d80cc195efc5183a157772bf3c SHA512 1c47e67574b722dbc4363c9a5bcf7292bd062b72abb53eb3e20dc7de5e2e4ed6715ddf5110c4aa9f04f66d0364a1cb66f7affee15f6940671a4db24ff713b92d WHIRLPOOL cf953aa3bfd0f1d054773c09ef961d084d8d5466612079a63811b258b31ca59d68dbdb50cd69d4a419309a5bf1d771789f4fd3eb5986ca2368e20320916d3270
 MISC ChangeLog-2015 7596 SHA256 a519587f0ed0529ca29d316c0e958984ccc5c02887219ca49de1d5a69c34e49d SHA512 22539404663febb287ecc813a8655256c2696864e7cd99409a957aa5c665b3a348a3744666621dfa8ce775eda08077b36a0f721f754c42957bb97305625d86a4 WHIRLPOOL a08bedf3739615df0c51931df17507be30792afe66f9353460db786648dbb91504449b30bd4c12a9adc95fbadc42f3bee9f1d85645aafdb511ba9e5b238290d8
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch
new file mode 100644
index 000000000000..df3e4d2af852
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch
@@ -0,0 +1,50 @@
+From e87745721deaf46d7054ac40cc55838561c9f552 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Carretero?= <cJ@zougloub.eu>
+Date: Tue, 24 Oct 2017 18:43:26 -0400
+Subject: [PATCH] plugins: mac: support newer mac API version
+
+---
+ src/plugins/mac/mac.cpp          | 6 +++++-
+ src/plugins/mac/source_adapter.h | 8 +++++++-
+ 2 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/mac/mac.cpp b/src/plugins/mac/mac.cpp
+index cec43e52..d8d3d1b9 100644
+--- a/src/plugins/mac/mac.cpp
++++ b/src/plugins/mac/mac.cpp
+@@ -210,8 +210,12 @@ xmms_mac_get_media_info (xmms_xform_t *xform)
+ 				gchar *name;
+ 
+ 				field_name = pTagField->GetFieldName ();
+-				name = (gchar *)GetUTF8FromUTF16 (field_name);
+ 
++#if MAC_DLL_INTERFACE_VERSION_NUMBER >= 1000
++				name = (gchar *)CAPECharacterHelper::GetUTF8FromUTF16 (field_name);
++#else
++				name = (gchar *)GetUTF8FromUTF16 (field_name);
++#endif
+ 				memset (field_value, 0, 255);
+ 				int size = 255;
+ 				p_ape_tag->GetFieldString (field_name, (char *)field_value, &size, TRUE);
+diff --git a/src/plugins/mac/source_adapter.h b/src/plugins/mac/source_adapter.h
+index 94f75359..70617514 100644
+--- a/src/plugins/mac/source_adapter.h
++++ b/src/plugins/mac/source_adapter.h
+@@ -38,7 +38,13 @@ public:
+ 	~CSourceAdapter () {};
+ 
+ 	// open / close
+-	int Open (const wchar_t * pName) { return ERROR_SUCCESS; }
++#if MAC_DLL_INTERFACE_VERSION_NUMBER >= 1000
++	int Open (const wchar_t * pName, BOOL bOpenReadOnly = FALSE)
++#else
++	int Open (const wchar_t * pName)
++#endif
++	{ return ERROR_SUCCESS; }
++
+ 	int Close () { return ERROR_SUCCESS; }
+ 
+ 	// read / write
+-- 
+2.15.0
+
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild
index 8e1a03998bf6..f65e222e0daf 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild
@@ -135,6 +135,9 @@ src_prepare() {
 	# fix hash to be the same on LE/BE platforms
 	eapply "${FILESDIR}/${P}"-be-hash.patch
 
+	# handle mac-3 -> -4 API change
+	eapply "${FILESDIR}/${P}"-mac-4.patch
+
 	eapply_user
 }