Date: Sun, 23 Mar 2014 10:53:07 -0700 (PDT) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: multimedia@FreeBSD.org Subject: [PATCH] multimedia/vlc: Stop depending on bitstream-vera, add explicit fontconfig/freetype dependencies Message-ID: <532f1f83.0425980a.575f.ffffdd3a@mx.google.com>
next in thread | raw e-mail | index | archive | help
>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 ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?532f1f83.0425980a.575f.ffffdd3a>