svn commit: r396197 - head/multimedia/libav
Jan Beich
jbeich at FreeBSD.org
Sat Sep 5 22:48:25 UTC 2015
Author: jbeich
Date: Sat Sep 5 22:48:23 2015
New Revision: 396197
URL: https://svnweb.freebsd.org/changeset/ports/396197
Log:
multimedia/libav: minor cleanup
- Add CPE information
- Convert WANT_SDL into a proper option
- Disable SDL by default like in ffmpeg* ports
- Unbreak and unhide DC1394 option
- Drop USE_GCC as the port builds fine on 9.x
- Drop implicit :build from USES=pkgconfig
- Switch to .tar.xz distfile
- Sort USES to pet portlint
Modified:
head/multimedia/libav/Makefile (contents, props changed)
head/multimedia/libav/distinfo (contents, props changed)
head/multimedia/libav/pkg-plist (contents, props changed)
Modified: head/multimedia/libav/Makefile
==============================================================================
--- head/multimedia/libav/Makefile Sat Sep 5 22:48:09 2015 (r396196)
+++ head/multimedia/libav/Makefile Sat Sep 5 22:48:23 2015 (r396197)
@@ -2,6 +2,7 @@
PORTNAME= libav
PORTVERSION= 11.4
+PORTREVISION= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://libav.org/releases/
@@ -10,10 +11,9 @@ COMMENT= Realtime audio/video conversion
BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm
-USES= pkgconfig:build gmake compiler:features perl5
+USES= cpe gmake perl5 pkgconfig tar:xz
USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}
HAS_CONFIGURE= yes
-WANT_SDL= yes
USE_PERL5= build
CPPFLAGS+= -I${LOCALBASE}/include
@@ -30,9 +30,9 @@ CONFIGURE_ARGS= --prefix="${PREFIX}" \
--disable-debug \
--cc="${CC}"
-OPTIONS_DEFINE= ALSA AMR_NB AMR_WB BZIP2 CDIO FAAC FDK_AAC DOCS FREETYPE \
+OPTIONS_DEFINE= ALSA AMR_NB AMR_WB BZIP2 CDIO FAAC FDK_AAC DC1394 DOCS FREETYPE \
FREI0R GNUTLS GSM ILBC JACK LAME OPENCV OPENJPEG OPENSSL \
- OPUS PULSEAUDIO RTMP SCHROEDINGER SPEEX THEORA V4L VAAPI \
+ OPUS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX THEORA V4L VAAPI \
VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX WAVPACK WEBP X11GRAB \
X264 XVID ZLIB
OPTIONS_DEFAULT=BZIP2 FREETYPE FREI0R GNUTLS OPENCV SCHROEDINGER \
@@ -41,6 +41,9 @@ OPTIONS_DEFAULT=BZIP2 FREETYPE FREI0R GN
FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK
ILBC_DESC= iLBC en/decoding via libilbc
X11GRAB_DESC= X11 grabbing
+DC1394_DESC= IIDC-1394 grabbing using libdc1394
+
+OPTIONS_SUB= yes
ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib
ALSA_CONFIGURE_ON= --enable-indev=alsa --enable-outdev=alsa
@@ -58,9 +61,8 @@ CDIO_LIB_DEPENDS= libcdio.so:${PORTSDIR
libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
CDIO_CONFIGURE_ENABLE= libcdio
-# --enable-libdc1394
-# DC1394_LIB_DEPENDS= libdc1394.so:${PORTSDIR}/multimedia/libdc1394
-# DC1394_CONFIGURE_ENABLE= libdc1394
+DC1394_LIB_DEPENDS= libdc1394.so:${PORTSDIR}/multimedia/libdc1394
+DC1394_CONFIGURE_ENABLE= libdc1394
DOCS_BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html
@@ -113,6 +115,9 @@ RTMP_CONFIGURE_ENABLE= librtmp
SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
SCHROEDINGER_CONFIGURE_ENABLE= libschroedinger
+SDL_USE= SDL=sdl
+SDL_CONFIGURE_ENABLE= avplay
+
SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex
SPEEX_CONFIGURE_ENABLE= libspeex
@@ -157,7 +162,7 @@ XVID_CONFIGURE_ENABLE= libxvid
ZLIB_CONFIGURE_ENABLE= zlib
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${ARCH} == "armv6"
CONFIGURE_ENV+= ASFLAGS=-no-integrated-as
@@ -167,20 +172,6 @@ CONFIGURE_ENV+= ASFLAGS=-no-integrated-a
CONFIGURE_ARGS+= --extra-cflags=-m32
.endif
-.if ${OSVERSION} < 900000 || ${COMPILER_TYPE} == gcc
-USE_GCC= yes
-.endif
-
-.if ${HAVE_SDL:Msdl}
-USE_SDL+= sdl
-MAN1+= avplay.1
-CONFIGURE_ARGS+= --enable-avplay
-PLIST_SUB+= AVPLAY=""
-.else
-CONFIGURE_ARGS+= --disable-avplay
-PLIST_SUB+= AVPLAY="@comment "
-.endif
-
# License definitions
.if ${PORT_OPTIONS:MFAAC} || ${PORT_OPTIONS:MFDK_AAC} || ${PORT_OPTIONS:MOPENSSL}
@@ -214,6 +205,7 @@ LICENSE= LGPL21
post-patch:
@${REINPLACE_CMD} -e 's|freetype/freetype.h|freetype2/freetype.h|' \
+ -e 's|-ldc1394 -lraw1394|-ldc1394|' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \
${WRKSRC}/configure \
@@ -232,4 +224,4 @@ post-stage:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${a}
.endfor
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/multimedia/libav/distinfo
==============================================================================
--- head/multimedia/libav/distinfo Sat Sep 5 22:48:09 2015 (r396196)
+++ head/multimedia/libav/distinfo Sat Sep 5 22:48:23 2015 (r396197)
@@ -1,2 +1,2 @@
-SHA256 (libav-11.4.tar.gz) = ce416632d4b62fbd1a667c4cbbd484eb5b5f058e15c5900fbec175d8b6865047
-SIZE (libav-11.4.tar.gz) = 6924749
+SHA256 (libav-11.4.tar.xz) = 0b7dabc2605f3a254ee410bb4b1a857945696aab495fe21b34c3b6544ff5d525
+SIZE (libav-11.4.tar.xz) = 4860264
Modified: head/multimedia/libav/pkg-plist
==============================================================================
--- head/multimedia/libav/pkg-plist Sat Sep 5 22:48:09 2015 (r396196)
+++ head/multimedia/libav/pkg-plist Sat Sep 5 22:48:23 2015 (r396197)
@@ -1,5 +1,5 @@
bin/avconv
-%%AVPLAY%%bin/avplay
+%%SDL%%bin/avplay
bin/avprobe
include/libav/libavcodec/avcodec.h
include/libav/libavcodec/avfft.h
@@ -110,7 +110,7 @@ libdata/pkgconfig/libavresample-libav.pc
libdata/pkgconfig/libavutil-libav.pc
libdata/pkgconfig/libswscale-libav.pc
man/man1/avconv.1.gz
-%%AVPLAY%%man/man1/avplay.1.gz
+%%SDL%%man/man1/avplay.1.gz
man/man1/avprobe.1.gz
%%DATADIR%%/libvpx-1080p.avpreset
%%DATADIR%%/libvpx-1080p50_60.avpreset
@@ -148,7 +148,7 @@ man/man1/avprobe.1.gz
%%DATADIR%%/libx264-veryslow.avpreset
%%DATADIR%%/libx264-veryslow_firstpass.avpreset
%%PORTDOCS%%%%DOCSDIR%%/avconv.html
-%%AVPLAY%%%%PORTDOCS%%%%DOCSDIR%%/avplay.html
+%%SDL%%%%PORTDOCS%%%%DOCSDIR%%/avplay.html
%%PORTDOCS%%%%DOCSDIR%%/avprobe.html
%%PORTDOCS%%%%DOCSDIR%%/developer.html
%%PORTDOCS%%%%DOCSDIR%%/faq.html
More information about the svn-ports-head
mailing list