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 69931138331 for ; Sat, 24 Feb 2018 09:48:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 726EDE0831; Sat, 24 Feb 2018 09:48:58 +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 41840E0831 for ; Sat, 24 Feb 2018 09:48:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 1D1C2335C43 for ; Sat, 24 Feb 2018 09:48:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 736F323C for ; Sat, 24 Feb 2018 09:48:55 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1519465716.013fee578dab2d361d0ffa239dbf5e31d9b96700.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-vlc/files/, media-libs/phonon-vlc/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/phonon-vlc/Manifest media-libs/phonon-vlc/files/phonon-vlc-0.10.0-pre-vlc-3.patch media-libs/phonon-vlc/phonon-vlc-0.10.0.ebuild X-VCS-Directories: media-libs/phonon-vlc/files/ media-libs/phonon-vlc/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 013fee578dab2d361d0ffa239dbf5e31d9b96700 X-VCS-Branch: master Date: Sat, 24 Feb 2018 09:48:55 +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: 4db8d339-1c30-4ee3-b0b1-a01a40ce9cd3 X-Archives-Hash: dad9eabc3abcd39beb7ec015a3527d8a commit: 013fee578dab2d361d0ffa239dbf5e31d9b96700 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Feb 23 20:56:16 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 24 09:48:36 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=013fee57 media-libs/phonon-vlc: 0.10.0 version bump Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-libs/phonon-vlc/Manifest | 1 + .../files/phonon-vlc-0.10.0-pre-vlc-3.patch | 34 ++++++++++++++++++ media-libs/phonon-vlc/phonon-vlc-0.10.0.ebuild | 41 ++++++++++++++++++++++ 3 files changed, 76 insertions(+) diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest index 9080aff8913..e63cd3ba100 100644 --- a/media-libs/phonon-vlc/Manifest +++ b/media-libs/phonon-vlc/Manifest @@ -1 +1,2 @@ +DIST phonon-backend-vlc-0.10.0.tar.xz 61080 BLAKE2B 1397bff2791b6baf1de2967aeb5ee1a6d71dcd68cff937bd9d4e2de51d36d8f95db3095a8cbb0786c78b420d3b4a1d0e2e102051cc6458a2267aeea3b2e6aec5 SHA512 cfe2050ac4c9b43fdf33b3cee9d60e5f1e5702aed4b4f14ec915f84578dba08dd5375c2fba6d19817c34197575e29eb9ed5fd816ea753e2bc124d97ea71b0bc8 DIST phonon-backend-vlc-0.9.1.tar.xz 59972 BLAKE2B 79c3b0d2cb21a04446cfe0a5b4bfed20f4c63cf6eb00037b0f0d8a67ff74fc9eab484d9a108a8d6694bb1ed97ac5618ad1813f7bbcd981bca9678b862bdc9eeb SHA512 104a29159541002d4064486b54d02183c32cf87931c205badf44333d9481b0c0e70e6eae7f9d3c558bef977de37f76cc203dc5c15120f4146d64d451992947aa diff --git a/media-libs/phonon-vlc/files/phonon-vlc-0.10.0-pre-vlc-3.patch b/media-libs/phonon-vlc/files/phonon-vlc-0.10.0-pre-vlc-3.patch new file mode 100644 index 00000000000..c670da35738 --- /dev/null +++ b/media-libs/phonon-vlc/files/phonon-vlc-0.10.0-pre-vlc-3.patch @@ -0,0 +1,34 @@ +From ea4d78ac3fc01f33bc2c0f3fb4a44a4103196da5 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Fri, 23 Feb 2018 21:51:45 +0100 +Subject: Fix build with VLC<3 + +libvlc_title_description_t and libvlc_chapter_description_t are not defined in vlc < 3 + +Differential Revision: https://phabricator.kde.org/D10775 +--- + src/mediaplayer.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/mediaplayer.h b/src/mediaplayer.h +index 9d413d4..cd847db 100644 +--- a/src/mediaplayer.h ++++ b/src/mediaplayer.h +@@ -62,11 +62,13 @@ private: + unsigned int m_size; + }; + ++#if (LIBVLC_VERSION_INT >= LIBVLC_VERSION(3, 0, 0, 0)) + typedef Descriptions TitleDescriptions; + typedef QSharedPointer SharedTitleDescriptions; + + typedef Descriptions ChapterDescriptions; + typedef QSharedPointer SharedChapterDescriptions; ++#endif + + class MediaPlayer : public QObject + { +-- +cgit v0.11.2 + + diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.0.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.0.ebuild new file mode 100644 index 00000000000..6c36bbe135d --- /dev/null +++ b/media-libs/phonon-vlc/phonon-vlc-0.10.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MY_PN="phonon-backend-vlc" + +if [[ ${PV} != *9999* ]]; then + SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +else + EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" ) + inherit git-r3 +fi + +inherit cmake-utils + +DESCRIPTION="Phonon VLC backend" +HOMEPAGE="https://phonon.kde.org/" + +LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )" +SLOT="0" +IUSE="debug" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + >=media-libs/phonon-4.10.0 + media-video/vlc:=[dbus,ogg,vorbis] +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}/${P}-pre-vlc-3.patch" ) + +src_configure() { + local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON ) + cmake-utils_src_configure +}