[Pkg-sdl-commits] r134 - in unstable/sdl-ttf2.0/debian: . patches
smimram at alioth.debian.org
smimram at alioth.debian.org
Mon Jul 23 12:46:01 UTC 2007
Author: smimram
Date: 2007-07-23 12:46:01 +0000 (Mon, 23 Jul 2007)
New Revision: 134
Removed:
unstable/sdl-ttf2.0/debian/patches/no_freetype_internals.dpatch
unstable/sdl-ttf2.0/debian/patches/pixel_mode_mono.dpatch
Modified:
unstable/sdl-ttf2.0/debian/changelog
unstable/sdl-ttf2.0/debian/patches/00list
unstable/sdl-ttf2.0/debian/rules
Log:
New upstream release.
Modified: unstable/sdl-ttf2.0/debian/changelog
===================================================================
--- unstable/sdl-ttf2.0/debian/changelog 2007-06-21 13:01:57 UTC (rev 133)
+++ unstable/sdl-ttf2.0/debian/changelog 2007-07-23 12:46:01 UTC (rev 134)
@@ -1,11 +1,17 @@
-sdl-ttf2.0 (2.0.8-4) UNRELEASED; urgency=low
+sdl-ttf2.0 (2.0.9-1) unstable; urgency=low
[ Aurelien Jarno ]
* debian/control:
- + Make the package binNMU safe.
+ + Make the package binNMU safe.
- -- Aurelien Jarno <aurel32 at debian.org> Mon, 5 Mar 2007 21:52:54 +0100
+ [ Samuel Mimram ]
+ * New upstream release.
+ * Removed no_freetype_internals.dpatch and pixel_mode_mono.dpatch,
+ integrated upstream.
+ * Don't ignore errors when cleaning.
+ -- Samuel Mimram <smimram at debian.org> Mon, 23 Jul 2007 14:39:46 +0200
+
sdl-ttf2.0 (2.0.8-3) unstable; urgency=low
* Added pixel_mode_mono.dpatch to fix a bug with monochrome bitmaps
Modified: unstable/sdl-ttf2.0/debian/patches/00list
===================================================================
--- unstable/sdl-ttf2.0/debian/patches/00list 2007-06-21 13:01:57 UTC (rev 133)
+++ unstable/sdl-ttf2.0/debian/patches/00list 2007-07-23 12:46:01 UTC (rev 134)
@@ -1,2 +0,0 @@
-no_freetype_internals
-pixel_mode_mono
Deleted: unstable/sdl-ttf2.0/debian/patches/no_freetype_internals.dpatch
===================================================================
--- unstable/sdl-ttf2.0/debian/patches/no_freetype_internals.dpatch 2007-06-21 13:01:57 UTC (rev 133)
+++ unstable/sdl-ttf2.0/debian/patches/no_freetype_internals.dpatch 2007-07-23 12:46:01 UTC (rev 134)
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## no_freetype_internals.dpatch by Samuel Mimram <smimram at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't rely on freetype internals.
-## DP: See http://www.freetype.org/freetype2/freetype-2.2.0.html.
-
- at DPATCH@
-diff -urNad sdl-ttf2.0-2.0.8~/SDL_ttf.c sdl-ttf2.0-2.0.8/SDL_ttf.c
---- sdl-ttf2.0-2.0.8~/SDL_ttf.c 2006-05-01 09:26:17.000000000 +0000
-+++ sdl-ttf2.0-2.0.8/SDL_ttf.c 2006-06-12 23:24:07.000000000 +0000
-@@ -43,16 +43,6 @@
- #include FT_FREETYPE_H
- #include FT_OUTLINE_H
- #include FT_TRUETYPE_IDS_H
--/*
--#include <freetype/freetype.h>
--#include <freetype/ftoutln.h>
--#include <freetype/ttnameid.h>
--*/
--#include <freetype/internal/ftobjs.h>
--
--#ifndef FT_OPEN_STREAM
--#define FT_OPEN_STREAM ft_open_stream
--#endif
-
- #include "SDL.h"
- #include "SDL_endian.h"
-@@ -278,7 +268,7 @@
- }
- memset(stream, 0, sizeof(*stream));
-
-- stream->memory = library->memory;
-+ stream->memory = NULL; /* set by FT_Open_Face */
- stream->read = RWread;
- stream->descriptor.pointer = src;
- stream->pos = (unsigned long)position;
Deleted: unstable/sdl-ttf2.0/debian/patches/pixel_mode_mono.dpatch
===================================================================
--- unstable/sdl-ttf2.0/debian/patches/pixel_mode_mono.dpatch 2007-06-21 13:01:57 UTC (rev 133)
+++ unstable/sdl-ttf2.0/debian/patches/pixel_mode_mono.dpatch 2007-07-23 12:46:01 UTC (rev 134)
@@ -1,58 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## pixel_mode_mono.dpatch by Guillaume Cottenceau <gcottenc at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix a bug with monochrome bitmaps which was causing some Japanese fonts
-## DP: not to render correctly.
-
- at DPATCH@
-diff -urNad sdl-ttf2.0-2.0.8~/SDL_ttf.c sdl-ttf2.0-2.0.8/SDL_ttf.c
---- sdl-ttf2.0-2.0.8~/SDL_ttf.c 2006-08-22 16:53:10.000000000 +0000
-+++ sdl-ttf2.0-2.0.8/SDL_ttf.c 2006-08-22 16:58:47.000000000 +0000
-@@ -524,7 +524,7 @@
- * a freetype2 bug because it is inconsistent with the
- * freetype2 documentation under FT_Render_Mode section.
- * */
-- if ( mono || !FT_IS_SCALABLE(face) ) {
-+ if ( mono || !FT_IS_SCALABLE(face) || src->pixel_mode == FT_PIXEL_MODE_MONO ) {
- dst->pitch *= 8;
- }
-
-@@ -550,27 +550,28 @@
- for( i = 0; i < src->rows; i++ ) {
- int soffset = i * src->pitch;
- int doffset = i * dst->pitch;
-- if ( mono ) {
-+ if ( mono || src->pixel_mode == FT_PIXEL_MODE_MONO ) {
- unsigned char *srcp = src->buffer + soffset;
- unsigned char *dstp = dst->buffer + doffset;
-+ unsigned char value = mono ? 1 : 255;
- int j;
- for ( j = 0; j < src->width; j += 8 ) {
- unsigned char ch = *srcp++;
-- *dstp++ = (ch&0x80) >> 7;
-+ *dstp++ = ch&0x80 ? value : 0;
- ch <<= 1;
-- *dstp++ = (ch&0x80) >> 7;
-+ *dstp++ = ch&0x80 ? value : 0;
- ch <<= 1;
-- *dstp++ = (ch&0x80) >> 7;
-+ *dstp++ = ch&0x80 ? value : 0;
- ch <<= 1;
-- *dstp++ = (ch&0x80) >> 7;
-+ *dstp++ = ch&0x80 ? value : 0;
- ch <<= 1;
-- *dstp++ = (ch&0x80) >> 7;
-+ *dstp++ = ch&0x80 ? value : 0;
- ch <<= 1;
-- *dstp++ = (ch&0x80) >> 7;
-+ *dstp++ = ch&0x80 ? value : 0;
- ch <<= 1;
-- *dstp++ = (ch&0x80) >> 7;
-+ *dstp++ = ch&0x80 ? value : 0;
- ch <<= 1;
-- *dstp++ = (ch&0x80) >> 7;
-+ *dstp++ = ch&0x80 ? value : 0;
- }
- } else if ( !FT_IS_SCALABLE(face) ) {
- /* This special case wouldn't
Modified: unstable/sdl-ttf2.0/debian/rules
===================================================================
--- unstable/sdl-ttf2.0/debian/rules 2007-06-21 13:01:57 UTC (rev 133)
+++ unstable/sdl-ttf2.0/debian/rules 2007-07-23 12:46:01 UTC (rev 134)
@@ -28,7 +28,7 @@
dh_testroot
rm -f build-stamp configure-stamp
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
-test -r /usr/share/misc/config.sub && \
cp -f /usr/share/misc/config.sub config.sub
-test -r /usr/share/misc/config.guess && \
More information about the pkg-sdl-commits
mailing list