From owner-freebsd-multimedia@FreeBSD.ORG Sun Mar 23 17:53:10 2014 Return-Path: Delivered-To: multimedia@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 59A64474; Sun, 23 Mar 2014 17:53:10 +0000 (UTC) Received: from mail-lb0-x236.google.com (mail-lb0-x236.google.com [IPv6:2a00:1450:4010:c04::236]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AB47924C; Sun, 23 Mar 2014 17:53:09 +0000 (UTC) Received: by mail-lb0-f182.google.com with SMTP id n15so3026195lbi.13 for ; Sun, 23 Mar 2014 10:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:sender:to:subject:from:cc; bh=yRbeW6NuP3lUgatROFav9arVOQOKnXYatrqW/xTvauY=; b=bKoJWYgN5TdYvon7Di0OXohgXWkSH0rkt45RMUVqW9FPmmCgCP7+DbWktIHH7jO2H8 yayW3ufl6wmwYmOSjwPeowcijnwnWqrl8EToriapQCkmiU3KfpDaSrfZX7hgFpGwJfVd m48fg7VU9oLzjHWRvjgzH9CAJ2KYBB5bKvJDOqq41BIT7cyKnfn38WTMjyvqUNNUJ56d tVoyW9MHLMdi4UlplK8pWUTUStlQP6OPq7y5KJG0EPVchT6Gvax50LbuXP+eNHorBZjI d2oTlyxW9RPxQfxSTI5ZPvyei5ztdCRVeuadmBSgJBT4mXg2c008q0yl8CIdE/U2By+D 46AQ== X-Received: by 10.112.156.165 with SMTP id wf5mr2145013lbb.37.1395597187788; Sun, 23 Mar 2014 10:53:07 -0700 (PDT) Received: from localhost (a91-154-115-217.elisa-laajakaista.fi. [91.154.115.217]) by mx.google.com with ESMTPSA id u4sm11144653laj.2.2014.03.23.10.53.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Mar 2014 10:53:07 -0700 (PDT) Message-ID: <532f1f83.0425980a.575f.ffffdd3a@mx.google.com> Date: Sun, 23 Mar 2014 10:53:07 -0700 (PDT) Sender: Raphael Kubo da Costa To: FreeBSD-gnats-submit@freebsd.org Subject: [PATCH] multimedia/vlc: Stop depending on bitstream-vera, add explicit fontconfig/freetype dependencies From: Raphael Kubo da Costa X-send-pr-version: 3.113 X-GNATS-Notify: Cc: multimedia@FreeBSD.org X-BeenThere: freebsd-multimedia@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Multimedia discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Mar 2014 17:53:10 -0000 >Submitter-Id: current-users >Originator: Raphael Kubo da Costa >Organization: >Confidential: no >Synopsis: [PATCH] multimedia/vlc: Stop depending on bitstream-vera, add explicit fontconfig/freetype dependencies >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 11.0-CURRENT amd64 >Environment: System: FreeBSD orwell 11.0-CURRENT FreeBSD 11.0-CURRENT #8 r263206: Sat Mar 15 19:30:03 EET >Description: This patch contains two separate changes related to VLC's font rendering settings. 1. Remove the WITH_VLC_DEFAULT_FONT variable and its accompanying sed call. For one, the Bitstream Vera family has long been deprecated in favour of the Dejavu fonts. Additionally, these settings are simply not used at all, since if Fontconfig support is detected VLC will refer to font family names instead of file paths in the system. 2. While here, make it explicit that VLC depends on Fontconfig and Freetype2. VLC's existing dependencies always bring those two libraries anyway, but it never hurts to be formally depend on them. Port maintainer (multimedia@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 1.00.2014.03.16 (mode: change, diff: SVN) >How-To-Repeat: >Fix: --- vlc-2.1.2.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 348876) +++ Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= vlc DISTVERSION= 2.1.2 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ @@ -17,7 +17,9 @@ LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libproxy.so:${PORTSDIR}/net/libproxy \ - libdvbpsi.so:${PORTSDIR}/multimedia/libdvbpsi + libdvbpsi.so:${PORTSDIR}/multimedia/libdvbpsi \ + libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ + libfreetype.so:${PORTSDIR}/print/freetype2 BUILD_DEPENDS= ffmpeg>=2.0:${PORTSDIR}/multimedia/ffmpeg RUN_DEPENDS= ffmpeg>=2.0:${PORTSDIR}/multimedia/ffmpeg @@ -404,13 +406,6 @@ WITH_DVD_DEVICE?=/dev/acd0 .endif -# If you change this value, the dependency will not be recorded -.if !defined(WITH_VLC_DEFAULT_FONT) -WITH_VLC_DEFAULT_FONT= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf -WITH_VLC_DEFAULT_MONO_FONT= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/VeraMono.ttf -RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera -.endif - post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ -e '\|LIBS|s|-lrt||' \ @@ -419,8 +414,6 @@ @${REINPLACE_CMD} -e 's|^pkgconfigdir.*|pkgconfigdir = \$$\(prefix\)/libdata/pkgconfig|' \ ${WRKSRC}/src/Makefile.in \ ${WRKSRC}/lib/Makefile.in - @${REINPLACE_CMD} -e 's|/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf|${WITH_VLC_DEFAULT_FONT}|' \ - ${WRKSRC}/modules/text_renderer/freetype.c @${REINPLACE_CMD} -e 's|/dev/cdrom|${WITH_CDROM_DEVICE}|g' \ -e 's|/dev/dvd|${WITH_DVD_DEVICE}|g' \ ${WRKSRC}/include/vlc_config.h --- vlc-2.1.2.patch ends here ---