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)
Responsible Changed From-To: freebsd-ports-bugs->freebsd-multimedia Over to maintainer (via the GNATS Auto Assign Tool)
Author: nox Date: Fri Apr 25 21:46:02 2014 New Revision: 352153 URL: http://svnweb.freebsd.org/changeset/ports/352153 QAT: https://qat.redports.org/buildarchive/r352153/ Log: - Stop depending on bitstream-vera, add explicit fontconfig/freetype dependencies. [1] - Switch to USES= tar:xz. - Bump PORTREVISION. PR: ports/187857 [1] Submitted by: rakuco [1] Modified: head/multimedia/vlc/Makefile Modified: head/multimedia/vlc/Makefile ============================================================================== --- head/multimedia/vlc/Makefile Fri Apr 25 21:36:10 2014 (r352152) +++ head/multimedia/vlc/Makefile Fri Apr 25 21:46:02 2014 (r352153) @@ -3,7 +3,7 @@ PORTNAME= vlc DISTVERSION= 2.1.2 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ @@ -17,7 +17,9 @@ LICENSE= GPLv2 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 @@ -243,8 +245,7 @@ X264_CONFIGURE_ENABLE= x264 ZVBI_LIB_DEPENDS= libzvbi.so:${PORTSDIR}/devel/libzvbi ZVBI_CONFIGURE_ENABLE= zvbi -USE_XZ= yes -USES= desktop-file-utils iconv perl5 gmake pkgconfig +USES= desktop-file-utils iconv perl5 gmake pkgconfig tar:xz USE_PERL5= build USE_CSTD= gnu99 WANT_GNOME= yes @@ -404,13 +405,6 @@ WITH_CDROM_DEVICE?=/dev/acd0 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 +413,6 @@ post-patch: @${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 _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!