From 91b5885bdc5b2d6951c0bf25b4c2d086b3871298 Mon Sep 17 00:00:00 2001 From: Emanuel Haupt Date: Sun, 25 Sep 2022 21:29:19 +0200 Subject: [PATCH] audio/ocp: Update to 0.2.100 --- audio/ocp/Makefile | 32 +++++----- audio/ocp/distinfo | 8 ++- .../files/patch-playtimidity_timidityconfig.c | 11 ++++ audio/ocp/pkg-plist | 59 +++++-------------- 4 files changed, 44 insertions(+), 66 deletions(-) create mode 100644 audio/ocp/files/patch-playtimidity_timidityconfig.c diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile index 21c6ec6f38b0..c8fa082f886c 100644 --- a/audio/ocp/Makefile +++ b/audio/ocp/Makefile @@ -1,9 +1,11 @@ PORTNAME= ocp -PORTVERSION= 0.2.99 -PORTREVISION= 1 +PORTVERSION= 0.2.100 PORTEPOCH= 1 CATEGORIES= audio -MASTER_SITES= https://github.com/mywave82/opencubicplayer/releases/download/v${PORTVERSION}/ +MASTER_SITES= https://stian.cubic.org/ocp/ + +PATCH_SITES= https://github.com/mywave82/opencubicplayer/commit/ +PATCHFILES+= b57f0279fb952db99b11006edb44ed7cb4658bed.patch:-p1 MAINTAINER= ehaupt@FreeBSD.org COMMENT= Legendary Open Cubic Player @@ -20,10 +22,11 @@ LIB_DEPENDS= libcjson.so:devel/libcjson \ libid3tag.so:audio/libid3tag \ libmad.so:audio/libmad \ libogg.so:audio/libogg \ + libpng.so:graphics/png \ libvorbis.so:audio/libvorbis -USES= compiler:c11 dos2unix gmake gnome iconv localbase:ldflags \ - makeinfo ncurses pkgconfig tar:bz2 +USES= compiler:c11 dos2unix gmake gnome iconv jpeg localbase:ldflags \ + makeinfo ncurses pkgconfig tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir=${PREFIX}/lib \ @@ -63,10 +66,9 @@ 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_LIB_DEPENDS= libfreetype.so:print/freetype2 SDL_RUN_DEPENDS= ${LOCALBASE}/share/fonts/gnu-unifont-ttf/unifont.ttf:x11-fonts/gnu-unifont-ttf -SDL_USES= desktop-file-utils jpeg sdl +SDL_USES= desktop-file-utils sdl SDL_USE= SDL=sdl2 SDL_CONFIGURE_WITH= sdl2 \ unifontdir=${LOCALBASE}/share/fonts/gnu-unifont-ttf @@ -74,12 +76,12 @@ 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_LIB_DEPENDS= libfreetype.so:print/freetype2 X11_RUN_DEPENDS= ${LOCALBASE}/share/fonts/gnu-unifont-ttf/unifont.ttf:x11-fonts/gnu-unifont-ttf -X11_USES= desktop-file-utils jpeg xorg +X11_USES= desktop-file-utils xorg X11_USE= XORG=x11,xext,xpm,xxf86dga,xxf86vm -X11_CONFIGURE_WITH= unifontdir=${LOCALBASE}/share/fonts/gnu-unifont-ttf x11 +X11_CONFIGURE_WITH= unifontdir-ttf=${LOCALBASE}/share/fonts/gnu-unifont-ttf \ + x11 X11_PLIST_SUB= DESKTOP='' \ XORG='' X11_PLIST_SUB_OFF= DESKTOP='@comment ' \ @@ -87,12 +89,6 @@ X11_PLIST_SUB_OFF= DESKTOP='@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 diff --git a/audio/ocp/distinfo b/audio/ocp/distinfo index 19ae6e07f11c..726a05411ac8 100644 --- a/audio/ocp/distinfo +++ b/audio/ocp/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1656230692 -SHA256 (ocp-0.2.99.tar.bz2) = dcf923d5968102f786a10e2fbee96c5f3c6ce8863184165601497197e3d89f0a -SIZE (ocp-0.2.99.tar.bz2) = 4835754 +TIMESTAMP = 1664125578 +SHA256 (ocp-0.2.100.tar.xz) = b0742b2123e9b4ec71030823daf5debae821f741ca97c4c15cfd68dcbeba0846 +SIZE (ocp-0.2.100.tar.xz) = 3837632 +SHA256 (b57f0279fb952db99b11006edb44ed7cb4658bed.patch) = 495d80e8868c5c1580a0fa2083f3fd5c8233003bf683da3fb71923f13d03c1ab +SIZE (b57f0279fb952db99b11006edb44ed7cb4658bed.patch) = 2525 diff --git a/audio/ocp/files/patch-playtimidity_timidityconfig.c b/audio/ocp/files/patch-playtimidity_timidityconfig.c new file mode 100644 index 000000000000..a803a3cc7362 --- /dev/null +++ b/audio/ocp/files/patch-playtimidity_timidityconfig.c @@ -0,0 +1,11 @@ +--- playtimidity/timidityconfig.c.orig 2022-09-25 19:16:16 UTC ++++ playtimidity/timidityconfig.c +@@ -293,7 +293,7 @@ static void refresh_configfiles (void) + } + } + +-static int timidityConfigInit (struct moduleinfostruct *info, struct ocpfilehandle_t *f, const struct cpifaceplayerstruct *) ++static int timidityConfigInit (struct moduleinfostruct *info, struct ocpfilehandle_t *f, const struct cpifaceplayerstruct *cpi) + { + return 1; + } diff --git a/audio/ocp/pkg-plist b/audio/ocp/pkg-plist index 562d400d7200..75e43fd65bb6 100644 --- a/audio/ocp/pkg-plist +++ b/audio/ocp/pkg-plist @@ -1,62 +1,31 @@ bin/ocp bin/ocp-curses -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 -lib/ocp/autoload/30-fstypes.so -lib/ocp/autoload/30-mcpbase.so -lib/ocp/autoload/30-playsid.so -lib/ocp/autoload/30-plrbase.so -lib/ocp/autoload/30-sidconfig.so -lib/ocp/autoload/30-timidityconfig.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 +lib/ocp/autoload/95-playay.so +lib/ocp/autoload/95-playcda.so +%%FLAC%%lib/ocp/autoload/95-playflac.so +lib/ocp/autoload/95-playgmd.so +lib/ocp/autoload/95-playhvl.so +lib/ocp/autoload/95-playit.so +lib/ocp/autoload/95-playmp2.so +lib/ocp/autoload/95-playogg.so +lib/ocp/autoload/95-playopl.so +lib/ocp/autoload/95-playsid.so +lib/ocp/autoload/95-playtimidity.so +lib/ocp/autoload/95-playwav.so +lib/ocp/autoload/95-playxm.so +lib/ocp/autoload/95-playym.so lib/ocp/devpdisk.so lib/ocp/devpnone.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 -lib/ocp/playgmd.so -lib/ocp/playhvl.so -lib/ocp/playit.so -lib/ocp/playmp2.so -lib/ocp/playogg.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 %%ADPLUG%%%%DATADIR%%/data/adplug.db -%%ADPLUG%%lib/ocp/autoload/40-cpifontdebug.so -%%ADPLUG%%lib/ocp/autoload/40-playopl.so %%ALSA%%lib/ocp/devpalsa.so %%DATADIR%%/data/ocp.hlp %%DATADIR%%/etc/ocp.ini %%DESKTOP%%share/applications/cubic.org-opencubicplayer.desktop -%%FLAC%%lib/ocp/autoload/30-flacptype.so -%%FLAC%%lib/ocp/playflac.so %%OSS%%lib/ocp/devposs.so %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/BUGS