sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Unbreak build with the new freetype version

Browse source 
- Add X11GRAB option
- Rename V4L2 option to V4L
This commit is contained in:
Marcus von Appen 2014-01-02 10:17:37 +00:00
parent e2036902ca
commit 003c3fd620
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=338431
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
multimedia/libav/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= libav PORTNAME= libav
PORTVERSION= 9.10 PORTVERSION= 9.10
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= multimedia audio ipv6 net CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://libav.org/releases/ MASTER_SITES= http://libav.org/releases/
@ -33,8 +33,8 @@ CONFIGURE_ARGS+= --prefix="${PREFIX}" \
OPTIONS_DEFINE= ALSA AMR_NB AMR_WB BZIP2 CDIO FAAC FDK_AAC FREETYPE FREI0R \ OPTIONS_DEFINE= ALSA AMR_NB AMR_WB BZIP2 CDIO FAAC FDK_AAC FREETYPE FREI0R \
GNUTLS GSM ILBC JACK LAME OPENCV OPENJPEG OPENSSL OPUS \ GNUTLS GSM ILBC JACK LAME OPENCV OPENJPEG OPENSSL OPUS \
PULSEAUDIO RTMP SCHROEDINGER SPEEX THEORA V4L2 VAAPI VDPAU \ PULSEAUDIO RTMP SCHROEDINGER SPEEX THEORA V4L VAAPI VDPAU \
VO_AACENC VO_AMRWBENC VORBIS VPX X264 XVID ZLIB VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID ZLIB
OPTIONS_DEFAULT= BZIP2 FREETYPE FREI0R GNUTLS OPENCV SCHROEDINGER \ OPTIONS_DEFAULT= BZIP2 FREETYPE FREI0R GNUTLS OPENCV SCHROEDINGER \
THEORA VO_AACENC VORBIS VPX X264 XVID ZLIB THEORA VO_AACENC VORBIS VPX X264 XVID ZLIB
@ -42,6 +42,7 @@ OPTIONS_DEFAULT= BZIP2 FREETYPE FREI0R GNUTLS OPENCV SCHROEDINGER \
FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK
ILBC_DESC= iLBC en/decoding via libilbc ILBC_DESC= iLBC en/decoding via libilbc
OPUS_DESC= Opus decoding with libopus OPUS_DESC= Opus decoding with libopus
X11GRAB_DESC= X11 grabbing
ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib
ALSA_CONFIGURE_ON= --enable-indev=alsa --enable-outdev=alsa ALSA_CONFIGURE_ON= --enable-indev=alsa --enable-outdev=alsa
@ -115,8 +116,8 @@ SPEEX_CONFIGURE_ENABLE= libspeex
THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora
THEORA_CONFIGURE_ENABLE= libtheora THEORA_CONFIGURE_ENABLE= libtheora
V4L2_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
V4L2_CONFIGURE_ENABLE= indev=v4l2 V4L_CONFIGURE_ENABLE= indev=v4l2
VAAPI_LIB_DEPENDS= libva.so:${PORTSDIR}/multimedia/libva VAAPI_LIB_DEPENDS= libva.so:${PORTSDIR}/multimedia/libva
VAAPI_CONFIGURE_ENABLE= vaapi VAAPI_CONFIGURE_ENABLE= vaapi
@ -136,6 +137,8 @@ VORBIS_CONFIGURE_ENABLE= libvorbis
VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx
VPX_CONFIGURE_ENABLE= libvpx VPX_CONFIGURE_ENABLE= libvpx
X11GRAB_USE= XORG=x11 xext xfixes
X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/x264 X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/x264
X264_CONFIGURE_ENABLE= libx264 X264_CONFIGURE_ENABLE= libx264
@ -202,6 +205,8 @@ LICENSE= LGPL21
.endif .endif
post-patch: post-patch:
@${REINPLACE_CMD} -e 's|freetype/freetype.h|freetype2/freetype.h|' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \ @${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \
${WRKSRC}/configure \ ${WRKSRC}/configure \
${WRKSRC}/libavcodec/libgsm.c ${WRKSRC}/libavcodec/libgsm.c

10
multimedia/libav/files/patch-libavfilter_vf_drawtext.c Normal file
View file

@ -0,0 +1,10 @@
--- libavfilter/vf_drawtext.c.orig 2014-01-01 12:39:17.000000000 +0100
+++ libavfilter/vf_drawtext.c 2014-01-01 12:39:32.000000000 +0100
@@ -47,7 +47,6 @@
#include "video.h"
#include <ft2build.h>
-#include <freetype/config/ftheader.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H