Commit f7bf7678 authored by Bernie Purcell's avatar Bernie Purcell

Revert the patch for working fontpath on Gentoo due to

complaints about it's inclusion in vanilla vlc on the list.
parent 81135f2d
......@@ -4140,16 +4140,6 @@ then
if test "${SYS}" = "mingw32"; then
VLC_ADD_LDFLAGS([freetype],[-lxml2])]
fi
if test "${host_cpu}" = "${build_cpu}"; then
AC_MSG_CHECKING(if using Gentoo Linux)
GENTOO=`${CC} -fversion |gawk '/(GCC)/ { print substr($4, 2); }'`
if test "${GENTOO}" = "Gentoo"; then
AC_MSG_RESULT(yes)
VLC_ADD_CFLAGS([freetype],[-DGENTOO_LINUX])
else
AC_MSG_RESULT(no)
fi
fi
AC_CHECK_HEADERS(fontconfig/fontconfig.h,
[VLC_ADD_CFLAGS([freetype],[-DHAVE_FONTCONFIG])
VLC_ADD_LDFLAGS([freetype],[-lfontconfig])])
......
......@@ -63,9 +63,6 @@
#elif defined( WIN32 )
#define DEFAULT_FONT "" /* Default font found at run-time */
#define FC_DEFAULT_FONT "Arial"
#elif defined(GENTOO_LINUX)
#define DEFAULT_FONT "/usr/share/fonts/ttf-bitstream-vera/Vera.ttf"
#define FC_DEFAULT_FONT "Vera"
#else
#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
#define FC_DEFAULT_FONT "Serif Bold"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment