Applied changes to make it compile on darwin

Originally committed as revision 1270 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Makefile b/Makefile
index b70e22b..c28de12 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,8 +48,10 @@ ifeq ($(BUILD_VHOOK),yes)
 VHOOK=videohook
 INSTALLVHOOK=install-vhook
 CLEANVHOOK=clean-vhook
+ifneq ($(CONFIG_DARWIN),yes)
 LDFLAGS += -rdynamic
 endif
+endif
 
 OBJS = ffmpeg.o ffserver.o
 SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)

diff --git a/configure b/configure
index b41fd4d..1378b5c 100755 (executable)
--- a/configure
+++ b/configure
@@ -114,6 +114,7 @@ CFLAGS="-no-cpp-precomp -pipe -O3 -fomit-frame-pointer -mdynamic-no-pic"
 SHFLAGS="-dynamiclib"
 extralibs=""
 darwin="yes"
+strip="strip -x"
 ;;
 CYGWIN*)
 v4l="no"
@@ -145,7 +146,7 @@ int main( void ) { return (int) dlopen("foo", 0); }
 EOF
 
 if $cc -o $TMPO $TMPC -ldl 2> /dev/null  ; then
-: vhook=yes
+vhook=yes
 fi
 
 cat > $TMPC << EOF
@@ -421,7 +422,7 @@ echo "  --disable-v4l            disable video4linux grabbing [default=no]"
 echo "  --disable-network        disable network support [default=no]"
 echo "  --disable-zlib           disable zlib [default=no]"
 echo "  --disable-simple_idct    disable simple IDCT routines [default=no]"
-# echo "  --disable-vhook          disable video hooking support"
+echo "  --disable-vhook          disable video hooking support"
 echo "  --enable-gprof           enable profiling with gprof [$gprof]"
 echo "  --disable-mpegaudio-hp   faster (but less accurate)"
 echo "                           mpegaudio decoding [default=no]"
@@ -451,10 +452,10 @@ echo "mp3lame enabled  $mp3lame"
 echo "vorbis enabled   $vorbis"
 echo "a52 support      $a52"
 echo "a52 dlopened     $a52bin"
-# echo "Video hooking    $vhook"
+echo "Video hooking    $vhook"
 
 if test "$vhook" = "yes" ; then
-: echo "Imlib2 support   $imlib2"
+echo "Imlib2 support   $imlib2"
 fi
 
 echo "Creating config.mak and config.h"

diff --git a/vhook/Makefile b/vhook/Makefile
index 5f19805..296127d 100644 (file)
--- a/vhook/Makefile
+++ b/vhook/Makefile
@@ -2,6 +2,11 @@ include ../config.mak
 
 CFLAGS=-fPIC $(OPTFLAGS) -g -Wall -I.. -I../libav -I../libavcodec -DHAVE_AV_CONFIG_H
 
+ifeq ($(CONFIG_DARWIN),yes)
+LDFLAGS+=-bundle -flat_namespace -undefined suppress
+else
+LDFLAGS+=-shared
+endif
 HOOKS=null.so fish.so
 
 ifeq ($(HAVE_IMLIB2),yes)
@@ -14,11 +19,11 @@ install:
        install -s -m 755 $(HOOKS) $(INSTDIR)
 
 imlib2.so: imlib2.o
-       $(CC) -g -o $@ -shared $< -lImlib2
+       $(CC) -g -o $@ $(LDFLAGS) $< -lImlib2
        rm $<
 
 %.so: %.o
-       $(CC) -g -o $@ -shared $<
+       $(CC) -g -o $@ $(LDFLAGS) $<
 
 %.html: %.texi
        texi2html -monolithic -number $<

diff --git a/vhook/fish.c b/vhook/fish.c
index c25ba60..b966b9b 100644 (file)
--- a/vhook/fish.c
+++ b/vhook/fish.c
@@ -35,7 +35,7 @@
  */
 #include <stdlib.h>
 #include <fcntl.h>
-#include <getopt.h>
+#include <unistd.h>
 #include <stdarg.h>
 #include <string.h>
 #include <sys/time.h>

diff --git a/vhook/imlib2.c b/vhook/imlib2.c
index 3e11d9c..fcc09e1 100644 (file)
--- a/vhook/imlib2.c
+++ b/vhook/imlib2.c
@@ -45,7 +45,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
-#include <getopt.h>
 #include <stdarg.h>
 #include <string.h>
 #include <unistd.h>