pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/quesoglc
Module Name: pkgsrc
Committed By: adam
Date: Sun Jan 4 13:39:09 UTC 2026
Modified Files:
pkgsrc/graphics/quesoglc: Makefile PLIST distinfo
pkgsrc/graphics/quesoglc/patches: patch-src_ofont.h
Added Files:
pkgsrc/graphics/quesoglc/patches: patch-src_scalable.c
Removed Files:
pkgsrc/graphics/quesoglc/patches: patch-src_ofont.c
Log Message:
quesoglc: updated to 0.7.2
Changes made from the "0.7.1" release to the "0.7.2" release:
- Fixed bug 2019450 (added a workaround for open source drivers of the Intel
chipsets : a bug in the drivers prevent a character to be displayed).
- Fixed a bug which caused some memory leaks when memory allocation failed
during the update of the masters.
- Updated the demo in the examples: extrusion and ligthing have been added.
- Fixed glcGetFontMap() and glcGetMasterMap() so that their return is not null
when a character is mapped in the font/master but its Unicode name is not
stored in QuesoGLC database.
- Character codes out of range are now rejected when GLC_UCS1 or GLC_UCS2 are
enabled. GLC_PARAMETER_ERROR is then raised.
- Fixed a bug that crashed QuesoGLC when trying to call glcGetFontMap() with a
character not mapped in the font.
- Fixed a bug which caused the measurement caches not to be updated when
GLC_RESOLUTION was changed by the users.
- Fixed a memory leak in the management of the texture atlas: when a font was
deleted, the memory allocated to this font in the atlas was definitely lost
instead of being given back to the texture allocator.
- Fixed a bug which did not include trailing spaces in the calculation of
bounding boxes.
- Fixed a bug which caused artifacts when rendering glyphes that extend beyond
the EM square.
- Fixed a bug which prevented letters l and i to be displayed at small scales
when GLC_HINTING_QSO and GLC_TEXTURE were enabled.
- Side effect of the above bug fix : the antialiasing is improved for most
characters since they are no longer located against the edges of the texture.
- Fixed a bug in glcGenFontID() which could return the ID of an existing font.
- Fixed a race condition in glcGenContext()
- Function glcGetStringCharMetric() now returns metrics in global string
coordinates (otherwise the kerning can not be measured)
- Fixed bug 1987563 (Kerning does not work when GLC_GL_OBJECTS is enabled)
Thanks to GenPFault for the bug report.
- Fixed bug 2012579 (Mac OSX Leopard compiling bug) - Thanks to Michael Strobel
and Tim Baumgartner for the bug report and the patch.
- Negative values passed to glcResolution() now raise GLC_PARAMETER_ERROR
- Fixed bug 1980982 (Checks for MinGW in the configure script are incomplete)
- Feature request 1947346 : added files for pkg-config (thanks to Giel
van Shijndel and Dennis Schridde for providing them)
- Fixed bug 1947464 (Warnings are generated when compiling with gcc option
-Wstrict-prototypes)
- Fixed bug 1935557 (Fonts are not rendered correctly when the resolution is
changed using glcResolution).
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/graphics/quesoglc/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/graphics/quesoglc/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/quesoglc/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/graphics/quesoglc/patches/patch-src_ofont.c
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/quesoglc/patches/patch-src_ofont.h
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/quesoglc/patches/patch-src_scalable.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/quesoglc/Makefile
diff -u pkgsrc/graphics/quesoglc/Makefile:1.21 pkgsrc/graphics/quesoglc/Makefile:1.22
--- pkgsrc/graphics/quesoglc/Makefile:1.21 Mon Nov 17 11:00:59 2025
+++ pkgsrc/graphics/quesoglc/Makefile Sun Jan 4 13:39:09 2026
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2025/11/17 11:00:59 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.22 2026/01/04 13:39:09 adam Exp $
-DISTNAME= quesoglc-0.7.1-free
+DISTNAME= quesoglc-0.7.2-free
PKGNAME= ${DISTNAME:S/-free$//}
-PKGREVISION= 15
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=quesoglc/}
EXTRACT_SUFX= .tar.bz2
@@ -13,13 +11,17 @@ HOMEPAGE= https://quesoglc.sourceforge.n
COMMENT= Free implementation of the OpenGL Character Renderer (GLC)
LICENSE= gnu-lgpl-v2.1
-WRKSRC= ${WRKDIR}/quesoglc-0.7.1
-GNU_CONFIGURE= yes
-USE_LANGUAGES= c c++
-USE_TOOLS+= pkg-config gmake
-USE_LIBTOOL= yes
+WRKSRC= ${WRKDIR}/quesoglc-${PKGVERSION_NOREV}
+USE_LANGUAGES= c c++
+USE_TOOLS+= pkg-config gmake
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-executables
+# Use vendored fribidi and glew, as the latest are incompatible.
+CONFIGURE_ARGS+= --without-fribidi
+CONFIGURE_ARGS+= --without-glew
+PKGCONFIG_OVERRIDE= quesoglc.pc.in
.include "../../mk/bsd.prefs.mk"
@@ -27,12 +29,12 @@ CONFIGURE_ARGS+= --disable-executables
CONFIGURE_ARGS+= --with-apple-opengl-framework
.else
.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glew/buildlink3.mk"
+#.include "../../graphics/glew/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
.include "../../graphics/freeglut/buildlink3.mk"
.endif
-.include "../../converters/fribidi/buildlink3.mk"
+#.include "../../converters/fribidi/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/quesoglc/PLIST
diff -u pkgsrc/graphics/quesoglc/PLIST:1.1.1.1 pkgsrc/graphics/quesoglc/PLIST:1.2
--- pkgsrc/graphics/quesoglc/PLIST:1.1.1.1 Sun Feb 15 16:03:46 2009
+++ pkgsrc/graphics/quesoglc/PLIST Sun Jan 4 13:39:09 2026
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/02/15 16:03:46 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2026/01/04 13:39:09 adam Exp $
include/GL/glc.h
lib/libGLC.la
+lib/pkgconfig/quesoglc.pc
Index: pkgsrc/graphics/quesoglc/distinfo
diff -u pkgsrc/graphics/quesoglc/distinfo:1.6 pkgsrc/graphics/quesoglc/distinfo:1.7
--- pkgsrc/graphics/quesoglc/distinfo:1.6 Thu May 2 20:04:32 2024
+++ pkgsrc/graphics/quesoglc/distinfo Sun Jan 4 13:39:09 2026
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2024/05/02 20:04:32 triaxx Exp $
+$NetBSD: distinfo,v 1.7 2026/01/04 13:39:09 adam Exp $
-BLAKE2s (quesoglc-0.7.1-free.tar.bz2) = 7391b11961cba58e0d8dae7e05f899fcb18424d6e299a1654fb22f9fb5b02ac4
-SHA512 (quesoglc-0.7.1-free.tar.bz2) = 7a0c875b4eb24f01490fb9d982f91c8503e0ea0d177dd32eb5921febf1eab4b5abb2f95d4015714f974f6d384539577ec889389c072f1c686e427d3230ddde9e
-Size (quesoglc-0.7.1-free.tar.bz2) = 641475 bytes
-SHA1 (patch-src_ofont.c) = 99531668f11606fb8a9c2d161c8ea74e024bb528
-SHA1 (patch-src_ofont.h) = dd7eed567663b9d0a11831ac3309e29f6ed8b525
+BLAKE2s (quesoglc-0.7.2-free.tar.bz2) = 81a8604b50441d4587242feae24cc5e50841a1549a833a3622edbfe84f86d2e7
+SHA512 (quesoglc-0.7.2-free.tar.bz2) = 107cc28fe85722614bc6c222a64914eeef0de1c5dfa01cef9ec611e5caff54fdbcf2b387d413c0b56533d33e06741ca8dee99fc0c5ee1e63d9a95d86c6c69190
+Size (quesoglc-0.7.2-free.tar.bz2) = 657394 bytes
+SHA1 (patch-src_ofont.h) = 1183c730fd82aa284dd4f72a1089cb5a7a9ef658
+SHA1 (patch-src_scalable.c) = 09251b3e9fa502504a01e1d9be38725c7cfe095c
Index: pkgsrc/graphics/quesoglc/patches/patch-src_ofont.h
diff -u pkgsrc/graphics/quesoglc/patches/patch-src_ofont.h:1.2 pkgsrc/graphics/quesoglc/patches/patch-src_ofont.h:1.3
--- pkgsrc/graphics/quesoglc/patches/patch-src_ofont.h:1.2 Thu May 2 20:04:32 2024
+++ pkgsrc/graphics/quesoglc/patches/patch-src_ofont.h Sun Jan 4 13:39:09 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_ofont.h,v 1.2 2024/05/02 20:04:32 triaxx Exp $
+$NetBSD: patch-src_ofont.h,v 1.3 2026/01/04 13:39:09 adam Exp $
Remove inlining.
---- src/ofont.h.orig 2013-02-25 16:31:17.000000000 +0000
+--- src/ofont.h.orig 2008-10-18 21:35:13.000000000 +0000
+++ src/ofont.h
@@ -27,11 +27,6 @@
@@ -16,35 +16,95 @@ Remove inlining.
struct __GLCfontRec {
GLint id;
__GLCfaceDescriptor* faceDesc;
-@@ -54,24 +49,24 @@ GLfloat* __glcFontGetKerning(__GLCfont*
+@@ -54,46 +49,46 @@ GLfloat* __glcFontGetKerning(__GLCfont*
GLfloat* outVec, __GLCcontext* inContext,
GLfloat inScaleX, GLfloat inScaleY);
#ifndef GLC_FT_CACHE
--inline void* __glcFontOpen(__GLCfont* This, __GLCcontext* inContext);
--inline void __glcFontClose(__GLCfont* This);
-+void* __glcFontOpen(__GLCfont* This, __GLCcontext* inContext);
-+void __glcFontClose(__GLCfont* This);
+-static inline void* __glcFontOpen(__GLCfont* This, __GLCcontext* inContext);
+-static inline void __glcFontClose(__GLCfont* This);
++static void* __glcFontOpen(__GLCfont* This, __GLCcontext* inContext);
++static void __glcFontClose(__GLCfont* This);
#endif
GLboolean __glcFontPrepareGlyph(__GLCfont* This, __GLCcontext* inContext,
GLfloat inScaleX, GLfloat inScaleY,
GLCulong inGlyphIndex);
--inline GLboolean __glcFontGetBitmapSize(__GLCfont* This, GLint* outWidth,
-+GLboolean __glcFontGetBitmapSize(__GLCfont* This, GLint* outWidth,
- GLint *outHeight, GLint* outBoundingBox,
- GLfloat inScaleX, GLfloat inScaleY,
- int inFactor, __GLCcontext* inContext);
--inline GLfloat* __glcFontGetMaxMetric(__GLCfont* This, GLfloat* outVec,
-+GLfloat* __glcFontGetMaxMetric(__GLCfont* This, GLfloat* outVec,
- __GLCcontext* inContext);
--inline GLboolean __glcFontOutlineDecompose(__GLCfont* This,
-+GLboolean __glcFontOutlineDecompose(__GLCfont* This,
- __GLCrendererData* inData,
+-static inline GLboolean __glcFontGetBitmapSize(__GLCfont* This, GLint* outWidth,
++static GLboolean __glcFontGetBitmapSize(__GLCfont* This, GLint* outWidth,
+ GLint *outHeight,
+ GLfloat inScaleX,
+ GLfloat inScaleY, int inFactor,
+ GLint* outPixBoundingBox,
+ __GLCcontext* inContext);
+-static inline GLfloat* __glcFontGetMaxMetric(__GLCfont* This, GLfloat* outVec,
++static GLfloat* __glcFontGetMaxMetric(__GLCfont* This, GLfloat* outVec,
+ __GLCcontext* inContext);
+-static inline GLboolean __glcFontOutlineDecompose(__GLCfont* This,
++static GLboolean __glcFontOutlineDecompose(__GLCfont* This,
+ __GLCrendererData* inData,
+ __GLCcontext* inContext);
+-static inline GLboolean __glcFontGetBitmap(__GLCfont* This, GLint inWidth,
++static GLboolean __glcFontGetBitmap(__GLCfont* This, GLint inWidth,
+ GLint inHeight, void* inBuffer,
__GLCcontext* inContext);
--inline GLboolean __glcFontGetBitmap(__GLCfont* This, GLint inWidth,
-+GLboolean __glcFontGetBitmap(__GLCfont* This, GLint inWidth,
- GLint inHeight, void* inBuffer,
- __GLCcontext* inContext);
--inline GLboolean __glcFontOutlineEmpty(__GLCfont* This,
-+GLboolean __glcFontOutlineEmpty(__GLCfont* This,
- __GLCcontext* inContext);
- #endif /* __glc_ofont_h */
+-static inline GLboolean __glcFontOutlineEmpty(__GLCfont* This);
++static GLboolean __glcFontOutlineEmpty(__GLCfont* This);
+
+ /* Inline functions definitions */
+
+ #ifndef GLC_FT_CACHE
+ /* Open the font file */
+-static inline void* __glcFontOpen(__GLCfont* This, __GLCcontext* inContext)
++static void* __glcFontOpen(__GLCfont* This, __GLCcontext* inContext)
+ {
+ return __glcFaceDescOpen(This->faceDesc, inContext);
+ }
+
+ /* Close the font file */
+-static inline void __glcFontClose(__GLCfont* This)
++static void __glcFontClose(__GLCfont* This)
+ {
+ __glcFaceDescClose(This->faceDesc);
+ }
+ #endif
+
+ /* Get the size of the bitmap in which the glyph will be rendered */
+-static inline GLboolean __glcFontGetBitmapSize(__GLCfont* This, GLint* outWidth,
++static GLboolean __glcFontGetBitmapSize(__GLCfont* This, GLint* outWidth,
+ GLint *outHeight,
+ GLfloat inScaleX,
+ GLfloat inScaleY, int inFactor,
+@@ -108,14 +103,14 @@ static inline GLboolean __glcFontGetBitm
+ /* Get the maximum metrics of a face that is the bounding box that encloses
+ * every glyph of the face, and the maximum advance of the face.
+ */
+-static inline GLfloat* __glcFontGetMaxMetric(__GLCfont* This, GLfloat* outVec,
++static GLfloat* __glcFontGetMaxMetric(__GLCfont* This, GLfloat* outVec,
+ __GLCcontext* inContext)
+ {
+ return __glcFaceDescGetMaxMetric(This->faceDesc, outVec, inContext);
+ }
+
+ /* Decompose the outline of a glyph */
+-static inline GLboolean __glcFontOutlineDecompose(__GLCfont* This,
++static GLboolean __glcFontOutlineDecompose(__GLCfont* This,
+ __GLCrendererData* inData,
+ __GLCcontext* inContext)
+ {
+@@ -123,7 +118,7 @@ static inline GLboolean __glcFontOutline
+ }
+
+ /* Render the glyph in a bitmap */
+-static inline GLboolean __glcFontGetBitmap(__GLCfont* This, GLint inWidth,
++static GLboolean __glcFontGetBitmap(__GLCfont* This, GLint inWidth,
+ GLint inHeight, void* inBuffer,
+ __GLCcontext* inContext)
+ {
+@@ -134,7 +129,7 @@ static inline GLboolean __glcFontGetBitm
+ /* Chek if the outline of the glyph is empty (which means it is a spacing
+ * character).
+ */
+-static inline GLboolean __glcFontOutlineEmpty(__GLCfont* This)
++static GLboolean __glcFontOutlineEmpty(__GLCfont* This)
+ {
+ return __glcFaceDescOutlineEmpty(This->faceDesc);
+ }
Added files:
Index: pkgsrc/graphics/quesoglc/patches/patch-src_scalable.c
diff -u /dev/null pkgsrc/graphics/quesoglc/patches/patch-src_scalable.c:1.1
--- /dev/null Sun Jan 4 13:39:09 2026
+++ pkgsrc/graphics/quesoglc/patches/patch-src_scalable.c Sun Jan 4 13:39:09 2026
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_scalable.c,v 1.1 2026/01/04 13:39:09 adam Exp $
+
+Fixes for newer glu.
+
+--- src/scalable.c.orig 2026-01-04 11:50:44.510274999 +0000
++++ src/scalable.c
+@@ -597,15 +597,13 @@ void __glcRenderCharScalable(__GLCfont*
+ gluTessProperty(tess, GLU_TESS_BOUNDARY_ONLY, GL_FALSE);
+
+ gluTessCallback(tess, GLU_TESS_ERROR,
+- (void (CALLBACK *) (GLenum))__glcCallbackError);
++ (void (CALLBACK *) (void))__glcCallbackError);
+ gluTessCallback(tess, GLU_TESS_VERTEX_DATA,
+- (void (CALLBACK *) (void*, void*))__glcVertexCallback);
++ (void (CALLBACK *) (void))__glcVertexCallback);
+ gluTessCallback(tess, GLU_TESS_COMBINE_DATA,
+- (void (CALLBACK *) (GLdouble[3], void*[4],
+- GLfloat[4], void**, void*))
+- __glcCombineCallback);
++ (void (CALLBACK *) (void))__glcCombineCallback);
+ gluTessCallback(tess, GLU_TESS_BEGIN_DATA,
+- (void (CALLBACK *) (GLenum, void*))__glcBeginCallback);
++ (void (CALLBACK *) (void))__glcBeginCallback);
+
+ gluTessNormal(tess, 0., 0., 1.);
+
Home |
Main Index |
Thread Index |
Old Index