diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2016-09-23 13:14:10 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2016-09-23 13:14:10 +0000 |
| commit | e7577aa20fe5708d310ee45e91f96b71242902b4 (patch) | |
| tree | af62327f760dc3cd377e778434cfbac418260fe6 /multimedia | |
| parent | c50fea9186669942eda67e49df9d788d6c5a071f (diff) | |
Notes
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/libx264/Makefile | 9 | ||||
| -rw-r--r-- | multimedia/x264/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/x264/files/patch-configure | 10 |
3 files changed, 18 insertions, 4 deletions
diff --git a/multimedia/libx264/Makefile b/multimedia/libx264/Makefile index 4fe9a02fbf0b..357b55ef2613 100644 --- a/multimedia/libx264/Makefile +++ b/multimedia/libx264/Makefile @@ -3,7 +3,7 @@ # # Updating notes: see multimedia/x264/Makefile. -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMEPREFIX= lib COMMENT= H.264/MPEG-4 AVC Video Encoding (Library) MASTERDIR= ${.CURDIR}/../x264 @@ -13,12 +13,17 @@ LIB_DEPENDS= # USES= pathfix -OPTIONS_DEFINE= HI10P +OPTIONS_DEFINE= HI10P OPENCL +OPTIONS_DEFAULT= OPENCL OPTIONS_EXCLUDE= FFMS GPAC LAVF LSMASH SWSCALE HI10P_DESC= Enable High 10 Profile 10-bit encoding HI10P_CONFIGURE_ON= --bit-depth=10 +OPENCL_DESC= Heterogeneous computing via OpenCL +OPENCL_BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl +OPENCL_CONFIGURE_OFF= --disable-opencl + CONFIGURE_ARGS= \ --enable-static \ --enable-shared \ diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile index 2a6024456d55..2e8406704925 100644 --- a/multimedia/x264/Makefile +++ b/multimedia/x264/Makefile @@ -103,8 +103,7 @@ SWSCALE_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg \ CONFIGURE_ARGS?= --system-libx264 CONFIGURE_ARGS+= --prefix="${PREFIX}" \ --extra-cflags="${CPPFLAGS} ${CFLAGS}" \ - --extra-ldflags="${LDFLAGS}" \ - --disable-opencl \ + --extra-ldflags="${LDFLAGS}" CFLAGS_armv6+= -mcpu=arm1136jf-s diff --git a/multimedia/x264/files/patch-configure b/multimedia/x264/files/patch-configure index 100545e7c280..02d7738a9a5a 100644 --- a/multimedia/x264/files/patch-configure +++ b/multimedia/x264/files/patch-configure @@ -51,3 +51,13 @@ if [ $compiler = ICC -o $compiler = ICL ] ; then if cc_check 'extras/intel_dispatcher.h' '' 'x264_intel_dispatcher_override();' ; then define HAVE_INTEL_DISPATCHER +@@ -1128,6 +1118,9 @@ if [ "$opencl" = "yes" ]; then + opencl="yes" + define HAVE_OPENCL + libdl="-ldl" ++ else ++ opencl="yes" ++ define HAVE_OPENCL + fi + LDFLAGS="$LDFLAGS $libdl" + fi |