Index: head/multimedia/gmerlin/Makefile =================================================================== --- head/multimedia/gmerlin/Makefile (revision 465686) +++ head/multimedia/gmerlin/Makefile (revision 465687) @@ -1,85 +1,85 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= gmerlin PORTVERSION= 1.2.0 PORTREVISION= 12 CATEGORIES= multimedia MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Multimedia framework LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexif.so:graphics/libexif \ libgavl.so:multimedia/gavl \ libfontconfig.so:x11-fonts/fontconfig USES= gettext libtool makeinfo pathfix pkgconfig sqlite USE_GNOME= gtk20 libxml2 USE_XORG= x11 xext xfixes xinerama xv USE_GL= gl GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_func_inotify_init=no CONFIGURE_ARGS= --disable-v4l --disable-v4l2 --disable-v4lconvert \ --without-doxygen --with-cpuflags=none --disable-musicbrainz USE_LDCONFIG= yes INSTALL_TARGET= install-strip INSTALL_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib LDFLAGS+= -Wl,--add-needed INFO= gmerlin OPTIONS_DEFINE= ALSA CDDB CDIO ESOUND JACK JPEG LIBVISUAL \ OPTIMIZED_CFLAGS PNG PULSEAUDIO QUICKTIME TIFF DOCS OPTIONS_DEFAULT= CDDB JACK JPEG LIBVISUAL \ OPTIMIZED_CFLAGS PNG PULSEAUDIO QUICKTIME TIFF OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib 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 JACK_CONFIGURE_OFF= --disable-jack JPEG_USES= jpeg JPEG_CONFIGURE_OFF= --disable-libjpeg LIBVISUAL_LIB_DEPENDS= libvisual-0.4.so:graphics/libvisual04 LIBVISUAL_CONFIGURE_OFF=--disable-libvisual OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops -fomit-frame-pointer -ffast-math PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CONFIGURE_OFF= --disable-libpng PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_OFF=--disable-pulseaudio QUICKTIME_LIB_DEPENDS= libquicktime.so:multimedia/libquicktime QUICKTIME_CONFIGURE_OFF=--disable-lqt TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_CONFIGURE_OFF= --disable-libtiff post-patch: @${REINPLACE_CMD} -e \ '/LIBS/s|-ldl || ; \ s|-DGTK_DISABLE_DEPRECATED|| ; \ s|-O3.*-ffast-math||' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ 's|^texinfo_|#texinfo_|g' ${WRKSRC}/doc/Makefile.in @${REINPLACE_CMD} -e \ 's|ln -sf $$(DESTDIR)|ln -sf |' ${WRKSRC}/icons/Makefile.in @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|-ldl||g' post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}) .include Index: head/multimedia/gmerlin/files/patch-plugins_cdaudio_cdparanoia.c =================================================================== --- head/multimedia/gmerlin/files/patch-plugins_cdaudio_cdparanoia.c (nonexistent) +++ head/multimedia/gmerlin/files/patch-plugins_cdaudio_cdparanoia.c (revision 465687) @@ -0,0 +1,15 @@ +Fix build with sysutils/libcdio >= 0.90 + +--- 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 Property changes on: head/multimedia/gmerlin/files/patch-plugins_cdaudio_cdparanoia.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/gmerlin/files/patch-plugins_cdaudio_cdtext.c =================================================================== --- head/multimedia/gmerlin/files/patch-plugins_cdaudio_cdtext.c (nonexistent) +++ head/multimedia/gmerlin/files/patch-plugins_cdaudio_cdtext.c (revision 465687) @@ -0,0 +1,91 @@ +Fix build with sysutils/libcdio >= 0.90 + +--- 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 Property changes on: head/multimedia/gmerlin/files/patch-plugins_cdaudio_cdtext.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property