From owner-svn-ports-all@freebsd.org Tue Mar 27 11:30:08 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7495EF70686; Tue, 27 Mar 2018 11:30:08 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 269477ED89; Tue, 27 Mar 2018 11:30:08 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1D0AE1B6FE; Tue, 27 Mar 2018 11:30:08 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2RBU7uV071873; Tue, 27 Mar 2018 11:30:07 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2RBU7CA071870; Tue, 27 Mar 2018 11:30:07 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201803271130.w2RBU7CA071870@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Tue, 27 Mar 2018 11:30:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r465690 - in branches/2018Q1/multimedia/gmerlin: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jhale X-SVN-Commit-Paths: in branches/2018Q1/multimedia/gmerlin: . files X-SVN-Commit-Revision: 465690 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2018 11:30:08 -0000 Author: jhale Date: Tue Mar 27 11:30:07 2018 New Revision: 465690 URL: https://svnweb.freebsd.org/changeset/ports/465690 Log: MFH: r465687 Fix build with CDIO option enabled Obtained from: Arch Linux (https://aur.archlinux.org/cgit/aur.git/tree/cdio-api-fixes.patch?h=gmerlin) Approved by: ports-secteam (blanket) Added: branches/2018Q1/multimedia/gmerlin/files/patch-plugins_cdaudio_cdparanoia.c - copied unchanged from r465687, head/multimedia/gmerlin/files/patch-plugins_cdaudio_cdparanoia.c branches/2018Q1/multimedia/gmerlin/files/patch-plugins_cdaudio_cdtext.c - copied unchanged from r465687, head/multimedia/gmerlin/files/patch-plugins_cdaudio_cdtext.c Modified: branches/2018Q1/multimedia/gmerlin/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/multimedia/gmerlin/Makefile ============================================================================== --- branches/2018Q1/multimedia/gmerlin/Makefile Tue Mar 27 11:15:39 2018 (r465689) +++ branches/2018Q1/multimedia/gmerlin/Makefile Tue Mar 27 11:30:07 2018 (r465690) @@ -45,9 +45,9 @@ 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 Copied: branches/2018Q1/multimedia/gmerlin/files/patch-plugins_cdaudio_cdparanoia.c (from r465687, head/multimedia/gmerlin/files/patch-plugins_cdaudio_cdparanoia.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/multimedia/gmerlin/files/patch-plugins_cdaudio_cdparanoia.c Tue Mar 27 11:30:07 2018 (r465690, copy of r465687, head/multimedia/gmerlin/files/patch-plugins_cdaudio_cdparanoia.c) @@ -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 Copied: branches/2018Q1/multimedia/gmerlin/files/patch-plugins_cdaudio_cdtext.c (from r465687, head/multimedia/gmerlin/files/patch-plugins_cdaudio_cdtext.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/multimedia/gmerlin/files/patch-plugins_cdaudio_cdtext.c Tue Mar 27 11:30:07 2018 (r465690, copy of r465687, head/multimedia/gmerlin/files/patch-plugins_cdaudio_cdtext.c) @@ -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