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 E3358138332 for ; Tue, 27 Feb 2018 09:03:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F616E08EC; Tue, 27 Feb 2018 09:03:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 E5D3DE08EC for ; Tue, 27 Feb 2018 09:03:04 +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 50BA2335C07 for ; Tue, 27 Feb 2018 09:03:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E610021C for ; Tue, 27 Feb 2018 09:03:00 +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: <1519722162.8ee3bcf1a81fec0c92980164afb4a71408dc3a65.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/vlc/vlc-3.0.9999.ebuild media-video/vlc/vlc-9999.ebuild X-VCS-Directories: media-video/vlc/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8ee3bcf1a81fec0c92980164afb4a71408dc3a65 X-VCS-Branch: master Date: Tue, 27 Feb 2018 09:03:00 +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: 10db23ee-3e9f-484a-9e87-d0936bfd34a0 X-Archives-Hash: 3e77bbacdbffbf32805d507948dc495b commit: 8ee3bcf1a81fec0c92980164afb4a71408dc3a65 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 26 23:11:41 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 27 09:02:42 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ee3bcf1 media-video/vlc: Drop USE=bidi from REQUIRED_USE Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-video/vlc/vlc-3.0.9999.ebuild | 16 ++++++++++++---- media-video/vlc/vlc-9999.ebuild | 16 ++++++++++++---- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index 248cb95f3cd..6c691145bec 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -40,7 +40,6 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse " REQUIRED_USE=" - bidi? ( truetype ) chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) @@ -62,7 +61,11 @@ RDEPEND=" alsa? ( media-libs/alsa-lib:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) - bidi? ( dev-libs/fribidi:0 ) + bidi? ( + dev-libs/fribidi:0 + media-libs/freetype:2 + virtual/ttf-fonts:0 + ) bluray? ( media-libs/libbluray:0= ) cddb? ( media-libs/libcddb:0 ) chromaprint? ( media-libs/chromaprint:0= ) @@ -355,7 +358,6 @@ src_configure() { $(use_enable taglib) $(use_enable theora) $(use_enable tremor) - $(use_enable truetype freetype) $(use_enable twolame) $(use_enable udev) $(use_enable upnp) @@ -421,7 +423,13 @@ src_configure() { xdg_environment_reset # bug 608256 - if use truetype || use projectm ; then + if use truetype || use bidi; then + myeconfargs+=( --enable-freetype ) + else + myeconfargs+=( --disable-freetype ) + fi + + if use truetype || use projectm; then local dejavu="/usr/share/fonts/dejavu/" myeconfargs+=( --with-default-font=${dejavu}/DejaVuSans.ttf diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 0de960bb657..9fcb8c7bb6b 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -40,7 +40,6 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse " REQUIRED_USE=" - bidi? ( truetype ) chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) @@ -62,7 +61,11 @@ RDEPEND=" alsa? ( media-libs/alsa-lib:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) - bidi? ( dev-libs/fribidi:0 ) + bidi? ( + dev-libs/fribidi:0 + media-libs/freetype:2 + virtual/ttf-fonts:0 + ) bluray? ( media-libs/libbluray:0= ) cddb? ( media-libs/libcddb:0 ) chromaprint? ( media-libs/chromaprint:0= ) @@ -354,7 +357,6 @@ src_configure() { $(use_enable taglib) $(use_enable theora) $(use_enable tremor) - $(use_enable truetype freetype) $(use_enable twolame) $(use_enable udev) $(use_enable upnp) @@ -420,7 +422,13 @@ src_configure() { xdg_environment_reset # bug 608256 - if use truetype || use projectm ; then + if use truetype || use bidi; then + myeconfargs+=( --enable-freetype ) + else + myeconfargs+=( --disable-freetype ) + fi + + if use truetype || use projectm; then local dejavu="/usr/share/fonts/dejavu/" myeconfargs+=( --with-default-font=${dejavu}/DejaVuSans.ttf