svn commit: r513385 - in head/multimedia/vlc: . files
Piotr Kubaj
pkubaj at FreeBSD.org
Mon Sep 30 14:18:37 UTC 2019
Author: pkubaj
Date: Mon Sep 30 14:18:36 2019
New Revision: 513385
URL: https://svnweb.freebsd.org/changeset/ports/513385
Log:
multimedia/vlc: add ALTIVEC option, fix build on powerpc64 elfv2, add USES=localbase
Add ALTIVEC option to enable/disable AltiVec easily when needed.
Fix build with LLVM and AltiVec, altivec.h defines its own bool.
Add USES=localbase.
PR: 240537
Approved by: linimon (mentor), multimedia (maintainer timeout)
Added:
head/multimedia/vlc/files/patch-modules_video__chroma_i420__yuy2.c (contents, props changed)
head/multimedia/vlc/files/patch-modules_video__filter_deinterlace_merge.c (contents, props changed)
Modified:
head/multimedia/vlc/Makefile
Modified: head/multimedia/vlc/Makefile
==============================================================================
--- head/multimedia/vlc/Makefile Mon Sep 30 14:16:26 2019 (r513384)
+++ head/multimedia/vlc/Makefile Mon Sep 30 14:18:36 2019 (r513385)
@@ -26,7 +26,7 @@ BUILD_DEPENDS= ffmpeg>=3.4.1,1:multimedia/ffmpeg \
RUN_DEPENDS= ffmpeg>=3.4.1,1:multimedia/ffmpeg
USES= compiler:c++11-lib desktop-file-utils gettext-tools gmake gnome \
- iconv libtool pathfix pkgconfig tar:xz
+ iconv libtool localbase pathfix pkgconfig tar:xz
# VLC git (post 2.2.4) requires C++11 support and passes the appropriate flag
# to the compiler. Until the port is updated, we explicitly pass -std=c++11 to
@@ -58,9 +58,7 @@ CONFIGURE_ARGS= --enable-avcodec --enable-avformat --e
.if defined(WITH_DEBUG)
CONFIGURE_ARGS+=--enable-debug
.endif
-CPPFLAGS+= -I${LOCALBASE}/include
CFLAGS_i386= -fomit-frame-pointer
-LIBS+= -L${LOCALBASE}/lib
OPTIONS_DEFINE= A52 AALIB AOM ASS AVAHI CACA CHROMECAST DAV1D DBUS DCA DOCS DVDREAD \
DVDNAV FAAD FLAC FLUID FREERDP FRIBIDI GME GNUTLS \
@@ -70,10 +68,14 @@ OPTIONS_DEFINE= A52 AALIB AOM ASS AVAHI CACA CHROMECAS
QT5 REALRTSP RUNROOT SAMPLERATE SIDPLAY SCHROEDINGER \
SDL SHOUTCAST SKINS SMB SNDIO STREAM SPEEX TAGLIB THEORA \
TWOLAME UPNP V4L VAAPI VCD VDPAU VPX VORBIS WAYLAND X11 X264 X265 ZVBI
+OPTIONS_DEFINE_powerpc= ALTIVEC
+OPTIONS_DEFINE_powerpc64= ALTIVEC
OPTIONS_DEFAULT=A52 AVAHI DAV1D DBUS DCA DVDREAD DVDNAV FAAD FLAC GNUTLS JPEG \
LIVEMEDIA LUA MAD MPEG2 OGG OPTIMIZED_CFLAGS \
OPUS PNG QT5 SAMPLERATE STREAM SPEEX TAGLIB THEORA TWOLAME \
V4L VAAPI VCD VDPAU VORBIS WAYLAND X11
+OPTIONS_DEFAULT_powerpc= ALTIVEC
+OPTIONS_DEFAULT_powerpc64= ALTIVEC
OPTIONS_SUB= yes
AOM_DESC= AV1 video encoding/decoding via libaom
@@ -109,6 +111,8 @@ AALIB_CONFIGURE_ENABLE= aa
ASS_LIB_DEPENDS= libass.so:multimedia/libass
ASS_CONFIGURE_ENABLE= libass
+
+ALTIVEC_CONFIGURE_ENABLE= altivec
AOM_LIB_DEPENDS= libaom.so:multimedia/aom
AOM_CONFIGURE_ENABLE= aom
Added: head/multimedia/vlc/files/patch-modules_video__chroma_i420__yuy2.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/vlc/files/patch-modules_video__chroma_i420__yuy2.c Mon Sep 30 14:18:36 2019 (r513385)
@@ -0,0 +1,12 @@
+--- modules/video_chroma/i420_yuy2.c.orig 2019-09-12 13:09:52 UTC
++++ modules/video_chroma/i420_yuy2.c
+@@ -37,7 +37,9 @@
+ #include <vlc_cpu.h>
+
+ #if defined (MODULE_NAME_IS_i420_yuy2_altivec) && defined(HAVE_ALTIVEC_H)
++# undef bool
+ # include <altivec.h>
++# define bool _Bool
+ #endif
+
+ #include "i420_yuy2.h"
Added: head/multimedia/vlc/files/patch-modules_video__filter_deinterlace_merge.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/vlc/files/patch-modules_video__filter_deinterlace_merge.c Mon Sep 30 14:18:36 2019 (r513385)
@@ -0,0 +1,12 @@
+--- modules/video_filter/deinterlace/merge.c.orig 2019-09-12 13:33:43 UTC
++++ modules/video_filter/deinterlace/merge.c
+@@ -39,7 +39,9 @@
+ #endif
+
+ #ifdef HAVE_ALTIVEC_H
++# undef bool
+ # include <altivec.h>
++# define bool _Bool
+ #endif
+
+ /*****************************************************************************
More information about the svn-ports-all
mailing list