From owner-freebsd-multimedia@FreeBSD.ORG Tue Apr 8 18:52:44 2008 Return-Path: Delivered-To: freebsd-multimedia@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C124F106566B for ; Tue, 8 Apr 2008 18:52:44 +0000 (UTC) (envelope-from me@janh.de) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.186]) by mx1.freebsd.org (Postfix) with ESMTP id 5B6868FC1B for ; Tue, 8 Apr 2008 18:52:43 +0000 (UTC) (envelope-from me@janh.de) Received: from janh.freebsd (f054097059.adsl.alicedsl.de [78.54.97.59]) by mrelayeu.kundenserver.de (node=mrelayeu7) with ESMTP (Nemesis) id 0ML2xA-1JjIjk43Fs-0003qC; Tue, 08 Apr 2008 20:40:05 +0200 Message-ID: <47FBBC12.5080802@janh.de> Date: Tue, 08 Apr 2008 20:40:18 +0200 From: Jan Henrik Sylvester User-Agent: Thunderbird 2.0.0.12 (X11/20080310) MIME-Version: 1.0 To: "Michael L. Hostbaek" Content-Type: multipart/mixed; boundary="------------030105030006090700090909" X-Provags-ID: V01U2FsdGVkX19gtRQdZghKrT8aC5OJSecDQMNGAgsjbOoQGTm z7fmG29HGcLenHUf9afpjVhT3HrOcvDYKRZHJbxafDgQ2ZWtqR VJjUj4fgZg+7QA8LuKtbg== Cc: multimedia-list freebsd Subject: Unbreak vlc after cdio upgrade X-BeenThere: freebsd-multimedia@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Multimedia discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2008 18:52:44 -0000 This is a multi-part message in MIME format. --------------030105030006090700090909 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit The latest cdio upgrade breaks the vlc build. These two patches converted over from Gentoo unbreak it. Jan Henrik ---------------------------------------- /usr/ports/multimedia/vlc/files/patch-modules_access_cdda_access.c ---------------------------------------- --- modules/access/cdda/access.c.orig 2008-03-23 23:41:48.000000000 +0100 +++ modules/access/cdda/access.c 2008-04-08 20:11:15.000000000 +0200 @@ -737,14 +737,14 @@ char *psz_paranoia = config_GetPsz( p_access, MODULE_STRING "-paranoia" ); - p_cdda->e_paranoia = paranoia_none; + p_cdda->e_paranoia = PARANOIA_MODE_DISABLE; if( psz_paranoia && *psz_paranoia ) { if( !strncmp( psz_paranoia, "full", strlen("full") ) ) - p_cdda->e_paranoia = paranoia_full; + p_cdda->e_paranoia = PARANOIA_MODE_FULL; else if( !strncmp( psz_paranoia, "overlap", strlen("overlap") ) ) - p_cdda->e_paranoia = paranoia_overlap; + p_cdda->e_paranoia = PARANOIA_MODE_OVERLAP; /* Use CD Paranoia? */ if ( p_cdda->e_paranoia ) { @@ -755,7 +755,7 @@ if ( 0 != cdio_cddap_open(p_cdda->paranoia_cd) ) { msg_Warn( p_cdda_input, "unable to get paranoia support - " "continuing without it." ); - p_cdda->e_paranoia = paranoia_none; + p_cdda->e_paranoia = PARANOIA_MODE_DISABLE; } else { p_cdda->paranoia = cdio_paranoia_init(p_cdda->paranoia_cd); cdio_paranoia_seek(p_cdda->paranoia, p_cdda->i_lsn, SEEK_SET); @@ -763,7 +763,7 @@ /* Set reading mode for full or overlap paranoia, but allow skipping sectors. */ cdio_paranoia_modeset(p_cdda->paranoia, - paranoia_full == p_cdda->e_paranoia ? + PARANOIA_MODE_FULL == p_cdda->e_paranoia ? PARANOIA_MODE_FULL^PARANOIA_MODE_NEVERSKIP : PARANOIA_MODE_OVERLAP^PARANOIA_MODE_NEVERSKIP ); ---------------------------------------- /usr/ports/multimedia/vlc/files/patch-modules_access_cdda_cdda.h ---------------------------------------- --- modules/access/cdda/cdda.h.orig 2008-03-23 23:41:48.000000000 +0100 +++ modules/access/cdda/cdda.h 2008-04-08 20:07:42.000000000 +0200 @@ -71,11 +71,13 @@ #define CdIo_t CdIo #endif +#if LIBCDIO_VERSION_NUM < 78 typedef enum { - paranoia_none = 0, /* Note: We make use of 0 as being the same as false */ - paranoia_overlap = 1, - paranoia_full = 2 + PARANOIA_MODE_DISABLE = 0x00, /* Note: We make use of 0 as being the same as false */ + PARANOIA_MODE_OVERLAP = 0x04, + PARANOIA_MODE_FULL = 0xff } paranoia_mode_t; +#endif /***************************************************************************** --------------030105030006090700090909 Content-Type: text/plain; name="patch-modules_access_cdda_access.c" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="patch-modules_access_cdda_access.c" --- modules/access/cdda/access.c.orig 2008-03-23 23:41:48.000000000 +0100 +++ modules/access/cdda/access.c 2008-04-08 20:11:15.000000000 +0200 @@ -737,14 +737,14 @@ char *psz_paranoia = config_GetPsz( p_access, MODULE_STRING "-paranoia" ); - p_cdda->e_paranoia = paranoia_none; + p_cdda->e_paranoia = PARANOIA_MODE_DISABLE; if( psz_paranoia && *psz_paranoia ) { if( !strncmp( psz_paranoia, "full", strlen("full") ) ) - p_cdda->e_paranoia = paranoia_full; + p_cdda->e_paranoia = PARANOIA_MODE_FULL; else if( !strncmp( psz_paranoia, "overlap", strlen("overlap") ) ) - p_cdda->e_paranoia = paranoia_overlap; + p_cdda->e_paranoia = PARANOIA_MODE_OVERLAP; /* Use CD Paranoia? */ if ( p_cdda->e_paranoia ) { @@ -755,7 +755,7 @@ if ( 0 != cdio_cddap_open(p_cdda->paranoia_cd) ) { msg_Warn( p_cdda_input, "unable to get paranoia support - " "continuing without it." ); - p_cdda->e_paranoia = paranoia_none; + p_cdda->e_paranoia = PARANOIA_MODE_DISABLE; } else { p_cdda->paranoia = cdio_paranoia_init(p_cdda->paranoia_cd); cdio_paranoia_seek(p_cdda->paranoia, p_cdda->i_lsn, SEEK_SET); @@ -763,7 +763,7 @@ /* Set reading mode for full or overlap paranoia, but allow skipping sectors. */ cdio_paranoia_modeset(p_cdda->paranoia, - paranoia_full == p_cdda->e_paranoia ? + PARANOIA_MODE_FULL == p_cdda->e_paranoia ? PARANOIA_MODE_FULL^PARANOIA_MODE_NEVERSKIP : PARANOIA_MODE_OVERLAP^PARANOIA_MODE_NEVERSKIP ); --------------030105030006090700090909 Content-Type: text/plain; name="patch-modules_access_cdda_cdda.h" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="patch-modules_access_cdda_cdda.h" --- modules/access/cdda/cdda.h.orig 2008-03-23 23:41:48.000000000 +0100 +++ modules/access/cdda/cdda.h 2008-04-08 20:07:42.000000000 +0200 @@ -71,11 +71,13 @@ #define CdIo_t CdIo #endif +#if LIBCDIO_VERSION_NUM < 78 typedef enum { - paranoia_none = 0, /* Note: We make use of 0 as being the same as false */ - paranoia_overlap = 1, - paranoia_full = 2 + PARANOIA_MODE_DISABLE = 0x00, /* Note: We make use of 0 as being the same as false */ + PARANOIA_MODE_OVERLAP = 0x04, + PARANOIA_MODE_FULL = 0xff } paranoia_mode_t; +#endif /***************************************************************************** --------------030105030006090700090909--