diff options
| -rw-r--r-- | multimedia/vlc/Makefile | 9 | ||||
| -rw-r--r-- | multimedia/vlc/Makefile.inc | 2 | ||||
| -rw-r--r-- | multimedia/vlc/files/patch-modules_access_pvr.c | 12 |
3 files changed, 19 insertions, 4 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 9792b3e652aa..efbf3bf643a1 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -54,7 +54,7 @@ OPTIONS= A52 "a52 audio support, many DVDs use this" On \ SPEEX "Speex voice codec support" On \ THEORA "OGG/Vorbis video codec support" On \ TWOLAME "Twolame mpeg2 audio encoder support" On \ - V4L "Enable Video for Linux" On \ + V4L "Enable Video for Linux & DVB support" On \ VORBIS "Vorbis support" On \ WIN32_CODECS "win32 multimedia DLL's" Off \ X264 "Enable H.264/AVC codec support" On \ @@ -581,11 +581,12 @@ CFLAGS+= -O3 -ffast-math -fomit-frame-pointer CONFIGURE_ARGS+=--enable-optimizations .endif +# Video for Linux and DVB (Digital Video Broadcast) support .if defined(WITHOUT_V4L) -CONFIGURE_ARGS+=--disable-v4l +CONFIGURE_ARGS+=--disable-v4l --disable-dvb .else -BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat -CONFIGURE_ARGS+=--enable-v4l +BUILD_DEPENDS+= v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat +CONFIGURE_ARGS+=--enable-v4l --enable-dvb .endif .if defined(WITHOUT_X11) diff --git a/multimedia/vlc/Makefile.inc b/multimedia/vlc/Makefile.inc index 79f39eb3862e..6e6d2736f306 100644 --- a/multimedia/vlc/Makefile.inc +++ b/multimedia/vlc/Makefile.inc @@ -202,6 +202,8 @@ # post-patch: + @${REINPLACE_CMD} -e 's|__u32|uint32_t|g' \ + ${WRKSRC}/modules/access/v4l2.c # Do not assume LOCALBASE is /usr/local @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure # Subtitle default font diff --git a/multimedia/vlc/files/patch-modules_access_pvr.c b/multimedia/vlc/files/patch-modules_access_pvr.c new file mode 100644 index 000000000000..de303ad8d7f6 --- /dev/null +++ b/multimedia/vlc/files/patch-modules_access_pvr.c @@ -0,0 +1,12 @@ +--- modules/access/pvr.c.orig 2010-03-23 17:37:48.000000000 +0100 ++++ modules/access/pvr.c 2010-03-23 17:38:04.000000000 +0100 +@@ -38,7 +38,9 @@ + #include <fcntl.h> + #include <unistd.h> + #include <errno.h> ++#ifdef __linux__ + #include <linux/types.h> ++#endif + #include <sys/ioctl.h> + #include <sys/poll.h> + #ifdef HAVE_NEW_LINUX_VIDEODEV2_H |