audio/gbsplay: Update to 0.0.95

freebsd · Jan 27, 2024 · 798b1e3 · 798b1e3
1 parent 660aacf
commit 798b1e3
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 29 deletions.
diff --git a/audio/gbsplay/Makefile b/audio/gbsplay/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gbsplay
-DISTVERSION=	0.0.94
-PORTREVISION=	1
+DISTVERSION=	0.0.95
 PORTEPOCH=	1
 CATEGORIES=	audio
 
@@ -11,36 +10,46 @@ WWW=		https://github.com/mmitch/gbsplay
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
+BUILD_DEPENDS=	bash:shells/bash
+
 USES=		compiler:c++11-lib desktop-file-utils gmake localbase:ldflags \
 		shared-mime-info
 USE_CSTD=	gnu89
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mmitch
 
-HAS_CONFIGURE=	yes
+HAS_CONFIGURE=			yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/share/man \
 			--prefix=${PREFIX} \
-			--sysconfdir=${PREFIX}/etc \
-			--without-xmmsplugin
+			--sysconfdir=${PREFIX}/etc
 
 MAKE_ENV+=	EXAMPLESDIR="${STAGEDIR}${EXAMPLESDIR}"
 
+CFLAGS+=	-D__BSD_VISIBLE=1
+
 CONFLICTS_INSTALL=	mate-control-center # share/applications/mimeinfo.cache
 
-OPTIONS_DEFINE=		BASH_COMPLETIONS DOCS EXAMPLES NAS NLS
+OPTIONS_DEFINE=		ALSA BASH_COMPLETIONS DOCS EXAMPLES NAS NLS PULSEAUDIO \
+			SDL
 OPTIONS_DEFAULT=	BASH_COMPLETIONS
 OPTIONS_SUB=		yes
 
 BASH_COMPLETIONS_DESC=	Install bash completions
 
-NAS_LIB_DEPENDS=	libaudio.so:audio/nas
-NAS_CONFIGURE_ENABLE=	nas
-NLS_USES=		gettext
-NLS_CONFIGURE_OFF=	--disable-i18n
-NLS_LDFLAGS=		-lintl
+ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
+ALSA_CONFIGURE_OFF=		--disable-alsa
+NAS_LIB_DEPENDS=		libaudio.so:audio/nas
+NAS_CONFIGURE_ENABLE=		nas
+NLS_USES=			gettext
+NLS_CONFIGURE_OFF=		--disable-i18n
+NLS_LDFLAGS=			-lintl
+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
+PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
+SDL_USES=			sdl2
+SDL_CONFIGURE_OFF=		--disable-sdl
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/\(gbsplayrc\)|${PREFIX}/etc/\1|" \
@@ -50,7 +59,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/gbsplayrc_sample \
 		${STAGEDIR}${PREFIX}/etc/gbsplayrc.sample
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gbsplay \
-		${STAGEDIR}${PREFIX}/bin/gbsinfo
+		${STAGEDIR}${PREFIX}/bin/gbsinfo ${STAGEDIR}${PREFIX}/bin/gbs2gb
 
 post-install-BASH_COMPLETIONS-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d

diff --git a/audio/gbsplay/distinfo b/audio/gbsplay/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593188134
-SHA256 (mmitch-gbsplay-0.0.94_GH0.tar.gz) = 8a4c66d97914ac8597c79d98f819874d516769542f36c98cf9daa5d463f435d5
-SIZE (mmitch-gbsplay-0.0.94_GH0.tar.gz) = 136589
+TIMESTAMP = 1706357471
+SHA256 (mmitch-gbsplay-0.0.95_GH0.tar.gz) = a922aa98ecaad3676f5a42b89f3fad3b9aef6aa8ac13dcdfabf994aadbea7c1c
+SIZE (mmitch-gbsplay-0.0.95_GH0.tar.gz) = 196028
diff --git a/audio/gbsplay/files/patch-Makefile b/audio/gbsplay/files/patch-Makefile
@@ -1,21 +1,21 @@
---- Makefile.orig	2018-12-25 13:50:45 UTC
+--- Makefile.orig	2024-01-25 22:32:28 UTC
 +++ Makefile
-@@ -71,7 +71,7 @@ xmmsdir     := $(DESTDIR)$(XMMSPREFIX)$(XMMS_INPUT_PLU
- man1dir     := $(mandir)/man1
+@@ -69,7 +69,7 @@ contribdir  := $(docdir)/contrib
+ man3dir     := $(mandir)/man3
  man5dir     := $(mandir)/man5
  contribdir  := $(docdir)/contrib
 -exampledir  := $(docdir)/examples
 +exampledir  := $(EXAMPLESDIR)
 
  DISTDIR := gbsplay-$(VERSION)
 
-@@ -82,10 +82,10 @@ GBSPLAYLDFLAGS :=
+@@ -86,10 +86,10 @@ export Q VERBOSE CC HOSTCC BUILDCC GBSCFLAGS GBSLDFLAG
 
  export Q VERBOSE CC HOSTCC BUILDCC GBSCFLAGS GBSLDFLAGS
 
--docs               := README HISTORY COPYRIGHT
-+docs               := README
- docs-dist          := INSTALL CODINGSTYLE TESTSUITE gbsformat.txt
+-docs               := README.md HISTORY COPYRIGHT
++docs               := README.md
+ docs-dist          := INSTALL.md CODINGSTYLE gbsformat.txt
 -contribs           := contrib/gbs2ogg.sh contrib/gbsplay.bashcompletion
 -examples           := examples/nightmode.gbs examples/gbsplayrc_sample
 +contribs           := contrib/gbs2ogg.sh

diff --git a/audio/gbsplay/files/patch-configure b/audio/gbsplay/files/patch-configure
@@ -1,14 +1,14 @@
---- configure.orig	2018-12-25 13:50:45 UTC
+--- configure.orig	2024-01-25 22:32:28 UTC
 +++ configure
-@@ -669,7 +669,6 @@ fi
+@@ -732,7 +732,6 @@ fi
 
  ## check for various headers
 
 -need_include inttypes.h
 
- if [ "$use_devdsp" != no ]; then
-     remember_use devdsp
-@@ -729,11 +728,11 @@ fi
+ if [ "$use_zlib" != no ]; then
+     remember_use zlib
+@@ -816,11 +815,11 @@ if [ "$use_nas" != no ]; then
 
  if [ "$use_nas" != no ]; then
      remember_use nas
@@ -22,7 +22,7 @@
  int main(int argc, char **argv) { return 0; }
  EOF
          retval2=$?
-@@ -954,7 +953,7 @@ append_nodupe CFLAGS -D_FORTIFY_SOURCE=2 -Wall -fsigne
+@@ -1138,7 +1137,7 @@ else
  if [ "$use_debug" = "yes" ]; then
      append_nodupe CFLAGS -g3
  else

diff --git a/audio/gbsplay/pkg-plist b/audio/gbsplay/pkg-plist
@@ -1,3 +1,4 @@
+bin/gbs2gb
 bin/gbsinfo
 bin/gbsplay
 @sample etc/gbsplayrc.sample
@@ -7,7 +8,7 @@ share/man/man1/gbsplay.1.gz
 share/man/man5/gbsplayrc.5.gz
 share/applications/gbsplay.desktop
 share/applications/mimeinfo.cache
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/contrib/gbs2ogg.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nightmode.gbs
 %%NLS%%share/locale/de/LC_MESSAGES/gbsplay.mo