Index: head/audio/ocp/Makefile =================================================================== --- head/audio/ocp/Makefile (revision 518636) +++ head/audio/ocp/Makefile (revision 518637) @@ -1,90 +1,84 @@ # Created by: Emanuel Haupt # $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@FreeBSD.org COMMENT= Legendary Open Cubic Player LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libid3tag.so:audio/libid3tag \ libmad.so:audio/libmad \ libvorbis.so:audio/libvorbis \ libsidplay.so:audio/libsidplay \ libogg.so:audio/libogg USES= gmake gnome iconv localbase:ldflags makeinfo ncurses pkgconfig \ tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALLS_ICONS= yes MAKE_JOBS_UNSAFE= yes CONFIGURE_ARGS= --with-dir-suffix="" \ - --without-alsa \ --libdir=${PREFIX}/lib CONFIGURE_ENV= SHARED_FLAGS="${LDFLAGS} -shared" 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 MIDI_DESC= timidity support 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='' X11_PLIST_SUB_OFF= XORG='@comment ' DESKTOP='@comment ' X11_USE= XORG=xxf86dga,xxf86vm,xpm,xext,x11 # needed despite stage-qa's warning 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 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocp/*.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocp/autoload/*.so .include Index: head/audio/ocp/distinfo =================================================================== --- head/audio/ocp/distinfo (revision 518636) +++ head/audio/ocp/distinfo (revision 518637) @@ -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 Index: head/audio/ocp/files/patch-configure =================================================================== --- head/audio/ocp/files/patch-configure (revision 518636) +++ head/audio/ocp/files/patch-configure (nonexistent) @@ -1,19 +0,0 @@ ---- configure.orig 2011-11-17 21:46:08 UTC -+++ configure -@@ -4442,7 +4442,6 @@ case "$target" in - with_desktop_file_install=no - ;; - *) -- SHARED_FLAGS=-shared - LIB_SUFFIX=.so - PTHREAD_LIBS=-pthread - ;; -@@ -4589,7 +4588,7 @@ else - '') - as_fn_error $? "not found" "$LINENO" 5; - ;; -- 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*) -+ 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*|[5-9].*) - _cc_major=`echo $cc_version | cut -d '.' -f 1` - _cc_minor=`echo $cc_version | cut -d '.' -f 2` - _cc_mini=`echo $cc_version | cut -d '.' -f 3` Property changes on: head/audio/ocp/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/ocp/files/patch-doc_texi_Makefile =================================================================== --- head/audio/ocp/files/patch-doc_texi_Makefile (revision 518636) +++ head/audio/ocp/files/patch-doc_texi_Makefile (nonexistent) @@ -1,13 +0,0 @@ ---- doc/texi/Makefile.orig 2011-11-17 21:46:08 UTC -+++ doc/texi/Makefile -@@ -19,8 +19,8 @@ install: all - mkdir -p "$(DESTDIR)$(INFODIR)" - $(CP) ocp.info.gz "$(DESTDIR)$(INFODIR)" - install-info --dir-file="$(DESTDIR)$(INFODIR)/dir" "$(DESTDIR)$(INFODIR)/ocp.info.gz" || true -- mkdir -p "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)/html" -- $(CP) -R ocp.html/* "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)/html" -+ $(DOCS)mkdir -p "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)/html" -+ $(DOCS)$(CP) -R ocp.html/* "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)/html" - uninstall: - install-info --delete --dir-file="$(DESTDIR)$(INFODIR)/dir" "$(DESTDIR)$(INFODIR)/ocp.info.gz" - rm -f "$(DESTDIR)$(INFODIR)/ocp.info.gz" Property changes on: head/audio/ocp/files/patch-doc_texi_Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/ocp/files/patch-Makefile.in =================================================================== --- head/audio/ocp/files/patch-Makefile.in (revision 518636) +++ head/audio/ocp/files/patch-Makefile.in (nonexistent) @@ -1,13 +0,0 @@ ---- Makefile.in.orig 2011-11-17 21:46:08 UTC -+++ Makefile.in -@@ -35,8 +35,8 @@ endif - - - install: all -- mkdir -p "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)" -- $(CP) AUTHORS BUGS COPYING CREDITS KEYBOARD_REMAPS SUID TODO "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)" -+ $(DOCS)mkdir -p "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)" -+ $(DOCS)$(CP) AUTHORS BUGS COPYING CREDITS KEYBOARD_REMAPS SUID TODO "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)" - mkdir -p "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)/data" - $(CP) ocp.hlp "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)/data" - mkdir -p "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)/etc" Property changes on: head/audio/ocp/files/patch-Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/ocp/files/patch-playogg_oggplay.c =================================================================== --- head/audio/ocp/files/patch-playogg_oggplay.c (nonexistent) +++ head/audio/ocp/files/patch-playogg_oggplay.c (revision 518637) @@ -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); Property changes on: head/audio/ocp/files/patch-playogg_oggplay.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/ocp/pkg-plist =================================================================== --- head/audio/ocp/pkg-plist (revision 518636) +++ head/audio/ocp/pkg-plist (revision 518637) @@ -1,86 +1,84 @@ 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 lib/ocp/autoload/10-mixclip.so lib/ocp/autoload/10-sets.so lib/ocp/autoload/11-framelock.so lib/ocp/autoload/12-poutput.so lib/ocp/autoload/15-keyhelp.so lib/ocp/autoload/20-cphelper.so 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 lib/ocp/libocp.so lib/ocp/load669.so lib/ocp/loadams.so lib/ocp/loaddmf.so lib/ocp/loadmdl.so 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 %%PORTDOCS%%%%DOCSDIR%%/CREDITS %%PORTDOCS%%%%DOCSDIR%%/KEYBOARD_REMAPS %%PORTDOCS%%%%DOCSDIR%%/SUID %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/html/configuration.html %%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 -@dir %%DATADIR%%/ultradir