From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C99361396D9 for ; Sat, 4 Nov 2017 18:14:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05C3AE0BEF; Sat, 4 Nov 2017 18:14:07 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C8CC0E0BEF for ; Sat, 4 Nov 2017 18:14:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0F5B933BF55 for ; Sat, 4 Nov 2017 18:14:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9977F94DC for ; Sat, 4 Nov 2017 18:14:03 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1509819239.c2395af07199c94377833699367243a29f9c83c6.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/xmms2/, media-sound/xmms2/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild X-VCS-Directories: media-sound/xmms2/files/ media-sound/xmms2/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: c2395af07199c94377833699367243a29f9c83c6 X-VCS-Branch: master Date: Sat, 4 Nov 2017 18:14:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f9493092-ae3a-4d66-a60b-6fc9a82584e2 X-Archives-Hash: 68819d2703722aee170d2df1511eab6a commit: c2395af07199c94377833699367243a29f9c83c6 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Nov 4 18:13:47 2017 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Nov 4 18:13:59 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2395af0 media-sound/xmms2: adapt to mac-3 -> mac-4 API change Picked patch sas-is from: https://github.com/xmms2/xmms2-devel/pull/2 Package-Manager: Portage-2.3.13, Repoman-2.3.4 .../xmms2/files/xmms2-0.8_p20161122-mac-4.patch | 50 ++++++++++++++++++++++ media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild | 3 ++ 2 files changed, 53 insertions(+) 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 00000000000..df3e4d2af85 --- /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?= +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 8e1a03998bf..f65e222e0da 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 }