Index: head/multimedia/gpac-libgpac/files/patch-configure =================================================================== --- head/multimedia/gpac-libgpac/files/patch-configure (revision 296963) +++ head/multimedia/gpac-libgpac/files/patch-configure (revision 296964) @@ -1,66 +1,75 @@ ---- configure.orig 2008-12-02 13:04:42.000000000 -0500 -+++ configure 2009-02-19 15:16:18.000000000 -0500 +--- configure.orig 2008-12-02 19:04:42.000000000 +0100 ++++ configure 2012-05-19 17:09:20.000000000 +0200 @@ -33,6 +33,7 @@ make="make" strip="strip" cpu=`uname -m` +targetos=`uname -s` debuginfo="no" sdl_path="" sdl_local="no" +@@ -102,7 +103,7 @@ + bigendian="no" + SHFLAGS=-shared + need_inet_aton="no" +-LDFLAGS="$LDFLAGS -Wl --warn-common" ++LDFLAGS="$LDFLAGS -Wl,--warn-common" + CFLAGS="" + CPPFLAGS="" + GPAC_SH_FLAGS=-lpthread @@ -222,7 +223,9 @@ if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then cpu="x86_64" - libdir="lib64" + if [ x"$targetos" != x"FreeBSD" ]; then + libdir="lib64" + fi #that's a bit crude... PIC_CFLAGS="-fPIC -DPIC" want_pic="yes" @@ -280,7 +283,6 @@ source_path="`cd \"$source_path\"; pwd`" fi # OS specific -targetos=`uname -s` case $targetos in BeOS) js_flags=-DXP_BEOS @@ -317,8 +319,8 @@ FreeBSD) make="gmake" LDFLAGS="$LDFLAGS -export-dynamic" -CFLAGS="$CFLAGS -pthread" -GPAC_SH_FLAGS=-pthread +DYN_LIB_SUFFIX="so.$LIBVER" +GPAC_SH_FLAGS="$PTHREAD_LIBS" freebsd="yes" js_flags="-DXP_UNIX -I/usr/include/js" ;; @@ -1111,6 +1113,8 @@ LINK3D="-lopengl32 -lglu32" elif test "$darwin" = "yes" ; then LINK3D="-lgl -lglu" + elif test "$freebsd" = "yes" ; then + LINK3D="-lGL -lGLU" else LINK3D="-lGL -lglut" fi @@ -1673,7 +1677,7 @@ echo "USE_X11_XV=$has_x11_xv" >> config.mak fi -if test "$is_64" = "yes"; then +if test "$is_64" = "yes" -a "$freebsd" = "no" ; then echo "X11_LIB_PATH=$X11_PATH/lib64" >> config.mak else echo "X11_LIB_PATH=$X11_PATH/lib" >> config.mak @@ -1805,6 +1809,6 @@ fi echo '%.opic : %.c' >> config.mak -echo ' $(CC) $(CFLAGS) $(PIC_CFLAGS) -c $< -o $@' >> config.mak +echo " \$(CC) \$(CFLAGS) \$(PIC_CFLAGS) $INCL3D -c \$< -o \$@" >> config.mak echo "Done - type 'make help' for make info, 'make' to build" Property changes on: head/multimedia/gpac-libgpac/files/patch-configure ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property