livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update freetype to 2.10.1 and move viewer fonts to their own package

master
Kitty Barnett 2019-10-20 23:45:52 +02:00
parent b26bdc8987
commit 4e2b2f662a
11 changed files with 43 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgignore
View File

@ -36,6 +36,7 @@ indra/newview/browser_profile
indra/newview/character
indra/newview/fmod.dll
indra/newview/fmod.log
indra/newview/fonts
indra/newview/mozilla-theme
indra/newview/mozilla-universal-darwin.tgz
indra/newview/res/ll_icon.*

38
autobuild.xml
View File

@ -817,6 +817,36 @@
<key>version</key>
<string>4.44.64.501533</string>
</map>
<key>fonts</key>
<map>
<key>copyright</key>
<string>Copyright various</string>
<key>description</key>
<string>Viewer fonts</string>
<key>license</key>
<string>Various open source</string>
<key>license_file</key>
<string>LICENSES/fonts.txt</string>
<key>name</key>
<string>fonts</string>
<key>platforms</key>
<map>
<key>common</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>65b89f06d9b698b376e1736216dd5623</string>
<key>url</key>
<string>viewer_fonts-1.0-1.tar.bz2</string>
</map>
<key>name</key>
<string>common</string>
</map>
</map>
<key>version</key>
<string>1.0</string>
</map>
<key>fontconfig</key>
<map>
<key>copyright</key>
@ -926,9 +956,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>b7a8df22cfc910180c66bb1c1ed89cd4</string>
<string>d8f5b352176d5c582d91ce936a700b2c</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/876/1922/freetype-2.4.4.500865-windows-500865.tar.bz2</string>
<string>freetype-2.10.1.0-windows-72.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -938,9 +968,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>ff72a895012ed603935083496b0a7bc9</string>
<string>aa8be83cdfcd5cda0343ea72e7d662ca</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/877/1925/freetype-2.4.4.500865-windows64-500865.tar.bz2</string>
<string>freetype-2.10.1.0-windows64-72.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>

1
indra/cmake/ViewerMiscLibs.cmake
View File

@ -10,3 +10,4 @@ if (NOT USESYSTEMLIBS)
use_prebuilt_binary(slvoice)
endif(NOT USESYSTEMLIBS)
use_prebuilt_binary(fonts)

6
indra/newview/CMakeLists.txt
View File

@ -1470,6 +1470,12 @@ if (WINDOWS)
set(viewer_SOURCE_FILES "${viewer_SOURCE_FILES}" llviewerprecompiledheaders.cpp)
endif(USE_PRECOMPILED_HEADERS)
message("Copying fonts")
file(GLOB FONT_FILE_GLOB_LIST
"${AUTOBUILD_INSTALL_DIR}/fonts/*"
)
file(COPY ${FONT_FILE_GLOB_LIST} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/fonts")
# Replace the icons with the appropriate ones for the channel
# ('test' is the default)
set(ICON_PATH "test")

99
indra/newview/fonts/DejaVu-license.txt
View File

@ -1,99 +0,0 @@
Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
Bitstream Vera Fonts Copyright
------------------------------
Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
a trademark of Bitstream, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of the fonts accompanying this license ("Fonts") and associated
documentation files (the "Font Software"), to reproduce and distribute the
Font Software, including without limitation the rights to use, copy, merge,
publish, distribute, and/or sell copies of the Font Software, and to permit
persons to whom the Font Software is furnished to do so, subject to the
following conditions:
The above copyright and trademark notices and this permission notice shall
be included in all copies of one or more of the Font Software typefaces.
The Font Software may be modified, altered, or added to, and in particular
the designs of glyphs or characters in the Fonts may be modified and
additional glyphs or characters may be added to the Fonts, only if the fonts
are renamed to names not containing either the words "Bitstream" or the word
"Vera".
This License becomes null and void to the extent applicable to Fonts or Font
Software that has been modified and is distributed under the "Bitstream
Vera" names.
The Font Software may be sold as part of a larger software package but no
copy of one or more of the Font Software typefaces may be sold by itself.
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
FONT SOFTWARE.
Except as contained in this notice, the names of Gnome, the Gnome
Foundation, and Bitstream Inc., shall not be used in advertising or
otherwise to promote the sale, use or other dealings in this Font Software
without prior written authorization from the Gnome Foundation or Bitstream
Inc., respectively. For further information, contact: fonts at gnome dot
org.
Arev Fonts Copyright
------------------------------
Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining
a copy of the fonts accompanying this license ("Fonts") and
associated documentation files (the "Font Software"), to reproduce
and distribute the modifications to the Bitstream Vera Font Software,
including without limitation the rights to use, copy, merge, publish,
distribute, and/or sell copies of the Font Software, and to permit
persons to whom the Font Software is furnished to do so, subject to
the following conditions:
The above copyright and trademark notices and this permission notice
shall be included in all copies of one or more of the Font Software
typefaces.
The Font Software may be modified, altered, or added to, and in
particular the designs of glyphs or characters in the Fonts may be
modified and additional glyphs or characters may be added to the
Fonts, only if the fonts are renamed to names not containing either
the words "Tavmjong Bah" or the word "Arev".
This License becomes null and void to the extent applicable to Fonts
or Font Software that has been modified and is distributed under the
"Tavmjong Bah Arev" names.
The Font Software may be sold as part of a larger software package but
no copy of one or more of the Font Software typefaces may be sold by
itself.
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
Except as contained in this notice, the name of Tavmjong Bah shall not
be used in advertising or otherwise to promote the sale, use or other
dealings in this Font Software without prior written authorization
from Tavmjong Bah. For further information, contact: tavmjong @ free
. fr.
$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $

BIN
indra/newview/fonts/DejaVuSans-Bold.ttf
View File

Binary file not shown.

BIN
indra/newview/fonts/DejaVuSans-BoldOblique.ttf
View File

Binary file not shown.

BIN
indra/newview/fonts/DejaVuSans-Oblique.ttf
View File

Binary file not shown.

BIN
indra/newview/fonts/DejaVuSans.ttf
View File

Binary file not shown.

BIN
indra/newview/fonts/DejaVuSansMono.ttf
View File

Binary file not shown.

2
indra/newview/viewer_manifest.py
View File

@ -137,7 +137,7 @@ class ViewerManifest(LLManifest):
self.path("*.tga")
# Include our fonts
with self.prefix(src_dst="fonts"):
with self.prefix(src="../packages/fonts"):
self.path("*.ttf")
self.path("*.txt")