aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia/x264
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/x264')
-rw-r--r--multimedia/x264/Makefile3
-rw-r--r--multimedia/x264/files/patch-configure10
2 files changed, 11 insertions, 2 deletions
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