summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2005-09-12 13:07:31 +0000
committerLuca Barbato <lu_zero@gentoo.org>2005-09-12 13:07:31 +0000
commitbabe7e8ff8d7ced067756830ccb9751f3168b915 (patch)
treefeef490298c1040897c48891db6cf21a1905cd8f /media-video
parentMark 3.4.1-r1 stable on alpha (diff)
downloadhistorical-babe7e8ff8d7ced067756830ccb9751f3168b915.tar.gz
historical-babe7e8ff8d7ced067756830ccb9751f3168b915.tar.bz2
historical-babe7e8ff8d7ced067756830ccb9751f3168b915.zip
dylib support
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ChangeLog6
-rw-r--r--media-video/ffmpeg/Manifest25
-rw-r--r--media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild6
-rw-r--r--media-video/ffmpeg/files/ffmpeg-0.4.9_p20050906-osx.patch351
4 files changed, 372 insertions, 16 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 7db1cc2ad687..f91ae29e252b 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.90 2005/09/12 10:27:40 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.91 2005/09/12 13:07:31 lu_zero Exp $
+
+ 12 Sep 2005; Luca Barbato <lu_zero@gentoo.org>
+ +files/ffmpeg-0.4.9_p20050906-osx.patch, ffmpeg-0.4.9_p20050906.ebuild:
+ Other fixes and dylib support
12 Sep 2005; Luca Barbato <lu_zero@gentoo.org>
ffmpeg-0.4.9_p20050906.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 5f7120d74c10..5d3e2eced938 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,19 +1,20 @@
+MD5 f3e70be04913e05ca108dacd5f371c46 ffmpeg-0.4.9_p20050906.ebuild 4769
+MD5 437df7598487b85a8678e49317d897b1 ffmpeg-0.4.9_pre1-r1.ebuild 4065
+MD5 68cc8e1288c7683a409637e928e8c4fc ChangeLog 14280
MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 7814b199a2d4980a2d7291576bea92cf ffmpeg-0.4.9_p20050906.ebuild 4761
-MD5 c57ec7ef531e1088a91de5d6d9ba1dfa ffmpeg-0.4.8.ebuild 2430
-MD5 5cf4c412dc53b728b65176157636473f ffmpeg-0.4.9_p20050226-r5.ebuild 4539
MD5 bb5094085c4fff51dc773d7735117475 ffmpeg-0.4.9_p20050226-r3.ebuild 4393
-MD5 b178003765926337759f84864fa497d3 ChangeLog 14124
-MD5 437df7598487b85a8678e49317d897b1 ffmpeg-0.4.9_pre1-r1.ebuild 4065
-MD5 e16a2db90cc2c151bdba748297e137dd files/digest-ffmpeg-0.4.9_pre1-r1 70
-MD5 e592f1aa79ce0d709ac4980404956e87 files/ffmpeg-a52.patch 1111
-MD5 b4ecc62e882107f766cf621bfc6c7e20 files/ffmpeg-osx.patch 5940
+MD5 5cf4c412dc53b728b65176157636473f ffmpeg-0.4.9_p20050226-r5.ebuild 4539
+MD5 c57ec7ef531e1088a91de5d6d9ba1dfa ffmpeg-0.4.8.ebuild 2430
MD5 f0c54c934c78216a2bd0b157028a6f84 files/gentoo-ffmpeg001.patch 752
-MD5 39cf7a98d0f59cfde5b82ab7fedf19d0 files/digest-ffmpeg-0.4.9_p20050906 73
-MD5 b1cd277309faaaa03e3dafb3b89b2a09 files/ffmpeg-libdir-pic.patch 6027
MD5 0a76b7a4442aea90d56ac85508b2eff5 files/digest-ffmpeg-0.4.8 65
+MD5 7ff9e08e701f8a8a860c09bd9259843f files/ffmpeg-0.4.9_p20050906-osx.patch 11103
+MD5 e592f1aa79ce0d709ac4980404956e87 files/ffmpeg-a52.patch 1111
+MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
+MD5 39cf7a98d0f59cfde5b82ab7fedf19d0 files/digest-ffmpeg-0.4.9_p20050906 73
+MD5 e16a2db90cc2c151bdba748297e137dd files/digest-ffmpeg-0.4.9_pre1-r1 70
MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r3 73
-MD5 20274823abfde904ae73478349585dd0 files/ffmpeg-0.4.9_p20050226-gcc4.patch 2319
MD5 1a8c0be3a5a5ba1d929b7773265943b7 files/ffmpeg-missing_links.patch 1199
-MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
+MD5 b1cd277309faaaa03e3dafb3b89b2a09 files/ffmpeg-libdir-pic.patch 6027
MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r5 73
+MD5 b4ecc62e882107f766cf621bfc6c7e20 files/ffmpeg-osx.patch 5940
+MD5 20274823abfde904ae73478349585dd0 files/ffmpeg-0.4.9_p20050226-gcc4.patch 2319
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild
index 8c2925790a5f..29acde8b4cc8 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild,v 1.4 2005/09/12 10:27:40 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild,v 1.5 2005/09/12 13:07:31 lu_zero Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
SLOT="0"
# ~alpha need to test aac useflag
# ~ia64 ~arm ~mips ~hppa
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
IUSE="aac altivec debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss test theora threads truetype v4l xvid dts network zlib sdl"
DEPEND="imlib? ( media-libs/imlib2 )
@@ -49,7 +49,7 @@ src_unpack() {
sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
# Fix building with gcc4
- # epatch ${FILESDIR}/${P}-gcc4.patch
+ epatch ${FILESDIR}/${P}-osx.patch
#ffmpeg doesn'g use libtool, so the condition for PIC code
#is __PIC__, not PIC.
diff --git a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20050906-osx.patch b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20050906-osx.patch
new file mode 100644
index 000000000000..7b5174cb9654
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20050906-osx.patch
@@ -0,0 +1,351 @@
+diff -ur ffmpeg-orig/configure ffmpeg/configure
+--- ffmpeg-orig/configure 2005-08-21 16:33:00.000000000 -0400
++++ ffmpeg/configure 2005-09-01 23:38:56.000000000 -0400
+@@ -308,11 +308,12 @@
+ audio_oss="no"
+ dv1394="no"
+ ffserver="no"
+-SHFLAGS="-dynamiclib"
++SHFLAGS="-dynamiclib -Wl,-single_module,-undefined,dynamic_lookup"
+ extralibs=""
+ darwin="yes"
+ strip="strip -x"
+-LDFLAGS="-Wl,-search_paths_first"
++LDFLAGS="-Wl,-dynamic,-search_paths_first"
++SLIBSUF=".dylib"
+ FFSLDFLAGS=-Wl,-bind_at_load
+ ;;
+ MINGW32*)
+@@ -1424,6 +1425,8 @@
+ if test "$shared_pp" = "yes" ; then
+ echo "#define SHARED_PP 1" >> $TMPH
+ echo "SHARED_PP=yes" >> config.mak
++ echo "SPPMAJOR=0" >> config.mak
++ echo "SPPVERSION=0.0.1" >> config.mak
+ fi
+ fi
+
+diff -ur ffmpeg-orig/libavcodec/Makefile ffmpeg/libavcodec/Makefile
+--- ffmpeg-orig/libavcodec/Makefile 2005-08-13 09:45:42.000000000 -0400
++++ ffmpeg/libavcodec/Makefile 2005-09-01 23:38:56.000000000 -0400
+@@ -373,17 +373,22 @@
+ CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
+ endif
+
++# Darwin specific stuff
++ifeq ($(CONFIG_DARWIN),yes)
++SHFLAGS += -Wl,-install_name,$(libdir)/$(SLIBPREF)avcodec$(SLIBSUF),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION)
++endif
++
+ SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S)
+ OBJS := $(OBJS) $(ASM_OBJS)
+
+ LIB= $(LIBPREF)avcodec$(LIBSUF)
+ LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF)
+ ifeq ($(BUILD_SHARED),yes)
+-SLIB= $(SLIBPREF)avcodec$(SLIBSUF)
++SLIBNAME= $(SLIBPREF)avcodec$(SLIBSUF)
+ endif
+ TESTS= imgresample-test dct-test motion-test fft-test
+
+-all: $(LIB) $(SLIB)
++all: $(LIB) $(SLIBNAME)
+
+ amrlibs:
+ $(MAKE) -C amr spclib fipoplib
+@@ -395,7 +400,7 @@
+ $(AR) rc $@ $(OBJS) $(AMREXTRALIBS)
+ $(RANLIB) $@
+
+-$(SLIB): $(OBJS)
++$(SLIBNAME): $(OBJS)
+ ifeq ($(CONFIG_PP),yes)
+ $(MAKE) -C libpostproc
+ endif
+@@ -403,7 +408,7 @@
+ $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
+ -lib /machine:i386 /def:$(@:.dll=.def)
+ else
+- $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
++ $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
+ endif
+
+ dsputil.o: dsputil.c dsputil.h
+@@ -423,7 +428,7 @@
+ dep: depend
+
+ clean: $(CLEANAMR)
+- rm -f *.o *.d *~ .depend $(LIB) $(SLIB) *.so i386/*.o i386/*~ \
++ rm -f *.o *.d *~ .depend $(LIB) $(SLIBNAME) *$(SLIBSUF) i386/*.o i386/*~ \
+ armv4l/*.o armv4l/*~ \
+ mlib/*.o mlib/*~ \
+ alpha/*.o alpha/*~ \
+@@ -472,11 +477,11 @@
+ ifeq ($(BUILD_SHARED),yes)
+ install: all install-headers
+ ifeq ($(CONFIG_WIN32),yes)
+- install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
++ install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
+ else
+ install -d $(libdir)
+- install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION).so
+- ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so
++ install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(libdir)/libavcodec-$(VERSION)$(SLIBSUF)
++ ln -sf libavcodec-$(VERSION)$(SLIBSUF) $(libdir)/libavcodec$(SLIBSUF)
+ $(LDCONFIG) || true
+ endif
+ ifeq ($(CONFIG_PP),yes)
+diff -ur ffmpeg-orig/libavcodec/libpostproc/Makefile ffmpeg/libavcodec/libpostproc/Makefile
+--- ffmpeg-orig/libavcodec/libpostproc/Makefile 2005-06-26 20:55:29.000000000 -0400
++++ ffmpeg/libavcodec/libpostproc/Makefile 2005-09-01 23:38:56.000000000 -0400
+@@ -4,9 +4,16 @@
+ VPATH=$(SRC_PATH)/libavcodec/libpostproc
+
+ ifeq ($(SHARED_PP),yes)
+-SPPLIB = $(SLIBPREF)postproc$(SLIBSUF)
+-SPPMAJOR = 0
+-SPPVERSION = $(SPPMAJOR).0.1
++SPPLIBNAME = $(SLIBPREF)postproc$(SLIBSUF)
++ifeq ($(CONFIG_DARWIN),yes)
++SPPLIBMAJOR = $(SLIBPREF)postproc.$(SPPMAJOR)$(SLIBSUF)
++SPPLIB = $(SLIBPREF)postproc.$(SPPVERSION)$(SLIBSUF)
++SHFLAGS += -Wl,-install_name,$(libdir)/$(SPPLIBNAME),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION)
++else
++SPPLIBMAJOR = $(SPPLIBNAME).$(SPPMAJOR)
++SPPLIB = $(SPPLIBNAME).$(SPPVERSION)
++SHFLAGS = -shared -Wl,-soname,$(SPPLIB)
++endif
+ endif
+ PPLIB = $(LIBPREF)postproc$(LIBSUF)
+
+@@ -23,13 +30,13 @@
+ .c.o:
+ $(CC) -c $(CFLAGS) $(LIBOBJFLAGS) -I$(SRC_PATH)/libavcodec -I../.. -o $@ $<
+
+-all: $(SWSLIB) $(PPLIB) $(SPPLIB)
++all: $(SWSLIB) $(PPLIB) $(SPPLIBNAME)
+
+ clean:
+- rm -f *.o *.a *~ *.so $(PPLIB) $(SPPLIB)
++ rm -f *.o *.a *~ *$(SLIBSUF) $(PPLIB) $(SPPLIBNAME)
+
+ distclean:
+- rm -f Makefile.bak *.o *.a *~ *.so .depend
++ rm -f Makefile.bak *.o *.a *~ *$(SLIBSUF) .depend
+
+ dep: depend
+
+@@ -40,9 +47,8 @@
+ postprocess_pic.o: postprocess.c
+ $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
+
+-$(SPPLIB): $(SPPOBJS)
+- $(CC) -shared -Wl,-soname,$(SPPLIB).$(SPPMAJOR) \
+- -o $(SPPLIB) $(SPPOBJS)
++$(SPPLIBNAME): $(SPPOBJS)
++ $(CC) $(SHFLAGS) -o $(SPPLIBNAME) $(SPPOBJS)
+ endif
+
+ $(PPLIB): $(PPOBJS)
+@@ -53,12 +59,12 @@
+ install: all
+ ifeq ($(SHARED_PP),yes)
+ ifeq ($(CONFIG_WIN32),yes)
+- install $(INSTALLSTRIP) -m 755 $(SPPLIB) "$(prefix)"
++ install $(INSTALLSTRIP) -m 755 $(SPPLIBNAME) "$(prefix)"
+ else
+ install -d $(libdir)
+- install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(libdir)/$(SPPLIB).$(SPPVERSION)
+- ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB)
+- ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB).$(SPPMAJOR)
++ install $(INSTALLSTRIP) -m 755 $(SPPLIBNAME) $(libdir)/$(SPPLIB)
++ ln -sf $(SPPLIB) $(libdir)/$(SPPLIBNAME)
++ ln -sf $(SPPLIB) $(libdir)/$(SPPLIBMAJOR)
+ install -d $(libdir)/pkgconfig
+ install -m 644 ../../libpostproc.pc $(libdir)/pkgconfig
+ $(LDCONFIG) || true
+diff -ur ffmpeg-orig/libavcodec/ppc/fdct_altivec.c ffmpeg/libavcodec/ppc/fdct_altivec.c
+--- ffmpeg-orig/libavcodec/ppc/fdct_altivec.c 2005-08-05 15:15:34.000000000 -0400
++++ ffmpeg/libavcodec/ppc/fdct_altivec.c 2005-09-01 23:38:56.000000000 -0400
+@@ -18,7 +18,7 @@
+ */
+
+
+-#include "common.h"
++#include "../../libavutil/common.h"
+ #include "../dsputil.h"
+ #include "dsputil_altivec.h"
+ #include "gcc_fixes.h"
+diff -ur ffmpeg-orig/libavformat/Makefile ffmpeg/libavformat/Makefile
+--- ffmpeg-orig/libavformat/Makefile 2005-08-13 09:45:42.000000000 -0400
++++ ffmpeg/libavformat/Makefile 2005-09-01 23:38:56.000000000 -0400
+@@ -81,9 +81,11 @@
+
+ LIB= $(LIBPREF)avformat$(LIBSUF)
+ ifeq ($(BUILD_SHARED),yes)
+-SLIB= $(SLIBPREF)avformat$(SLIBSUF)
+-
+-AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec
++SLIBNAME= $(SLIBPREF)avformat$(SLIBSUF)
++AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec -lavutil$(BUILDSUF) -L../libavutil
++ifeq ($(CONFIG_DARWIN),yes)
++SHFLAGS += -Wl,-install_name,$(libdir)/$(SLIBNAME),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION)
++endif
+ ifeq ($(CONFIG_MP3LAME),yes)
+ AVCLIBS+=-lmp3lame
+ endif
+@@ -91,14 +93,14 @@
+
+ SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp)
+
+-all: $(LIB) $(SLIB)
++all: $(LIB) $(SLIBNAME)
+
+ $(LIB): $(OBJS) $(PPOBJS)
+ rm -f $@
+ $(AR) rc $@ $(OBJS) $(PPOBJS)
+ $(RANLIB) $@
+
+-$(SLIB): $(OBJS)
++$(SLIBNAME): $(OBJS)
+ ifeq ($(CONFIG_WIN32),yes)
+ $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS)
+ -lib /machine:i386 /def:$(@:.dll=.def)
+@@ -112,11 +114,11 @@
+ ifeq ($(BUILD_SHARED),yes)
+ install: all install-headers
+ ifeq ($(CONFIG_WIN32),yes)
+- install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
++ install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
+ else
+ install -d $(libdir)
+- install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION).so
+- ln -sf libavformat-$(VERSION).so $(libdir)/libavformat.so
++ install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(libdir)/$(SLIBPREF)avformat-$(VERSION)$(SLIBSUF)
++ ln -sf $(SLIBPREF)avformat-$(VERSION)$(SLIBSUF) $(libdir)/$(SLIBNAME)
+ $(LDCONFIG) || true
+ endif
+ else
+@@ -143,7 +145,7 @@
+ g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
+
+ distclean clean:
+- rm -f *.o *.d .depend *~ *.a *.so $(LIB)
++ rm -f *.o *.d .depend *~ *.a *$(SLIBSUF) $(LIB)
+
+ #
+ # include dependency files if they exist
+diff -ur ffmpeg-orig/libavutil/Makefile ffmpeg/libavutil/Makefile
+--- ffmpeg-orig/libavutil/Makefile 2005-08-06 06:03:08.000000000 -0400
++++ ffmpeg/libavutil/Makefile 2005-09-01 23:38:56.000000000 -0400
+@@ -22,22 +22,25 @@
+
+ LIB= $(LIBPREF)avutil$(LIBSUF)
+ ifeq ($(BUILD_SHARED),yes)
+-SLIB= $(SLIBPREF)avutil$(SLIBSUF)
++SLIBNAME= $(SLIBPREF)avutil$(SLIBSUF)
++ifeq ($(CONFIG_DARWIN),yes)
++SHFLAGS += -Wl,-install_name,$(libdir)/$(SLIBNAME),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION)
++endif
+ endif
+
+-all: $(LIB) $(SLIB)
++all: $(LIB) $(SLIBNAME)
+
+ $(LIB): $(OBJS)
+ rm -f $@
+ $(AR) rc $@ $(OBJS)
+ $(RANLIB) $@
+
+-$(SLIB): $(OBJS)
++$(SLIBNAME): $(OBJS)
+ ifeq ($(CONFIG_WIN32),yes)
+ $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
+ -lib /machine:i386 /def:$(@:.dll=.def)
+ else
+- $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
++ $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
+ endif
+
+ %.o: %.c
+@@ -49,7 +52,7 @@
+ dep: depend
+
+ clean:
+- rm -f *.o *.d *~ .depend $(LIB) $(SLIB) *.so
++ rm -f *.o *.d *~ .depend $(LIB) $(SLIBNAME) *$(SLIBSUF)
+
+ distclean: clean
+ rm -f Makefile.bak .depend
+@@ -58,11 +61,11 @@
+ ifeq ($(BUILD_SHARED),yes)
+ install: all install-headers
+ ifeq ($(CONFIG_WIN32),yes)
+- install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
++ install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
+ else
+ install -d $(libdir)
+- install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavutil-$(VERSION).so
+- ln -sf libavutil-$(VERSION).so $(libdir)/libavutil.so
++ install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(libdir)/libavutil-$(VERSION)$(SLIBSUF)
++ ln -sf libavutil-$(VERSION)$(SLIBSUF) $(libdir)/$(SLIBNAME)
+ $(LDCONFIG) || true
+ endif
+ else
+diff -ur ffmpeg-orig/vhook/Makefile ffmpeg/vhook/Makefile
+--- ffmpeg-orig/vhook/Makefile 2005-08-01 16:07:05.000000000 -0400
++++ ffmpeg/vhook/Makefile 2005-09-01 23:39:34.000000000 -0400
+@@ -5,22 +5,22 @@
+ CFLAGS=-fPIC $(SHCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavutil -DHAVE_AV_CONFIG_H
+
+ ifeq ($(CONFIG_DARWIN),yes)
+-SHFLAGS+=-flat_namespace -undefined suppress
++ SHFLAGS += -flat_namespace
+ endif
+-HOOKS=null.so fish.so ppm.so watermark.so
++HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF)
+
+ ifeq ($(HAVE_IMLIB2),yes)
+- HOOKS += imlib2.so
++ HOOKS += imlib2$(SLIBSUF)
+ endif
+
+ ifeq ($(HAVE_FREETYPE2),yes)
+- HOOKS += drawtext.so
++ HOOKS += drawtext$(SLIBSUF)
+ CFLAGS += `freetype-config --cflags`
+ endif
+
+ all: $(HOOKS)
+
+-SRCS := $(HOOKS:.so=.c)
++SRCS := $(HOOKS:$(SLIBSUF)=.c)
+
+ depend: $(SRCS)
+ $(CC) -MM $(CFLAGS) $^ 1>.depend
+@@ -29,17 +29,21 @@
+ install -d "$(libdir)/vhook"
+ install -m 755 $(HOOKS) "$(libdir)/vhook"
+
+-imlib2.so: imlib2.o
++imlib2$(SLIBSUF): imlib2.o
+ $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< -lImlib2
+
+-drawtext.so: drawtext.o
++drawtext$(SLIBSUF): drawtext.o
+ $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`
+
+-%.so: %.o
++%$(SLIBSUF): %.o
++ifeq ($(CONFIG_DARWIN),yes)
++ $(CC) $(LDFLAGS) $(SHFLAGS) -Wl,-install_name,$(libdir)/vhoook/$@ -g -o $@ $<
++else
+ $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $<
++endif
+
+ clean:
+- rm -f *.o *.d .depend *.so *~
++ rm -f *.o *.d .depend *$(SLIBSUF) *~
+
+ ifneq ($(wildcard .depend),)
+ include .depend