From owner-svn-ports-all@freebsd.org Mon Sep 30 14:18:37 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5EDFC12908A; Mon, 30 Sep 2019 14:18:37 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46hkz11pFKz403p; Mon, 30 Sep 2019 14:18:37 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 211CA3D8A; Mon, 30 Sep 2019 14:18:37 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8UEIbl0056482; Mon, 30 Sep 2019 14:18:37 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8UEIavk056480; Mon, 30 Sep 2019 14:18:36 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201909301418.x8UEIavk056480@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Mon, 30 Sep 2019 14:18:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513385 - in head/multimedia/vlc: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/multimedia/vlc: . files X-SVN-Commit-Revision: 513385 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Sep 2019 14:18:37 -0000 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 + + #if defined (MODULE_NAME_IS_i420_yuy2_altivec) && defined(HAVE_ALTIVEC_H) ++# undef bool + # include ++# 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 ++# define bool _Bool + #endif + + /*****************************************************************************