aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2016-12-19 09:08:21 +0800
committerjbeich <jbeich@FreeBSD.org>2016-12-19 09:08:21 +0800
commit3595261644dada134985ce8f0ba7cd00067ab9f0 (patch)
tree351b954a15d966db518fa2ccb473cc5645d6c54a
parent2d4a576990d5aa1a5d991a7c313ba29b65f61832 (diff)
downloadfreebsd-ports-gnome-3595261644dada134985ce8f0ba7cd00067ab9f0.tar.gz
freebsd-ports-gnome-3595261644dada134985ce8f0ba7cd00067ab9f0.tar.zst
freebsd-ports-gnome-3595261644dada134985ce8f0ba7cd00067ab9f0.zip
multimedia/ffmpeg: expose SOXR dependency
-rw-r--r--Mk/bsd.options.desc.mk1
-rw-r--r--audio/pulseaudio/Makefile1
-rw-r--r--multimedia/ffmpeg/Makefile7
-rw-r--r--multimedia/qmmp-qt5/Makefile1
-rw-r--r--multimedia/qmmp/Makefile1
5 files changed, 6 insertions, 5 deletions
diff --git a/Mk/bsd.options.desc.mk b/Mk/bsd.options.desc.mk
index 5229b559fcee..f253d1bd8325 100644
--- a/Mk/bsd.options.desc.mk
+++ b/Mk/bsd.options.desc.mk
@@ -438,6 +438,7 @@ SNMP_DESC?= SNMP network protocol support
SOCKS_DESC?= SOCKS proxy support
SOUND_DESC?= Sound (audio) support
SOUNDTOUCH_DESC?= Sound processing support via SoundTouch
+SOXR_DESC?= SoX resampler support via libsoxr
SPANDSP_DESC?= SpanDSP faxing support
SPATIALITE_DESC?= SpatiaLite support
SPDY_DESC?= SPDY network protocol support
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 81cd65832fc4..64a8c3702662 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -76,7 +76,6 @@ ALSA_CONFIGURE_ENABLE= alsa
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
JACK_CONFIGURE_ENABLE= jack
JACK_LIB_DEPENDS= libjack.so:audio/jack
-SOXR_DESC= SoX resampler support
SOXR_CONFIGURE_WITH= soxr
SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr
SPEEX_DESC= Speex resampler and AEC support
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 3cd6fc9692e4..c2d8a517c2f6 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -30,7 +30,7 @@ OPTIONS_DEFINE= ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT CHROMAPRINT DC1394 \
FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK KVAZAAR LADSPA \
LAME LIBBLURAY MODPLUG NETCDF OPENAL OPENCL OPENCV OPENGL \
OPENH264 OPENJPEG OPTIMIZED_CFLAGS OPUS PULSEAUDIO \
- RUBBERBAND RTCPU SCHROEDINGER SDL SMB SNAPPY SNDIO SPEEX SSH \
+ RUBBERBAND RTCPU SCHROEDINGER SDL SMB SNAPPY SNDIO SOXR SPEEX SSH \
TESSERACT THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS \
VO_AMRWBENC VPX WAVPACK WEBP X11GRAB X264 X265 XCB XVID \
XVIDEO ZIMG ZMQ ZVBI
@@ -316,6 +316,10 @@ SNDIO_CONFIGURE_OFF= --disable-indev=sndio \
--disable-outdev=sndio
SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
+# soxr
+SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr
+SOXR_CONFIGURE_ENABLE= libsoxr
+
# speex
SPEEX_LIB_DEPENDS= libspeex.so:audio/speex
SPEEX_CONFIGURE_ENABLE= libspeex
@@ -446,7 +450,6 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \
--enable-avfilter \
--enable-avresample \
--enable-pthreads \
- --disable-libsoxr \
--cc="${CC}"
CONFIGURE_ENV_armv6_clang= ASFLAGS=-no-integrated-as
diff --git a/multimedia/qmmp-qt5/Makefile b/multimedia/qmmp-qt5/Makefile
index 3df53f60a6f0..10f4ccc38996 100644
--- a/multimedia/qmmp-qt5/Makefile
+++ b/multimedia/qmmp-qt5/Makefile
@@ -189,7 +189,6 @@ CUE_CMAKE_BOOL= USE_CUE
NULLOUT_DESC= Support null output
NULLOUT_CMAKE_BOOL= USE_NULL
-SOXR_DESC= Support SoX Resampler
SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr
SOXR_CMAKE_BOOL= USE_SOXR
diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index cef3bd43020c..ab9dbc0c573c 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -189,7 +189,6 @@ CUE_CMAKE_BOOL= USE_CUE
NULLOUT_DESC= Support null output
NULLOUT_CMAKE_BOOL= USE_NULL
-SOXR_DESC= Support SoX Resampler
SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr
SOXR_CMAKE_BOOL= USE_SOXR