Index: audio/aqualung/Makefile =================================================================== --- audio/aqualung/Makefile +++ audio/aqualung/Makefile @@ -3,7 +3,7 @@ PORTNAME= aqualung PORTVERSION= 1.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio MASTER_SITES= SF Index: audio/clementine-player/Makefile =================================================================== --- audio/clementine-player/Makefile +++ audio/clementine-player/Makefile @@ -3,7 +3,7 @@ PORTNAME= clementine PORTVERSION= 1.3.1 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= audio PKGNAMESUFFIX= -player Index: audio/cmus/Makefile =================================================================== --- audio/cmus/Makefile +++ audio/cmus/Makefile @@ -4,7 +4,7 @@ PORTNAME= cmus DISTVERSIONPREFIX= v DISTVERSION= 2.8.0-rc0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio DIST_SUBDIR= cmus Index: audio/deadbeef/Makefile =================================================================== --- audio/deadbeef/Makefile +++ audio/deadbeef/Makefile @@ -3,7 +3,7 @@ PORTNAME= deadbeef PORTVERSION= 0.7.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/ Index: audio/musicpd/Makefile =================================================================== --- audio/musicpd/Makefile +++ audio/musicpd/Makefile @@ -2,6 +2,7 @@ PORTNAME= musicpd PORTVERSION= 0.20.17 +PORTREVISION= 1 CATEGORIES= audio ipv6 MASTER_SITES= http://www.musicpd.org/download/mpd/${PORTVERSION:R}/ DISTNAME= mpd-${PORTVERSION} Index: audio/mythplugin-mythmusic/Makefile =================================================================== --- audio/mythplugin-mythmusic/Makefile +++ audio/mythplugin-mythmusic/Makefile @@ -4,7 +4,7 @@ PORTNAME= mythmusic PORTVERSION= 0.27.5 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio PKGNAMEPREFIX= mythplugin- Index: audio/py-fmoo-audiotools/Makefile =================================================================== --- audio/py-fmoo-audiotools/Makefile +++ audio/py-fmoo-audiotools/Makefile @@ -2,7 +2,7 @@ PORTNAME= fmoo-audiotools PORTVERSION= 3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio python MASTER_SITES= SF/audiotools/audiotools DISTNAME= audiotools-${PORTVERSION} Index: audio/xmms2/Makefile =================================================================== --- audio/xmms2/Makefile +++ audio/xmms2/Makefile @@ -4,7 +4,7 @@ PORTNAME?= xmms2 PORTVERSION= 0.8 DISTVERSIONSUFFIX= DrO_o -PORTREVISION?= 23 +PORTREVISION?= 24 CATEGORIES?= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX} Index: devel/gvfs/Makefile =================================================================== --- devel/gvfs/Makefile +++ devel/gvfs/Makefile @@ -3,7 +3,7 @@ PORTNAME= gvfs PORTVERSION= 1.26.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 Index: emulators/mednafen/Makefile =================================================================== --- emulators/mednafen/Makefile +++ emulators/mednafen/Makefile @@ -2,7 +2,7 @@ PORTNAME= mednafen PORTVERSION= 0.9.45.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= emulators games MASTER_SITES= https://mednafen.github.io/releases/files/ Index: emulators/pcsxr/Makefile =================================================================== --- emulators/pcsxr/Makefile +++ emulators/pcsxr/Makefile @@ -3,7 +3,7 @@ PORTNAME= pcsxr PORTVERSION= 1.9.94.r87113 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= emulators MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \ LOCAL/martymac Index: multimedia/audacious-plugins-gtk3/Makefile =================================================================== --- multimedia/audacious-plugins-gtk3/Makefile +++ multimedia/audacious-plugins-gtk3/Makefile @@ -4,7 +4,7 @@ PORTNAME= audacious-plugins PORTVERSION= 3.9 DISTVERSIONSUFFIX= -gtk3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio #MASTER_SITES= http://distfiles.audacious-media-player.org/ PKGNAMESUFFIX= ${DISTVERSIONSUFFIX} Index: multimedia/audacious-plugins/Makefile =================================================================== --- multimedia/audacious-plugins/Makefile +++ multimedia/audacious-plugins/Makefile @@ -3,7 +3,7 @@ PORTNAME= audacious-plugins PORTVERSION= 3.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio MASTER_SITES= http://distfiles.audacious-media-player.org/ Index: multimedia/ffmpeg/Makefile =================================================================== --- multimedia/ffmpeg/Makefile +++ multimedia/ffmpeg/Makefile @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 3.4.1 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ Index: multimedia/gmerlin-avdecoder/Makefile =================================================================== --- multimedia/gmerlin-avdecoder/Makefile +++ multimedia/gmerlin-avdecoder/Makefile @@ -3,7 +3,7 @@ PORTNAME= gmerlin-avdecoder PORTVERSION= 1.2.0 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= multimedia MASTER_SITES= SF/gmerlin/${PORTNAME}/${PORTVERSION} Index: multimedia/gmerlin/Makefile =================================================================== --- multimedia/gmerlin/Makefile +++ multimedia/gmerlin/Makefile @@ -3,7 +3,7 @@ PORTNAME= gmerlin PORTVERSION= 1.2.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= multimedia MASTER_SITES= SF @@ -45,9 +45,9 @@ ALSA_CONFIGURE_OFF= --disable-alsa --disable-alsamixer CDDB_LIB_DEPENDS= libcddb.so:audio/libcddb CDDB_CONFIGURE_OFF= --disable-cddb -CDIO_LIB_DEPENDS= libcdio.so:sysutils/libcdio +CDIO_LIB_DEPENDS= libcdio.so:sysutils/libcdio \ + libcdio_cdda.so:sysutils/libcdio-paranoia CDIO_CONFIGURE_OFF= --disable-libcdio -CDIO_BROKEN= fails to build with new libcdio ESOUND_USE= gnome=esound ESOUND_CONFIGURE_OFF= --disable-esd JACK_LIB_DEPENDS= libjack.so:audio/jack Index: multimedia/gmerlin/files/patch-plugins_cdaudio_cdparanoia.c =================================================================== --- /dev/null +++ multimedia/gmerlin/files/patch-plugins_cdaudio_cdparanoia.c @@ -0,0 +1,15 @@ +Fix build with sysutils/libcdio 2.x + +--- plugins/cdaudio/cdparanoia.c.orig 2018-02-22 06:24:11 UTC ++++ plugins/cdaudio/cdparanoia.c +@@ -28,8 +28,8 @@ + + #include "cdaudio.h" + #define DO_NOT_WANT_PARANOIA_COMPATIBILITY +-#include +-#include ++#include ++#include + + /* + * Ripping support Index: multimedia/gmerlin/files/patch-plugins_cdaudio_cdtext.c =================================================================== --- /dev/null +++ multimedia/gmerlin/files/patch-plugins_cdaudio_cdtext.c @@ -0,0 +1,91 @@ +Fix build with sysutils/libcdio 2.x + +--- plugins/cdaudio/cdtext.c.orig 2012-06-08 11:50:33 UTC ++++ plugins/cdaudio/cdtext.c +@@ -34,7 +34,7 @@ + #include "cdaudio.h" + + #define GET_FIELD(dst, key) \ +- field = cdtext_get_const(key, cdtext); ++ field = cdtext_get_const(cdtext, key, i+1); + + #define GET_FIELD_DEFAULT(dst,key) \ + field = cdtext_get_const(key, cdtext); \ +@@ -64,38 +64,34 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_t * cdio, + + /* Get information for the whole disc */ + +- cdtext = cdio_get_cdtext (cdio, 0); ++ cdtext = cdio_get_cdtext (cdio); + + if(!cdtext) + return 0; + +- artist = cdtext_get_const(CDTEXT_PERFORMER, cdtext); +- author = cdtext_get_const(CDTEXT_COMPOSER, cdtext); /* Composer overwrites songwriter */ ++ artist = cdtext_get_const(cdtext, CDTEXT_FIELD_PERFORMER, 0); ++ author = cdtext_get_const(cdtext, CDTEXT_FIELD_COMPOSER, 0); /* Composer overwrites songwriter */ + + if(!author) +- author = cdtext_get_const(CDTEXT_SONGWRITER, cdtext); ++ author = cdtext_get_const(cdtext, CDTEXT_FIELD_SONGWRITER, 0); + +- album = cdtext_get_const(CDTEXT_TITLE, cdtext); +- genre = cdtext_get_const(CDTEXT_GENRE, cdtext); +- comment = cdtext_get_const(CDTEXT_MESSAGE, cdtext); ++ album = cdtext_get_const(cdtext, CDTEXT_FIELD_TITLE, 0); ++ genre = cdtext_get_const(cdtext, CDTEXT_FIELD_GENRE, 0); ++ comment = cdtext_get_const(cdtext, CDTEXT_FIELD_MESSAGE, 0); + + for(i = 0; i < idx->num_tracks; i++) + { + if(idx->tracks[i].is_audio) + { +- cdtext = cdio_get_cdtext (cdio, i+1); +- if(!cdtext) +- return 0; ++ GET_FIELD(title, CDTEXT_FIELD_TITLE); + +- GET_FIELD(title, CDTEXT_TITLE); +- + if(!title) + return 0; + + gavl_metadata_set(&info[idx->tracks[i].index].metadata, + GAVL_META_TITLE, title); + +- if((field = cdtext_get_const(CDTEXT_PERFORMER, cdtext))) ++ if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_PERFORMER, i+1))) + gavl_metadata_set(&info[idx->tracks[i].index].metadata, + GAVL_META_ARTIST, field); + else +@@ -103,10 +99,10 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_t * cdio, + GAVL_META_ARTIST, artist); + + +- if((field = cdtext_get_const(CDTEXT_COMPOSER, cdtext))) ++ if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_COMPOSER, i+1))) + gavl_metadata_set(&info[idx->tracks[i].index].metadata, + GAVL_META_AUTHOR, field); +- else if((field = cdtext_get_const(CDTEXT_SONGWRITER, cdtext))) ++ else if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_SONGWRITER, i+1))) + gavl_metadata_set(&info[idx->tracks[i].index].metadata, + GAVL_META_AUTHOR, field); + else if(author) +@@ -114,14 +110,14 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_t * cdio, + GAVL_META_AUTHOR, author); + + +- if((field = cdtext_get_const(CDTEXT_GENRE, cdtext))) ++ if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_GENRE, i+1))) + gavl_metadata_set(&info[idx->tracks[i].index].metadata, + GAVL_META_GENRE, field); + else + gavl_metadata_set(&info[idx->tracks[i].index].metadata, + GAVL_META_GENRE, genre); + +- if((field = cdtext_get_const(CDTEXT_MESSAGE, cdtext))) ++ if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_MESSAGE, i+1))) + gavl_metadata_set(&info[idx->tracks[i].index].metadata, + GAVL_META_COMMENT, field); + else Index: multimedia/kodi-devel/Makefile =================================================================== --- multimedia/kodi-devel/Makefile +++ multimedia/kodi-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= kodi DISTVERSION= 18.0.g201801112007 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia PKGNAMESUFFIX?= -devel Index: multimedia/kodi/Makefile =================================================================== --- multimedia/kodi/Makefile +++ multimedia/kodi/Makefile @@ -2,7 +2,7 @@ PORTNAME= kodi DISTVERSION= 17.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia java MAINTAINER= mickael.maillot@gmail.com Index: multimedia/libav/Makefile =================================================================== --- multimedia/libav/Makefile +++ multimedia/libav/Makefile @@ -2,7 +2,7 @@ PORTNAME= libav PORTVERSION= 12.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://libav.org/releases/ Index: multimedia/libxine/Makefile =================================================================== --- multimedia/libxine/Makefile +++ multimedia/libxine/Makefile @@ -3,7 +3,7 @@ PORTNAME= xine PORTVERSION= 1.2.6 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= multimedia ipv6 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION} PKGNAMEPREFIX= lib Index: multimedia/mplayer/Makefile =================================================================== --- multimedia/mplayer/Makefile +++ multimedia/mplayer/Makefile @@ -3,7 +3,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org Index: multimedia/mpv/Makefile =================================================================== --- multimedia/mpv/Makefile +++ multimedia/mpv/Makefile @@ -3,7 +3,7 @@ PORTNAME= mpv PORTVERSION= 0.27.2 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= multimedia audio Index: multimedia/qmmp-qt5/Makefile =================================================================== --- multimedia/qmmp-qt5/Makefile +++ multimedia/qmmp-qt5/Makefile @@ -2,6 +2,7 @@ PORTNAME= qmmp PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://qmmp.ylsoftware.com/files/ \ SF/qmmp-dev/${PORTNAME}/ Index: multimedia/qmmp/Makefile =================================================================== --- multimedia/qmmp/Makefile +++ multimedia/qmmp/Makefile @@ -2,6 +2,7 @@ PORTNAME= qmmp PORTVERSION= 0.11.0 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://qmmp.ylsoftware.com/files/ \ SF/qmmp-dev/${PORTNAME}/ Index: multimedia/vcdimager/Makefile =================================================================== --- multimedia/vcdimager/Makefile +++ multimedia/vcdimager/Makefile @@ -2,26 +2,26 @@ # $FreeBSD$ PORTNAME= vcdimager -PORTVERSION= 0.7.24 -PORTREVISION= 7 +PORTVERSION= 2.0.1 CATEGORIES= multimedia MASTER_SITES= GNU MAINTAINER= multimedia@FreeBSD.org COMMENT= GNU VCDImager/VCDRip -- The GNU VideoCD Image Maker/Ripping Tool -LICENSE= GPLv2 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpopt.so:devel/popt \ libxml2.so:textproc/libxml2 \ libcdio.so:sysutils/libcdio +USES= gmake libtool localbase makeinfo pathfix pkgconfig +USE_LDCONFIG= yes + GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USES= gmake libtool pathfix pkgconfig -USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib +TEST_TARGET= check INFO= vcdimager vcdxrip vcd-info Index: multimedia/vcdimager/distinfo =================================================================== --- multimedia/vcdimager/distinfo +++ multimedia/vcdimager/distinfo @@ -1,2 +1,3 @@ -SHA256 (vcdimager-0.7.24.tar.gz) = 075d7a67353ff3004745da781435698b6bc4a053838d0d4a3ce0516d7d974694 -SIZE (vcdimager-0.7.24.tar.gz) = 1066815 +TIMESTAMP = 1519291369 +SHA256 (vcdimager-2.0.1.tar.gz) = 67515fefb9829d054beae40f3e840309be60cda7d68753cafdd526727758f67a +SIZE (vcdimager-2.0.1.tar.gz) = 1115207 Index: multimedia/vcdimager/pkg-descr =================================================================== --- multimedia/vcdimager/pkg-descr +++ multimedia/vcdimager/pkg-descr @@ -14,5 +14,5 @@ - Extraction of Video CD's into files (incl. the PBC information) - Use of XML for the description of Video CD's -WWW: http://www.gnu.org/software/vcdimager/ - http://www.vcdimager.org/ +WWW: https://www.gnu.org/software/vcdimager/ + https://github.com/rocky/vcdimager Index: multimedia/vcdimager/pkg-plist =================================================================== --- multimedia/vcdimager/pkg-plist +++ multimedia/vcdimager/pkg-plist @@ -1,10 +1,10 @@ +bin/cdxa2mpeg bin/vcd-info bin/vcdimager -bin/cdxa2mpeg bin/vcdxbuild bin/vcdxgen -bin/vcdxrip bin/vcdxminfo +bin/vcdxrip include/libvcd/files.h include/libvcd/files_private.h include/libvcd/inf.h Index: print/kover/Makefile =================================================================== --- print/kover/Makefile +++ print/kover/Makefile @@ -3,7 +3,7 @@ PORTNAME= kover PORTVERSION= 6 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= print kde MASTER_SITES= https://lisas.de/kover/ Index: sysutils/gstreamer-plugins-cdio/Makefile =================================================================== --- sysutils/gstreamer-plugins-cdio/Makefile +++ sysutils/gstreamer-plugins-cdio/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ CATEGORIES= sysutils -PORTREVISION= 2 +PORTREVISION= 3 COMMENT= Gstreamer compact disc input and control library Index: sysutils/gstreamer1-plugins-cdio/Makefile =================================================================== --- sysutils/gstreamer1-plugins-cdio/Makefile +++ sysutils/gstreamer1-plugins-cdio/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= sysutils COMMENT= GStreamer compact disc input and control library Index: sysutils/libcdio-paranoia/Makefile =================================================================== --- sysutils/libcdio-paranoia/Makefile +++ sysutils/libcdio-paranoia/Makefile @@ -2,6 +2,7 @@ PORTNAME= libcdio-paranoia PORTVERSION= 10.2+0.94+1 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= GNU/libcdio Index: sysutils/libcdio/Makefile =================================================================== --- sysutils/libcdio/Makefile +++ sysutils/libcdio/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libcdio -PORTVERSION= 0.94 +PORTVERSION= 2.0.0 CATEGORIES= sysutils MASTER_SITES= GNU @@ -26,8 +26,6 @@ INFO= libcdio CPE_VENDOR= gnu INSTALL_TARGET= install-strip - -post-patch: - @${REINPLACE_CMD} -e 's|freebsd10\.\*|freebsd*|g' ${WRKSRC}/configure +TEST_TARGET= check .include Index: sysutils/libcdio/distinfo =================================================================== --- sysutils/libcdio/distinfo +++ sysutils/libcdio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484801785 -SHA256 (libcdio-0.94.tar.gz) = 96e2c903f866ae96f9f5b9048fa32db0921464a2286f5b586c0f02699710025a -SIZE (libcdio-0.94.tar.gz) = 2355452 +TIMESTAMP = 1519235055 +SHA256 (libcdio-2.0.0.tar.gz) = 1b481b5da009bea31db875805665974e2fc568e2b2afa516f4036733657cf958 +SIZE (libcdio-2.0.0.tar.gz) = 2354813 Index: sysutils/libcdio/pkg-plist =================================================================== --- sysutils/libcdio/pkg-plist +++ sysutils/libcdio/pkg-plist @@ -50,20 +50,20 @@ include/cdio/xa.h lib/libcdio++.a lib/libcdio++.so -lib/libcdio++.so.0 -lib/libcdio++.so.0.0.2 +lib/libcdio++.so.1 +lib/libcdio++.so.1.0.0 lib/libcdio.a lib/libcdio.so -lib/libcdio.so.16 -lib/libcdio.so.16.0.0 +lib/libcdio.so.18 +lib/libcdio.so.18.0.0 lib/libiso9660++.a lib/libiso9660++.so lib/libiso9660++.so.0 lib/libiso9660++.so.0.0.0 lib/libiso9660.a lib/libiso9660.so -lib/libiso9660.so.10 -lib/libiso9660.so.10.0.0 +lib/libiso9660.so.11 +lib/libiso9660.so.11.0.0 lib/libudf.a lib/libudf.so lib/libudf.so.0 Index: sysutils/unieject/Makefile =================================================================== --- sysutils/unieject/Makefile +++ sysutils/unieject/Makefile @@ -3,7 +3,7 @@ PORTNAME= unieject PORTVERSION= 6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MASTER_SITES= SF