diff options
| author | mva <mva@FreeBSD.org> | 2013-11-09 20:21:06 +0800 |
|---|---|---|
| committer | mva <mva@FreeBSD.org> | 2013-11-09 20:21:06 +0800 |
| commit | 32530471e52897d401daa02719f68daf8a6b6e97 (patch) | |
| tree | 46738b2d25224fbe4d0f88d974c603579da809e7 /multimedia | |
| parent | 697e6c37da7833124fe696e8e3664926e4c42bd8 (diff) | |
| download | freebsd-ports-gnome-32530471e52897d401daa02719f68daf8a6b6e97.tar.gz freebsd-ports-gnome-32530471e52897d401daa02719f68daf8a6b6e97.tar.zst freebsd-ports-gnome-32530471e52897d401daa02719f68daf8a6b6e97.zip | |
- Unbreak build on 10.x and -CURRENT
- Use a modern GCC toolchain to unbreak the build on 8.x
- Force 32-bit mode on i386
- Enhance default OPTIONs for a better usability of the port
Supported by: John Van Sickle <john.vansickle@gmail.com>
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/libav/Makefile | 13 | ||||
| -rw-r--r-- | multimedia/libav/files/patch-libavutil_x86_asm.h | 11 |
2 files changed, 23 insertions, 1 deletions
diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile index dd160939e4c2..fc70340f44af 100644 --- a/multimedia/libav/Makefile +++ b/multimedia/libav/Makefile @@ -2,6 +2,7 @@ PORTNAME= libav PORTVERSION= 9.10 +PORTREVISION= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://libav.org/releases/ @@ -26,6 +27,8 @@ CONFIGURE_ARGS+= --prefix="${PREFIX}" \ --enable-pthreads \ --enable-shared \ --enable-runtime-cpudetect \ + --disable-debug \ + --cc="${CC}" \ --disable-avserver OPTIONS_DEFINE= ALSA AMR_NB AMR_WB BZIP2 CDIO FAAC FDK_AAC FREETYPE FREI0R \ @@ -34,7 +37,7 @@ OPTIONS_DEFINE= ALSA AMR_NB AMR_WB BZIP2 CDIO FAAC FDK_AAC FREETYPE FREI0R \ VO_AACENC VO_AMRWBENC VORBIS VPX X264 XVID ZLIB OPTIONS_DEFAULT= BZIP2 FREETYPE FREI0R GNUTLS OPENCV SCHROEDINGER \ - THEORA VPX X264 XVID + THEORA VO_AACENC VORBIS VPX X264 XVID ZLIB FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK ILBC_DESC= iLBC en/decoding via libilbc @@ -150,6 +153,14 @@ USE_OPENSSL= yes .include <bsd.port.pre.mk> +.if ${ARCH} == "i386" +CONFIGURE_ARGS+= --extra-cflags=-m32 +.endif + +.if ${OSVERSION} < 900000 +USE_GCC= 4.6+ +.endif + .if ${HAVE_SDL:Msdl} USE_SDL+= sdl MAN1+= avplay.1 diff --git a/multimedia/libav/files/patch-libavutil_x86_asm.h b/multimedia/libav/files/patch-libavutil_x86_asm.h new file mode 100644 index 000000000000..e31cc791e5f6 --- /dev/null +++ b/multimedia/libav/files/patch-libavutil_x86_asm.h @@ -0,0 +1,11 @@ +--- libavutil/x86/asm.h.orig 2013-11-07 22:15:35.000000000 +0100 ++++ libavutil/x86/asm.h 2013-11-07 22:15:52.000000000 +0100 +@@ -68,7 +68,7 @@ + typedef int x86_reg; + #endif + +-#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE)) ++#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE && !defined(__clang__))) + #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE)) + + #if ARCH_X86_64 && defined(PIC) |