From nobody Wed Sep 04 16:40:50 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzSst3XT1z5VD4q; Wed, 04 Sep 2024 16:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WzSst346nz4jck; Wed, 4 Sep 2024 16:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725468050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CSqJcs2lUaAHSh7p7u4QdbWitvdPc8wpD/fUZWmtzzc=; b=kt4C+L4tD9UODFytmV98jnBiF62UxjHyv+EynuFKz/ooVRFMISLhEuDje/QDutoPFsxXbf is3fk5rLAxNMcLQOBmWLXQGDecM59bdnUKOBOCKU84UEkW0eI5s1kUdpQM9hS4EjOlz8zZ 0j332+gY7BgAXSm/rwdbE4c7XwepgGgU6dVbdbiCnD67N8Ong+lrewQHw+Yr9lhGGfu8wD mzDzYiebSgNUF8dYYsOcHYjcqwmfLMVszdgKnGtK88lrBQE0Bp61jBsbePXfoaV0Ciy784 BZnOsM9nb8m9ume85LULDWFk9ASdLMvCD1+HIiBLJcb5qPY4x8NJSpn0xyPVBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725468050; a=rsa-sha256; cv=none; b=W102hKETm/n7R9GCC0PDQdYnrB5sfluUzHrc3xapLihky1zpaIQkibSb11W3jvQMxZw2fp xeMIGFU5ERzOSotkd9IbfuyaxOGEw5GTZPIBjHsdfhfNEQWDo2UYlM2xqdGDYu8h/cHyW4 Wg6zUW+KcHszW90I+TT+hnqbyNHw+ueKpFILN22qNwdKEUGs06igssaO9fugUb2IiKe3v7 lkibnmWnFUPB/GZmc/8bzdg14gi9cwU5yWMZthVjhqtuS0hfVjwBWjDsqpCwSnVD3feSu7 OSfB09iTY6/2oagApYiq3pwL1tqOVeFb1KRITM95hAIed0Og8mq7eK7bNxktyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725468050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CSqJcs2lUaAHSh7p7u4QdbWitvdPc8wpD/fUZWmtzzc=; b=JPpBrOnVi3/MYzuvinoiT3Cy1Z2hW0swQ8YP/ptMkhkt9CtbhmwVHQbNarp9AXpcm/c5c1 lAbZTPvMo6jzj37UgBuY4z+ZQMufvs0BvBfo5UvIeI9DFS+Bg4hwEsPnthX2rKLcpmX4ZO hBK6wxqK/4I4ygkOV3CoVNMFJHGPaFwRcYNcTjX6C8BJTlFTsA1gkCYW4buAbuXtyEnZMB Trf8+1qWIHflqWboYVHOIA/27W6TCF38cuC66t1cvBgfw7SFCOgMSE3STNTnJHzb7MRDiH o4e6ImgdJNAy6JKbGWv4MJyDmmAbUUGaXbgHVYsuOzGxJqix51TedAqIOitQoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WzSst2h27zXZ6; Wed, 4 Sep 2024 16:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 484GeoVH002385; Wed, 4 Sep 2024 16:40:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484Geoe4002382; Wed, 4 Sep 2024 16:40:50 GMT (envelope-from git) Date: Wed, 4 Sep 2024 16:40:50 GMT Message-Id: <202409041640.484Geoe4002382@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: d5debff4b735 - main - multimedia/xanim: fix build with gcc14 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5debff4b735a93924b68212e6b960533c613016 Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=d5debff4b735a93924b68212e6b960533c613016 commit d5debff4b735a93924b68212e6b960533c613016 Author: Dirk Meyer AuthorDate: 2024-09-04 16:40:36 +0000 Commit: Dirk Meyer CommitDate: 2024-09-04 16:40:36 +0000 multimedia/xanim: fix build with gcc14 cleanup MASTER_SITES cleanup pkg-descr reformat patches PR: 281241 --- multimedia/xanim/Makefile | 11 +++---- multimedia/xanim/files/patch-Imakefile | 18 +++++------ multimedia/xanim/files/patch-xa_audio.h | 6 ++-- multimedia/xanim/files/patch-xa_color.c | 10 ++++++ multimedia/xanim/files/patch-xa_fli.c | 11 +++++++ multimedia/xanim/files/patch-xa_g72x.c | 11 +++++++ multimedia/xanim/files/patch-xa_input.c | 8 ++--- multimedia/xanim/files/patch-xa_vid_codec.c | 18 ++++++++--- multimedia/xanim/pkg-descr | 47 ++++------------------------- 9 files changed, 72 insertions(+), 68 deletions(-) diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile index b9904a91bc96..b0bca62b9533 100644 --- a/multimedia/xanim/Makefile +++ b/multimedia/xanim/Makefile @@ -1,16 +1,14 @@ PORTNAME= xanim PORTVERSION= 2.92.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= multimedia graphics -MASTER_SITES= ftp://ftp.nstu.ru/pub/mirrors/xanim.va.pubnix.com/:main \ - LOCAL/dinoex:main,DEFAULT \ - ftp://ftp.nstu.ru/pub/mirrors/xanim.va.pubnix.com/dlls/ +MASTER_SITES= LOCAL/dinoex DISTNAME= xanim2920 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:main ${EXTRA_FILES} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${EXTRA_FILES} MAINTAINER= dinoex@FreeBSD.org COMMENT= Play most popular animation formats and show pictures -WWW= http://xanim.polter.net/ +WWW= https://web.archive.org/web/20230627070655/http://xanim.polter.net/ # Converted from NO_CDROM LICENSE= xanim @@ -22,6 +20,7 @@ LICENSE_PERMS= dist-mirror pkg-mirror auto-accept # which is fatal for imake. USES= alias imake xorg USE_GCC= yes +USE_CSTD= gnu99 USE_XORG= xext xt sm ice xext x11 MAKE_ARGS+= -j 2 # safe and helps even the single-CPU machines DLLDIR= ${PREFIX}/lib/X11/xanim diff --git a/multimedia/xanim/files/patch-Imakefile b/multimedia/xanim/files/patch-Imakefile index 20268744731c..7077c074b9ed 100644 --- a/multimedia/xanim/files/patch-Imakefile +++ b/multimedia/xanim/files/patch-Imakefile @@ -1,6 +1,6 @@ ---- Imakefile.orig Sun Apr 21 01:25:06 2002 -+++ Imakefile Thu Jan 2 07:53:41 2003 -@@ -96,7 +96,7 @@ +--- Imakefile.orig 2002-04-20 23:25:06 UTC ++++ Imakefile +@@ -96,7 +96,7 @@ XCOMM ## Linux XCOMM to link against symbols inside xanim. XCOMM XCOMM ## Linux @@ -9,7 +9,7 @@ XCOMM XCOMM ## SunOS/Solaris use: XCOMM LD_FLAGS = -@@ -112,7 +112,7 @@ +@@ -112,7 +112,7 @@ XCOMM XCOMM NOTE: not all machines need the XA_DLL_LIB define. XCOMM ######################################################################### XCOMM @@ -18,7 +18,7 @@ XCOMM ### Use this only if the above doesn't work XCOMM XA_DLL_DEF = -DXA_DLL XCOMM -@@ -120,14 +120,14 @@ +@@ -120,14 +120,14 @@ XCOMM HP/UX should use the following: XCOMM XA_DLL_LIB = -ldl XCOMM XCOMM HP/UX should use the following: @@ -36,7 +36,7 @@ XCOMM ######################################################################### -@@ -319,8 +319,8 @@ +@@ -319,8 +319,8 @@ XCOMM -- Also FreeBSD, and BSDI with SBlast-BSD-1.5 ( XCOMM XA_AUDIO_LIBS = -lc XCOMM XCOMM -- Also FreeBSD, and BSDI with SBlast-BSD-1.5 (development stages)------ @@ -47,7 +47,7 @@ XCOMM XCOMM -- TOWNS Linux 16 bit PCM ---------------------------------------------- XCOMM XA_AUDIO_DEFS = -DXA_TOWNS_AUDIO -@@ -351,9 +351,9 @@ +@@ -351,9 +351,9 @@ XCOMM -- HP/UX 10.x AServer XCOMM XA_AUDIO_LIBS = -lAlib XCOMM -- XCOMM -- HP/UX 10.x AServer @@ -60,7 +60,7 @@ XCOMM XCOMM ------ AF (AudioFile) Support ------------------------------------------ XCOMM -- You need to indicate where the AF libraries libAFUtil.a and libAF.a -@@ -447,7 +447,7 @@ +@@ -447,7 +447,7 @@ XCOMM -- NOTE_8: HP-UX machines need to comment thi XCOMM -- following symbols(XmbufDisplayBuffers, XmbufQueryExtension, XCOMM -- XmbufCreateBuffers). XCOMM -- NOTE_8: HP-UX machines need to comment this out. @@ -69,7 +69,7 @@ XCOMM XCOMM ########### XCOMM -@@ -470,7 +470,7 @@ +@@ -470,7 +470,7 @@ PROGRAMS = $(XANIM) PROGRAMS = $(XANIM) diff --git a/multimedia/xanim/files/patch-xa_audio.h b/multimedia/xanim/files/patch-xa_audio.h index c31651a74fbe..6538448debd6 100644 --- a/multimedia/xanim/files/patch-xa_audio.h +++ b/multimedia/xanim/files/patch-xa_audio.h @@ -1,6 +1,6 @@ ---- xa_audio.h.old Thu Apr 11 08:48:39 2002 -+++ xa_audio.h Thu Apr 11 08:49:25 2002 -@@ -139,7 +139,11 @@ +--- xa_audio.h.orig 1999-03-21 22:36:25 UTC ++++ xa_audio.h +@@ -139,7 +139,11 @@ extern xaULONG xa_forkit; #define _FILE_DSP "/dev/dsp" #define _FILE_MIXER "/dev/mixer" #ifdef __FreeBSD__ diff --git a/multimedia/xanim/files/patch-xa_color.c b/multimedia/xanim/files/patch-xa_color.c new file mode 100644 index 000000000000..178ff59d3192 --- /dev/null +++ b/multimedia/xanim/files/patch-xa_color.c @@ -0,0 +1,10 @@ +--- xa_color.c.orig 1999-03-21 22:36:25 UTC ++++ xa_color.c +@@ -2606,6 +2606,7 @@ xaULONG image_type; + + void *YUV2x2_Blk_Func(image_type,blks,dith_flag) + xaULONG image_type; ++xaULONG blks; + xaULONG dith_flag; + { void (*color_func)(); + if (blks == 1) diff --git a/multimedia/xanim/files/patch-xa_fli.c b/multimedia/xanim/files/patch-xa_fli.c new file mode 100644 index 000000000000..4921ad6e6b29 --- /dev/null +++ b/multimedia/xanim/files/patch-xa_fli.c @@ -0,0 +1,11 @@ +--- xa_fli.c.orig 1999-03-21 22:36:25 UTC ++++ xa_fli.c +@@ -126,7 +126,7 @@ Fli_Frame_Header *frame_hdr; + DEBUG_LEVEL1 fprintf(stderr," magic = %02x%02x\n",(int)tmp[5],(int)tmp[4]); + while( !( (tmp[5]==0xf1) && ((tmp[4]==0xfa) || (tmp[4] == 0x00)) ) ) + { +- for(i=0;i<6;i++) tmp[i] = tmp[i+1]; ++ for(i=0;i<4;i++) tmp[i] = tmp[i+1]; + tmp[5] = (xaUBYTE)xin->Read_U8(xin); + if (xin->At_EOF(xin,10)) return(0); + } diff --git a/multimedia/xanim/files/patch-xa_g72x.c b/multimedia/xanim/files/patch-xa_g72x.c new file mode 100644 index 000000000000..45fe554f751a --- /dev/null +++ b/multimedia/xanim/files/patch-xa_g72x.c @@ -0,0 +1,11 @@ +--- xa_g72x.c.orig 1999-03-21 22:36:25 UTC ++++ xa_g72x.c +@@ -32,6 +32,8 @@ + + #include "xa_g72x.h" + ++#include ++ + static short power2[15] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80, + 0x100, 0x200, 0x400, 0x800, 0x1000, 0x2000, 0x4000}; + diff --git a/multimedia/xanim/files/patch-xa_input.c b/multimedia/xanim/files/patch-xa_input.c index d0d03eb48c8a..a471f53d29a2 100644 --- a/multimedia/xanim/files/patch-xa_input.c +++ b/multimedia/xanim/files/patch-xa_input.c @@ -1,6 +1,6 @@ ---- xa_input.c.orig Sun Mar 21 23:36:25 1999 -+++ xa_input.c Thu Jun 7 15:02:43 2007 -@@ -1025,28 +1025,28 @@ +--- xa_input.c.orig 1999-03-21 22:36:25 UTC ++++ xa_input.c +@@ -1025,28 +1025,28 @@ char *machine, *user_cmd, *passwd_cmd, *file_cmd; memset(&data,0,sizeof(data)); memset(&from,0,sizeof(from)); if (gethostname(hostname, sizeof(hostname)) < 0) @@ -36,7 +36,7 @@ /* POD add support for PORT command? */ addr = (xaUBYTE *) (&data.sin_addr); -@@ -1059,15 +1059,15 @@ +@@ -1059,15 +1059,15 @@ char *machine, *user_cmd, *passwd_cmd, *file_cmd; if (xa_ftp_send_cmd(xin, port_cmd, &retcode) == xaFALSE) { fprintf(stderr,"FTP: send cmd err\n"); diff --git a/multimedia/xanim/files/patch-xa_vid_codec.c b/multimedia/xanim/files/patch-xa_vid_codec.c index 36e13f53bb22..470d92ba5459 100644 --- a/multimedia/xanim/files/patch-xa_vid_codec.c +++ b/multimedia/xanim/files/patch-xa_vid_codec.c @@ -1,6 +1,6 @@ ---- xa_vid_codec.c.orig Sun Apr 21 01:20:46 2002 -+++ xa_vid_codec.c Thu Jan 2 07:30:36 2003 -@@ -169,7 +169,9 @@ +--- xa_vid_codec.c.orig 2002-04-20 23:20:46 UTC ++++ xa_vid_codec.c +@@ -169,7 +169,9 @@ static void Check_For_Video_Modules() if ((mod_path == 0) || (*mod_path==0)) mod_path = "/usr/local/xanim/mods"; @@ -10,7 +10,7 @@ len = strlen( mod_path ); what_fun = (double)cos(45.0); -@@ -186,7 +188,9 @@ +@@ -186,7 +188,9 @@ static void Check_For_Video_Modules() dp = path_buf; @@ -20,7 +20,7 @@ while( dp && *dp ) { char *t1p, *t2p; -@@ -211,10 +215,14 @@ +@@ -211,10 +215,14 @@ char *dir_name; char *end_of_dir; int len; @@ -35,3 +35,11 @@ DEBUG_LEVEL1 fprintf(stderr,"dirname: %s\n", dir_name ); +@@ -416,6 +424,7 @@ CODEC_LIST **list; + ****--------------------------------------------------------------------****/ + static void Video_Add_Codec_To_List( list, id, init_func, dec_func) + CODEC_LIST **list; ++xaULONG id; + xaLONG (*init_func)(); + xaULONG (*dec_func)(); + { diff --git a/multimedia/xanim/pkg-descr b/multimedia/xanim/pkg-descr index 415cc250f6e9..c26cecb66d38 100644 --- a/multimedia/xanim/pkg-descr +++ b/multimedia/xanim/pkg-descr @@ -2,50 +2,15 @@ XAnim is a program that can display animations of various formats on systems running X11. XAnim currently supports the following animation types: - + FLI animations. - + FLC animations. - + IFF animations. The following features are sup- - ported: - -> Compressions 3,5,7,J(movies) and l(small - L). - -> Color cycling during single images and - anims. - -> Display Modes: depth 1-8, EHB, HAM and - HAM8. - + GIF87a and GIF89a files. - -> single and multiple images supported. - -> GIF89a animation extensions supported. - + GIF89a animation extension support. - + a kludgy text file listing gifs and what order - to show them in. - + DL animations. Formats 1, 2 and partial 3. - + Amiga PFX(PageFlipper Plus F/X) animations. TEMP - DISABLED - + Amiga MovieSetter animations(For those Eric - Schwartz fans). - + Utah Raster Toolkit RLE images and anims. - + AVI animations. Currently supported are - -> IBM Ultimotion (ULTI) depth 16. - -> JPEG (JPEG) depth 24. - images. - + MPEG animations. Currently only Type I Frames - are displayed. Type B and Type P frames are cur- - rently ignored, but will be added in future - revs. - + WAV audio files may have their sound added to - any animation type that doesn't already have - audio, by specifying the .wav file after the - animation file on the command line. Currently - only the PCM audio codec is supported. - + any combination of the above on the same command - line. +FLI animations, FLC animations, IFF animations, +GIF87a, GIF89a, GIF89a animation extension +DL animations, Amiga PFX(PageFlipper Plus F/X) animations, +Amiga MovieSetter animations (For Eric Schwartz fans), +Utah Raster Toolkit RLE images and animations, +AVI animations, MPEG animations, WAV audio files XAnim also provides various options that allow the user to alter colormaps, playback speeds, looping modes and can provide on-the-fly scaling of animations with the mouse. LICENSE: freely used, copied and redistributed without fee for non-commerical purposes - -( http://xanim.va.pubnix.com/home.html ) -( http://xanim.resnet.gatech.edu/home.html ) -( http://smurfland.cit.buffalo.edu/xanim/home.html )