diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2006-10-07 17:12:14 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2006-10-07 17:12:14 +0000 |
| commit | 01840bf3b20ac7959aece88c4693533f5cead25b (patch) | |
| tree | c1936d0ad7b861ad9016eaac53b4e0a87e961b9f /multimedia | |
| parent | - Change the new location of tar ball (diff) | |
* Fix build with SDL
* Fix build on amd64
Pointy hat to: lioux
Notes
Notes:
svn path=/head/; revision=174813
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg-devel/Makefile | 6 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/files/patch-configure | 13 |
2 files changed, 14 insertions, 5 deletions
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile index b7ff5646c436..2d8274fe9326 100644 --- a/multimedia/ffmpeg-devel/Makefile +++ b/multimedia/ffmpeg-devel/Makefile @@ -85,7 +85,7 @@ LIB_FILES= libavcodec/libavcodec.a \ .include <bsd.port.pre.mk> -.if ${ARCH} == "ia64" || ${ARCH} == "amd64" +.if ${ARCH} == "ia64" BROKEN= Does not compile on ${ARCH} .endif @@ -547,7 +547,7 @@ post-patch: ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${FIND} ${WRKSRC} -type f | \ ${XARGS} -n 10 ${REINPLACE_CMD} -E \ - -e 's|#include <SDL|#include <SDL11/SDL|' + -e 's|#include <SDL|#include <SDL/SDL|' .endif .ifndef(WITHOUT_POSTPROCESS) @${LN} -sf libpostproc.so \ @@ -570,7 +570,7 @@ post-configure: .endif .ifdef(WITH_DTS) @${REINPLACE_CMD} -E \ - -e 's|-ldts|${LOCALBASE}/lib/libdts.a|' \ + -e 's|-ldts|${LOCALBASE}/lib/libdts_pic.a|' \ -e 's|(-lx264)|-L${LOCALBASE}/lib \1|' \ ${WRKSRC}/config.mak \ ${WRKSRC}/libavcodec/Makefile diff --git a/multimedia/ffmpeg-devel/files/patch-configure b/multimedia/ffmpeg-devel/files/patch-configure index cf8e48111ee5..55f22248f1c5 100644 --- a/multimedia/ffmpeg-devel/files/patch-configure +++ b/multimedia/ffmpeg-devel/files/patch-configure @@ -1,5 +1,14 @@ ---- configure.orig Sun Mar 19 03:31:32 2006 -+++ configure Thu Mar 23 15:15:34 2006 +--- configure.orig Sun Mar 19 01:31:55 2006 ++++ configure Thu Sep 28 20:27:49 2006 +@@ -138,7 +138,7 @@ + cpu="x86" + ;; + x86_64|amd64) +- cpu="x86" ++ cpu="x86_64" + canon_arch="`cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`" + if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then + if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then @@ -1107,6 +1107,8 @@ builtin_vector=no if $cc -msse -o $TMPO $TMPC 2> /dev/null ; then |