Re: UPDATE: moc

On Sun, Nov 24, 2024 at 12:43:16PM +0000, Stuart Henderson wrote:
> $ pkg_check-version moc-2.6.a3 moc-2.6.0 moc-2.6.1 moc-2.5.2
> moc-*- sorted: moc-2.5.2 moc-2.6.0 moc-2.6.1 moc-2.6.a3
>
> moc-2.6alpha3 would work better

Updated the PKGNAME.


Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/moc/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- Makefile 21 Nov 2024 07:00:52 -0000 1.31
+++ Makefile 25 Nov 2024 01:58:54 -0000
@@ -1,23 +1,26 @@
COMMENT = console audio player
-DISTNAME = moc-2.5.2
+
+DIST_TUPLE+= gitlab tomaszg mocp fb0a63b564b40fa861204e2f804b696c6ee573da .
+PKGNAME = moc-2.6alpha3
CATEGORIES = audio
-HOMEPAGE = https://moc.daper.net/
-SITES = https://ftp.daper.net/pub/soft/moc/stable/ \
- https://distfiles.sigtrap.nl/
-EXTRACT_SUFX = .tar.bz2
-REVISION = 12

# GPLv3+
PERMIT_PACKAGE = Yes

# uses pledge()
-WANTLIB += ${COMPILER_LIBCXX} FLAC c crypto curl curses db faad
-WANTLIB += iconv id3tag ltdl m mad magic modplug mp3lame mpcdec
-WANTLIB += mpg123 nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_quictls
-WANTLIB += ogg opus samplerate sndfile sndio speex ssl tag tag_c
-WANTLIB += vorbis vorbisenc vorbisfile wavpack z
+WANTLIB += ${COMPILER_LIBCXX} FLAC X11 X11-xcb Xext Xfixes aom
+WANTLIB += avcodec avformat avutil bz2 c crypto curl curses dav1d
+WANTLIB += drm faad gsm iconv id3tag intl ltdl lzma m mad magic
+WANTLIB += modplug mp3lame mpcdec mpg123 nghttp2 nghttp3 ngtcp2
+WANTLIB += ngtcp2_crypto_quictls ogg opus popt samplerate sndfile
+WANTLIB += sndio speex ssl swresample tag tag_c theoradec theoraenc
+WANTLIB += va va-drm va-x11 vorbis vorbisenc vorbisfile vpx wavpack
+WANTLIB += x264 x265 xcb xcb-dri3 xml2 xvidcore z
+
+COMPILER = base-clang ports-gcc

-COMPILER = base-clang ports-gcc base-gcc
+RUN_DEPENDS+= devel/desktop-file-utils \
+ x11/gtk+4,-guic

LIB_DEPENDS = audio/faad \
audio/flac \
@@ -36,30 +39,32 @@ LIB_DEPENDS = audio/faad \
audio/taglib \
audio/wavpack \
converters/libiconv \
- databases/db/v4 \
devel/libmagic \
devel/libtool,-ltdl \
- net/curl \
- net/ngtcp2 \
- www/nghttp2 \
- www/nghttp3
+ devel/popt \
+ graphics/ffmpeg \
+ net/curl

+AUTOCONF_VERSION= 2.71
+AUTOMAKE_VERSION= 1.16
SEPARATE_BUILD = Yes
-
-CONFIGURE_STYLE = gnu
+CONFIGURE_STYLE = autoreconf
CONFIGURE_ARGS += \
- --with-sndio \
+ --disable-cache \
--without-jack \
--without-oss \
--without-alsa \
+ --without-mpg123 \
+ --without-mpris \
+ --without-opus \
+ --without-pulse \
--without-rcc \
--without-included-ltdl \
--without-timidity \
- --without-ffmpeg \
--with-magic \
--with-ltdl-include=${LOCALBASE}/include \
--with-ltdl-lib=${LOCALBASE}/lib
-CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/db4" \
+CONFIGURE_ENV = CPPFLAGS="-Wno-unused-but-set-parameter -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

pre-install:
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/moc/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 18 Nov 2017 12:01:14 -0000 1.2
+++ distinfo 25 Nov 2024 01:58:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (moc-2.5.2.tar.bz2) = 86aBFWAqR4i3z6m76Tl6nV4kxoy2GldpXRwsPs9J2wg=
-SIZE (moc-2.5.2.tar.bz2) = 602728
+SHA256 (tomaszg-mocp-fb0a63b564b40fa861204e2f804b696c6ee573da.tar.gz) = 0vVH+wk+UGP9Ag7nk+8QAKhSL0W4NwMQ8yok5DyyKIo=
+SIZE (tomaszg-mocp-fb0a63b564b40fa861204e2f804b696c6ee573da.tar.gz) = 703656
Index: patches/patch-config_example_in
===================================================================
RCS file: /cvs/ports/audio/moc/patches/patch-config_example_in,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-config_example_in
--- patches/patch-config_example_in 11 Mar 2022 18:20:18 -0000 1.3
+++ patches/patch-config_example_in 25 Nov 2024 01:58:54 -0000
@@ -3,7 +3,7 @@ Remove audio choices that are irrelevant
Index: config.example.in
--- config.example.in.orig
+++ config.example.in
-@@ -121,32 +121,10 @@
+@@ -140,32 +140,10 @@
#
#HTTPProxy =

@@ -35,5 +35,5 @@ Index: config.example.in
-#ALSAMixer1 = PCM
-#ALSAMixer2 = Master

- # Under some circumstances on 32-bit systems, audio played continously
- # for long periods of time may begin to stutter. Setting this option to
+ # Save software mixer state?
+ # If enabled, a file 'softmixer' will be created in '~/.moc/' storing the
Index: patches/patch-decoder_plugins_ffmpeg_ffmpeg_c
===================================================================
RCS file: patches/patch-decoder_plugins_ffmpeg_ffmpeg_c
diff -N patches/patch-decoder_plugins_ffmpeg_ffmpeg_c
--- patches/patch-decoder_plugins_ffmpeg_ffmpeg_c 11 Mar 2022 18:20:18 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-Maint: Migrate to FFmpeg/LibAV's AV_-prefixed #defines.
-
-Index: decoder_plugins/ffmpeg/ffmpeg.c
---- decoder_plugins/ffmpeg/ffmpeg.c.orig
-+++ decoder_plugins/ffmpeg/ffmpeg.c
-@@ -984,7 +984,7 @@ static void *ffmpeg_open (const char *file)
- * FFmpeg/LibAV in use. For some versions this will be caught in
- * *_find_stream_info() above and misreported as an unfound codec
- * parameters error. */
-- if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+ if (data->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
- decoder_error (&data->error, ERROR_FATAL, 0,
- "The codec is experimental and may damage MOC: %s",
- data->codec->name);
-@@ -993,8 +993,8 @@ static void *ffmpeg_open (const char *file)
-