On Sun, Sep 9, 2012 at 2:36 AM, Alberto Villa <[email protected]> wrote:
> On Sun, Sep 9, 2012 at 4:56 AM, Dan Dennedy <[email protected]> wrote:
>>> patch-src__modules__kdenlive__Makefile:
>>> it is needed to make src/framework/mlt_property.h include sys/param.h
>>> and define __FreeBSD_version while building the Kdenlive module (so
>>> that xlocale.h is correctly included, when available). It may be
>>
>> This patch seems unnecessary. The kdenlive module never uses locale_t
>> or mlt_property.h directly even though it gets included. A lack of
>> definition for locale_t within the module has no effect on how
>> mlt_properties uses locate_t and mlt_property within the framework.
>> Furthermore, I never forsee that changing as mlt_property (and
>> therefore locale_t) is virtually private.
>
> But string.h includes xlocale...
>
> #if __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_)
> #include <xlocale/_string.h>
> #endif
>
> ...so it ends up in a conflict:
> http://lists.freebsd.org/pipermail/freebsd-ports/2012-May/074864.html

OK, per your suggestion, does this work:

diff --git a/configure b/configure
index c9c6e00..cae7e15 100755
--- a/configure
+++ b/configure
@@ -104,6 +104,9 @@ build_config()
                [ "$optimisations" = "true" ] &&
                        echo "OPTIMISATIONS+=-ffast-math"
                echo "CFLAGS+=-fPIC -pthread"
+               ifdef HAVE_SYS_PARAM_H
+                       echo "CFLAGS += -DHAVE_SYS_PARAM_H"
+               endif
                echo "SHFLAGS=-shared"
                echo "RDYNAMIC=-rdynamic"
                echo "LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed"
diff --git a/src/framework/Makefile b/src/framework/Makefile
index a493dfb..fcb7a29 100644
--- a/src/framework/Makefile
+++ b/src/framework/Makefile
@@ -18,11 +18,6 @@ NAME = libmlt$(LIBSUF)
 TARGET = $(NAME).$(version)
 SONAME = $(NAME).$(soversion)
 SHFLAGS += -Wl,-soname,$(SONAME)
-       ifeq ($(targetos), FreeBSD)
-               ifdef HAVE_SYS_PARAM_H
-                       CFLAGS += -DHAVE_SYS_PARAM_H
-               endif
-       endif
 endif

 OBJS = mlt_frame.o \

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Mlt-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mlt-devel

Reply via email to