From 96e5f9e53525aade8fe1ebb98b466d08c8829e38 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sat, 11 Apr 2009 00:00:19 +0000 Subject: [PATCH] * Don't build avcodec with assembly targets using yasm - because it breaks the build. * Remove the APE reader from the image as it also depends on the non-working yasm rule. Please don't just leave the build in such a broken state. It's really annoying when you're held up by stuff like that when you want to work on something. Just leave changes like those disabled until you have verified that they work. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30111 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 1 - src/add-ons/media/plugins/avcodec/libavcodec/Jamfile | 2 +- src/add-ons/media/plugins/avcodec/libavcodec/config.h | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 01a3166c41..dec8303c6e 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -110,7 +110,6 @@ SYSTEM_ADD_ONS_MEDIA_PLUGINS = $(GPL_ONLY)ac3_decoder mp3_decoder mp3_reader mp4_reader musepack ogg raw_decoder speex - $(X86_ONLY)APE_reader # theora vorbis wav_reader ; diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile b/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile index 3196be9219..67ae365a1f 100644 --- a/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile +++ b/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile @@ -314,5 +314,5 @@ StaticLibrary libavcodec.a : xsubdec.c zmbv.c : - libavcodec_x86.a +# libavcodec_x86.a ; diff --git a/src/add-ons/media/plugins/avcodec/libavcodec/config.h b/src/add-ons/media/plugins/avcodec/libavcodec/config.h index 68b1853b5a..1a0ed384da 100644 --- a/src/add-ons/media/plugins/avcodec/libavcodec/config.h +++ b/src/add-ons/media/plugins/avcodec/libavcodec/config.h @@ -27,12 +27,12 @@ #define HAVE_ARMVFP 0 #define HAVE_IWMMXT 0 #define HAVE_MMI 0 -#define HAVE_MMX 1 -#define HAVE_MMX2 1 +#define HAVE_MMX 0 +#define HAVE_MMX2 0 #define HAVE_NEON 0 #define HAVE_PPC4XX 0 -#define HAVE_SSE 1 -#define HAVE_SSSE3 1 +#define HAVE_SSE 0 +#define HAVE_SSSE3 0 #define HAVE_VIS 0 #define HAVE_BEOSTHREADS 0 #define HAVE_OS2THREADS 0