diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile index c2c50475b3b2..d125c2c59888 100644 --- a/audio/ocp/Makefile +++ b/audio/ocp/Makefile @@ -1,101 +1,101 @@ # Created by: Emanuel Haupt PORTNAME= ocp -PORTVERSION= 0.2.93 +PORTVERSION= 0.2.94 PORTEPOCH= 1 CATEGORIES= audio MASTER_SITES= https://github.com/mywave82/opencubicplayer/releases/download/v${PORTVERSION}/ MAINTAINER= ehaupt@FreeBSD.org COMMENT= Legendary Open Cubic Player LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 powerpc64le BUILD_DEPENDS= xa65:devel/xa65 LIB_DEPENDS= libcjson.so:devel/libcjson \ libdiscid.so:audio/libdiscid \ libid3tag.so:audio/libid3tag \ libmad.so:audio/libmad \ libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis USES= compiler:c11 dos2unix gmake gnome iconv localbase:ldflags \ makeinfo ncurses pkgconfig tar:bz2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir=${PREFIX}/lib \ --with-dir-suffix="" \ --without-sdl CONFIGURE_ENV= SHARED_FLAGS="${LDFLAGS} -shared" \ XA=${PREFIX}/bin/xa65 MAKE_JOBS_UNSAFE= yes LDFLAGS_i386= -Wl,-z,notext CONFLICTS_INSTALL= alliance # man/man1/ocp.1.gz 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 ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CONFIGURE_WITH= alsa FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLAC_CONFIGURE_WITH= flac MIDI_RUN_DEPENDS= eawpats>0:audio/eawpats OSS_CONFIGURE_WITH= oss 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 \ libpng.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 ' X11_BUILD_DEPENDS= ${LOCALBASE}/share/fonts/gnu-unifont-ttf/unifont.ttf:x11-fonts/gnu-unifont-ttf X11_LIB_DEPENDS= libfreetype.so:print/freetype2 \ libpng.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 ' TIMIDITY_CFG= ${LOCALBASE}/share/timidity/timidity.cfg 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 diff --git a/audio/ocp/distinfo b/audio/ocp/distinfo index 4508579358d7..8dc27e7a6a14 100644 --- a/audio/ocp/distinfo +++ b/audio/ocp/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1642959284 -SHA256 (ocp-0.2.93.tar.bz2) = 8a93a980cdf6cc274abd470bed8e17253521c7cf849cd1805626b07401147425 -SIZE (ocp-0.2.93.tar.bz2) = 3071816 +TIMESTAMP = 1646068115 +SHA256 (ocp-0.2.94.tar.bz2) = 307c3bb057b03514ed018ca2cca57e1b669f7b1cc95cd5f37e315ef2e9cda6e7 +SIZE (ocp-0.2.94.tar.bz2) = 3059881 +SHA256 (becedb6186234b6fb3baf9db0f25b62055e65cdd.patch) = e0c2affdc1c265c3d0b7763141915d7052ef72a4a2692b965b59c50fa2e1a585 +SIZE (becedb6186234b6fb3baf9db0f25b62055e65cdd.patch) = 1637 +SHA256 (ad24360fe92475a18c0ba1d44da6e5d060319176.patch) = 21d8407187042cefb4ff53fbe75e40e58897e1dc5a7bb670f1bb6dd13dadceb0 +SIZE (ad24360fe92475a18c0ba1d44da6e5d060319176.patch) = 731 diff --git a/audio/ocp/files/patch-config.h.in b/audio/ocp/files/patch-config.h.in deleted file mode 100644 index 9341babdae59..000000000000 --- a/audio/ocp/files/patch-config.h.in +++ /dev/null @@ -1,14 +0,0 @@ ---- config.h.in.orig 2019-11-26 21:41:02 UTC -+++ config.h.in -@@ -160,9 +160,11 @@ - - #undef HAVE_RESIZE_TERM - -+/* - #if (defined(_X86) || defined(__i386__)) && !defined(__APPLE__) - #define I386_ASM 1 - #endif -+*/ - - /* #define I386_ASM_EMU 1 */ - diff --git a/audio/ocp/files/patch-filesel_cdfs_audio.c b/audio/ocp/files/patch-filesel_cdfs_audio.c new file mode 100644 index 000000000000..c62382950fbb --- /dev/null +++ b/audio/ocp/files/patch-filesel_cdfs_audio.c @@ -0,0 +1,13 @@ +--- filesel/cdfs/audio.c.orig 2022-02-28 13:08:06 UTC ++++ filesel/cdfs/audio.c +@@ -131,9 +131,8 @@ void __attribute__ ((visibility ("internal"))) Check_A + } + failout: + discid_free (did); +-postfailout: + } +- ++postfailout: + AudioDir = CDFS_Directory_add (disc, 0, "AUDIO"); + + { diff --git a/audio/ocp/files/patch-filesel_cdfs_iso9660.c b/audio/ocp/files/patch-filesel_cdfs_iso9660.c new file mode 100644 index 000000000000..ba99de52d163 --- /dev/null +++ b/audio/ocp/files/patch-filesel_cdfs_iso9660.c @@ -0,0 +1,31 @@ +--- filesel/cdfs/iso9660.c.orig 2022-02-28 13:33:37 UTC ++++ filesel/cdfs/iso9660.c +@@ -1140,8 +1140,7 @@ static void CDFS_Render_RockRidge_directory (struct cd + } + + if ((directory->dirents_data[i]->Flags & ISO9660_DIRENT_FLAGS_DIR) || directory->dirents_data[i]->RockRidge_IsAugmentedDirectory) +- { +-dir: ++ {dir:;{ /* clang is stricter than gcc, no labels before variables */ + uint32_t Location = directory->dirents_data[i]->Absolute_Location; + uint32_t this_directory_handle = CDFS_Directory_add (disc, parent_directory, temp); + if (directory->dirents_data[i]->RockRidge_IsAugmentedDirectory) +@@ -1156,8 +1155,7 @@ dir: + break; + } + } +- } else { +-file: ++ }} else {file:;{ /* clang is stricter than gcc, no labels before variables */ + int handle = CDFS_File_add (disc, parent_directory, temp); + struct iso_dirent_t *iter; + uint32_t Length = directory->dirents_data[i]->Length; +@@ -1170,7 +1168,7 @@ file: + } + CDFS_File_extent (disc, handle, iter->Absolute_Location, RunLength, 0); + } +- } ++ }} + next: + free (temp); + } diff --git a/audio/ocp/pkg-plist b/audio/ocp/pkg-plist index 96adaa043d83..94ac4a6fa95d 100644 --- a/audio/ocp/pkg-plist +++ b/audio/ocp/pkg-plist @@ -1,86 +1,87 @@ bin/ocp %%XORG%%bin/ocp-x11 bin/ocp-curses %%SDL%%bin/ocp-sdl2 lib/ocp/autoload/10-devi.so lib/ocp/autoload/10-hardware.so lib/ocp/autoload/10-mchasm.so lib/ocp/autoload/10-sets.so lib/ocp/autoload/12-poutput.so lib/ocp/autoload/20-cphelper.so lib/ocp/autoload/25-pfilesel.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 +lib/ocp/autoload/60-cdfs.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 lib/ocp/playcda.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/autoload/30-timidityconfig.so lib/ocp/playsid.so lib/ocp/playtimidity.so lib/ocp/playwav.so lib/ocp/playxm.so lib/ocp/playym.so man/man1/ocp.1.gz %%DATADIR%%/data/ocp.hlp %%DATADIR%%/etc/ocp.ini %%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%%/html/configuration.html %%PORTDOCS%%%%DOCSDIR%%/html/faq.html %%PORTDOCS%%%%DOCSDIR%%/html/fileselector.html %%PORTDOCS%%%%DOCSDIR%%/html/index.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/128x128/apps/opencubicplayer.png %%XORG%%share/icons/hicolor/16x16/apps/opencubicplayer.png %%XORG%%share/icons/hicolor/22x22/apps/opencubicplayer.png %%XORG%%share/icons/hicolor/24x24/apps/opencubicplayer.png %%XORG%%share/icons/hicolor/32x32/apps/opencubicplayer.png %%XORG%%share/icons/hicolor/48x48/apps/opencubicplayer.png %%XORG%%share/icons/hicolor/64x64/apps/opencubicplayer.png %%XORG%%share/icons/hicolor/scalable/apps/opencubicplayer.svg