Date: Tue, 30 Apr 2024 22:03:25 GMT From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4a1f274ca54a - main - graphics/grafx2: Update to 2.9 Message-ID: <202404302203.43UM3P2k082323@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=4a1f274ca54a44f5472e20f331dfdfd4999f6595 commit 4a1f274ca54a44f5472e20f331dfdfd4999f6595 Author: Emanuel Haupt <ehaupt@FreeBSD.org> AuthorDate: 2024-04-30 22:03:10 +0000 Commit: Emanuel Haupt <ehaupt@FreeBSD.org> CommitDate: 2024-04-30 22:03:17 +0000 graphics/grafx2: Update to 2.9 --- graphics/grafx2/Makefile | 11 +++++------ graphics/grafx2/distinfo | 6 +++--- graphics/grafx2/files/patch-Makefile | 4 ++-- graphics/grafx2/files/patch-sdlscreen.c | 29 ----------------------------- graphics/grafx2/pkg-plist | 10 +++++++--- 5 files changed, 17 insertions(+), 43 deletions(-) diff --git a/graphics/grafx2/Makefile b/graphics/grafx2/Makefile index e4b7b5354c32..404a429f8c29 100644 --- a/graphics/grafx2/Makefile +++ b/graphics/grafx2/Makefile @@ -1,7 +1,7 @@ PORTNAME= grafx2 -PORTVERSION= 2.8 -DISTVERSIONSUFFIX= .3091-HEAD-src -PORTREVISION= 3 +DISTVERSIONPREFIX= v +DISTVERSION= 2.9 +DISTVERSIONSUFFIX= .3219 CATEGORIES= graphics MASTER_SITES= http://pulkomandy.tk/projects/GrafX2/downloads/ \ LOCAL/ehaupt @@ -16,8 +16,7 @@ LIB_DEPENDS= libpng.so:graphics/png \ libtiff.so:graphics/tiff \ libX11.so:x11/libX11 -USES= desktop-file-utils gmake gnome iconv:wchar_t pkgconfig sdl \ - tar:tgz +USES= desktop-file-utils gmake gnome iconv:wchar_t pkgconfig sdl USE_SDL= image2 sdl2 MAKE_ENV+= API=${GRAFX2_API} \ @@ -25,7 +24,7 @@ MAKE_ENV+= API=${GRAFX2_API} \ CFLAGS+= -DHAVE_SYS_PARAM_H -DHAVE_SYS_UCRED_H -DHAVE_SYS_MOUNT_H -WRKSRC= ${WRKDIR}/grafx2 +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${PORTVERSION} WRKSRC_SUBDIR= src OPTIONS_DEFINE= LUA TTF diff --git a/graphics/grafx2/distinfo b/graphics/grafx2/distinfo index 9e3e9ae1d2df..b8ef0126a0d6 100644 --- a/graphics/grafx2/distinfo +++ b/graphics/grafx2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1616843664 -SHA256 (grafx2-2.8.3091-HEAD-src.tgz) = 29d63b194850a7f43bb7f92d2cf1b123ae991f2da00c07df9f6c81e6999c2423 -SIZE (grafx2-2.8.3091-HEAD-src.tgz) = 1127842 +TIMESTAMP = 1714510191 +SHA256 (grafx2-v2.9.3219.tar.gz) = 57c020e2d0a8287537c703ba596c9bc77cef98f409d86e4a625ce08d1a5de4c2 +SIZE (grafx2-v2.9.3219.tar.gz) = 2631545 diff --git a/graphics/grafx2/files/patch-Makefile b/graphics/grafx2/files/patch-Makefile index 9879e6274655..f83e345c1f77 100644 --- a/graphics/grafx2/files/patch-Makefile +++ b/graphics/grafx2/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2021-03-24 19:59:20 UTC +--- Makefile.orig 2024-04-29 15:47:02 UTC +++ Makefile -@@ -1242,7 +1242,8 @@ install : $(BIN) +@@ -1250,7 +1250,8 @@ install : $(BIN) test -d $(DESTDIR)$(datadir)/grafx2/fonts || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/fonts test -d $(DESTDIR)$(datadir)/grafx2/skins || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/skins test -d $(DESTDIR)$(datadir)/grafx2/scripts || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts diff --git a/graphics/grafx2/files/patch-sdlscreen.c b/graphics/grafx2/files/patch-sdlscreen.c deleted file mode 100644 index 6f75258a549a..000000000000 --- a/graphics/grafx2/files/patch-sdlscreen.c +++ /dev/null @@ -1,29 +0,0 @@ ---- sdlscreen.c.orig 2023-04-11 14:41:38 UTC -+++ sdlscreen.c -@@ -373,17 +373,11 @@ byte * Surface_to_bytefield(SDL_Surface *source, byte - byte *src; - byte *dest_ptr; - int y; -- int remainder; - - // Support seulement des images 256 couleurs - if (source->format->BytesPerPixel != 1) - return NULL; - -- if (source->w & 3) -- remainder=4-(source->w&3); -- else -- remainder=0; -- - if (dest==NULL) - dest=(byte *)malloc(source->w*source->h); - -@@ -393,7 +387,7 @@ byte * Surface_to_bytefield(SDL_Surface *source, byte - { - memcpy(dest_ptr, src,source->w); - dest_ptr += source->w; -- src += source->w + remainder; -+ src += source->pitch; - } - return dest; - diff --git a/graphics/grafx2/pkg-plist b/graphics/grafx2/pkg-plist index 55c5b12e4599..bf2c786bde4a 100644 --- a/graphics/grafx2/pkg-plist +++ b/graphics/grafx2/pkg-plist @@ -20,8 +20,6 @@ share/applications/grafx2.desktop %%DATADIR%%/gfx2def.ini %%DATADIR%%/gfx2.png %%DATADIR%%/skins/skin_chrisfx.png -%%DATADIR%%/skins/unicode_0390-03C9.png -%%DATADIR%%/skins/unicode_3040-309F.png %%LUA%%%%DATADIR%%/scripts/samples/brush/ApplyColor.lua %%LUA%%%%DATADIR%%/scripts/samples/brush/Fisheye.lua %%LUA%%%%DATADIR%%/scripts/samples/brush/GrayscaleAvg.lua @@ -81,6 +79,10 @@ share/applications/grafx2.desktop %%LUA%%%%DATADIR%%/scripts/samples/picture/thomson/ostro_to7.lua %%LUA%%%%DATADIR%%/scripts/samples/picture/thomson/ostro_to8.lua %%LUA%%%%DATADIR%%/scripts/samples/picture/thomson/ostro_to9.lua +%%DATADIR%%/fonts/5pxtinyfont.png +%%DATADIR%%/fonts/GrafX2_Black.gif +%%DATADIR%%/fonts/GrafX2_Dark.gif +%%DATADIR%%/fonts/colorfont.pcx %%DATADIR%%/skins/font_Classic.png %%DATADIR%%/skins/font_DPaint.png %%DATADIR%%/skins/font_Fairlight.png @@ -89,10 +91,12 @@ share/applications/grafx2.desktop %%DATADIR%%/skins/font_Seen.png %%DATADIR%%/skins/skin_Aurora.png %%DATADIR%%/skins/skin_DPaint.png +%%DATADIR%%/skins/skin_black.png %%DATADIR%%/skins/skin_classic.png +%%DATADIR%%/skins/skin_klin.png %%DATADIR%%/skins/skin_modern.png %%DATADIR%%/skins/skin_scenish.png %%DATADIR%%/skins/unicode_0410-044F.png share/icons/hicolor/scalable/apps/grafx2.svg share/icons/hicolor/scalable/apps/grafx2.xpm -share/metainfo/grafx2.appdata.xml +share/metainfo/eu.grafx2.grafx2.metainfo.xml
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404302203.43UM3P2k082323>