Build fixes for some GCC versions.

diff --git a/src/mono_picture_frame.h b/src/mono_picture_frame.h
index 87c5d6ab6c04c80ac565dd47c70ac704d67cb23a..fa4f649bafd13198b170fdfa0723a9dfc151c24f 100644 (file)
--- a/src/mono_picture_frame.h
+++ b/src/mono_picture_frame.h
@@ -74,7 +74,10 @@ public:
        int j2k_size () const;
 
 private:
-       friend MonoPictureAssetReader;
+       /* XXX: this is a bit of a shame, but I tried friend MonoPictureAssetReader and it's
+          rejected by some (seemingly older) GCCs.
+       */
+       friend class AssetReader<ASDCP::JP2K::MXFReader, MonoPictureFrame>;
 
        MonoPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, boost::shared_ptr<DecryptionContext>);
 

diff --git a/src/stereo_picture_frame.h b/src/stereo_picture_frame.h
index 42d88b3f5c979bf6f41cf17a3f3430d8f45cd30b..14c94e2e1454af1c130f4a3cd719b4b263c07fe4 100644 (file)
--- a/src/stereo_picture_frame.h
+++ b/src/stereo_picture_frame.h
@@ -70,7 +70,10 @@ public:
        int right_j2k_size () const;
 
 private:
-       friend StereoPictureAssetReader;
+       /* XXX: this is a bit of a shame, but I tried friend StereoPictureAssetReader and it's
+          rejected by some (seemingly older) GCCs.
+       */
+       friend AssetReader<ASDCP::JP2K::MXFSReader, StereoPictureFrame>;
 
        StereoPictureFrame (ASDCP::JP2K::MXFSReader* reader, int n, boost::shared_ptr<DecryptionContext>);
 

diff --git a/src/wscript b/src/wscript
index b2a833c59c0321b7f9f142427eac769c9e3f9774..365f3df391c028fd435973288cee19775d6c423c 100644 (file)
--- a/src/wscript
+++ b/src/wscript
@@ -124,6 +124,7 @@ def build(bld):
               encryption_context.h
               exceptions.h
               font_asset.h
+              frame.h
               gamma_transfer_function.h
               interop_load_font_node.h
               interop_subtitle_asset.h