Author: qboosh Date: Fri Apr 29 17:13:07 2011 GMT Module: packages Tag: HEAD ---- Log message: - updated to 2.15 - added c++ patch (fixes build with gcc 4.5)
---- Files affected: packages/ffmpegsource: ffmpegsource.spec (1.1 -> 1.2) , ffmpegsource-c++.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/ffmpegsource/ffmpegsource.spec diff -u packages/ffmpegsource/ffmpegsource.spec:1.1 packages/ffmpegsource/ffmpegsource.spec:1.2 --- packages/ffmpegsource/ffmpegsource.spec:1.1 Tue Nov 2 21:17:13 2010 +++ packages/ffmpegsource/ffmpegsource.spec Fri Apr 29 19:13:02 2011 @@ -2,12 +2,14 @@ Summary: FFmpegSource - FFmpeg wrapper library Summary(pl.UTF-8): FFmpegSource - biblioteka obudowująca FFmpeg Name: ffmpegsource -Version: 2.14 +Version: 2.15 Release: 1 License: MIT (ffmpegsource itself), GPL v3+ (forced by ffmpeg) Group: Libraries +#Source0Download: http://code.google.com/p/ffmpegsource/downloads/list Source0: http://ffmpegsource.googlecode.com/files/%{name}-%{version}_src.7z -# Source0-md5: 59e7d09a4c8af57a7907b2ec58b9f249 +# Source0-md5: 0d0e2d4f6c4424e5f182f40f451c064e +Patch0: %{name}-c++.patch URL: http://code.google.com/p/ffmpegsource/ BuildRequires: autoconf >= 2.58 BuildRequires: automake @@ -68,7 +70,8 @@ %prep %setup -q -c -T -n %{name}-%{version}_src 7z -o.. x %{SOURCE0} - +%undos src/core/utils.cpp +%patch0 -p1 %{__rm} configure %build @@ -120,5 +123,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2011/04/29 17:13:02 qboosh +- updated to 2.15 +- added c++ patch (fixes build with gcc 4.5) + Revision 1.1 2010/11/02 20:17:13 qboosh - new ================================================================ Index: packages/ffmpegsource/ffmpegsource-c++.patch diff -u /dev/null packages/ffmpegsource/ffmpegsource-c++.patch:1.1 --- /dev/null Fri Apr 29 19:13:07 2011 +++ packages/ffmpegsource/ffmpegsource-c++.patch Fri Apr 29 19:13:02 2011 @@ -0,0 +1,11 @@ +--- ffmpegsource-2.15_src/src/core/utils.cpp.orig 2011-02-12 01:33:57.000000000 +0100 ++++ ffmpegsource-2.15_src/src/core/utils.cpp 2011-04-29 19:00:44.272480825 +0200 +@@ -230,7 +230,7 @@ + template<class T> static void safe_aligned_reallocz(T *&ptr, size_t old_size, size_t new_size) { + void *newalloc = av_mallocz(new_size); + if (newalloc) { +- memcpy(newalloc, ptr, min(old_size, new_size)); ++ memcpy(newalloc, ptr, std::min(old_size, new_size)); + } + av_free(ptr); + ptr = static_cast<T*>(newalloc); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ffmpegsource/ffmpegsource.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
