cpet
/
openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gnubg-1.07.001.

This commit is contained in:
ajacoutot 2022-11-22 13:00:31 +00:00
parent 079ba29e1e
commit 13dfb5945b
9 changed files with 107 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
games/gnubg/Makefile
View File

@ -1,41 +1,44 @@
COMMENT = GNU Backgammon
V = 1.05.002
V = 1.07.001
DISTNAME = gnubg-release-$V-sources
PKGNAME = gnubg-$V
CATEGORIES = games x11
HOMEPAGE = http://gnubg.org/
REVISION = 12
# GPLv3+
PERMIT_PACKAGE = Yes
WANTLIB += GL GLU X11 X11-xcb Xcomposite Xcursor Xdamage Xext
WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c
WANTLIB += cairo canberra canberra-gtk crypto curl curses drm
WANTLIB += expat ffi fontconfig freetype fribidi gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gdkglext-x11-1.0 gio-2.0 glapi glib-2.0 gmodule-2.0
WANTLIB += gmp gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0 gtkglext-x11-1.0
WANTLIB += harfbuzz iconv intl ltdl m nghttp2 ogg pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre2-8 pixman-1 png pthread readline sqlite3
WANTLIB += ${MODPY_WANTLIB}
WANTLIB += ${COMPILER_LIBCXX} GL GLU X11 X11-xcb Xau Xcomposite
WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr
WANTLIB += Xrender Xxf86vm atk-1.0 c cairo canberra canberra-gtk
WANTLIB += crypto curl curses drm expat ffi fontconfig freetype
WANTLIB += fribidi gdk-x11-2.0 gdk_pixbuf-2.0 gdkglext-x11-1.0
WANTLIB += gio-2.0 glapi glib-2.0 gmodule-2.0 gmp gobject-2.0
WANTLIB += graphite2 gthread-2.0 gtk-x11-2.0 gtkglext-x11-1.0
WANTLIB += harfbuzz iconv intl jpeg ltdl m nghttp2 nghttp3 ngtcp2
WANTLIB += ngtcp2_crypto_openssl ogg pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre2-8 pixman-1 png readline sqlite3
WANTLIB += ssl util vorbis vorbisfile xcb xcb-dri2 xcb-dri3 xcb-glx
WANTLIB += xcb-present xcb-render xcb-shm xcb-sync xcb-xfixes
WANTLIB += xshmfence z execinfo
WANTLIB += ${MODPY_WANTLIB}
WANTLIB += xshmfence z
MASTER_SITES = http://gnubg.org/media/sources/
MASTER_SITES = https://ftp.gnu.org/gnu/gnubg/
MODULES = lang/python
BUILD_DEPENDS = devel/gettext,-tools
BUILD_DEPENDS = devel/gettext,-tools \
math/cglm
LIB_DEPENDS = audio/libcanberra,-gtk \
databases/sqlite3 \
devel/gettext,-runtime \
devel/glib2 \
devel/gmp \
devel/pango \
graphics/png \
net/curl \
x11/gtkglext
RUN_DEPENDS = x11/gtk+3,-guic \
devel/desktop-file-utils

4
games/gnubg/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gnubg-release-1.05.002-sources.tar.gz) = ssX5RXoCOiKXCLt4iu5vcSQoyRHhmfMvsH86g9bItgs=
SIZE (gnubg-release-1.05.002-sources.tar.gz) = 15092499
SHA256 (gnubg-release-1.07.001-sources.tar.gz) = cjmXKUGcrZ8RLDBmoS0AANpFCkVq3XsJTYkVUGnWgh4=
SIZE (gnubg-release-1.07.001-sources.tar.gz) = 13729158

28
games/gnubg/patches/patch-board3d_font3dOGL_c Normal file
View File

@ -0,0 +1,28 @@
We make GNU Backgammon use system-supplied DejaVu fonts instead of bundling Vera
fonts. Thus stop building dynamically allocated paths for fonts.
Index: board3d/font3dOGL.c
--- board3d/font3dOGL.c.orig
+++ board3d/font3dOGL.c
@@ -104,19 +104,14 @@ RenderText(const char* text, FT_Library ftLib, OGLFont
int
CreateFontText(OGLFont* ppFont, const char* text, const char* fontFile, int pitch, float size, float heightRatio)
{
- char* filename;
-
FT_Library ftLib;
if (FT_Init_FreeType(&ftLib))
return 0;
- filename = BuildFilename(fontFile);
- if (!RenderText(text, ftLib, ppFont, filename, pitch, size, heightRatio)) {
- outputerrf(_("Failed to create font from (%s)\n"), filename);
- g_free(filename);
+ if (!RenderText(text, ftLib, ppFont, fontFile, pitch, size, heightRatio)) {
+ outputerrf(_("Failed to create font from (%s)\n"), fontFile);
return 0;
}
- g_free(filename);
return !FT_Done_FreeType(ftLib);
}
#endif

39
games/gnubg/patches/patch-board3d_font3d_c
View File

@ -1,48 +1,23 @@
We make GNU Backgammon use system-supplied DejaVu fonts instead of bundling Vera
fonts. Thus stop building dynamically allocated paths for fonts.
--- board3d/font3d.c.orig Sun Apr 5 10:05:29 2015
+++ board3d/font3d.c Sun Apr 5 10:10:56 2015
@@ -73,7 +73,6 @@ static int RenderGlyph(const FT_Outline * pOutline);
Index: board3d/font3d.c
--- board3d/font3d.c.orig
+++ board3d/font3d.c
@@ -38,18 +38,14 @@ static double controlPoints[4][2]; /* 2D array st
int
CreateNumberFont(OGLFont ** ppFont, const char *fontFile, int pitch, float size, float heightRatio)
CreateNumberFont(OGLFont *ppFont, const char *fontFile, int pitch, float size, float heightRatio)
{
- char *filename;
FT_Library ftLib;
if (FT_Init_FreeType(&ftLib))
return 0;
@@ -81,20 +80,16 @@ CreateNumberFont(OGLFont ** ppFont, const char *fontFi
free(*ppFont);
*ppFont = (OGLFont *) malloc(sizeof(OGLFont));
- filename = BuildFilename(fontFile);
- if (!CreateOGLFont(ftLib, *ppFont, filename, pitch, size, heightRatio)) {
- if (!CreateOGLFont(ftLib, ppFont, filename, pitch, size, heightRatio)) {
- outputerrf(_("Failed to create font from (%s)\n"), filename);
- g_free(filename);
+ if (!CreateOGLFont(ftLib, *ppFont, fontFile, pitch, size, heightRatio)) {
+ outputerrf(_("Failed to create font from (%s)\n"), fontFile);
return 0;
}
- g_free(filename);
return !FT_Done_FreeType(ftLib);
}
int
CreateFontText(OGLFont ** ppFont, const char *text, const char *fontFile, int pitch, float size, float heightRatio)
{
- char *filename;
FT_Library ftLib;
if (FT_Init_FreeType(&ftLib))
@@ -103,13 +98,10 @@ CreateFontText(OGLFont ** ppFont, const char *text, co
free(*ppFont);
*ppFont = (OGLFont *) malloc(sizeof(OGLFont));
- filename = BuildFilename(fontFile);
- if (!RenderText(text, ftLib, *ppFont, filename, pitch, size, heightRatio)) {
- outputerrf(_("Failed to create font from (%s)\n"), filename);
- g_free(filename);
+ if (!RenderText(text, ftLib, *ppFont, fontFile, pitch, size, heightRatio)) {
+ if (!CreateOGLFont(ftLib, ppFont, fontFile, pitch, size, heightRatio)) {
+ outputerrf(_("Failed to create font from (%s)\n"), fontFile);
return 0;
}

13
games/gnubg/patches/patch-board3d_inc3d_h → games/gnubg/patches/patch-board3d_fun3d_h
View File

@ -1,14 +1,15 @@
Use system-supplied DejaVu fonts instead of bundling Vera fonts.
--- board3d/inc3d.h.orig Sun Aug 2 23:22:23 2015
+++ board3d/inc3d.h Sat Oct 1 09:42:14 2016
@@ -82,9 +82,6 @@ typedef enum _BoardState {
Index: board3d/fun3d.h
--- board3d/fun3d.h.orig
+++ board3d/fun3d.h
@@ -136,9 +136,6 @@ typedef struct {
#define CUBE_FONT_SIZE (base_unit / 24.0f)
#define CUBE_FONT_HEIGHT_RATIO 1.25f
-#define FONT_VERA "fonts/Vera.ttf"
-#define FONT_VERA_SERIF_BOLD "fonts/VeraSeBd.ttf"
-
/* Animation paths */
#define MAX_PATHS 3
typedef enum _PathType {
/* Setup functions */
void InitGL(const BoardData* bd);

23
games/gnubg/patches/patch-configure
View File

@ -1,15 +1,14 @@
Remove hardcoded CFLAGS
Remove hardcoded CFLAGS.
--- configure.orig Mon Oct 3 11:08:53 2016
+++ configure Mon Oct 3 11:09:09 2016
@@ -17556,10 +17556,6 @@ else
$as_echo "yes" >&6; }
Index: configure
--- configure.orig
+++ configure
@@ -20238,7 +20238,7 @@ else $as_nop
printf "%s\n" "yes" >&6; }
fi
-AM_CFLAGS="-O3 $AM_CFLAGS"
-if test x"$GCC" = "xyes"; then
- AM_CFLAGS="-ffast-math $AM_CFLAGS"
-fi
-AM_CFLAGS="$AM_CFLAGS -g -O3"
+AM_CFLAGS="$AM_CFLAGS -g"
if test x"$GCC" = "xyes"; then
AM_CFLAGS="$AM_CFLAGS -ffast-math"
fi

8
games/gnubg/patches/patch-doc_Makefile_in
View File

@ -1,12 +1,14 @@
"install-data-hook" compresses manual pages. Stop doing that.
--- doc/Makefile.in.orig Sat Oct 1 15:05:36 2016
+++ doc/Makefile.in Sat Oct 1 15:06:26 2016
@@ -616,7 +616,6 @@ info-am:
Index: doc/Makefile.in
--- doc/Makefile.in.orig
+++ doc/Makefile.in
@@ -663,7 +663,7 @@ info-am:
install-data-am: install-gnubg_helpDATA install-gnubg_imageDATA \
install-man
@$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ $(MAKE) $(AM_MAKEFLAGS)
install-dvi: install-dvi-am
install-dvi-am:

33
games/gnubg/patches/patch-render_c
View File

@ -1,13 +1,14 @@
We make GNU Backgammon use system-supplied DejaVu fonts instead of bundling Vera
fonts. Thus stop building dynamically allocated paths for fonts.
--- render.c.orig Sun Oct 19 23:24:53 2014
+++ render.c Tue Apr 7 11:21:30 2015
Index: render.c
--- render.c.orig
+++ render.c
@@ -52,14 +52,6 @@
static randctx rc;
#define RAND irand( &rc )
-#if HAVE_FREETYPE
-#if defined(HAVE_FREETYPE)
-#define FONT_VERA "fonts/Vera.ttf"
-#define FONT_VERA_SERIF_BOLD "fonts/VeraSeBd.ttf"
-#if 0 /* unused for now */
@ -18,11 +19,9 @@ fonts. Thus stop building dynamically allocated paths for fonts.
/* aaanPositions[Clockwise][x][point number][x, y. deltay] */
int positions[2][30][3] = { {
{BAR_X, BAR_Y_1, -CHEQUER_HEIGHT}, /* bar - player 1 */
@@ -1475,15 +1467,11 @@ RenderLabels(renderdata * prd, unsigned char *puch, in
FT_Face ftf;
int i;
@@ -1487,13 +1479,10 @@ RenderLabels(renderdata * prd, unsigned char *puch, in
FT_Glyph aftg[10];
- char *file;
char *file;
- file = BuildFilename(FONT_VERA);
- if (FT_New_Face(ftl, file, 0, &ftf)) {
@ -35,7 +34,7 @@ fonts. Thus stop building dynamically allocated paths for fonts.
if (FT_Set_Pixel_Sizes(ftf, 0, prd->nSize * 5 / 2)) {
RenderBasicLabels(prd, puch, nStride, iStart, iEnd, iDelta);
@@ -1761,10 +1749,8 @@ RenderChequerLabels(renderdata * prd, unsigned char *p
@@ -1773,10 +1762,8 @@ RenderChequerLabels(renderdata * prd, unsigned char *p
FT_Face ftf;
FT_Glyph aftg[10];
int fFreetype = FALSE;
@ -47,7 +46,7 @@ fonts. Thus stop building dynamically allocated paths for fonts.
fFreetype = TRUE;
for (i = 0; i < 10; i++) {
FT_Load_Char(ftf, '0' + i, FT_LOAD_RENDER);
@@ -1773,7 +1759,6 @@ RenderChequerLabels(renderdata * prd, unsigned char *p
@@ -1785,7 +1772,6 @@ RenderChequerLabels(renderdata * prd, unsigned char *p
FT_Done_Face(ftf);
}
@ -55,9 +54,11 @@ fonts. Thus stop building dynamically allocated paths for fonts.
#endif
for (i = 0; i < 12; i++) {
@@ -1932,8 +1917,7 @@ RenderCubeFaces(renderdata * prd, unsigned char *puch,
@@ -1942,10 +1928,8 @@ RenderCubeFaces(renderdata * prd, unsigned char *puch,
FT_Face ftf;
FT_Glyph aftg[10], aftgSmall[10], aftgTiny[10];
int fFreetype = FALSE;
char *file;
- char *file;
- file = BuildFilename(FONT_VERA_SERIF_BOLD);
- if (!FT_New_Face(ftl, file, 0, &ftf) && !FT_Set_Pixel_Sizes(ftf, 0, 3 * prd->nSize)) {
@ -65,7 +66,7 @@ fonts. Thus stop building dynamically allocated paths for fonts.
fFreetype = TRUE;
for (i = 0; i < 10; i++) {
@@ -1950,7 +1934,6 @@ RenderCubeFaces(renderdata * prd, unsigned char *puch,
@@ -1969,7 +1953,6 @@ RenderCubeFaces(renderdata * prd, unsigned char *puch,
FT_Done_Face(ftf);
}
@ -73,9 +74,11 @@ fonts. Thus stop building dynamically allocated paths for fonts.
#endif
for (i = 0; i < 6; i++) {
@@ -2010,8 +1993,7 @@ RenderResignFaces(renderdata * prd, unsigned char *puc
@@ -2045,10 +2028,8 @@ RenderResignFaces(renderdata * prd, unsigned char *puc
FT_Face ftf;
FT_Glyph aftg[10], aftgSmall[10];
int fFreetype = FALSE;
char *file;
- char *file;
- file = BuildFilename(FONT_VERA_SERIF_BOLD);
- if (!FT_New_Face(ftl, file, 0, &ftf) && !FT_Set_Pixel_Sizes(ftf, 0, 4 * prd->nSize)) {
@ -83,7 +86,7 @@ fonts. Thus stop building dynamically allocated paths for fonts.
fFreetype = TRUE;
for (i = 0; i < 10; i++) {
@@ -2028,7 +2010,6 @@ RenderResignFaces(renderdata * prd, unsigned char *puc
@@ -2065,7 +2046,6 @@ RenderResignFaces(renderdata * prd, unsigned char *puc
FT_Done_Face(ftf);
}

12
games/gnubg/pkg/PLIST
View File

@ -11,7 +11,9 @@
share/applications/gnubg.desktop
share/doc/gnubg/
share/doc/gnubg/allabout.html
share/doc/gnubg/allabout.pdf
share/doc/gnubg/gnubg.html
share/doc/gnubg/gnubg.pdf
share/doc/gnubg/images/
share/doc/gnubg/images/1540d81e.png
share/doc/gnubg/images/16d7944c.png
@ -109,7 +111,6 @@ share/doc/gnubg/images/m7bf4f29.png
share/doc/gnubg/images/m7cee1bfc.png
share/doc/gnubg/images/m93f2ca3.png
share/doc/gnubg/images/mb4b1284.png
share/doc/gnubg/images/md9b1995.png
share/doc/gnubg/images/mgcd.png
share/doc/gnubg/images/mgtp.png
share/doc/gnubg/images/movefilter1.png
@ -129,11 +130,17 @@ share/doc/gnubg/images/setturn.png
share/doc/gnubg/images/tutor.png
share/doc/gnubg/images/tutorwarning.png
share/gnubg/
share/gnubg/Shaders/
share/gnubg/Shaders/basic-fragment.glsl
share/gnubg/Shaders/basic-vertex.glsl
share/gnubg/Shaders/main-fragment.glsl
share/gnubg/Shaders/main-vertex.glsl
share/gnubg/boards.xml
share/gnubg/flags/
share/gnubg/flags/czech.png
share/gnubg/flags/denmark.png
share/gnubg/flags/england.png
share/gnubg/flags/finland.png
share/gnubg/flags/france.png
share/gnubg/flags/germany.png
share/gnubg/flags/greece.png
@ -145,6 +152,7 @@ share/gnubg/flags/russia.png
share/gnubg/flags/spain.png
share/gnubg/flags/turkey.png
share/gnubg/flags/usa.png
share/gnubg/gnubg.css
share/gnubg/gnubg.gtkrc
share/gnubg/gnubg.sql
share/gnubg/gnubg.wd
@ -231,10 +239,12 @@ share/locale/cs/LC_MESSAGES/gnubg.mo
share/locale/da/LC_MESSAGES/gnubg.mo
share/locale/de/LC_MESSAGES/gnubg.mo
share/locale/el/LC_MESSAGES/gnubg.mo
share/locale/en_GB/LC_MESSAGES/gnubg.mo
share/locale/en_US/
share/locale/en_US/LC_MESSAGES/
share/locale/en_US/LC_MESSAGES/gnubg.mo
share/locale/es/LC_MESSAGES/gnubg.mo
share/locale/fi/LC_MESSAGES/gnubg.mo
share/locale/fr/LC_MESSAGES/gnubg.mo
share/locale/is/LC_MESSAGES/gnubg.mo
share/locale/it/LC_MESSAGES/gnubg.mo