diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2014-05-26 14:42:44 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2014-05-26 14:42:44 +0000 |
| commit | 097c01dd0ace18abed4d23be1149c3197bf26482 (patch) | |
| tree | b4fd1c0da900b47d7f7bd9ff430fdf2a56aa044d /multimedia | |
| parent | - Convert gmake to USES (diff) | |
Update openjpeg to 2.1.0.
Version 2.x is incompatible with openjpeg 1.5. Preserve it as openjpeg15
and update users.
Approved by: portmgr (implicit) for NO_STAGE ports
Notes
Notes:
svn path=/head/; revision=355352
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/ffmpeg0/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/gmerlin-avdecoder/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/gstreamer1-plugins/Makefile.common | 2 | ||||
| -rw-r--r-- | multimedia/libav/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/mplayer/Makefile.optvars | 2 | ||||
| -rw-r--r-- | multimedia/opencinematools/Makefile | 7 |
7 files changed, 11 insertions, 10 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index bbd2570ad9e6..85a9d2a03ef2 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -138,7 +138,7 @@ OPENCV_LIB_DEPENDS= libopencv_imgproc.so:${PORTSDIR}/graphics/opencv-core OPENCV_CONFIGURE_ENABLE= libopencv # openjpeg -OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg +OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 OPENJPEG_CONFIGURE_ENABLE= libopenjpeg # opus diff --git a/multimedia/ffmpeg0/Makefile b/multimedia/ffmpeg0/Makefile index 01e710e017b0..3162115cfa93 100644 --- a/multimedia/ffmpeg0/Makefile +++ b/multimedia/ffmpeg0/Makefile @@ -265,7 +265,7 @@ CONFIGURE_ARGS+= --disable-libopencv # openjpeg .if ${PORT_OPTIONS:MOPENJPEG} -LIB_DEPENDS+= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg +LIB_DEPENDS+= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 CONFIGURE_ARGS+= --enable-libopenjpeg .else CONFIGURE_ARGS+= --disable-libopenjpeg diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile index c2b0c8088aaa..1207ebe0e9f6 100644 --- a/multimedia/gmerlin-avdecoder/Makefile +++ b/multimedia/gmerlin-avdecoder/Makefile @@ -3,7 +3,7 @@ PORTNAME= gmerlin-avdecoder PORTVERSION= 1.2.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= SF/gmerlin/${PORTNAME}/${PORTVERSION} @@ -152,7 +152,7 @@ PLIST_SUB+= CDIO="@comment " .endif .if ${PORT_OPTIONS:MOPENJPEG} -LIB_DEPENDS+= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg +LIB_DEPENDS+= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 .else CONFIGURE_ARGS+=--disable-openjpeg .endif diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common index fd4500faffe8..6cf16c1cbf25 100644 --- a/multimedia/gstreamer1-plugins/Makefile.common +++ b/multimedia/gstreamer1-plugins/Makefile.common @@ -324,7 +324,7 @@ gst_opencv_PLIST_DIRSTRY= share/gst-plugins-bad/${VERSION}/opencv_haarcascades \ share/gst-plugins-bad # openjpeg -gst_openjpeg_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg +gst_openjpeg_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 # opus gst_opus_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile index 0ebfa44fa930..24079b22b03c 100644 --- a/multimedia/libav/Makefile +++ b/multimedia/libav/Makefile @@ -95,7 +95,7 @@ LAME_CONFIGURE_ENABLE= libmp3lame OPENCV_LIB_DEPENDS= libopencv_gpu.so:${PORTSDIR}/graphics/opencv OPENCV_CONFIGURE_ENABLE= libopencv -OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg +OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 OPENJPEG_CONFIGURE_ENABLE= libopenjpeg OPENSSL_CONFIGURE_ENABLE= openssl diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars index aba282debfe2..a29fc0567bbe 100644 --- a/multimedia/mplayer/Makefile.optvars +++ b/multimedia/mplayer/Makefile.optvars @@ -68,7 +68,7 @@ NAS_CONFIGURE_OFF= --disable-nas OPENAL_USES= openal:soft OPENAL_CONFIGURE_OFF= --disable-openal -OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg +OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 OPENJPEG_CONFIGURE_OFF= --disable-libopenjpeg OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus diff --git a/multimedia/opencinematools/Makefile b/multimedia/opencinematools/Makefile index 3bc6c1a2a1f2..69d60fa11640 100644 --- a/multimedia/opencinematools/Makefile +++ b/multimedia/opencinematools/Makefile @@ -2,6 +2,7 @@ PORTNAME= opencinematools PORTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -9,9 +10,9 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= olgeni@FreeBSD.org COMMENT= Tools for creating multi-reel DCPs from MXF source material -LIB_DEPENDS= openjpeg.2:${PORTSDIR}/graphics/openjpeg \ - expat.6:${PORTSDIR}/textproc/expat2 \ - asdcp.0:${PORTSDIR}/multimedia/asdcplib +LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \ + libexpat.so:${PORTSDIR}/textproc/expat2 \ + libasdcp.so:${PORTSDIR}/multimedia/asdcplib USES= dos2unix zip |