diff options
| author | tron <tron@pkgsrc.org> | 2014-07-25 14:21:18 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2014-07-25 14:21:18 +0000 |
| commit | 8629c86668aed54346930c921f0f87cff6bd7b74 (patch) | |
| tree | c5a0ff7176f5618a7a6c6aedafd149751b981604 | |
| parent | 3273a308f5025a35f62efa5e1565aa18865147e3 (diff) | |
| download | pkgsrc-8629c86668aed54346930c921f0f87cff6bd7b74.tar.gz | |
Fix (one?) build problem with GCC 4.5.3.
| -rw-r--r-- | www/firefox/distinfo | 3 | ||||
| -rw-r--r-- | www/firefox/patches/patch-content_media_fmp4_demuxer_bit_reader.cc | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/www/firefox/distinfo b/www/firefox/distinfo index df2daacc279..2e08cb9de4b 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.157 2014/07/24 14:57:12 ryoon Exp $ +$NetBSD: distinfo,v 1.158 2014/07/25 14:21:18 tron Exp $ SHA1 (firefox-31.0.source.tar.bz2) = a6c3e25ee3aeb7da42db2aaeb50a385d63532beb RMD160 (firefox-31.0.source.tar.bz2) = 8512ed164920c9fdad492ba2b47b46aae4894564 @@ -35,6 +35,7 @@ SHA1 (patch-content_base_src_moz.build) = fc2660dcc82f11c89d6d5a5772f27c9827f58f SHA1 (patch-content_media_AudioStream.cpp) = 70021dfd1cc86e8999f144b49a23bfb27dd24157 SHA1 (patch-content_media_AudioStream.h) = 5cda5329db7bef4c45f3a05a33a5ee7043ec3c2e SHA1 (patch-content_media_Makefile.in) = 54c8c5e41eb36bae0ce544360ded9f75ba3acc13 +SHA1 (patch-content_media_fmp4_demuxer_bit_reader.cc) = 6d87cd7231e61a12396d15dd2fa3d1a51051e8ee SHA1 (patch-content_media_gstreamer_GStreamerAllocator.cpp) = 524a669e411189926e142912b6d94d3d8dbdb0eb SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 69b0a51d733cd52e7d200052362e0faf4ec918f1 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 0a7f3167e939822013ae6195406657453578453e diff --git a/www/firefox/patches/patch-content_media_fmp4_demuxer_bit_reader.cc b/www/firefox/patches/patch-content_media_fmp4_demuxer_bit_reader.cc new file mode 100644 index 00000000000..d7dd078a492 --- /dev/null +++ b/www/firefox/patches/patch-content_media_fmp4_demuxer_bit_reader.cc @@ -0,0 +1,15 @@ +$NetBSD: patch-content_media_fmp4_demuxer_bit_reader.cc,v 1.1 2014/07/25 14:21:18 tron Exp $ + +Fix build with pre-C++11 compilers like G++ 4.5.3. + +--- content/media/fmp4/demuxer/bit_reader.cc.orig 2014-07-17 02:45:09.000000000 +0100 ++++ content/media/fmp4/demuxer/bit_reader.cc 2014-07-25 13:00:34.000000000 +0100 +@@ -9,7 +9,7 @@ + + BitReader::BitReader(const uint8_t* data, off_t size) + : data_(data), bytes_left_(size), num_remaining_bits_in_curr_byte_(0) { +- DCHECK(data_ != nullptr && bytes_left_ > 0); ++ DCHECK(data_ != 0 && bytes_left_ > 0); + + UpdateCurrByte(); + } |