Index: head/audio/ocp/Makefile =================================================================== --- head/audio/ocp/Makefile (revision 537571) +++ head/audio/ocp/Makefile (revision 537572) @@ -1,89 +1,107 @@ # Created by: Emanuel Haupt # $FreeBSD$ PORTNAME= ocp -PORTVERSION= 0.2.1 +PORTVERSION= 0.2.2 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= audio MAINTAINER= ehaupt@FreeBSD.org COMMENT= Legendary Open Cubic Player LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 i386 powerpc64 +BUILD_DEPENDS= xa65:devel/xa65 LIB_DEPENDS= libid3tag.so:audio/libid3tag \ libmad.so:audio/libmad \ - libvorbis.so:audio/libvorbis \ + libogg.so:audio/libogg \ libsidplay.so:audio/libsidplay \ - libogg.so:audio/libogg + libvorbis.so:audio/libvorbis USES= gmake gnome iconv localbase:ldflags makeinfo ncurses pkgconfig \ tar:xz -USE_LDCONFIG= yes -GNU_CONFIGURE= yes -INSTALLS_ICONS= yes - USE_GITHUB= yes - GH_ACCOUNT= mywave82 GH_PROJECT= opencubicplayer -GH_TUPLE= mywave82:timidity:77cd92d:timidity/playgmi/timidity-git +GH_TUPLE= mywave82:timidity:77cd92d:timidity/playgmi/timidity-git \ + mywave82:sidplay-residfp-ocp:152551f:sidplayresidfpocp/playsid/sidplayfp-git -MAKE_JOBS_UNSAFE= yes +INSTALLS_ICONS= yes +USE_LDCONFIG= yes -CONFIGURE_ARGS= --with-dir-suffix="" \ - --libdir=${PREFIX}/lib +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --libdir=${PREFIX}/lib \ + --with-dir-suffix="" \ + --without-sdl CONFIGURE_ENV= SHARED_FLAGS="${LDFLAGS} -shared" -INFO= ocp +MAKE_JOBS_UNSAFE= yes -TIMIDITY_CFG= ${LOCALBASE}/share/timidity/timidity.cfg +LDFLAGS_i386= -Wl,-z,notext -OPTIONS_DEFINE= ADPLUG ALSA FLAC MIDI OSS X11 SDL DOCS -OPTIONS_DEFAULT=ADPLUG ALSA FLAC MIDI OSS X11 SDL -OPTIONS_SUB= yes +INFO= ocp +OPTIONS_DEFINE= ADPLUG ALSA DOCS FLAC MIDI OSS SDL X11 +OPTIONS_DEFAULT= ADPLUG ALSA FLAC MIDI OSS SDL X11 +OPTIONS_SUB= yes + ADPLUG_DESC= adplug support MIDI_DESC= timidity support +ADPLUG_LIB_DEPENDS= libadplug.so:audio/libadplug \ + libbinio.so:devel/libbinio 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 +ALSA_CONFIGURE_WITH= alsa -FLAC_CONFIGURE_WITH= flac FLAC_LIB_DEPENDS= libFLAC.so:audio/flac +FLAC_CONFIGURE_WITH= flac MIDI_RUN_DEPENDS= eawpats>0:audio/eawpats OSS_CONFIGURE_WITH= oss -SDL_CONFIGURE_WITH= sdl2 +SDL_IMPLIES= X11 +SDL_BUILD_DEPENDS= ${LOCALBASE}/share/fonts/gnu-unifont-ttf/unifont.ttf:x11-fonts/gnu-unifont-ttf +SDL_LIB_DEPENDS= libfreetype.so:print/freetype2 \ + libpng16.so:graphics/png +SDL_RUN_DEPENDS= ${LOCALBASE}/share/fonts/gnu-unifont-ttf/unifont.ttf:x11-fonts/gnu-unifont-ttf +SDL_USES= desktop-file-utils jpeg sdl +SDL_USE= SDL=sdl2 +SDL_CONFIGURE_WITH= sdl2 \ + unifontdir=${LOCALBASE}/share/fonts/gnu-unifont-ttf SDL_PLIST_SUB= DESKTOP='' SDL_PLIST_SUB_OFF= DESKTOP='@comment ' -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 +X11_BUILD_DEPENDS= ${LOCALBASE}/share/fonts/gnu-unifont-ttf/unifont.ttf:x11-fonts/gnu-unifont-ttf +X11_LIB_DEPENDS= libfreetype.so:print/freetype2 \ + libpng16.so:graphics/png +X11_RUN_DEPENDS= ${LOCALBASE}/share/fonts/gnu-unifont-ttf/unifont.ttf:x11-fonts/gnu-unifont-ttf +X11_USES= desktop-file-utils jpeg xorg +X11_USE= XORG=x11,xext,xpm,xxf86dga,xxf86vm +X11_CONFIGURE_WITH= unifontdir=${LOCALBASE}/share/fonts/gnu-unifont-ttf x11 +X11_PLIST_SUB= DESKTOP='' \ + XORG='' +X11_PLIST_SUB_OFF= DESKTOP='@comment ' \ + XORG='@comment ' -# needed despite stage-qa's warning -SDL_USES= desktop-file-utils sdl -X11_USES= desktop-file-utils xorg +TIMIDITY_CFG= ${LOCALBASE}/share/timidity/timidity.cfg -LDFLAGS_i386= -Wl,-z,notext +post-patch-SDL-off: + @${REINPLACE_CMD} -E '/(LIBJPEG|LIBPNG_LIBS)/d' ${WRKSRC}/Rules.make.in + +post-patch-X11-off: + @${REINPLACE_CMD} -E '/(LIBJPEG|LIBPNG_LIBS)/d' ${WRKSRC}/Rules.make.in 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 537571) +++ head/audio/ocp/distinfo (revision 537572) @@ -1,5 +1,7 @@ -TIMESTAMP = 1575554501 -SHA256 (mywave82-opencubicplayer-v0.2.1_GH0.tar.gz) = 49ab335f848e6b76b9c98d929ac2c4567c37c69a2dac14260c863fca260b0293 -SIZE (mywave82-opencubicplayer-v0.2.1_GH0.tar.gz) = 1023061 +TIMESTAMP = 1591003840 +SHA256 (mywave82-opencubicplayer-v0.2.2_GH0.tar.gz) = 5d90a1755ea1be7045a18af55e712e6b5da8f21dd9f8add5a0c5271685cc2cf0 +SIZE (mywave82-opencubicplayer-v0.2.2_GH0.tar.gz) = 1188111 SHA256 (mywave82-timidity-77cd92d_GH0.tar.gz) = 66b9fd32dd8587a1b9f423fe324f5d0e6ab697780514861e3e20406905706efa SIZE (mywave82-timidity-77cd92d_GH0.tar.gz) = 1763114 +SHA256 (mywave82-sidplay-residfp-ocp-152551f_GH0.tar.gz) = cf620c1a49fa1a9fe488845e49bb9266a304f2d9cf86b2750165fee9c046cea3 +SIZE (mywave82-sidplay-residfp-ocp-152551f_GH0.tar.gz) = 906248 Index: head/audio/ocp/files/patch-configure =================================================================== --- head/audio/ocp/files/patch-configure (nonexistent) +++ head/audio/ocp/files/patch-configure (revision 537572) @@ -0,0 +1,11 @@ +--- configure.orig 2020-05-24 23:40:48 UTC ++++ configure +@@ -10540,7 +10540,7 @@ $as_echo "#define HAVE_CXX11 1" >>confdefs.h + + + # Extract the first word of "xa", so it can be a program name with args. +-set dummy xa; ac_word=$2 ++set dummy xa65; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } + if ${ac_cv_prog_XA+:} false; then : Property changes on: head/audio/ocp/files/patch-configure ___________________________________________________________________ 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 537571) +++ head/audio/ocp/pkg-plist (revision 537572) @@ -1,84 +1,83 @@ bin/ocp bin/ocp-curses %%SDL%%bin/ocp-sdl2 %%XORG%%bin/ocp-x11 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 %%ALSA%%lib/ocp/devpalsa.so lib/ocp/devpdisk.so lib/ocp/devpnone.so %%OSS%%lib/ocp/devposs.so %%SDL%%lib/ocp/devpsdl2.so lib/ocp/devsnone.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/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 %%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/mdz.html %%PORTDOCS%%%%DOCSDIR%%/html/player.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 %%DATADIR%%/data/ocp.hlp %%DATADIR%%/etc/ocp.ini