This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus.
commit 673c0473392e2d385d26dc5ba6f66b08314b5417 Author: Sven Eckelmann <[email protected]> Date: Tue Jun 2 14:03:57 2009 +0200 Add 103-dejavu-font.patch, use font from ttf-dejavu-core package --- debian/changelog | 1 + debian/patches/103-dejavu-font.patch | 44 ++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 46 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2f70dec..d9ba79d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ mupen64plus (1.5-3) UNRELEASED; urgency=low - Add 100-fix-desktop-file.patch, fix desktop file - Add 101-destdir.patch, fix usage of DESTDIR in install target - Add 102-plugin-searchpath.patch, add search path for plugins + - Add 103-dejavu-font.patch, use font from ttf-dejavu-core package * Convert debian/copyright to new dep5 version -- Félix Arreola Rodríguez <[email protected]> Mon, 01 Jun 2009 14:42:41 +0200 diff --git a/debian/patches/103-dejavu-font.patch b/debian/patches/103-dejavu-font.patch new file mode 100644 index 0000000..c379835 --- /dev/null +++ b/debian/patches/103-dejavu-font.patch @@ -0,0 +1,44 @@ +From d48a9c0fc7e3b2aaa192d550cf70dda4141aa594 Mon Sep 17 00:00:00 2001 +From: Sven Eckelmann <[email protected]> +Date: Tue, 2 Jun 2009 14:01:51 +0200 +Subject: [PATCH] Use font from ttf-dejavu-core + + +Signed-off-by: Sven Eckelmann <[email protected]> +--- + opengl/osd.cpp | 9 +++------ + 1 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/opengl/osd.cpp b/opengl/osd.cpp +index ff55864..43e9bfc 100644 +--- a/opengl/osd.cpp ++++ b/opengl/osd.cpp +@@ -31,7 +31,7 @@ extern "C" { + #include "../main/util.h" + } + +-#define FONT_FILENAME "font.ttf" ++#define FONT_FILENAME "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf" + + #ifdef __WIN32__ + # warning This hack should be fixed at some point +@@ -206,14 +206,11 @@ static float get_message_offset(osd_message_t *msg, float fLinePos) + extern "C" + void osd_init(int width, int height) + { +- char fontpath[PATH_MAX]; +- +- snprintf(fontpath, PATH_MAX, "%sfonts/%s", get_installpath(), FONT_FILENAME); +- l_font = new OGLFT::Monochrome(fontpath, height / 35); // make font size proportional to screen height ++ l_font = new OGLFT::Monochrome(FONT_FILENAME, height / 35); // make font size proportional to screen height + + if(!l_font || !l_font->isValid()) + { +- printf("Could not construct face from %s\n", fontpath); ++ printf("Could not construct face from %s\n", FONT_FILENAME); + return; + } + +-- +1.6.3.1 + diff --git a/debian/patches/series b/debian/patches/series index b5aaf24..5eaef4b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 100-fix-desktop-file.patch 101-destdir.patch 102-plugin-searchpath.patch +103-dejavu-font.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
