diff options
| author | Michael Johnson <ahze@FreeBSD.org> | 2008-04-09 12:18:51 +0000 |
|---|---|---|
| committer | Michael Johnson <ahze@FreeBSD.org> | 2008-04-09 12:18:51 +0000 |
| commit | a3b9b8fcce2e8c09b759a81f19f31ee7c27cf9f5 (patch) | |
| tree | 81694083ee30e48cb3a026af2d1d1c0d140a9cef /multimedia | |
| parent | Update to 2.22.1 (diff) | |
Fix build with libcdio
Submitted by: Jan Henrik Sylvester <me@janh.de>
Joseph S. Atkinson <jsatkinson@embarqmail.com>
Obtained from: gentoo
Notes
Notes:
svn path=/head/; revision=210925
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/vlc/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/vlc/files/patch-libcdio | 55 |
2 files changed, 56 insertions, 1 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index e7c178b8f9c3..48b7e9974435 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -10,7 +10,7 @@ PORTNAME= vlc DISTVERSION= 0.8.6f -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 2 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${DISTVERSION}/ \ diff --git a/multimedia/vlc/files/patch-libcdio b/multimedia/vlc/files/patch-libcdio new file mode 100644 index 000000000000..2b09da24e67d --- /dev/null +++ b/multimedia/vlc/files/patch-libcdio @@ -0,0 +1,55 @@ +--- modules/access/cdda/cdda.h.orig 2008-04-09 08:08:07.801650907 -0400 ++++ modules/access/cdda/cdda.h 2008-04-09 08:09:00.648021466 -0400 +@@ -71,12 +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_t; +- ++#endif + + /***************************************************************************** + * cdda_data_t: CD audio information +--- modules/access/cdda/access.c.orig 2008-04-09 08:05:14.289716290 -0400 ++++ modules/access/cdda/access.c 2008-04-09 08:07:57.944769027 -0400 +@@ -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 + ); |