pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/audio/ocp
Module Name: pkgsrc
Committed By: nia
Date: Sun Mar 17 17:34:06 UTC 2024
Modified Files:
pkgsrc/audio/ocp: DESCR Makefile PLIST distinfo options.mk
pkgsrc/audio/ocp/patches: patch-configure
Added Files:
pkgsrc/audio/ocp/patches: patch-filesel_filesystem-rpg.c
Removed Files:
pkgsrc/audio/ocp: PLIST.Linux TODO
pkgsrc/audio/ocp/patches: patch-ab patch-ac patch-ad patch-ae patch-af
patch-goodies_helpc_Makefile.in patch-playay_ayplay.c
patch-playym_ympplay.cpp
Log Message:
ocp: Update to 0.2.107
12 years of changes.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/audio/ocp/DESCR
cvs rdiff -u -r1.23 -r1.24 pkgsrc/audio/ocp/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/ocp/PLIST
cvs rdiff -u -r1.1 -r0 pkgsrc/audio/ocp/PLIST.Linux
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/audio/ocp/TODO
cvs rdiff -u -r1.14 -r1.15 pkgsrc/audio/ocp/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/ocp/options.mk
cvs rdiff -u -r1.3 -r0 pkgsrc/audio/ocp/patches/patch-ab \
pkgsrc/audio/ocp/patches/patch-af
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/audio/ocp/patches/patch-ac
cvs rdiff -u -r1.2 -r0 pkgsrc/audio/ocp/patches/patch-ad \
pkgsrc/audio/ocp/patches/patch-ae
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/ocp/patches/patch-configure
cvs rdiff -u -r0 -r1.1 \
pkgsrc/audio/ocp/patches/patch-filesel_filesystem-rpg.c
cvs rdiff -u -r1.1 -r0 \
pkgsrc/audio/ocp/patches/patch-goodies_helpc_Makefile.in \
pkgsrc/audio/ocp/patches/patch-playay_ayplay.c \
pkgsrc/audio/ocp/patches/patch-playym_ympplay.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/audio/ocp/DESCR
diff -u pkgsrc/audio/ocp/DESCR:1.1.1.1 pkgsrc/audio/ocp/DESCR:1.2
--- pkgsrc/audio/ocp/DESCR:1.1.1.1 Sun Aug 16 15:52:10 2009
+++ pkgsrc/audio/ocp/DESCR Sun Mar 17 17:34:05 2024
@@ -1,11 +1,6 @@
-Open Cubic Player first appeared around December 1994 as a DOS
-binary-only module player. It supported many soundcards and module
-formats.
+This is the UNIX port of Open Cubic Player, which is a text-based tracker
+music player.
-At some point, the source code was released to the public under the
-terms of the GNU General Public License, and around 2003 Stian
-Skjelstad ported the code to Linux.
-
-In addition to legacy tracker formats such as mod, xm and s3m, Open
-Cubic Player now also supports mp3, ogg and ay files and can be compiled
-with libadplug support.
+In addition to legacy tracker formats such as mod, xm, and s3m used by
+chiptunes and the demoscene, Open Cubic Player now also supports mp3, ogg,
+and flac files.
Index: pkgsrc/audio/ocp/Makefile
diff -u pkgsrc/audio/ocp/Makefile:1.23 pkgsrc/audio/ocp/Makefile:1.24
--- pkgsrc/audio/ocp/Makefile:1.23 Sun Apr 12 23:59:41 2020
+++ pkgsrc/audio/ocp/Makefile Sun Mar 17 17:34:05 2024
@@ -1,37 +1,71 @@
-# $NetBSD: Makefile,v 1.23 2020/04/12 23:59:41 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2024/03/17 17:34:05 nia Exp $
-DISTNAME= ocp-0.1.21
-PKGREVISION= 7
+DISTNAME= ocp-0.2.107
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opencubicplayer/}
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= ${MASTER_SITE_GITHUB:=mywave82/}
+GITHUB_PROJECT= opencubicplayer
+GITHUB_RELEASE= v${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://sourceforge.net/p/opencubicplayer/
-COMMENT= Open Cubic Player
+HOMEPAGE= https://stian.cubic.org/project-ocp.php
+COMMENT= Music visualizer for tracker music (TUI version)
LICENSE= gnu-gpl-v2
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake makeinfo
+USE_TOOLS+= gmake makeinfo perl pkg-config
USE_LANGUAGES= c c++
-USE_NCURSES= yes # resize_term
+
+DISTINFO_FILE= ${.CURDIR}/../../audio/ocp/distinfo
+PATCHDIR= ${.CURDIR}/../../audio/ocp/patches
+
+USE_CXX_FEATURES+= c++17
+
INFO_FILES= yes
+TOOL_DEPENDS+= xa65-[0-9]*:../../devel/xa65
+
REPLACE_SH= ocp-curses ocp-sdl ocp-vcsa ocp-x11
# ymtype.so wants to link -llzh before it's finished building
MAKE_JOBS_SAFE= no
CONFIGURE_ARGS+= --exec-prefix=${PREFIX}
-CONFIGURE_ARGS+= --infodir=${PREFIX}/info
+
+# seems fairly useless since you need curses anyway...
+CONFIGURE_ARGS+= --without-sdl
+CONFIGURE_ARGS+= --without-sdl2
+CONFIGURE_ARGS+= --without-x11
CFLAGS.SunOS+= -mimpure-text
-CFLAGS.SunOS+= -DSOUND_PCM_WRITE_CHANNELS=SNDCTL_DSP_CHANNELS
-CFLAGS.SunOS+= -DSOUND_PCM_WRITE_BITS=SNDCTL_DSP_SETFMT
-CFLAGS.SunOS+= -DSOUND_PCM_WRITE_RATE=SNDCTL_DSP_SPEED
-PLIST_VARS+= sdl x11 desktop
+.include "../../mk/bsd.prefs.mk"
+
+# curses_version(3) was introduced in NetBSD 10.0.
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 100000
+USE_NCURSES= yes
+. include "../../devel/ncursesw/buildlink3.mk"
+.else
+USE_CURSES= wide
+FAKE_NCURSES= yes
+. include "../../mk/curses.buildlink3.mk"
+. if !${CURSES_TYPE:M*ncurses*}
+CFLAGS+= -DNCURSES_ATTR_T=int
+. endif
+.endif
+
+.include "../../mk/oss.buildlink3.mk"
+
+PLIST_VARS+= oss
+.if ${OSS_TYPE} != "none"
+PLIST.oss= yes
+LDFLAGS+= ${LIBOSSAUDIO}
+SUBST_CLASSES+= oss
+SUBST_STAGE.oss= pre-configure
+SUBST_MESSAGE.oss= Correcting the path to the OSS device.
+SUBST_FILES.oss+= devp/devposs.c
+SUBST_SED.oss+= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
+.endif
SUBST_CLASSES+= ldflags
SUBST_SED.ldflags+= -e 's/$$(SHARED_FLAGS)/$$(LDFLAGS) $$(SHARED_FLAGS)/g'
@@ -40,13 +74,17 @@ SUBST_MESSAGE.ldflags= Honoring LDFLAGS.
SUBST_STAGE.ldflags= pre-build
.include "options.mk"
-
+.include "../../archivers/ancient/buildlink3.mk"
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../audio/flac/buildlink3.mk"
+.include "../../audio/libdiscid/buildlink3.mk"
.include "../../audio/libid3tag/buildlink3.mk"
.include "../../audio/libmad/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
+.include "../../textproc/cJSON/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/ocp/PLIST
diff -u pkgsrc/audio/ocp/PLIST:1.4 pkgsrc/audio/ocp/PLIST:1.5
--- pkgsrc/audio/ocp/PLIST:1.4 Mon Apr 30 08:26:41 2012
+++ pkgsrc/audio/ocp/PLIST Sun Mar 17 17:34:05 2024
@@ -1,82 +1,46 @@
-@comment $NetBSD: PLIST,v 1.4 2012/04/30 08:26:41 shattered Exp $
+@comment $NetBSD: PLIST,v 1.5 2024/03/17 17:34:05 nia Exp $
bin/ocp
-bin/${PKGNAME}
bin/ocp-curses
-${PLIST.sdl}bin/ocp-sdl
-${PLIST.x11}bin/ocp-x11
info/ocp.info.gz
-lib/${PKGNAME}/autoload/10-compat.so
-lib/${PKGNAME}/autoload/10-devi.so
-lib/${PKGNAME}/autoload/10-hardware.so
-lib/${PKGNAME}/autoload/10-mchasm.so
-lib/${PKGNAME}/autoload/10-mixclip.so
-lib/${PKGNAME}/autoload/10-sets.so
-lib/${PKGNAME}/autoload/11-framelock.so
-lib/${PKGNAME}/autoload/12-poutput.so
-lib/${PKGNAME}/autoload/15-keyhelp.so
-lib/${PKGNAME}/autoload/20-cphelper.so
-lib/${PKGNAME}/autoload/25-pfilesel.so
-lib/${PKGNAME}/autoload/30-arctar.so
-lib/${PKGNAME}/autoload/30-arczip.so
-lib/${PKGNAME}/autoload/30-aytype.so
-lib/${PKGNAME}/autoload/30-fstypes.so
-lib/${PKGNAME}/autoload/30-mcpbase.so
-lib/${PKGNAME}/autoload/30-plrbase.so
-lib/${PKGNAME}/autoload/30-smpbase.so
-lib/${PKGNAME}/autoload/30-ymtype.so
-lib/${PKGNAME}/autoload/35-cpiface.so
-lib/${PKGNAME}/autoload/40-cphlpif.so
-lib/${PKGNAME}/devpdisk.so
-lib/${PKGNAME}/devpnone.so
-lib/${PKGNAME}/devposs.so
-${PLIST.sdl}lib/${PKGNAME}/devpsdl.so
-lib/${PKGNAME}/devsnone.so
-lib/${PKGNAME}/devsoss.so
-lib/${PKGNAME}/devwmix.so
-lib/${PKGNAME}/devwmixf.so
-lib/${PKGNAME}/devwnone.so
-lib/${PKGNAME}/libocp.so
-lib/${PKGNAME}/load669.so
-lib/${PKGNAME}/loadams.so
-lib/${PKGNAME}/loaddmf.so
-lib/${PKGNAME}/loadmdl.so
-lib/${PKGNAME}/loadmtm.so
-lib/${PKGNAME}/loadokt.so
-lib/${PKGNAME}/loadptm.so
-lib/${PKGNAME}/loads3m.so
-lib/${PKGNAME}/loadult.so
-lib/${PKGNAME}/medialib.so
-lib/${PKGNAME}/playay.so
-lib/${PKGNAME}/playgmd.so
-lib/${PKGNAME}/playgmi.so
-lib/${PKGNAME}/playit.so
-lib/${PKGNAME}/playmp2.so
-lib/${PKGNAME}/playogg.so
-lib/${PKGNAME}/playwav.so
-lib/${PKGNAME}/playxm.so
-lib/${PKGNAME}/playym.so
-${PLIST.desktop}share/applications/cubic.org-opencubicplayer.desktop
-share/doc/${PKGNAME}/AUTHORS
-share/doc/${PKGNAME}/BUGS
-share/doc/${PKGNAME}/COPYING
-share/doc/${PKGNAME}/CREDITS
-share/doc/${PKGNAME}/KEYBOARD_REMAPS
-share/doc/${PKGNAME}/SUID
-share/doc/${PKGNAME}/TODO
-share/doc/${PKGNAME}/html/configuration.html
-share/doc/${PKGNAME}/html/faq.html
-share/doc/${PKGNAME}/html/fileselector.html
-share/doc/${PKGNAME}/html/index.html
-share/doc/${PKGNAME}/html/install.html
-share/doc/${PKGNAME}/html/mdz.html
-share/doc/${PKGNAME}/html/player.html
-share/doc/${PKGNAME}/html/plugin.html
-share/doc/${PKGNAME}/html/specialdrive.html
-share/doc/${PKGNAME}/html/starting.html
-share/doc/${PKGNAME}/html/support.html
-share/doc/${PKGNAME}/html/wap.html
-share/${PKGNAME}/data/ocp.hlp
-share/${PKGNAME}/etc/ocp.ini
-${PLIST.x11}share/icons/hicolor/16x16/apps/opencubicplayer.xpm
-${PLIST.x11}share/icons/hicolor/48x48/apps/opencubicplayer.xpm
-@pkgdir share/ocp/ultradir
+${PLIST.alsa}lib/ocp/autoload/35-devpalsa.so
+lib/ocp/autoload/35-devpnone.so
+${PLIST.oss}lib/ocp/autoload/35-devposs.so
+lib/ocp/autoload/35-devwmix.so
+lib/ocp/autoload/35-devwmixf.so
+lib/ocp/autoload/35-devwnone.so
+lib/ocp/autoload/95-playay.so
+lib/ocp/autoload/95-playcda.so
+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/autoload/freverb.so
+lib/ocp/autoload/ireverb.so
+lib/ocp/libocp.so
+man/man1/ocp.1
+share/doc/ocp/AUTHORS
+share/doc/ocp/BUGS
+share/doc/ocp/COPYING
+share/doc/ocp/CREDITS
+share/doc/ocp/KEYBOARD_REMAPS
+share/doc/ocp/SUID
+share/doc/ocp/html/configuration.html
+share/doc/ocp/html/faq.html
+share/doc/ocp/html/fileselector.html
+share/doc/ocp/html/index.html
+share/doc/ocp/html/player.html
+share/doc/ocp/html/specialdrive.html
+share/doc/ocp/html/starting.html
+share/doc/ocp/html/support.html
+share/doc/ocp/html/wap.html
+share/ocp/data/adplug.db
+share/ocp/data/ocp.hlp
+share/ocp/etc/ocp.ini
Index: pkgsrc/audio/ocp/distinfo
diff -u pkgsrc/audio/ocp/distinfo:1.14 pkgsrc/audio/ocp/distinfo:1.15
--- pkgsrc/audio/ocp/distinfo:1.14 Tue Oct 26 09:59:19 2021
+++ pkgsrc/audio/ocp/distinfo Sun Mar 17 17:34:05 2024
@@ -1,14 +1,7 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 09:59:19 nia Exp $
+$NetBSD: distinfo,v 1.15 2024/03/17 17:34:05 nia Exp $
-BLAKE2s (ocp-0.1.21.tar.bz2) = 0bb17841cd29c491bfb37647b0df62b746bbff091fb4130e8b47cbfe27b0970d
-SHA512 (ocp-0.1.21.tar.bz2) = fec0123b61163780d8133939df2a0219c98b533a7a6eb477ee1029eff7b2f3782969e792f6a767d3ff99c809cc2cf8dc0b8518f0e91f96015279c20115507269
-Size (ocp-0.1.21.tar.bz2) = 781805 bytes
-SHA1 (patch-ab) = d33aad7cfa41330c5cb026a7d3e92545f741f429
-SHA1 (patch-ac) = f28f3ebc5e3d61858f2f5bed79094fff57130da6
-SHA1 (patch-ad) = 5252050662343fa2575d84e883f8d157b4a2de0e
-SHA1 (patch-ae) = 00f5b6edaf0dcb2200f8e9f14ab6a8e1a9711f65
-SHA1 (patch-af) = dbb7b2d1b7a5f35c14477725ad18e31b2af787b9
-SHA1 (patch-configure) = c26f3be5c102da245f0e0c55d17a34cfdb844a37
-SHA1 (patch-goodies_helpc_Makefile.in) = aeb8f25afa126aa0db50325d2d7daf0eccedaee3
-SHA1 (patch-playay_ayplay.c) = 565efad3e619743fd7260c2957152a0b116674c4
-SHA1 (patch-playym_ympplay.cpp) = d0d5fd0126e30f5036f0267d17ae3524c9afcb34
+BLAKE2s (ocp-0.2.107.tar.gz) = 05d26993a52f40485f9d9a00ce0f1a45c84d6452487a9f010fe1b9d6dca8f1c0
+SHA512 (ocp-0.2.107.tar.gz) = 6e55f08397f8a4ea5374ca07b64f63dab9315c4511a522b195ae50c7ab47074634c2adc7beb7a5cfa9010a30efdafa69e04260f0a8df40398304b853e58eeffd
+Size (ocp-0.2.107.tar.gz) = 6220734 bytes
+SHA1 (patch-configure) = b1fa4d795fe13b9d6b9875d295a921d99fcacbc4
+SHA1 (patch-filesel_filesystem-rpg.c) = fc3c580f4a01dbe5ab724603defea91d1f95bb50
Index: pkgsrc/audio/ocp/options.mk
diff -u pkgsrc/audio/ocp/options.mk:1.3 pkgsrc/audio/ocp/options.mk:1.4
--- pkgsrc/audio/ocp/options.mk:1.3 Tue Oct 23 10:31:39 2012
+++ pkgsrc/audio/ocp/options.mk Sun Mar 17 17:34:05 2024
@@ -1,29 +1,16 @@
-# $NetBSD: options.mk,v 1.3 2012/10/23 10:31:39 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2024/03/17 17:34:05 nia Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.ocp
-PKG_SUPPORTED_OPTIONS= x11
+PKG_OPTIONS_VAR= PKG_OPTIONS.ocp
+PKG_SUPPORTED_OPTIONS= alsa
+PKG_SUGGESTED_OPTIONS.Linux= alsa
.include "../../mk/bsd.options.mk"
-# broken (crashes at startup)
-.if !empty(PKG_OPTIONS:Msdl)
-CONFIGURE_ARGS+= --with-sdl=yes
-PLIST.sdl= yes
-PLIST.desktop= yes
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../devel/SDL/buildlink3.mk"
+PLIST_VARS+= alsa
+.if !empty(PKG_OPTIONS:Malsa)
+PLIST.alsa= yes
+CONFIGURE_ARGS+= --with-alsa
+. include "../../audio/alsa-lib/buildlink3.mk"
.else
-CONFIGURE_ARGS+= --without-sdl
-.endif
-
-.if !empty(PKG_OPTIONS:Mx11)
-CONFIGURE_ARGS+= --with-x11=yes
-PLIST.x11= yes
-PLIST.desktop= yes
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --without-x11
+CONFIGURE_ARGS+= --without-alsa
.endif
Index: pkgsrc/audio/ocp/patches/patch-configure
diff -u pkgsrc/audio/ocp/patches/patch-configure:1.3 pkgsrc/audio/ocp/patches/patch-configure:1.4
--- pkgsrc/audio/ocp/patches/patch-configure:1.3 Sun Apr 18 20:38:37 2021
+++ pkgsrc/audio/ocp/patches/patch-configure Sun Mar 17 17:34:06 2024
@@ -1,40 +1,51 @@
-$NetBSD: patch-configure,v 1.3 2021/04/18 20:38:37 wiz Exp $
+$NetBSD: patch-configure,v 1.4 2024/03/17 17:34:06 nia Exp $
-Remove gcc check, trust pkgsrc to provide a working one.
+Shell portability.
---- configure.orig 2011-11-17 21:46:08.000000000 +0000
+--- configure.orig 2024-03-17 16:30:27.835226059 +0000
+++ configure
-@@ -4579,33 +4579,6 @@ test "x$exec_prefix" = xNONE && exec_pre
+@@ -8953,7 +8953,7 @@ printf "%s\n" "no" >&6; }
+ PKG_CONFIG=""
+ fi
+ fi
+-if test "x$WINDOWS" == x
++if test "x$WINDOWS" = x
+ then :
+@@ -10165,7 +10165,7 @@ else $as_nop
+ fi
+
+
+-if test "x$WINDOWS" == x
++if test "x$WINDOWS" = x
+ then :
+
+
+@@ -15058,7 +15058,7 @@ printf "%s\n" "#define HAVE_CXX17 1" >>c
+ fi
+
+
+-if test $ax_cv_cxx_compile_cxx17__std_cpp17 == "yes"
++if test $ax_cv_cxx_compile_cxx17__std_cpp17 = "yes"
+ then :
+ printf "%s\n" "#define HAVE_CXX17 1" >>confdefs.h
+
+@@ -15556,7 +15556,7 @@ printf "%s\n" "#define HAVE_CXX14 1" >>c
+ fi
+
+
+- if test $ax_cv_cxx_compile_cxx14__std_cpp14 == "yes"
++ if test $ax_cv_cxx_compile_cxx14__std_cpp14 = "yes"
+ then :
+ printf "%s\n" "#define HAVE_CXX14 1" >>confdefs.h
+
+@@ -15934,7 +15934,7 @@ printf "%s\n" "#define HAVE_CXX11 1" >>c
+ fi
+
+
+- if test $ax_cv_cxx_compile_cxx11__std_cpp11 == "yes"
++ if test $ax_cv_cxx_compile_cxx11__std_cpp11 = "yes"
+ then :
+ printf "%s\n" "#define HAVE_CXX11 1" >>confdefs.h
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc version" >&5
--$as_echo_n "checking gcc version... " >&6; }
--cc_version=`( $CC -dumpversion ) 2>&1`
--if test "$?" -gt 0 || test x$cc_version = x; then
-- as_fn_error $? "not found" "$LINENO" 5
--else
-- case $cc_version in
-- '')
-- 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.*)
-- _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`
-- if test $_cc_major -gt 2; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cc_version, ok" >&5
--$as_echo "$cc_version, ok" >&6; }
-- else
-- as_fn_error $? "$cc_version, bad" "$LINENO" 5
-- fi
-- ;;
-- *)
-- as_fn_error $? "$cc_version, bad" "$LINENO" 5
-- ;;
-- esac
--fi
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken signed char to signed int in loops (gcc version 4.1.1)" >&5
- $as_echo_n "checking for broken signed char to signed int in loops (gcc version 4.1.1)... " >&6; }
- if test "$cross_compiling" = yes; then :
Added files:
Index: pkgsrc/audio/ocp/patches/patch-filesel_filesystem-rpg.c
diff -u /dev/null pkgsrc/audio/ocp/patches/patch-filesel_filesystem-rpg.c:1.1
--- /dev/null Sun Mar 17 17:34:06 2024
+++ pkgsrc/audio/ocp/patches/patch-filesel_filesystem-rpg.c Sun Mar 17 17:34:06 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-filesel_filesystem-rpg.c,v 1.1 2024/03/17 17:34:06 nia Exp $
+
+filesystem-rpg.c:613:4: error: a label can only be part of a statement
+and a declaration is not a statement
+
+--- filesel/filesystem-rpg.c.orig 2024-03-17 16:47:27.071188695 +0000
++++ filesel/filesystem-rpg.c
+@@ -609,10 +609,13 @@ static int rpg_dir_readdir_iterate (ocpd
+ self->dir->owner->archive_filehandle->seek_set (self->dir->owner->archive_filehandle, self->nextheader_offset);
+ if (self->dir->owner->archive_filehandle->read (self->dir->owner->archive_filehandle, header, sizeof (header)) < 6)
+ {
+-finished:
+ const char *filename;
+- uint8_t *metadata = 0;
+- size_t metadatasize = 0;
++ uint8_t *metadata;
++ size_t metadatasize;
++
++finished:
++ metadata = NULL;
++ metadatasize = 0;
+
+ self->dir->owner->ready = 1;
+ rpg_instance_encode_blob (self->dir->owner, &metadata, &metadatasize);
Home |
Main Index |
Thread Index |
Old Index