svn commit: r518637 - in head/audio/ocp: . files

Emanuel Haupt ehaupt at FreeBSD.org
Fri Nov 29 09:17:55 UTC 2019 

Author: ehaupt
Date: Fri Nov 29 09:17:53 2019
New Revision: 518637
URL: https://svnweb.freebsd.org/changeset/ports/518637

Log:
  - Update to 0.2.0
  - Drop sdl1 option in favour of sdl2
  - Make alsa support an option
  - Make oss support an option

Added:
  head/audio/ocp/files/patch-playogg_oggplay.c   (contents, props changed)
Deleted:
  head/audio/ocp/files/patch-Makefile.in
  head/audio/ocp/files/patch-configure
  head/audio/ocp/files/patch-doc_texi_Makefile
Modified:
  head/audio/ocp/Makefile
  head/audio/ocp/distinfo
  head/audio/ocp/pkg-plist

Modified: head/audio/ocp/Makefile
==============================================================================
--- head/audio/ocp/Makefile	Fri Nov 29 09:07:24 2019	(r518636)
+++ head/audio/ocp/Makefile	Fri Nov 29 09:17:53 2019	(r518637)
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	ocp
-PORTVERSION=	0.1.21
-PORTREVISION=	5
+PORTVERSION=	0.2.0
 PORTEPOCH=	1
 CATEGORIES=	audio
-MASTER_SITES=	SF/opencubicplayer/${DISTNAME} \
+MASTER_SITES=	https://stian.cubic.org/ocp/ \
 		LOCAL/ehaupt
 
 MAINTAINER=	ehaupt at FreeBSD.org
@@ -33,7 +32,6 @@ INSTALLS_ICONS=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 CONFIGURE_ARGS=	--with-dir-suffix="" \
-		--without-alsa \
 		--libdir=${PREFIX}/lib
 CONFIGURE_ENV=	SHARED_FLAGS="${LDFLAGS} -shared"
 
@@ -41,8 +39,8 @@ INFO=		ocp
 
 TIMIDITY_CFG=	${LOCALBASE}/share/timidity/timidity.cfg
 
-OPTIONS_DEFINE=	ADPLUG FLAC MIDI X11 SDL DOCS
-OPTIONS_DEFAULT=ADPLUG FLAC MIDI X11 SDL
+OPTIONS_DEFINE=	ADPLUG ALSA FLAC MIDI OSS X11 SDL DOCS
+OPTIONS_DEFAULT=ADPLUG ALSA FLAC MIDI OSS X11 SDL
 OPTIONS_SUB=	yes
 
 ADPLUG_DESC=	adplug support
@@ -52,15 +50,20 @@ ADPLUG_CONFIGURE_WITH=	adplug
 ADPLUG_LIB_DEPENDS=	libbinio.so:devel/libbinio \
 			libadplug.so:audio/libadplug
 
+ALSA_CONFIGURE_WITH=	alsa
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+
 FLAC_CONFIGURE_WITH=	flac
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 
 MIDI_RUN_DEPENDS=	eawpats>0:audio/eawpats
 
-SDL_CONFIGURE_WITH=	sdl
+OSS_CONFIGURE_WITH=	oss
+
+SDL_CONFIGURE_WITH=	sdl2
 SDL_PLIST_SUB=		DESKTOP=''
 SDL_PLIST_SUB_OFF=	DESKTOP='@comment '
-SDL_USE=		SDL=sdl
+SDL_USE=		SDL=sdl2
 
 X11_CONFIGURE_WITH=	x11
 X11_PLIST_SUB=		XORG='' DESKTOP=''
@@ -72,15 +75,6 @@ SDL_USES=	desktop-file-utils sdl
 X11_USES=	desktop-file-utils xorg
 
 LDFLAGS_i386=	-Wl,-z,notext
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/.*\.cfg|${TIMIDITY_CFG}|' \
-		${WRKSRC}/playgmi/gmitimidity.c
-# conflicts with fnmatch.h from security/heimdal
-	@${REINPLACE_CMD} -e 's|<\(fnmatch.h\)>|"/usr/include/\1"|' \
-		${WRKSRC}/filesel/adb.c \
-		${WRKSRC}/filesel/pfilesel.c
-	@${REINPLACE_CMD} -e '1s|bash|sh|' ${WRKSRC}/ultrafix.sh
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ocp

Modified: head/audio/ocp/distinfo
==============================================================================
--- head/audio/ocp/distinfo	Fri Nov 29 09:07:24 2019	(r518636)
+++ head/audio/ocp/distinfo	Fri Nov 29 09:17:53 2019	(r518637)
@@ -1,2 +1,3 @@
-SHA256 (ocp-0.1.21.tar.xz) = 000097bd4e6b83640389d6e5002983b1c89d60da3b033ce4b31b06f6e7c758e5
-SIZE (ocp-0.1.21.tar.xz) = 627500
+TIMESTAMP = 1574955492
+SHA256 (ocp-0.2.0.tar.xz) = f077ed44c2d2522e52d9589f5e172590bdc917d383f637ab1cd4bb3f8373769e
+SIZE (ocp-0.2.0.tar.xz) = 1966552

Added: head/audio/ocp/files/patch-playogg_oggplay.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/ocp/files/patch-playogg_oggplay.c	Fri Nov 29 09:17:53 2019	(r518637)
@@ -0,0 +1,11 @@
+--- playogg/oggplay.c.orig	2019-11-26 21:41:03 UTC
++++ playogg/oggplay.c
+@@ -136,7 +136,7 @@ static void oggIdler(void)
+ 		}
+ 		if (ov_pcm_tell(&ov)!=oggpos)
+ 		{
+-			fprintf (stderr, "[playogg]: warning, frame position is broken in file (got=%" __PRI64_PREFIX "d, expected= %" __PRI64_PREFIX "d)\n", ov_pcm_tell(&ov), oggpos);
++			fprintf (stderr, "[playogg]: warning, frame position is broken in file (got=%\" __PRI64_PREFIX \"d, expected= %\" __PRI64_PREFIX \"d)\n", ov_pcm_tell(&ov), oggpos);
+ 		}
+ 
+ 		ringbuffer_get_head_samples (oggbufpos, &pos1, &length1, &pos2, &length2);

Modified: head/audio/ocp/pkg-plist
==============================================================================
--- head/audio/ocp/pkg-plist	Fri Nov 29 09:07:24 2019	(r518636)
+++ head/audio/ocp/pkg-plist	Fri Nov 29 09:17:53 2019	(r518637)
@@ -1,10 +1,7 @@
 bin/ocp
 bin/ocp-curses
+%%SDL%%bin/ocp-sdl2
 %%XORG%%bin/ocp-x11
-%%SDL%%bin/ocp-sdl
-%%SDL%%lib/ocp/devpsdl.so
-bin/ultrafix.sh
-lib/ocp/autoload/10-compat.so
 lib/ocp/autoload/10-devi.so
 lib/ocp/autoload/10-hardware.so
 lib/ocp/autoload/10-mchasm.so
@@ -18,21 +15,23 @@ lib/ocp/autoload/25-pfilesel.so
 lib/ocp/autoload/30-arctar.so
 lib/ocp/autoload/30-arczip.so
 lib/ocp/autoload/30-aytype.so
+%%FLAC%%lib/ocp/autoload/30-flacptype.so
 lib/ocp/autoload/30-fstypes.so
 lib/ocp/autoload/30-mcpbase.so
+%%ADPLUG%%lib/ocp/autoload/30-opltype.so
 lib/ocp/autoload/30-playsid.so
 lib/ocp/autoload/30-plrbase.so
 lib/ocp/autoload/30-smpbase.so
 lib/ocp/autoload/30-ymtype.so
 lib/ocp/autoload/35-cpiface.so
 lib/ocp/autoload/40-cphlpif.so
-%%FLAC%%lib/ocp/autoload/30-flacptype.so
-%%ADPLUG%%lib/ocp/autoload/30-opltype.so
+%%ALSA%%lib/ocp/devpalsa.so
 lib/ocp/devpdisk.so
 lib/ocp/devpnone.so
-lib/ocp/devposs.so
+%%OSS%%lib/ocp/devposs.so
+%%SDL%%lib/ocp/devpsdl2.so
 lib/ocp/devsnone.so
-lib/ocp/devsoss.so
+%%OSS%%lib/ocp/devsoss.so
 lib/ocp/devwmix.so
 lib/ocp/devwmixf.so
 lib/ocp/devwnone.so
@@ -45,20 +44,23 @@ lib/ocp/loadmtm.so
 lib/ocp/loadokt.so
 lib/ocp/loadptm.so
 lib/ocp/loads3m.so
+lib/ocp/loadstm.so
 lib/ocp/loadult.so
 lib/ocp/medialib.so
 lib/ocp/playay.so
+%%FLAC%%lib/ocp/playflac.so
 lib/ocp/playgmd.so
-lib/ocp/playgmi.so
+lib/ocp/playhvl.so
 lib/ocp/playit.so
 lib/ocp/playmp2.so
 lib/ocp/playogg.so
+%%ADPLUG%%lib/ocp/playopl.so
 lib/ocp/playsid.so
+lib/ocp/playtimidity.so
 lib/ocp/playwav.so
 lib/ocp/playxm.so
 lib/ocp/playym.so
-%%FLAC%%lib/ocp/playflac.so
-%%ADPLUG%%lib/ocp/playopl.so
+%%DESKTOP%%share/applications/cubic.org-opencubicplayer.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
@@ -70,17 +72,13 @@ lib/ocp/playym.so
 %%PORTDOCS%%%%DOCSDIR%%/html/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/html/fileselector.html
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/install.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mdz.html
 %%PORTDOCS%%%%DOCSDIR%%/html/player.html
-%%PORTDOCS%%%%DOCSDIR%%/html/plugin.html
 %%PORTDOCS%%%%DOCSDIR%%/html/specialdrive.html
 %%PORTDOCS%%%%DOCSDIR%%/html/starting.html
 %%PORTDOCS%%%%DOCSDIR%%/html/support.html
 %%PORTDOCS%%%%DOCSDIR%%/html/wap.html
 %%XORG%%share/icons/hicolor/16x16/apps/opencubicplayer.xpm
 %%XORG%%share/icons/hicolor/48x48/apps/opencubicplayer.xpm
-%%DESKTOP%%share/applications/cubic.org-opencubicplayer.desktop
 %%DATADIR%%/data/ocp.hlp
 %%DATADIR%%/etc/ocp.ini
- at dir %%DATADIR%%/ultradir

More information about the svn-ports-head mailing list