rpms/glyph-keeper/devel glyph-keeper-0.32-so-compat.patch, NONE, 1.1 glyph-keeper-0.29.1-fixes.patch, 1.1, 1.2 glyph-keeper.spec, 1.4, 1.5 glyph-keeper-0.29.1-new-ft.patch, 1.1, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Mon Feb 19 12:40:27 UTC 2007
Author: jwrdegoede
Update of /cvs/extras/rpms/glyph-keeper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21170
Modified Files:
glyph-keeper-0.29.1-fixes.patch glyph-keeper.spec
Added Files:
glyph-keeper-0.32-so-compat.patch
Removed Files:
glyph-keeper-0.29.1-new-ft.patch
Log Message:
* Fri Feb 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.32-1
- New upstream release 0.32
glyph-keeper-0.32-so-compat.patch:
--- NEW FILE glyph-keeper-0.32-so-compat.patch ---
--- glyph-keeper-0.32/src/glyph_rend.c.compat 2007-02-06 00:14:18.000000000 +0100
+++ glyph-keeper-0.32/src/glyph_rend.c 2007-02-19 13:32:35.000000000 +0100
@@ -789,5 +789,25 @@
#endif
}
+/* for binary compatiblity with glyph-keeper-0.29, these won't be used by
+ newly compiled apps as those will be made into using the new functions
+ through defines in glyph.h, which is also why we need the undef's */
+#undef gk_rend_set_angle
+void gk_rend_set_angle(GLYPH_REND* const rend,const double new_text_angle)
+{
+ gk_rend_set_angle_in_radians(rend, new_text_angle);
+}
+
+#undef gk_rend_set_italic
+void gk_rend_set_italic(GLYPH_REND* const rend,const double new_italic_angle)
+{
+ gk_rend_set_italic_angle_in_degrees(rend, new_italic_angle);
+}
+
+#undef gk_rend_set_bold
+void gk_rend_set_bold(GLYPH_REND* const rend,const int new_bold_strength)
+{
+ gk_rend_set_bold_strength(rend, new_bold_strength);
+}
#endif /* included_from_glyph_c */
--- glyph-keeper-0.32/src/glyph_face.c.compat 2007-02-05 17:51:50.000000000 +0100
+++ glyph-keeper-0.32/src/glyph_face.c 2007-02-19 13:34:06.000000000 +0100
@@ -225,7 +225,7 @@
char buf[1000] = "";
funcname = "gk_load_face_from_file()";
- if (gk_header_version != GK_MAKE_VERSION(_gk_version_major,_gk_version_minor,_gk_version_patch))
+ if (gk_header_version < GK_MAKE_VERSION(0, 29, 1) || gk_header_version > GK_MAKE_VERSION(_gk_version_major,_gk_version_minor,_gk_version_patch))
{
_gk_msg("Error: Glyph Keeper library and header versions don't match\n");
return 0;
@@ -340,7 +340,7 @@
GLYPH_FACE* f;
funcname = "gk_load_face_from_memory()";
- if (gk_header_version != GK_MAKE_VERSION(_gk_version_major,_gk_version_minor,_gk_version_patch))
+ if (gk_header_version < GK_MAKE_VERSION(0, 29, 1) || gk_header_version > GK_MAKE_VERSION(_gk_version_major,_gk_version_minor,_gk_version_patch))
{
_gk_msg("Error: Glyph Keeper library and header versions don't match\n");
return 0;
glyph-keeper-0.29.1-fixes.patch:
Index: glyph-keeper-0.29.1-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/glyph-keeper/devel/glyph-keeper-0.29.1-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glyph-keeper-0.29.1-fixes.patch 13 Mar 2006 22:46:44 -0000 1.1
+++ glyph-keeper-0.29.1-fixes.patch 19 Feb 2007 12:39:55 -0000 1.2
@@ -1,127 +1,22 @@
-diff -ur glyph-keeper-0.29.1.orig/Makefile.GNU.all glyph-keeper-0.29.1/Makefile.GNU.all
---- glyph-keeper-0.29.1.orig/Makefile.GNU.all 2005-07-09 16:26:56.000000000 +0200
-+++ glyph-keeper-0.29.1/Makefile.GNU.all 2006-03-11 17:11:10.000000000 +0100
-@@ -66,13 +66,9 @@
-
- CC := gcc
-
--WFLAGS := -W -Wall
--
--OFLAGS := -O3 -s
--
- FT_CFLAGS := $(WFLAGS) -std=c89 $(OFLAGS) -Ifreetype/include $(ft_defines)
-
--GK_CFLAGS := $(WFLAGS) -std=c89 $(OFLAGS) -Iinclude $(gk_defines) $(if $(FT_LIB),,-Ifreetype/include)
-+GK_CFLAGS := $(CFLAGS) -std=c89 -Iinclude $(gk_defines) $(if $(FT_LIB),,-Ifreetype/include)
-
-
-
-Only in glyph-keeper-0.29.1: Makefile.GNU.all~
-diff -ur glyph-keeper-0.29.1.orig/include/glyph.h glyph-keeper-0.29.1/include/glyph.h
---- glyph-keeper-0.29.1.orig/include/glyph.h 2005-07-09 15:02:50.000000000 +0200
-+++ glyph-keeper-0.29.1/include/glyph.h 2006-03-11 19:13:38.000000000 +0100
-@@ -149,7 +149,7 @@
-
- #elif (GLYPH_TARGET == GLYPH_TARGET_SDL)
-
--#include <sdl.h>
-+#include <SDL/SDL.h>
- #define GLYPH_TARGET_STR "SDL"
- #define GLYPH_TARGET_SURFACE SDL_Surface
- #define GLYPH_TARGET_HAS_RECTFILL
-Only in glyph-keeper-0.29.1/include: glyph.h~
-Only in glyph-keeper-0.29.1: log
-Only in glyph-keeper-0.29.1/obj: glyph-alleg.o
-Only in glyph-keeper-0.29.1/obj: glyph-sdl.o
-Only in glyph-keeper-0.29.1/obj: libglyph-alleg.a
-Only in glyph-keeper-0.29.1/obj: libglyph-sdl.a
-diff -ur glyph-keeper-0.29.1.orig/src/glyph_index.c glyph-keeper-0.29.1/src/glyph_index.c
---- glyph-keeper-0.29.1.orig/src/glyph_index.c 2005-06-24 11:35:00.000000000 +0200
-+++ glyph-keeper-0.29.1/src/glyph_index.c 2006-03-11 19:11:04.000000000 +0100
-@@ -58,13 +58,13 @@
- if (!index->pages) return size;
-
- size += 69*sizeof(void*);
-- if ((int)index->pages[68])
-+ if ((long)index->pages[68])
- {
- for (a=0; a<68; a++)
- {
- if (!index->pages[a]) continue;
- size += 129*sizeof(void*);
-- if ((int)index->pages[a][128])
-+ if ((long)index->pages[a][128])
- {
- for (b=0; b<128; b++) { if (index->pages[a][b]) size += 129*sizeof(void*); }
- }
-@@ -220,7 +220,7 @@
-
- /* unlinking the glyph from index */
- page_c[c_index] = 0;
-- (*(int*)(page_c+128))--;
-+ (*(long*)(page_c+128))--;
-
- /* uninking the glyph from keeper's list */
- if (glyph == keeper->head) keeper->head = keeper->head->next;
-@@ -235,19 +235,19 @@
- free(glyph);
-
- /* releasing unnecessary index pages, and index itself */
-- if (((int)page_c[128])<=0)
-+ if (((long)page_c[128])<=0)
- {
- free(page_c);
- page_b[b_index] = 0;
- keeper->allocated -= 129*sizeof(void*);
-- (*(int*)(page_b+128))--;
-- if (((int)page_b[128])<=0)
-+ (*(long*)(page_b+128))--;
-+ if (((long)page_b[128])<=0)
- {
- free(page_b);
- index->pages[a_index] = 0;
- keeper->allocated -= 129*sizeof(void*);
-- (*(int*)(index->pages+68))--;
-- if (((int)index->pages[68])<=0)
-+ (*(long*)(index->pages+68))--;
-+ if (((long)index->pages[68])<=0)
- {
- free(index->pages);
- index->pages = 0;
-@@ -314,7 +314,7 @@
- {
- index->pages[a_index] = (GLYPH***)_gk_malloc(129*sizeof(void*));
- if (!index->pages[a_index]) return 0;
-- (*(int*)(index->pages+68))++;
-+ (*(long*)(index->pages+68))++;
- memset(index->pages[a_index],0,129*sizeof(void*));
- keeper->allocated += 129*sizeof(void*);
- }
-@@ -326,7 +326,7 @@
- {
- page_b[b_index] = (GLYPH**)_gk_malloc(129*sizeof(void*));
- if (!page_b[b_index]) return 0;
-- (*(int*)(page_b+128))++;
-+ (*(long*)(page_b+128))++;
- memset(page_b[b_index],0,129*sizeof(void*));
- keeper->allocated += 129*sizeof(void*);
- }
-@@ -338,7 +338,7 @@
- CARE(page_c[c_index]==0);
-
- page_c[c_index] = glyph;
-- (*(int*)(page_c+128))++;
-+ (*(long*)(page_c+128))++;
- glyph->index = index;
-
- glyph->prev = 0;
-@@ -512,7 +512,7 @@
- GLYPH_REND *rend;
- int ni = 0, nr = 0;
-
-- _gk_msg("GLYPH_KEEP object (address:%d):\n",(int)keeper);
-+ _gk_msg("GLYPH_KEEP object (address:%p):\n", keeper);
-
- if (!keeper) return;
- _gk_msg(" can keep %d glyphs, currently keeping %d\n",keeper->max_glyphs,keeper->num_glyphs);
-Only in glyph-keeper-0.29.1/src: glyph_index.c~
+--- glyph-keeper-0.32/src/glyph_index.c~ 2007-02-16 11:12:41.000000000 +0100
++++ glyph-keeper-0.32/src/glyph_index.c 2007-02-16 11:12:41.000000000 +0100
+@@ -340,7 +340,7 @@
+ CARE(page_c[c_index]==0);
+
+ page_c[c_index] = glyph;
+- (*(int*)(page_c+128))++;
++ (*(long*)(page_c+128))++;
+ glyph->index = index;
+
+ glyph->prev = 0;
+--- glyph-keeper-0.32/Makefile.GNU.all~ 2007-02-16 11:14:27.000000000 +0100
++++ glyph-keeper-0.32/Makefile.GNU.all 2007-02-16 11:14:27.000000000 +0100
+@@ -90,7 +90,7 @@
+
+ WFLAGS := -W -Wall
+
+-OFLAGS := -O2 -s
++OFLAGS = -O2 -s
+
+ FT_CFLAGS := $(WFLAGS) -std=c89 $(OFLAGS) -Ifreetype/include $(ft_defines)
+ GK_CFLAGS := $(WFLAGS) -std=c89 -pedantic $(OFLAGS) -Iinclude $(gk_defines) $(if $(FT_LIB),,-Ifreetype/include)
Index: glyph-keeper.spec
===================================================================
RCS file: /cvs/extras/rpms/glyph-keeper/devel/glyph-keeper.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glyph-keeper.spec 28 Aug 2006 14:33:24 -0000 1.4
+++ glyph-keeper.spec 19 Feb 2007 12:39:55 -0000 1.5
@@ -1,13 +1,13 @@
Name: glyph-keeper
-Version: 0.29.1
-Release: 4%{?dist}
+Version: 0.32
+Release: 1%{?dist}
Summary: Library for text rendering
Group: System Environment/Libraries
-License: zlib License
+License: zlib/libpng License
URL: http://kd.lab.nig.ac.jp/glyph-keeper/
-Source0: http://kd.lab.nig.ac.jp/%{name}/files/%{name}-%{version}-no-freetype.zip
+Source0: http://kd.lab.nig.ac.jp/%{name}/files/%{name}-%{version}.zip
Patch0: glyph-keeper-0.29.1-fixes.patch
-Patch1: glyph-keeper-0.29.1-new-ft.patch
+Patch1: glyph-keeper-0.32-so-compat.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: freetype-devel >= 2.1.10
BuildRequires: SDL-devel allegro-devel
@@ -34,19 +34,19 @@
%prep
%setup -q
%patch0 -p1 -z .fix
-%patch1 -p1 -z .new-ft
-sed -i 's/\r//' docs/*.html
+%patch1 -p1 -z .compat
+sed -i 's/\r//' docs/*.html *.txt
%build
make %{?_smp_mflags} -f Makefile.GNU.all TARGET=ALLEGRO FT_LIB=-lfreetype \
- CFLAGS="$RPM_OPT_FLAGS -fpic -I/usr/include/freetype2" lib
+ OFLAGS="$RPM_OPT_FLAGS -fpic -I/usr/include/freetype2" lib
gcc -shared -o libglyph-alleg.so.0 -Wl,-soname,libglyph-alleg.so.0 \
obj/glyph-alleg.o -lfreetype \
`allegro-config --libs | sed 's/-lalleg_unsharable//'`
make %{?_smp_mflags} -f Makefile.GNU.all TARGET=SDL FT_LIB=-lfreetype \
- CFLAGS="$RPM_OPT_FLAGS -fpic -I/usr/include/freetype2" lib
+ OFLAGS="$RPM_OPT_FLAGS -fpic -I/usr/include/freetype2" lib
gcc -shared -o libglyph-sdl.so.0 -Wl,-soname,libglyph-sdl.so.0 \
obj/glyph-sdl.o -lfreetype -lSDL
@@ -82,6 +82,9 @@
%changelog
+* Fri Feb 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.32-1
+- New upstream release 0.32
+
* Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.29.1-4
- Fix building with newer freetype
- Build .so files instead of a static lib
--- glyph-keeper-0.29.1-new-ft.patch DELETED ---
More information about the scm-commits
mailing list