[mupen64plus-core] 133/310: Fix freetype initialization in debian/patches/dejavu-font.patch

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit 8d3bd93523b33fb0c46dfbc6414918870463b52c
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Nov 13 09:41:45 2011 +0100

    Fix freetype initialization in debian/patches/dejavu-font.patch
---
 debian/changelog                 |  6 ++++++
 debian/patches/dejavu-font.patch | 16 +++++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 503381e..a2f299c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mupen64plus-core (1.99.4+99+7f1880795b02-2) UNRELEASED; urgency=low
+
+  * Fix freetype initialization in debian/patches/dejavu-font.patch
+
+ -- Sven Eckelmann <sven at narfation.org>  Sun, 13 Nov 2011 09:39:37 +0100
+
 mupen64plus-core (1.99.4+99+7f1880795b02-1) experimental; urgency=low
 
   * New upstream snapshot from revision 7f1880795b0235062a466c973d76333d258c2241
diff --git a/debian/patches/dejavu-font.patch b/debian/patches/dejavu-font.patch
index d28d7ed..4d13c20 100644
--- a/debian/patches/dejavu-font.patch
+++ b/debian/patches/dejavu-font.patch
@@ -1,6 +1,6 @@
 Description: Use font from ttf-dejavu-core
 Forwarded: not-needed
-Author: Sven Eckelmann <sven at narfation.org> Please enter the commit message for your changes. Lines starting
+Author: Sven Eckelmann <sven at narfation.org>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
@@ -16,7 +16,7 @@ index c259133a316163aade279a8ab763a2f8c89e1f0b..b9b7c27a737461bd47c1a4845e93e385
  	$(INSTALL) -m 0644 ../../src/api/m64p_*.h "$(DESTDIR)$(INCDIR)"
  	-$(LDCONFIG) "$(DESTDIR)$(LIBDIR)"
 diff --git a/src/osd/osd.cpp b/src/osd/osd.cpp
-index 77348d8c2388403f7a41dba94952e85895670e87..186e040a6d484eaffde1ff5d3ca5d98317949af5 100644
+index 77348d8c2388403f7a41dba94952e85895670e87..e0853fd8845d48b2a92fbb0d7ac31b4f60be63f1 100644
 --- a/src/osd/osd.cpp
 +++ b/src/osd/osd.cpp
 @@ -39,7 +39,7 @@ extern "C" {
@@ -28,16 +28,10 @@ index 77348d8c2388403f7a41dba94952e85895670e87..186e040a6d484eaffde1ff5d3ca5d983
  
  typedef void (APIENTRYP PTRGLACTIVETEXTURE)(GLenum texture);
  static PTRGLACTIVETEXTURE pglActiveTexture = NULL;
-@@ -216,13 +216,7 @@ void osd_init(int width, int height)
- {
-     const char *fontpath;
+@@ -222,7 +222,7 @@ void osd_init(int width, int height)
+         return;
+     }
  
--    if (!OGLFT::Init_FT())
--    {
--        DebugMessage(M64MSG_ERROR, "Could not initialize freetype library.");
--        return;
--    }
--
 -    fontpath = ConfigGetSharedDataFilepath(FONT_FILENAME);
 +    fontpath = FONT_FILENAME;
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-core.git