* [gentoo-commits] gentoo-x86 commit in media-video/vlc: metadata.xml vlc-9999.ebuild ChangeLog
@ 2013-10-21 1:15 Tom Wijsman (tomwij)
0 siblings, 0 replies; 2+ messages in thread
From: Tom Wijsman (tomwij) @ 2013-10-21 1:15 UTC (permalink / raw
To: gentoo-commits
tomwij 13/10/21 01:15:02
Modified: metadata.xml vlc-9999.ebuild ChangeLog
Log:
Updated 9999 in a first preparation of the 2.1.0 version bump; switched to git-r3, moved bootstrap to src_prepare, small cleanup, added USE flags "chromaprint,opencv,rdp,sftp,vnc" and their respective dependencies (exceptions: rdp --> freerdp, sftp --> libssh2), made unpacking work for non-9999 versions, removed gcc warnings for missing pragmas in gcc C99 to shorten build log, fix detection of git checkout, revised freetype fonts patch, support newer freerdp and be compatibility with libva 1.2.1, disable "decklink,goom,mfx,vxsu" which are not (yet) in the Portage tree. Updated metadata.xml to document new USE flags. More changes and testing will follow.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Revision Changes Path
1.69 media-video/vlc/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/metadata.xml?rev=1.69&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/metadata.xml?rev=1.69&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/metadata.xml?r1=1.68&r2=1.69
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/metadata.xml,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- metadata.xml 20 Oct 2013 09:56:09 -0000 1.68
+++ metadata.xml 21 Oct 2013 01:15:02 -0000 1.69
@@ -12,6 +12,7 @@
<flag name="avcodec">Enables libavcodec support for video/audio encoding/decoding. libavcodec is part of FFmpeg.</flag>
<flag name="avformat">Enables libformat support for reading and writing various media containers. libavformat is part of FFmpeg.</flag>
<flag name="bluray">Enables libbluray for Blu-ray disc support.</flag>
+ <flag name="chromaprint">Enables libchromaprint for Chromaprint based audio fingerprinter support.</flag>
<flag name="dc1394">Enables IIDC cameras support.</flag>
<flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag>
<flag name="direct2d">Enable Win7/VistaPU Direct2D support.</flag>
@@ -45,16 +46,19 @@
<flag name="media-library">Build the (sqlite based) media library.</flag>
<flag name="omxil">Enables OpenMAX Integration Layer codec module.</flag>
<flag name="optimisememory">Enable optimisation for memory rather than performance.</flag>
+ <flag name="opencv">Enabled OpenCV (computer vision) filter module.</flag>
<flag name="opus">Support opus decoding via libopus.</flag>
<flag name="postproc">Enables image post-processing via libpostproc (part of FFmpeg).</flag>
<flag name="projectm">Enables the projectM visualization plugin.</flag>
<flag name="pvr">Enables PVR cards access module.</flag>
<flag name="qt4" restrict=">=media-video/vlc-0.9">Builds a <pkg>x11-libs/qt</pkg> based frontend. It is now the most up-to-date graphical interface available.</flag>
+ <flag name="rdp">Enables freerdp for RDP/Remote Desktop client support</flag>
<flag name="rtsp">Enables real audio and RTSP modules.</flag>
<flag name="run-as-root">Allows vlc to start for root. Don't enable this unless you have a very specific (e.g. embedded) need for it!</flag>
<flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
<flag name="sid">Adds support for playing C64 SID files through <pkg>media-libs/libsidplay-2</pkg>.</flag>
<flag name="sdl-image">Enables sdl image video decoder (depends on sdl)</flag>
+ <flag name="sftp">Enables libssh2 to support SFTP file transfer.</flag>
<flag name="shine">Enables shine fixed point mp3 encoder.</flag>
<flag name="shout">Enables libshout output.</flag>
<flag name="skins">Enables support for the skins2 interface.</flag>
1.192 media-video/vlc/vlc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.192&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.192&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?r1=1.191&r2=1.192
Index: vlc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- vlc-9999.ebuild 20 Sep 2013 23:30:16 -0000 1.191
+++ vlc-9999.ebuild 21 Oct 2013 01:15:02 -0000 1.192
@@ -1,13 +1,13 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.191 2013/09/20 23:30:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.192 2013/10/21 01:15:02 tomwij Exp $
EAPI="5"
SCM=""
if [ "${PV%9999}" != "${PV}" ] ; then
- SCM=git-2
- EGIT_BOOTSTRAP="bootstrap"
+ SCM="git-r3"
+
if [ "${PV%.9999}" != "${PV}" ] ; then
EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
else
@@ -32,9 +32,6 @@
SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
fi
-# SRC_URI="${SRC_URI}
-# mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
LICENSE="LGPL-2.1 GPL-2"
SLOT="0"
@@ -44,20 +41,21 @@
KEYWORDS=""
fi
IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
- +avformat bidi bluray cdda cddb dbus dc1394 debug dirac
+ +avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug dirac
directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode
fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify
libsamplerate libtiger linsys libtar lirc live lua +macosx
+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
- mtp musepack ncurses neon ogg omxil opengl optimisememory oss png
- +postproc projectm pulseaudio +qt4 rtsp run-as-root samba schroedinger
- sdl sdl-image shine shout sid skins speex sse svg +swscale
- taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vorbis waveout
- wma-fixed +X x264 +xcb xml xv zvbi"
+ mtp musepack ncurses neon ogg omxil opencv opengl optimisememory oss png
+ +postproc projectm pulseaudio +qt4 rdp rtsp run-as-root samba schroedinger
+ sdl sdl-image sftp shine shout sid skins speex sse svg +swscale
+ taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vnc vorbis
+ waveout wma-fixed +X x264 +xcb xml xv zvbi"
RDEPEND="
+ >=sys-devel/gettext-0.18.3
>=sys-libs/zlib-1.2.5.1-r2[minizip]
a52? ( >=media-libs/a52dec-0.7.4-r3 )
aalib? ( media-libs/aalib )
@@ -69,6 +67,7 @@
bidi? ( >=dev-libs/fribidi-0.10.4 )
bluray? ( >=media-libs/libbluray-0.2.1 )
cddb? ( >=media-libs/libcddb-1.2.0 )
+ chromaprint? ( >=media-libs/chromaprint-0.6 )
dbus? ( >=sys-apps/dbus-1.0.2 )
dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
dirac? ( >=media-video/dirac-0.10.0 )
@@ -108,16 +107,19 @@
musepack? ( >=media-sound/musepack-tools-444 )
ncurses? ( sys-libs/ncurses[unicode] )
ogg? ( media-libs/libogg )
+ opencv? ( >=media-libs/opencv-2.0 )
opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 )
png? ( media-libs/libpng sys-libs/zlib )
postproc? ( || ( media-video/ffmpeg:0 media-libs/libpostproc ) )
projectm? ( media-libs/libprojectm media-fonts/dejavu )
pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
+ rdp? ( net-misc/freerdp )
samba? ( >=net-fs/samba-3.4.6[smbclient] )
schroedinger? ( >=media-libs/schroedinger-1.0.10 )
sdl? ( >=media-libs/libsdl-1.2.8
sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )
+ sftp? ( net-libs/libssh2 )
shout? ( media-libs/libshout )
sid? ( media-libs/libsidplay:2 )
skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama )
@@ -135,6 +137,7 @@
vaapi? ( x11-libs/libva )
vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
vorbis? ( media-libs/libvorbis )
+ vnc? ( >=net-libs/libvncserver-0.9.9 )
X? ( x11-libs/libX11 )
x264? ( >=media-libs/x264-0.0.20090923:= )
xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 )
@@ -143,10 +146,10 @@
"
DEPEND="${RDEPEND}
+ >=sys-devel/gettext-0.18.3
kde? ( >=kde-base/kdelibs-4 )
xcb? ( x11-proto/xproto )
app-arch/xz-utils
- >=sys-devel/gettext-0.18.3
virtual/pkgconfig"
REQUIRED_USE="
@@ -175,24 +178,51 @@
src_unpack() {
if [ "${PV%9999}" != "${PV}" ] ; then
- git-2_src_unpack
+ git-r3_src_unpack
+ else
+ unpack ${A}
fi
}
src_prepare() {
+ # Remove unnecessary warnings about unimplemented pragmas on gcc for now.
+ # Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
+ #
+ # config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
+ # config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
+ #
+ # http://gcc.gnu.org/c99status.html
+ if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
+ sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
+ fi
+
+ # Bootstrap when we are on a git checkout.
+ if [[ "${PV%9999}" != "${PV}" ]] ; then
+ ./bootstrap
+ fi
+
# Make it build with libtool 1.5
- rm -f m4/lt* m4/libtool.m4
+ rm -f m4/lt* m4/libtool.m4 || die
+
+ # We are not in a real git checkout due to the absence of a .git directory.
+ touch src/revision.txt || die
+
+ # Patch up problems and reconfigure autotools.
+ epatch "${FILESDIR}"/${PN}-2.1.0-freetype-proper-default-font.patch
+ epatch "${FILESDIR}"/${PN}-2.1.0-newer-rdp.patch
+ epatch "${FILESDIR}"/${PN}-2.1.0-libva-1.2.1-compat.patch
-# EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
eautoreconf
}
src_configure() {
- # needs libresid-builder from libsidplay:2 which is in another directory...
+ # Needs libresid-builder from libsidplay:2 which is in another directory...
# FIXME!
use sid && append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
- if use truetype || use projectm; then
+ # Need to check if this works and is correct so we can drop the patch above.
+ # TODO!
+ if use truetype || use projectm ; then
local dejavu="/usr/share/fonts/dejavu/"
myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
--with-default-font-family=Sans \
@@ -217,6 +247,7 @@
$(use_enable bluray) \
$(use_enable cdda vcd) \
$(use_enable cddb libcddb) \
+ $(use_enable chromaprint) \
$(use_enable dbus) \
$(use_enable dirac) \
$(use_enable directfb) \
@@ -270,6 +301,7 @@
$(use_enable neon) \
$(use_enable ogg) $(use_enable ogg mux_ogg) \
$(use_enable omxil) \
+ $(use_enable opencv) \
$(use_enable opengl glx) \
$(use_enable optimisememory optimize-memory) \
$(use_enable oss) \
@@ -278,6 +310,7 @@
$(use_enable projectm) \
$(use_enable pulseaudio pulse) \
$(use_enable qt4 qt) \
+ $(use_enable rdp freerdp) \
$(use_enable rtsp realrtsp) \
$(use_enable run-as-root) \
$(use_enable samba smbclient) \
@@ -302,6 +335,7 @@
$(use_enable vaapi libva) \
$(use_enable vcdx) \
$(use_enable vlm) \
+ $(use_enable vnc) \
$(use_enable vorbis) \
$(use_enable waveout) \
$(use_enable wma-fixed) \
@@ -312,7 +346,13 @@
$(use_enable xv xvideo) \
$(use_enable zvbi) $(use_enable !zvbi telx) \
--disable-optimizations \
- --enable-fast-install
+ --enable-fast-install \
+ --disable-decklink \
+ --disable-goom \
+ --disable-mfx \
+ --disable-vsxu
+
+ # ^ We don't have decklink, goom, mfx or vsxu in the Portage tree.
}
src_install() {
1.854 media-video/vlc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.854&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.854&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?r1=1.853&r2=1.854
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v
retrieving revision 1.853
retrieving revision 1.854
diff -u -r1.853 -r1.854
--- ChangeLog 20 Oct 2013 09:56:09 -0000 1.853
+++ ChangeLog 21 Oct 2013 01:15:02 -0000 1.854
@@ -1,6 +1,20 @@
# ChangeLog for media-video/vlc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.853 2013/10/20 09:56:09 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.854 2013/10/21 01:15:02 tomwij Exp $
+
+ 21 Oct 2013; Tom Wijsman <TomWij@gentoo.org>
+ +files/vlc-2.1.0-freetype-proper-default-font.patch,
+ +files/vlc-2.1.0-libva-1.2.1-compat.patch, +files/vlc-2.1.0-newer-rdp.patch,
+ metadata.xml, vlc-9999.ebuild:
+ Updated 9999 in a first preparation of the 2.1.0 version bump; switched to
+ git-r3, moved bootstrap to src_prepare, small cleanup, added USE flags
+ "chromaprint,opencv,rdp,sftp,vnc" and their respective dependencies
+ (exceptions: rdp --> freerdp, sftp --> libssh2), made unpacking work for
+ non-9999 versions, removed gcc warnings for missing pragmas in gcc C99 to
+ shorten build log, fix detection of git checkout, revised freetype fonts
+ patch, support newer freerdp and be compatibility with libva 1.2.1, disable
+ "decklink,goom,mfx,vxsu" which are not (yet) in the Portage tree. Updated
+ metadata.xml to document new USE flags. More changes and testing will follow.
20 Oct 2013; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
Added myself as primary maintainer to the metadata, as per aballier's gentoo-
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/vlc: metadata.xml vlc-9999.ebuild ChangeLog
@ 2013-10-21 19:15 Tom Wijsman (tomwij)
0 siblings, 0 replies; 2+ messages in thread
From: Tom Wijsman (tomwij) @ 2013-10-21 19:15 UTC (permalink / raw
To: gentoo-commits
tomwij 13/10/21 19:15:29
Modified: metadata.xml vlc-9999.ebuild ChangeLog
Log:
Worked further on the 2.1.0 version bump: Added USE flags and dependencies to support fdk(aac), opus, tremor, vdpau and vpx. Added support for the upcming Qt 5 release. Added missing dependencies (libgpg-error used in HTML communication, libidn which is used by most objects, gdb-pixbuf, glib and xcb-util-keysyms) SLOTted all dependencies, used the slot operator where dependencies have sub slots; to avoid incorrect dependencies, new SLOTs and overlays versions from breaking the vlc package. Moved gettext to RDEPEND as it was duplicated. Remove _FORTIFY_SOURCE definition as it is set to Gentoo's default to shorten the build log by removing unnecessary warnings. Removed the freetype patch as the configure parameters work. Ensured that there are less to none automagic dependencies. Enumerated almost all configure parameters as there were some missing. Removed oss due to compile error due to missing package. Run tests using virtualx to avoid a window from popping up. Simplified src_inst
all. Documented fdk, tremor and vpx USE flags in metadata.xml. More changes and testing will follow; there still appear warnings and errors to look into (also resid_builder), which probably requires configure.ac patching. Progress is being tracked mainly in bug #479566.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Revision Changes Path
1.70 media-video/vlc/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/metadata.xml?rev=1.70&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/metadata.xml?rev=1.70&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/metadata.xml?r1=1.69&r2=1.70
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/metadata.xml,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- metadata.xml 21 Oct 2013 01:15:02 -0000 1.69
+++ metadata.xml 21 Oct 2013 19:15:29 -0000 1.70
@@ -22,6 +22,7 @@
<flag name="dxva2">Enables Win32 DxVA2 support.</flag>
<flag name="egl">Enables EGL video output module.</flag>
<flag name="fbosd">Enables the framebuffer overlay plugin.</flag>
+ <flag name="fdk">Enables the Fraunhofer AAC codec library.</flag>
<flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis (with external sound fonts).</flag>
<flag name="gcrypt">Enables cryptography support via libgcrypt.</flag>
<flag name="gme">Enables support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats.</flag>
@@ -64,11 +65,13 @@
<flag name="skins">Enables support for the skins2 interface.</flag>
<flag name="switcher">Enables MPEG2 video switcher stream output module.</flag>
<flag name="swscale">Enables image scaling and conversion via libswscale (part of FFmpeg).</flag>
+ <flag name="tremor">Enables tremor, a fixed-point version of the Ogg Vorbis decoder.</flag>
<flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder).</flag>
<flag name="upnp">Enables support for Intel UPnP stack.</flag>
<flag name="vaapi">Enables VAAPI (Video Acceleration API) for hardware decoding</flag>
<flag name="vcdx">Enables VCD with navigation via libvcdinfo (depends on cdio)</flag>
<flag name="vlm">New videolan (media) manager (vlm), a little manager designed to launch and manage multiple streams from within one instance of VLC.</flag>
+ <flag name="vpx">Enables the decoder(s) from the WebM VP8 / VP9 Codec SDK.</flag>
<flag name="waveout">Enable win32 waveOut plugin.</flag>
<flag name="wingdi">Enable Win32 GDI module.</flag>
<flag name="wma-fixed">Enables fixed point WMA decoder.</flag>
1.193 media-video/vlc/vlc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.193&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.193&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?r1=1.192&r2=1.193
Index: vlc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- vlc-9999.ebuild 21 Oct 2013 01:15:02 -0000 1.192
+++ vlc-9999.ebuild 21 Oct 2013 19:15:29 -0000 1.193
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.192 2013/10/21 01:15:02 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.193 2013/10/21 19:15:29 tomwij Exp $
EAPI="5"
@@ -15,13 +15,12 @@
fi
fi
-inherit eutils multilib autotools toolchain-funcs flag-o-matic ${SCM}
+inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM}
MY_PV="${PV/_/-}"
MY_PV="${MY_PV/-beta/-test}"
MY_P="${PN}-${MY_PV}"
-# PATCHLEVEL="108"
DESCRIPTION="VLC media player - Video player and streamer"
HOMEPAGE="http://www.videolan.org/vlc/"
if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
@@ -40,117 +39,126 @@
else
KEYWORDS=""
fi
+
IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
+avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug dirac
- directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode
+ directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode fdk
fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify
libsamplerate libtiger linsys libtar lirc live lua +macosx
+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
- mtp musepack ncurses neon ogg omxil opencv opengl optimisememory oss png
- +postproc projectm pulseaudio +qt4 rdp rtsp run-as-root samba schroedinger
- sdl sdl-image sftp shine shout sid skins speex sse svg +swscale
- taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vnc vorbis
- waveout wma-fixed +X x264 +xcb xml xv zvbi"
+ mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
+ png +postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
+ schroedinger sdl sdl-image sftp shout sid skins speex sse svg +swscale
+ taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
+ vlm vnc vorbis waveout vpx wma-fixed +X x264 +xcb xml xv zvbi"
RDEPEND="
- >=sys-devel/gettext-0.18.3
- >=sys-libs/zlib-1.2.5.1-r2[minizip]
- a52? ( >=media-libs/a52dec-0.7.4-r3 )
- aalib? ( media-libs/aalib )
- aac? ( >=media-libs/faad2-2.6.1 )
- alsa? ( >=media-libs/alsa-lib-1.0.23 )
- avahi? ( >=net-dns/avahi-0.6[dbus] )
- avcodec? ( virtual/ffmpeg )
- avformat? ( virtual/ffmpeg )
- bidi? ( >=dev-libs/fribidi-0.10.4 )
- bluray? ( >=media-libs/libbluray-0.2.1 )
- cddb? ( >=media-libs/libcddb-1.2.0 )
- chromaprint? ( >=media-libs/chromaprint-0.6 )
- dbus? ( >=sys-apps/dbus-1.0.2 )
- dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
- dirac? ( >=media-video/dirac-0.10.0 )
- directfb? ( dev-libs/DirectFB sys-libs/zlib )
- dts? ( media-libs/libdca )
- dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 )
- dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
- egl? ( virtual/opengl )
- elibc_glibc? ( >=sys-libs/glibc-2.8 )
- flac? ( media-libs/libogg >=media-libs/flac-1.1.2 )
- fluidsynth? ( >=media-sound/fluidsynth-1.1.0 )
- fontconfig? ( media-libs/fontconfig )
- gcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
- gme? ( media-libs/game-music-emu )
- gnome? ( gnome-base/gnome-vfs )
- gnutls? ( >=net-libs/gnutls-2.0.0 )
- ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 )
- ios-vout? ( virtual/opengl )
- jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
- kate? ( >=media-libs/libkate-0.1.1 )
- libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig )
- libcaca? ( >=media-libs/libcaca-0.99_beta14 )
- libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 )
- libsamplerate? ( media-libs/libsamplerate )
- libtar? ( >=dev-libs/libtar-1.2.11-r3 )
- libtiger? ( media-libs/libtiger )
- linsys? ( >=media-libs/zvbi-0.2.28 )
- lirc? ( app-misc/lirc )
- live? ( >=media-plugins/live-2011.12.23 )
- lua? ( >=dev-lang/lua-5.1 )
- macosx-vout? ( virtual/opengl )
- matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 )
- modplug? ( >=media-libs/libmodplug-0.8.8.1 )
- mp3? ( media-libs/libmad )
- mpeg? ( >=media-libs/libmpeg2-0.3.2 )
- mtp? ( >=media-libs/libmtp-1.0.0 )
- musepack? ( >=media-sound/musepack-tools-444 )
- ncurses? ( sys-libs/ncurses[unicode] )
- ogg? ( media-libs/libogg )
- opencv? ( >=media-libs/opencv-2.0 )
- opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 )
- png? ( media-libs/libpng sys-libs/zlib )
- postproc? ( || ( media-video/ffmpeg:0 media-libs/libpostproc ) )
- projectm? ( media-libs/libprojectm media-fonts/dejavu )
- pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
+ dev-libs/libgpg-error:0
+ net-dns/libidn:0
+ >=sys-devel/gettext-0.18.3:0
+ >=sys-libs/zlib-1.2.5.1-r2:0[minizip]
+ a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
+ aalib? ( media-libs/aalib:0 )
+ aac? ( >=media-libs/faad2-2.6.1:0 )
+ alsa? ( >=media-libs/alsa-lib-1.0.23:0 )
+ avahi? ( >=net-dns/avahi-0.6:0[dbus] )
+ avcodec? ( virtual/ffmpeg:0 )
+ avformat? ( virtual/ffmpeg:0 )
+ bidi? ( >=dev-libs/fribidi-0.10.4:0 )
+ bluray? ( >=media-libs/libbluray-0.2.1:0 )
+ cddb? ( >=media-libs/libcddb-1.2.0:0 )
+ chromaprint? ( >=media-libs/chromaprint-0.6:0 )
+ dbus? ( >=sys-apps/dbus-1.0.2:0 )
+ dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.0.2:2 )
+ dirac? ( >=media-video/dirac-0.10.0:0 )
+ directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
+ dts? ( media-libs/libdca:0 )
+ dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0 )
+ dvd? ( media-libs/libdvdread:0 >=media-libs/libdvdnav-0.1.9:0 )
+ egl? ( virtual/opengl:0 )
+ elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
+ fdk? ( media-libs/fdk-aac:0 )
+ flac? ( media-libs/libogg:0 >=media-libs/flac-1.1.2:0 )
+ fluidsynth? ( >=media-sound/fluidsynth-1.1.0:0 )
+ fontconfig? ( media-libs/fontconfig:1.0 )
+ gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0 )
+ gme? ( media-libs/game-music-emu:0 )
+ gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
+ gnutls? ( >=net-libs/gnutls-2.0.0:0 )
+ ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
+ ios-vout? ( virtual/opengl:0 )
+ jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 )
+ kate? ( >=media-libs/libkate-0.1.1:0 )
+ libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 )
+ libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
+ libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
+ libsamplerate? ( media-libs/libsamplerate:0 )
+ libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
+ libtiger? ( media-libs/libtiger:0 )
+ linsys? ( >=media-libs/zvbi-0.2.28:0 )
+ lirc? ( app-misc/lirc:0 )
+ live? ( >=media-plugins/live-2011.12.23:0 )
+ lua? ( >=dev-lang/lua-5.1:0 )
+ macosx-vout? ( virtual/opengl:0 )
+ matroska? ( >=dev-libs/libebml-1.0.0:0= >=media-libs/libmatroska-1.0.0:0= )
+ modplug? ( >=media-libs/libmodplug-0.8.8.1:0 )
+ mp3? ( media-libs/libmad:0 )
+ mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
+ mtp? ( >=media-libs/libmtp-1.0.0:0 )
+ musepack? ( >=media-sound/musepack-tools-444:0 )
+ ncurses? ( sys-libs/ncurses:5[unicode] )
+ ogg? ( media-libs/libogg:0 )
+ opencv? ( >=media-libs/opencv-2.0:0 )
+ opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
+ opus? ( >=media-libs/opus-1.0.3:0 )
+ png? ( media-libs/libpng:0= sys-libs/zlib:0 )
+ postproc? ( || ( media-video/ffmpeg:0= media-libs/libpostproc:0 ) )
+ projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
- rdp? ( net-misc/freerdp )
- samba? ( >=net-fs/samba-3.4.6[smbclient] )
- schroedinger? ( >=media-libs/schroedinger-1.0.10 )
- sdl? ( >=media-libs/libsdl-1.2.8
- sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )
- sftp? ( net-libs/libssh2 )
- shout? ( media-libs/libshout )
+ qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 )
+ rdp? ( net-misc/freerdp:0 )
+ samba? ( >=net-fs/samba-3.4.6:0[smbclient] )
+ schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
+ sdl? ( >=media-libs/libsdl-1.2.8:0
+ sdl-image? ( media-libs/sdl-image:0 sys-libs/zlib:0 ) )
+ sftp? ( net-libs/libssh2:0 )
+ shout? ( media-libs/libshout:0 )
sid? ( media-libs/libsidplay:2 )
- skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama )
- speex? ( media-libs/speex )
- svg? ( >=gnome-base/librsvg-2.9.0 )
- swscale? ( virtual/ffmpeg )
- taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
- theora? ( >=media-libs/libtheora-1.0_beta3 )
- truetype? ( media-libs/freetype virtual/ttf-fonts
- !fontconfig? ( media-fonts/dejavu ) )
- twolame? ( media-sound/twolame )
- udev? ( virtual/udev )
- upnp? ( net-libs/libupnp )
- v4l? ( media-libs/libv4l )
- vaapi? ( x11-libs/libva )
- vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
- vorbis? ( media-libs/libvorbis )
- vnc? ( >=net-libs/libvncserver-0.9.9 )
- X? ( x11-libs/libX11 )
- x264? ( >=media-libs/x264-0.0.20090923:= )
- xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 )
- xml? ( dev-libs/libxml2 )
- zvbi? ( >=media-libs/zvbi-0.2.25 )
- "
+ skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
+ speex? ( media-libs/speex:0 )
+ svg? ( >=gnome-base/librsvg-2.9.0:2 )
+ swscale? ( virtual/ffmpeg:0 )
+ taglib? ( >=media-libs/taglib-1.5:0 sys-libs/zlib:0 )
+ theora? ( >=media-libs/libtheora-1.0_beta3:0 )
+ tremor? ( media-libs/tremor:0 )
+ truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
+ !fontconfig? ( media-fonts/dejavu:0 ) )
+ twolame? ( media-sound/twolame:0 )
+ udev? ( virtual/udev:0 )
+ upnp? ( net-libs/libupnp:0 )
+ v4l? ( media-libs/libv4l:0 )
+ vaapi? ( x11-libs/libva:0 )
+ vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
+ vdpau? ( >=x11-libs/libvdpau-0.6:0 )
+ vnc? ( >=net-libs/libvncserver-0.9.9:0 )
+ vorbis? ( media-libs/libvorbis:0 )
+ vpx? ( media-libs/libvpx:0 )
+ X? ( x11-libs/libX11:0 )
+ x264? ( >=media-libs/x264-0.0.20090923:0= )
+ xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 x11-libs/xcb-util-keysyms:0 )
+ xml? ( dev-libs/libxml2:2 )
+ zvbi? ( >=media-libs/zvbi-0.2.25:0 )
+"
DEPEND="${RDEPEND}
- >=sys-devel/gettext-0.18.3
- kde? ( >=kde-base/kdelibs-4 )
- xcb? ( x11-proto/xproto )
- app-arch/xz-utils
- virtual/pkgconfig"
+ kde? ( >=kde-base/kdelibs-4:4 )
+ xcb? ( x11-proto/xproto:0 )
+ app-arch/xz-utils:0
+ virtual/pkgconfig:0
+"
REQUIRED_USE="
aalib? ( X )
@@ -166,9 +174,10 @@
libcaca? ( X )
libtar? ( skins )
libtiger? ( kate )
- qt4? ( X )
+ qt4? ( X !qt5 )
+ qt5? ( X !qt4 )
sdl? ( X )
- skins? ( truetype qt4 X )
+ skins? ( truetype X ^^ ( qt4 qt5 ) )
vaapi? ( avcodec X )
vlm? ( encode )
xv? ( xcb )
@@ -185,6 +194,12 @@
}
src_prepare() {
+ # Support for Qt5.
+ if use qt5 ; then
+ export UIC="/usr/lib64/qt5/bin/uic"
+ export MOC="/usr/lib64/qt5/bin/moc"
+ fi
+
# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
#
@@ -196,6 +211,9 @@
sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
fi
+ # _FORTIFY_SOURCE is set to 2 by default on Gentoo, remove redefine warnings.
+ sed -i '/_FORTIFY_SOURCE.*, 2,/d' configure.ac || die
+
# Bootstrap when we are on a git checkout.
if [[ "${PV%9999}" != "${PV}" ]] ; then
./bootstrap
@@ -207,21 +225,21 @@
# We are not in a real git checkout due to the absence of a .git directory.
touch src/revision.txt || die
- # Patch up problems and reconfigure autotools.
- epatch "${FILESDIR}"/${PN}-2.1.0-freetype-proper-default-font.patch
+ # Patch up incompatibilities and reconfigure autotools.
epatch "${FILESDIR}"/${PN}-2.1.0-newer-rdp.patch
epatch "${FILESDIR}"/${PN}-2.1.0-libva-1.2.1-compat.patch
eautoreconf
+
+ # Disable automatic running of tests.
+ find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
}
src_configure() {
# Needs libresid-builder from libsidplay:2 which is in another directory...
# FIXME!
- use sid && append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+ append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
- # Need to check if this works and is correct so we can drop the patch above.
- # TODO!
if use truetype || use projectm ; then
local dejavu="/usr/share/fonts/dejavu/"
myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
@@ -232,7 +250,13 @@
econf \
${myconf} \
+ --enable-vlc
--docdir=/usr/share/doc/${PF} \
+ --disable-dependency-tracking \
+ --disable-optimizations \
+ --disable-update-check \
+ --enable-fast-install \
+ --enable-screen \
$(use_enable a52) \
$(use_enable aalib aa) \
$(use_enable aac faad) \
@@ -260,6 +284,7 @@
$(use_enable dxva2) \
$(use_enable egl) \
$(use_enable encode sout) \
+ $(use_enable fdk fdkaac)
$(use_enable flac) \
$(use_enable fluidsynth) \
$(use_enable fontconfig) \
@@ -302,14 +327,15 @@
$(use_enable ogg) $(use_enable ogg mux_ogg) \
$(use_enable omxil) \
$(use_enable opencv) \
- $(use_enable opengl glx) \
+ $(use_enable opengl glx) $(use_enable opengl glspectrum) \
+ $(use_enable opus)
$(use_enable optimisememory optimize-memory) \
- $(use_enable oss) \
$(use_enable png) \
$(use_enable postproc) \
$(use_enable projectm) \
$(use_enable pulseaudio pulse) \
$(use_enable qt4 qt) \
+ $(use_enable qt5 qt) \
$(use_enable rdp freerdp) \
$(use_enable rtsp realrtsp) \
$(use_enable run-as-root) \
@@ -317,8 +343,8 @@
$(use_enable schroedinger) \
$(use_enable sdl) \
$(use_enable sdl-image) \
- $(use_enable shine) \
$(use_enable sid) \
+ $(use_enable sftp) \
$(use_enable shout) \
$(use_enable skins skins2) \
$(use_enable speex) \
@@ -327,6 +353,7 @@
$(use_enable swscale) \
$(use_enable taglib) \
$(use_enable theora) \
+ $(use_enable tremor) \
$(use_enable truetype freetype) \
$(use_enable twolame) \
$(use_enable udev) \
@@ -334,9 +361,11 @@
$(use_enable v4l v4l2) \
$(use_enable vaapi libva) \
$(use_enable vcdx) \
+ $(use_enable vdpau) \
$(use_enable vlm) \
$(use_enable vnc) \
$(use_enable vorbis) \
+ $(use_enable vpx) \
$(use_enable waveout) \
$(use_enable wma-fixed) \
$(use_with X x) \
@@ -345,21 +374,30 @@
$(use_enable xml libxml2) \
$(use_enable xv xvideo) \
$(use_enable zvbi) $(use_enable !zvbi telx) \
- --disable-optimizations \
- --enable-fast-install \
+ --disable-crystalhd \
--disable-decklink \
--disable-goom \
+ --disable-kai \
+ --disable-kva \
--disable-mfx \
+ --disable-oss \
+ --disable-shine \
+ --disable-sndio \
+ --disable-x265 \
+ --disable-vda \
--disable-vsxu
- # ^ We don't have decklink, goom, mfx or vsxu in the Portage tree.
+ # ^ We don't have these disables libraries in the Portage tree yet.
}
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
+src_test() {
+ Xemake check-TESTS
+}
+
+DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt"
- dodoc AUTHORS THANKS NEWS README \
- doc/fortunes.txt doc/intf-vcd.txt
+src_install() {
+ default
# Punt useless libtool's .la files
find "${D}" -name '*.la' -delete
1.855 media-video/vlc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.855&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.855&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?r1=1.854&r2=1.855
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v
retrieving revision 1.854
retrieving revision 1.855
diff -u -r1.854 -r1.855
--- ChangeLog 21 Oct 2013 01:15:02 -0000 1.854
+++ ChangeLog 21 Oct 2013 19:15:29 -0000 1.855
@@ -1,6 +1,27 @@
# ChangeLog for media-video/vlc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.854 2013/10/21 01:15:02 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.855 2013/10/21 19:15:29 tomwij Exp $
+
+ 21 Oct 2013; Tom Wijsman <TomWij@gentoo.org>
+ -files/vlc-2.1.0-freetype-proper-default-font.patch, metadata.xml,
+ vlc-9999.ebuild:
+ Worked further on the 2.1.0 version bump: Added USE flags and dependencies to
+ support fdk(aac), opus, tremor, vdpau and vpx. Added support for the upcming
+ Qt 5 release. Added missing dependencies (libgpg-error used in HTML
+ communication, libidn which is used by most objects, gdb-pixbuf, glib and xcb-
+ util-keysyms) SLOTted all dependencies, used the slot operator where
+ dependencies have sub slots; to avoid incorrect dependencies, new SLOTs and
+ overlays versions from breaking the vlc package. Moved gettext to RDEPEND as
+ it was duplicated. Remove _FORTIFY_SOURCE definition as it is set to Gentoo's
+ default to shorten the build log by removing unnecessary warnings. Removed the
+ freetype patch as the configure parameters work. Ensured that there are less
+ to none automagic dependencies. Enumerated almost all configure parameters as
+ there were some missing. Removed oss due to compile error due to missing
+ package. Run tests using virtualx to avoid a window from popping up.
+ Simplified src_install. Documented fdk, tremor and vpx USE flags in
+ metadata.xml. More changes and testing will follow; there still appear
+ warnings and errors to look into (also resid_builder), which probably requires
+ configure.ac patching. Progress is being tracked mainly in bug #479566.
21 Oct 2013; Tom Wijsman <TomWij@gentoo.org>
+files/vlc-2.1.0-freetype-proper-default-font.patch,
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-21 19:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-21 19:15 [gentoo-commits] gentoo-x86 commit in media-video/vlc: metadata.xml vlc-9999.ebuild ChangeLog Tom Wijsman (tomwij)
-- strict thread matches above, loose matches on Subject: below --
2013-10-21 1:15 Tom Wijsman (tomwij)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox