62 lines
2.5 KiB
Diff
62 lines
2.5 KiB
Diff
|
Allow Synfig to build in C++11 mode.
|
||
|
|
|
||
|
|
Taken from here:
|
||
|
|
https://projects.archlinux.org/svntogit/community.git/plain/trunk/build-fix.patch?h=packages/synfig
|
||
|
|
|
||
|
|
diff -wbBur synfig-1.0-RC5/src/modules/mod_libavcodec/mptr.cpp synfig-1.0-RC5.my/src/modules/mod_libavcodec/mptr.cpp
|
||
|
|
--- synfig-1.0-RC5/src/modules/mod_libavcodec/mptr.cpp 2015-03-28 13:15:00.000000000 +0300
|
||
|
|
+++ synfig-1.0-RC5.my/src/modules/mod_libavcodec/mptr.cpp 2015-04-28 16:56:11.568749053 +0300
|
||
|
|
@@ -56,8 +56,8 @@
|
||
|
|
/* === M E T H O D S ======================================================= */
|
||
|
|
|
||
|
|
|
||
|
|
-Importer_LibAVCodec::Importer_LibAVCodec(const char *file):
|
||
|
|
- filename(file)
|
||
|
|
+Importer_LibAVCodec::Importer_LibAVCodec(const synfig::FileSystem::Identifier &identifier):
|
||
|
|
+ Importer(identifier)
|
||
|
|
{
|
||
|
|
}
|
||
|
|
|
||
|
|
diff -wbBur synfig-1.0-RC5/src/modules/mod_libavcodec/mptr.h synfig-1.0-RC5.my/src/modules/mod_libavcodec/mptr.h
|
||
|
|
--- synfig-1.0-RC5/src/modules/mod_libavcodec/mptr.h 2015-03-28 13:15:00.000000000 +0300
|
||
|
|
+++ synfig-1.0-RC5.my/src/modules/mod_libavcodec/mptr.h 2015-04-28 16:55:18.699192946 +0300
|
||
|
|
@@ -46,7 +46,7 @@
|
||
|
|
synfig::String filename;
|
||
|
|
|
||
|
|
public:
|
||
|
|
- Importer_LibAVCodec(const char *filename);
|
||
|
|
+ Importer_LibAVCodec(const synfig::FileSystem::Identifier &identifier);
|
||
|
|
~Importer_LibAVCodec();
|
||
|
|
|
||
|
|
virtual bool get_frame(synfig::Surface &surface, const synfig::RendDesc &renddesc, synfig::Time time, synfig::ProgressCallback *callback);
|
||
|
|
diff -wbBur synfig-1.0-RC5/src/modules/mod_libavcodec/trgt_av.cpp synfig-1.0-RC5.my/src/modules/mod_libavcodec/trgt_av.cpp
|
||
|
|
--- synfig-1.0-RC5/src/modules/mod_libavcodec/trgt_av.cpp 2015-03-28 13:15:00.000000000 +0300
|
||
|
|
+++ synfig-1.0-RC5.my/src/modules/mod_libavcodec/trgt_av.cpp 2015-04-28 16:46:54.720091106 +0300
|
||
|
|
@@ -121,14 +121,14 @@
|
||
|
|
picture = avcodec_alloc_frame();
|
||
|
|
if (!picture)
|
||
|
|
return NULL;
|
||
|
|
- size = avpicture_get_size(pix_fmt, width, height);
|
||
|
|
+ size = avpicture_get_size((::PixelFormat)pix_fmt, width, height);
|
||
|
|
picture_buf = (uint8_t *)malloc(size);
|
||
|
|
if (!picture_buf) {
|
||
|
|
av_free(picture);
|
||
|
|
return NULL;
|
||
|
|
}
|
||
|
|
avpicture_fill((AVPicture *)picture, picture_buf,
|
||
|
|
- pix_fmt, width, height);
|
||
|
|
+ (::PixelFormat)pix_fmt, width, height);
|
||
|
|
return picture;
|
||
|
|
}
|
||
|
|
|
||
|
|
diff -wbBur synfig-1.0.2/src/synfig/time.cpp synfig-1.0.2.my/src/synfig/time.cpp
|
||
|
|
--- synfig-1.0.2/src/synfig/time.cpp 2015-07-09 10:33:03.000000000 +0300
|
||
|
|
+++ synfig-1.0.2.my/src/synfig/time.cpp 2015-10-12 13:54:58.382313903 +0300
|
||
|
|
@@ -319,5 +319,5 @@
|
||
|
|
bool
|
||
|
|
Time::is_valid()const
|
||
|
|
{
|
||
|
|
- return !isnan(value_);
|
||
|
|
+ return !::isnan(value_);
|
||
|
|
}
|