Hi, On Mon, 22 Apr 2019 22:46:00 +0100 Edd Barrett <e...@theunixzoo.co.uk> wrote:
> Hi, > > On Mon, Apr 22, 2019 at 09:34:14PM +0200, Antoine Jacoutot wrote: > > Why are you changing the LIB_DEPENDS? There's no change in WANTLIB > > is there? > > Whereas libcdio used to provide the cdio_cdda and cdio_paranoia shared > libs, now the new package libcdio-paranoia provides them. > > > Here's an updated diff. `make port-lib-depends-check` is happy, but > I'll re-build the lot to be doubly sure that this is correct. > > Thanks Please consider evaluating this diff, as it is currently in CVS, libcdio won't build with ports-gcc-8. I've tested it on macppc. Due to bugs existing before that update and ports that can't be built on this platform, i can't really give an OK. I've no objections though. Ports that can't be tested on macppc: - aqualung: arch-limited - audacious-plugins: doesn't build with what is in CVS and the sound output is broken at runtime anyway (white noise) Testing: I've found no breakages while building consumers, audio tracks are recognised. I can rip cds with cd-paranoia, WAV are as expected. cd-* commands all work. mpv and mpd play white noise when playing CDs directly, but it has been always the case. cmus crashes with a double-free *but* Paco Esteban is proposing an update that inadvertently fixes the issue [0]. Charlène. [0] https://marc.info/?l=openbsd-ports&m=155682514609330&w=2 > > Index: audio/libcdio/Makefile > =================================================================== > RCS file: /cvs/ports/audio/libcdio/Makefile,v > retrieving revision 1.22 > diff -u -p -r1.22 Makefile > --- audio/libcdio/Makefile 24 Oct 2018 14:27:58 -0000 > 1.22 +++ audio/libcdio/Makefile 22 Apr 2019 17:21:58 -0000 > @@ -2,43 +2,30 @@ > > COMMENT= compact disk input and control library > > -DISTNAME= libcdio-0.80 > -REVISION= 10 > +DISTNAME= libcdio-2.1.0 > +EXTRACT_SUFX= .tar.bz2 > + > CATEGORIES= audio devel > MASTER_SITES= ${MASTER_SITE_GNU:=libcdio/} > > -SHARED_LIBS= cdio 0.1 \ > - cdio++ 0.1 \ > - cdio_cdda 0.1 \ > - cdio_paranoia 0.1 \ > - iso9660 0.1 \ > - iso9660++ 0.1 \ > - udf 0.1 > +SHARED_LIBS= cdio 1.0 \ > + cdio++ 1.0 \ > + iso9660 1.0 \ > + iso9660++ 1.0 \ > + udf 1.0 > > HOMEPAGE= https://www.gnu.org/software/libcdio/ > > # GPLv2+ > PERMIT_PACKAGE_CDROM= Yes > - > -WANTLIB= c cddb iconv m ncurses ${COMPILER_LIBCXX} > - > -COMPILER = base-clang ports-gcc base-gcc > +WANTLIB= c cddb iconv m ${COMPILER_LIBCXX} > > LIB_DEPENDS= audio/libcddb \ > converters/libiconv > +BUILD_DEPENDS= devel/libtool > > USE_GMAKE= Yes > -CONFIGURE_STYLE= autoconf > -AUTOCONF_VERSION= 2.61 > +CONFIGURE_STYLE=gnu > CONFIGURE_ARGS= --disable-vcd-info > -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ > - LDFLAGS="-L${LOCALBASE}/lib" > - > -post-extract: > - @cp ${FILESDIR}/openbsd.c ${WRKSRC}/lib/driver > - > -post-install: > - cd ${WRKSRC} && ${INSTALL_DATA} libcdio_cdda.pc > libcdio_paranoia.pc \ > - ${PREFIX}/lib/pkgconfig > > .include <bsd.port.mk> > Index: audio/libcdio/distinfo > =================================================================== > RCS file: /cvs/ports/audio/libcdio/distinfo,v > retrieving revision 1.2 > diff -u -p -r1.2 distinfo > --- audio/libcdio/distinfo 18 Jan 2015 03:12:43 -0000 > 1.2 +++ audio/libcdio/distinfo 22 Apr 2019 12:29:28 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (libcdio-0.80.tar.gz) = > saQaNNtaA0ZJEJwzKHguTi+kOLHivdxFjNJg9g73ymY= -SIZE > (libcdio-0.80.tar.gz) = 2083287 +SHA256 (libcdio-2.1.0.tar.bz2) = > hVDpWJ29WUv6yTuB7PEpsdydDVHpD5aW8bL5sq8ycSs= +SIZE > (libcdio-2.1.0.tar.bz2) = 1759040 Index: audio/libcdio/pkg/PLIST > =================================================================== > RCS file: /cvs/ports/audio/libcdio/pkg/PLIST,v > retrieving revision 1.4 > diff -u -p -r1.4 PLIST > --- audio/libcdio/pkg/PLIST 16 Mar 2015 18:07:35 -0000 > 1.4 +++ audio/libcdio/pkg/PLIST 21 Apr 2019 11:00:23 -0000 > @@ -1,9 +1,7 @@ > -@comment $OpenBSD: PLIST,v 1.4 2015/03/16 18:07:35 naddy Exp $ > +@comment $OpenBSD: PLIST,v$ > @bin bin/cd-drive > @bin bin/cd-info > -@bin bin/cd-paranoia > @bin bin/cd-read > -@bin bin/cdda-player > @bin bin/iso-info > @bin bin/iso-read > @bin bin/mmc-tool > @@ -23,7 +21,6 @@ include/cdio/audio.h > include/cdio/bytesex.h > include/cdio/bytesex_asm.h > include/cdio/cd_types.h > -include/cdio/cdda.h > include/cdio/cdio.h > include/cdio/cdio_config.h > include/cdio/cdtext.h > @@ -34,8 +31,12 @@ include/cdio/dvd.h > include/cdio/ecma_167.h > include/cdio/iso9660.h > include/cdio/logging.h > +include/cdio/memory.h > include/cdio/mmc.h > -include/cdio/paranoia.h > +include/cdio/mmc_cmds.h > +include/cdio/mmc_hl_cmds.h > +include/cdio/mmc_ll_cmds.h > +include/cdio/mmc_util.h > include/cdio/posix.h > include/cdio/read.h > include/cdio/rock.h > @@ -56,12 +57,6 @@ lib/libcdio++.la > lib/libcdio.a > lib/libcdio.la > @lib lib/libcdio.so.${LIBcdio_VERSION} > -lib/libcdio_cdda.a > -lib/libcdio_cdda.la > -@lib lib/libcdio_cdda.so.${LIBcdio_cdda_VERSION} > -lib/libcdio_paranoia.a > -lib/libcdio_paranoia.la > -@lib lib/libcdio_paranoia.so.${LIBcdio_paranoia_VERSION} > lib/libiso9660++.a > lib/libiso9660++.la > @lib lib/libiso9660++.so.${LIBiso9660++_VERSION} > @@ -73,17 +68,11 @@ lib/libudf.la > @lib lib/libudf.so.${LIBudf_VERSION} > lib/pkgconfig/libcdio++.pc > lib/pkgconfig/libcdio.pc > -lib/pkgconfig/libcdio_cdda.pc > -lib/pkgconfig/libcdio_paranoia.pc > lib/pkgconfig/libiso9660++.pc > lib/pkgconfig/libiso9660.pc > lib/pkgconfig/libudf.pc > -man/jp/ > -man/jp/man1/ > -@man man/jp/man1/cd-paranoia.1 > @man man/man1/cd-drive.1 > @man man/man1/cd-info.1 > -@man man/man1/cd-paranoia.1 > @man man/man1/cd-read.1 > @man man/man1/iso-info.1 > @man man/man1/iso-read.1 > Index: audio/aqualung/Makefile > =================================================================== > RCS file: /cvs/ports/audio/aqualung/Makefile,v > retrieving revision 1.52 > diff -u -p -r1.52 Makefile > --- audio/aqualung/Makefile 3 Feb 2019 03:58:35 -0000 > 1.52 +++ audio/aqualung/Makefile 22 Apr 2019 21:11:58 -0000 > @@ -4,7 +4,7 @@ COMMENT= advanced music player > > VERSION= 1.0 > DISTNAME= aqualung-${VERSION} > -REVISION= 8 > +REVISION= 9 > EPOCH= 0 > CATEGORIES= audio > > @@ -36,6 +36,7 @@ MODLUA_SA= Yes > LIB_DEPENDS= audio/flac \ > audio/lame \ > audio/libcdio \ > + audio/libcdio-paranoia \ > audio/libcddb \ > audio/libmad \ > audio/libmodplug \ > Index: audio/audacious-plugins/Makefile > =================================================================== > RCS file: /cvs/ports/audio/audacious-plugins/Makefile,v > retrieving revision 1.76 > diff -u -p -r1.76 Makefile > --- audio/audacious-plugins/Makefile 21 Feb 2019 22:37:58 > -0000 1.76 +++ audio/audacious-plugins/Makefile 22 Apr > 2019 13:21:25 -0000 @@ -4,7 +4,7 @@ COMMENT = input > and output plugins for > V = 3.9 > DISTNAME = audacious-plugins-$V > -REVISION = 1 > +REVISION = 2 > > CATEGORIES = audio multimedia > > @@ -40,6 +40,7 @@ LIB_DEPENDS = audio/faad>=2.7 \ > audio/flac \ > audio/lame \ > audio/libcdio \ > + audio/libcdio-paranoia \ > audio/libcue \ > audio/libmodplug \ > audio/libsamplerate \ > Index: audio/cantata/Makefile > =================================================================== > RCS file: /cvs/ports/audio/cantata/Makefile,v > retrieving revision 1.17 > diff -u -p -r1.17 Makefile > --- audio/cantata/Makefile 8 Mar 2019 20:00:39 -0000 > 1.17 +++ audio/cantata/Makefile 22 Apr 2019 13:41:23 -0000 > @@ -5,7 +5,7 @@ COMMENT = Qt-based MPD client > V = 2.3.2 > DISTNAME = cantata-${V} > HOMEPAGE = https://github.com/CDrummond/cantata > -REVISION = 0 > +REVISION = 1 > > MASTER_SITES = > https://github.com/CDrummond/cantata/releases/download/v${V}/ > EXTRACT_SUFX = .tar.bz2 @@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM > = Yes WANTLIB += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core > Qt5DBus Qt5Gui WANTLIB += Qt5Multimedia Qt5Network Qt5Sql Qt5Svg > Qt5Widgets Qt5Xml WANTLIB += avcodec avformat avutil c cddb cdio > cdio_cdda cdio_paranoia -WANTLIB += m mpg123 mtp musicbrainz5 tag z > avahi-client avahi-common +WANTLIB += iconv m mpg123 mtp musicbrainz5 > tag z avahi-client avahi-common > MODULES = devel/cmake \ > x11/qt5 > @@ -27,6 +27,7 @@ RUN_DEPENDS += devel/desktop-file-utils > RUN_DEPENDS += x11/gtk+3,-guic > LIB_DEPENDS += audio/mpg123 \ > audio/libcdio \ > + audio/libcdio-paranoia \ > audio/libcddb \ > audio/libmusicbrainz5 \ > audio/taglib \ > Index: audio/cmus/Makefile > =================================================================== > RCS file: /cvs/ports/audio/cmus/Makefile,v > retrieving revision 1.20 > diff -u -p -r1.20 Makefile > --- audio/cmus/Makefile 16 Apr 2019 20:19:01 -0000 1.20 > +++ audio/cmus/Makefile 22 Apr 2019 13:34:24 -0000 > @@ -7,7 +7,7 @@ V= 2.7.1 > DISTNAME= cmus-${V} > PKGNAME-main= ${PKGNAME} > PKGNAME-ffmpeg= cmus-ffmpeg-${V} > -REVISION= 6 > +REVISION= 7 > > GH_ACCOUNT= cmus > GH_PROJECT= cmus > @@ -26,6 +26,7 @@ WANTLIB-main+= ogg opusfile pthread > snd > LIB_DEPENDS-main= audio/flac \ > audio/libcdio \ > + audio/libcdio-paranoia \ > audio/libcue \ > audio/libdiscid \ > audio/libmad \ > Index: multimedia/mpv/Makefile > =================================================================== > RCS file: /cvs/ports/multimedia/mpv/Makefile,v > retrieving revision 1.46 > diff -u -p -r1.46 Makefile > --- multimedia/mpv/Makefile 25 Feb 2019 22:43:46 -0000 > 1.46 +++ multimedia/mpv/Makefile 22 Apr 2019 13:44:13 -0000 > @@ -6,6 +6,8 @@ GH_ACCOUNT = mpv-player > GH_PROJECT = mpv > GH_TAGNAME = v0.29.1 > > +REVISION = 0 > + > CATEGORIES = multimedia x11 > > HOMEPAGE = https://mpv.io/ > @@ -34,6 +36,7 @@ BUILD_DEPENDS = audio/ladspa \ > textproc/py-docutils > > LIB_DEPENDS = audio/libcdio \ > + audio/libcdio-paranoia \ > converters/libiconv \ > devel/libdvdread \ > devel/sdl2 \ > Index: audio/mpd/Makefile > =================================================================== > RCS file: /cvs/ports/audio/mpd/Makefile,v > retrieving revision 1.118 > diff -u -p -r1.118 Makefile > --- audio/mpd/Makefile 2 Jan 2019 21:32:32 -0000 1.118 > +++ audio/mpd/Makefile 22 Apr 2019 21:16:50 -0000 > @@ -3,6 +3,7 @@ > BROKEN-hppa = no atomic ops > COMMENT = Music Player Daemon > VER = 0.20.23 > +REVISION = 0 > DISTNAME = mpd-${VER} > CATEGORIES = audio > HOMEPAGE = https://www.musicpd.org/ > @@ -29,6 +30,7 @@ LIB_DEPENDS = audio/faad>=2.6.1p0 \ > audio/flac \ > audio/lame \ > audio/libcdio \ > + audio/libcdio-paranoia \ > audio/libid3tag \ > audio/libmikmod \ > audio/libmpdclient \ > Index: graphics/vcdimager/Makefile > =================================================================== > RCS file: /cvs/ports/graphics/vcdimager/Makefile,v > retrieving revision 1.20 > diff -u -p -r1.20 Makefile > --- graphics/vcdimager/Makefile 21 Nov 2017 00:13:01 > -0000 1.20 +++ graphics/vcdimager/Makefile 22 Apr 2019 > 21:19:29 -0000 @@ -2,9 +2,8 @@ > > COMMENT= (S)VCD authoring software > > -DISTNAME= vcdimager-0.7.24 > +DISTNAME= vcdimager-2.0.1 > CATEGORIES= graphics multimedia > -REVISION= 0 > > SHARED_LIBS += vcdinfo 0.0 # 2.0 > > Index: graphics/vcdimager/distinfo > =================================================================== > RCS file: /cvs/ports/graphics/vcdimager/distinfo,v > retrieving revision 1.6 > diff -u -p -r1.6 distinfo > --- graphics/vcdimager/distinfo 4 Jun 2015 06:26:29 > -0000 1.6 +++ graphics/vcdimager/distinfo 22 Apr 2019 > 14:30:39 -0000 @@ -1,2 +1,2 @@ > -SHA256 (vcdimager-0.7.24.tar.gz) = > B116ZzU/8wBHRdp4FDVpi2vEoFODjQ1KPOBRbX2XRpQ= -SIZE > (vcdimager-0.7.24.tar.gz) = 1066815 +SHA256 (vcdimager-2.0.1.tar.gz) > = Z1Ff77mCnQVL6uQPPoQDCb5gzafWh1PK/dUmcndY9no= +SIZE > (vcdimager-2.0.1.tar.gz) = 1115207 > > -- > Best Regards > Edd Barrett > > http://www.theunixzoo.co.uk >
