Sun Oct 21 11:03:23 PDT 2007 Peter Gavin <pg...@gm...>
* gstreamer: make Adapter and Buffer build with ghc 6.8
the problems actually come from the changes in bytestring. not sure if I should specifically check for that instead.
move ./gstreamer/Media/Streaming/GStreamer/Base/Adapter.chs ./gstreamer/Media/Streaming/GStreamer/Base/Adapter.chs.pp
move ./gstreamer/Media/Streaming/GStreamer/Core/Buffer.chs ./gstreamer/Media/Streaming/GStreamer/Core/Buffer.chs.pp
hunk ./Makefile.am 1926
- gstreamer/Media/Streaming/GStreamer/Core/Buffer.chs \
+ gstreamer/Media/Streaming/GStreamer/Core/Buffer.chs.pp \
hunk ./Makefile.am 1951
- gstreamer/Media/Streaming/GStreamer/Base/Adapter.chs \
+ gstreamer/Media/Streaming/GStreamer/Base/Adapter.chs.pp \
hunk ./gstreamer/Media/Streaming/GStreamer/Base/Adapter.chs.pp 52
+#if __GLASGOW_HASKELL__ < 608
hunk ./gstreamer/Media/Streaming/GStreamer/Base/Adapter.chs.pp 54
+#else
+import qualified Data.ByteString.Unsafe as BS
+import qualified Data.ByteString.Internal as BS
+#endif
hunk ./gstreamer/Media/Streaming/GStreamer/Base/Adapter.chs.pp 92
+#if __GLASGOW_HASKELL__ < 608
hunk ./gstreamer/Media/Streaming/GStreamer/Base/Adapter.chs.pp 94
+#else
+ else liftM Just $ BS.packCStringLen (castPtr ptr, fromIntegral size)
+#endif
hunk ./gstreamer/Media/Streaming/GStreamer/Base/Adapter.chs.pp 103
-adapterCopy adapter offset size =
+adapterCopy adapter offset size = do
hunk ./gstreamer/Media/Streaming/GStreamer/Base/Adapter.chs.pp 153
- BS.fromForeignPtr (castForeignPtr fPtr) $
- fromIntegral nBytes
+ BS.fromForeignPtr (castForeignPtr fPtr)
+#if __GLASGOW_HASKELL__ >= 608
+ 0
+#endif
+ (fromIntegral nBytes)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Buffer.chs.pp 142
+#if __GLASGOW_HASKELL__ < 608
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Buffer.chs.pp 144
+#else
+ BS.packCStringLen (castPtr ptr, fromIntegral size)
+#endif
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Buffer.chs.pp 154
+#if __GLASGOW_HASKELL__ < 608
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Buffer.chs.pp 156
+#else
+ BS.packCStringLen (castPtr ptr, fromIntegral size)
+#endif
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Buffer.chs.pp 182
+#if __GLASGOW_HASKELL__ < 608
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Buffer.chs.pp 184
+#else
+ BS.packCStringLen (castPtr ptr, fromIntegral size)
+#endif
|
