diff options
| author | Christian Weisgerber <naddy@FreeBSD.org> | 2010-06-06 20:39:21 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@FreeBSD.org> | 2010-06-06 20:39:21 +0000 |
| commit | f613ac049d40272c3b27a76dbab7f6723f2a2ba2 (patch) | |
| tree | e62b67c39f729f55f17b68f6438f9f1beeadd10c /sysutils/cdrdao | |
| parent | Update to 2.30.2.0. (diff) | |
Bump PORTREVISION after libao update and handle API incompatibility.
Notes
Notes:
svn path=/head/; revision=255956
Diffstat (limited to 'sysutils/cdrdao')
| -rw-r--r-- | sysutils/cdrdao/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/cdrdao/files/patch-trackdb::FormatMp3.cc | 10 | ||||
| -rw-r--r-- | sysutils/cdrdao/files/patch-trackdb::FormatOgg.cc | 10 | ||||
| -rw-r--r-- | sysutils/cdrdao/files/patch-xdao::SoundIF-ao.cc | 10 |
4 files changed, 32 insertions, 2 deletions
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile index e6a86a7e4364..8d78daa8730d 100644 --- a/sysutils/cdrdao/Makefile +++ b/sysutils/cdrdao/Makefile @@ -7,7 +7,7 @@ PORTNAME?= cdrdao PORTVERSION= 1.2.3 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= sysutils audio MASTER_SITES= SF MASTER_SITE_SUBDIR= cdrdao/cdrdao/${PORTVERSION} @@ -20,7 +20,7 @@ USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -MP3OGG_LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao \ +MP3OGG_LIB_DEPENDS= ao.4:${PORTSDIR}/audio/libao \ mad.2:${PORTSDIR}/audio/libmad \ vorbis.4:${PORTSDIR}/audio/libvorbis diff --git a/sysutils/cdrdao/files/patch-trackdb::FormatMp3.cc b/sysutils/cdrdao/files/patch-trackdb::FormatMp3.cc new file mode 100644 index 000000000000..1134a8b59a9f --- /dev/null +++ b/sysutils/cdrdao/files/patch-trackdb::FormatMp3.cc @@ -0,0 +1,10 @@ +--- trackdb/FormatMp3.cc.orig 2010-06-06 16:45:00.000000000 +0200 ++++ trackdb/FormatMp3.cc 2010-06-06 16:45:36.000000000 +0200 +@@ -111,6 +111,7 @@ FormatSupport::Status FormatMp3::madInit + + // Initialize libao for WAV output; + ao_sample_format out_format; ++ memset(&out_format, 0, sizeof(out_format)); + out_format.bits = 16; + out_format.rate = 44100; + out_format.channels = 2; diff --git a/sysutils/cdrdao/files/patch-trackdb::FormatOgg.cc b/sysutils/cdrdao/files/patch-trackdb::FormatOgg.cc new file mode 100644 index 000000000000..6647a3309f0d --- /dev/null +++ b/sysutils/cdrdao/files/patch-trackdb::FormatOgg.cc @@ -0,0 +1,10 @@ +--- trackdb/FormatOgg.cc.orig 2010-06-06 16:45:05.000000000 +0200 ++++ trackdb/FormatOgg.cc 2010-06-06 16:48:23.000000000 +0200 +@@ -84,6 +84,7 @@ FormatSupport::Status FormatOgg::oggInit + return FS_WRONG_FORMAT; + } + ++ memset(&outFormat_, 0, sizeof(outFormat_)); + outFormat_.bits = 16; + outFormat_.rate = 44100; + outFormat_.channels = 2; diff --git a/sysutils/cdrdao/files/patch-xdao::SoundIF-ao.cc b/sysutils/cdrdao/files/patch-xdao::SoundIF-ao.cc new file mode 100644 index 000000000000..2e5bde7b6ebc --- /dev/null +++ b/sysutils/cdrdao/files/patch-xdao::SoundIF-ao.cc @@ -0,0 +1,10 @@ +--- xdao/SoundIF-ao.cc.orig 2010-06-06 16:37:14.000000000 +0200 ++++ xdao/SoundIF-ao.cc 2010-06-06 16:42:17.000000000 +0200 +@@ -37,6 +37,7 @@ SoundIF::SoundIF() + + impl_ = new SoundIFImpl; + impl_->driverId = ao_default_driver_id(); ++ memset(&impl_->format, 0, sizeof(impl_->format)); + impl_->format.bits = 16; + impl_->format.rate = 44100; + impl_->format.channels = 2; |