On 4/17/2014 10:08 PM, Stefan Bruda wrote: > Hello, > > At 20:34 -0500 on 2014-4-17 Hanspeter Niederstrasser wrote: > > > > I have no way to test 10.9. If you feel comfortable manually > > editing files in the failed build dir, edit the file > > > /sw/src/fink.build/libx264-118-shlibs/x264-snapshot-20111013-2245/common/osdep.h > > as shown in this patch: > > > > > http://git.videolan.org/?p=x264.git;a=blobdiff;f=common/osdep.h;h=054953d38fd8405ee6393ebc52ae04904fb8bfb9;hp=dba1eb071a5f62dcaf22ff5ecf9ffd0b0dcf9044;hb=c628e3bacabb3ec6aff74332c76a7879b80a7a3d;hpb=44b9b6d480eb91cd56d262088d7a9fa5af02338a > > Indeed, the following patch is a slight adaptation of the above (which > applies as well, but with some fuzz) and works well. Many thanks! > > ------ begin libx264-118-shlibs.patch ------ > diff -Pur x264-snapshot-20111013-2245-orig/common/osdep.h > x264-snapshot-20111013-2245/common/osdep.h > --- x264-snapshot-20111013-2245-orig/common/osdep.h 2011-10-13 > 16:45:02.000000000 -0400 > +++ x264-snapshot-20111013-2245/common/osdep.h 2014-04-17 > 22:48:52.000000000 -0400 > @@ -40,6 +40,12 @@ > #include <inttypes.h> > #endif > > +#ifdef __INTEL_COMPILER > +#include <mathimf.h> > +#else > +#include <math.h> > +#endif > + > #if !HAVE_LOG2F > #define log2f(x) (logf(x)/0.693147180559945f) > #define log2(x) (log(x)/0.693147180559945) > @@ -59,12 +65,6 @@ > #define S_ISREG(x) (((x) & S_IFMT) == S_IFREG) > #endif > > -#ifdef __INTEL_COMPILER > -#include <mathimf.h> > -#else > -#include <math.h> > -#endif > - > #if (defined(__GNUC__) || defined(__INTEL_COMPILER)) && (ARCH_X86 || > ARCH_X86_64) > #define HAVE_X86_INLINE_ASM 1 > #endif > ------ end libx264-118-shlibs.patch ------ > > Best regards, > Stefan
Applied to the 10.7 tree. Thanks for testing. Hanspeter ------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/NeoTech _______________________________________________ Fink-users mailing list Fink-users@lists.sourceforge.net List archive: http://news.gmane.org/gmane.os.macosx.fink.user Subscription management: https://lists.sourceforge.net/lists/listinfo/fink-users
