Re: [FFmpeg-devel] [PATCH v2] mips/asmdefs: use asm/sgidefs.h header on linux
On Sat, Mar 07, 2015 at 12:42:30PM +, James Cowgill wrote: On Sat, 2015-03-07 at 13:32 +0100, Michael Niedermayer wrote: On Sat, Mar 07, 2015 at 10:56:45AM +, James Cowgill wrote: Unfortunately android api 21 (lollipop) doesn't have the sgidefs.h header, but the linux kernel does have an almost equivalent asm/sgidefs.h which will do so use that header if we can. Change _ABI64 to _MIPS_SIM_ABI64 which is defined in both headers. Signed-off-by: James Cowgill james...@cowgill.org.uk tryng to build for androidmips: In file included from ffmpeg/libavcodec/mips/mpegaudiodsp_mips_float.c:58: ffmpeg/libavutil/mips/asmdefs.h:30:5: warning: HAVE_ASM_SGIDEFS_H is not defined ffmpeg/libavutil/mips/asmdefs.h:33:21: error: sgidefs.h: No such file or directory ffmpeg/libavutil/mips/asmdefs.h:36:18: warning: _MIPS_SIM_ABI64 is not defined i guess you are missing a include config.h in this Woops sorry - I don't have access to any mips machines at the weekend so it wasn't tested a huge amount (time for qemu...) any news on this ? id like to put some fix in 2.6.1 or should i just revert the commit causing this ? thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Complexity theory is the science of finding the exact solution to an approximation. Benchmarking OTOH is finding an approximation of the exact signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH v2] mips/asmdefs: use asm/sgidefs.h header on linux
Unfortunately android api 21 (lollipop) doesn't have the sgidefs.h header, but the linux kernel does have an almost equivalent asm/sgidefs.h which will do so use that header if we can. Change _ABI64 to _MIPS_SIM_ABI64 which is defined in both headers. Signed-off-by: James Cowgill james...@cowgill.org.uk --- configure| 4 libavutil/mips/asmdefs.h | 6 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 1ea2032..a5ff67c 100755 --- a/configure +++ b/configure @@ -1642,6 +1642,7 @@ HEADERS_LIST= alsa_asoundlib_h altivec_h arpa_inet_h +asm_sgidefs_h asm_types_h cdio_paranoia_h cdio_paranoia_paranoia_h @@ -4570,6 +4571,9 @@ EOF elif enabled mips; then +check_header asm/sgidefs.h || check_header sgidefs.h || \ +die either asm/sgidefs.h or sgidefs.h is required on mips + check_inline_asm loongson 'dmult.g $1, $2, $3' # Enable minimum ISA based on selected options diff --git a/libavutil/mips/asmdefs.h b/libavutil/mips/asmdefs.h index a3a5ee3..0e911cb 100644 --- a/libavutil/mips/asmdefs.h +++ b/libavutil/mips/asmdefs.h @@ -27,9 +27,13 @@ #ifndef AVUTIL_MIPS_ASMDEFS_H #define AVUTIL_MIPS_ASMDEFS_H +#if HAVE_ASM_SGIDEFS_H +#include asm/sgidefs.h +#else #include sgidefs.h +#endif -#if _MIPS_SIM == _ABI64 +#if _MIPS_SIM == _MIPS_SIM_ABI64 # define PTRSIZE 8 # define PTRLOG 3 # define PTR_ADDU daddu -- 2.1.4 ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH v2] mips/asmdefs: use asm/sgidefs.h header on linux
On Sat, 2015-03-07 at 13:32 +0100, Michael Niedermayer wrote: On Sat, Mar 07, 2015 at 10:56:45AM +, James Cowgill wrote: Unfortunately android api 21 (lollipop) doesn't have the sgidefs.h header, but the linux kernel does have an almost equivalent asm/sgidefs.h which will do so use that header if we can. Change _ABI64 to _MIPS_SIM_ABI64 which is defined in both headers. Signed-off-by: James Cowgill james...@cowgill.org.uk tryng to build for androidmips: In file included from ffmpeg/libavcodec/mips/mpegaudiodsp_mips_float.c:58: ffmpeg/libavutil/mips/asmdefs.h:30:5: warning: HAVE_ASM_SGIDEFS_H is not defined ffmpeg/libavutil/mips/asmdefs.h:33:21: error: sgidefs.h: No such file or directory ffmpeg/libavutil/mips/asmdefs.h:36:18: warning: _MIPS_SIM_ABI64 is not defined i guess you are missing a include config.h in this Woops sorry - I don't have access to any mips machines at the weekend so it wasn't tested a huge amount (time for qemu...) James ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH v2] mips/asmdefs: use asm/sgidefs.h header on linux
On Sat, Mar 07, 2015 at 10:56:45AM +, James Cowgill wrote: Unfortunately android api 21 (lollipop) doesn't have the sgidefs.h header, but the linux kernel does have an almost equivalent asm/sgidefs.h which will do so use that header if we can. Change _ABI64 to _MIPS_SIM_ABI64 which is defined in both headers. Signed-off-by: James Cowgill james...@cowgill.org.uk tryng to build for androidmips: In file included from ffmpeg/libavcodec/mips/mpegaudiodsp_mips_float.c:58: ffmpeg/libavutil/mips/asmdefs.h:30:5: warning: HAVE_ASM_SGIDEFS_H is not defined ffmpeg/libavutil/mips/asmdefs.h:33:21: error: sgidefs.h: No such file or directory ffmpeg/libavutil/mips/asmdefs.h:36:18: warning: _MIPS_SIM_ABI64 is not defined i guess you are missing a include config.h in this [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The real ebay dictionary, page 3 Rare item - Common item with rare defect or maybe just a lie Professional - 'Toy' made in china, not functional except as doorstop Experts will know - The seller hopes you are not an expert signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
