Force using and initialising libX11 for threads in the xosd module. This should fix...
authorAlexis Ballier <aballier@gentoo.org>
Fri, 9 Dec 2011 19:58:47 +0000 (19:58 +0000)
committerAlexis Ballier <aballier@gentoo.org>
Fri, 9 Dec 2011 19:58:47 +0000 (19:58 +0000)
Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

media-video/vlc/ChangeLog
media-video/vlc/Manifest
media-video/vlc/vlc-1.1.12-r1.ebuild [new file with mode: 0644]
media-video/vlc/vlc-1.1.9999.ebuild
media-video/vlc/vlc-1.2.9999.ebuild
media-video/vlc/vlc-9999.ebuild

index 782d8497840aea2b587a20cfca8f218e0ed7b8ff..9ef01b0fe0103f20a70adb707ddd694e27ad1b03 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.757 2011/12/09 13:32:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.758 2011/12/09 19:58:47 aballier Exp $
+
+*vlc-1.1.12-r1 (09 Dec 2011)
+
+  09 Dec 2011; Alexis Ballier <aballier@gentoo.org> +vlc-1.1.12-r1.ebuild,
+  vlc-1.1.9999.ebuild, vlc-1.2.9999.ebuild, vlc-9999.ebuild:
+  Force using and initialising libX11 for threads in the xosd module. This
+  should fix bug #393439
 
   09 Dec 2011; Alexis Ballier <aballier@gentoo.org> vlc-1.2.9999.ebuild,
   vlc-9999.ebuild:
index 3f6aafddd985357f97abcee76e7d6a0dbfff3ed8..8f35680c2cc982519b192c5e1e9f3001611a4a92 100644 (file)
@@ -4,18 +4,20 @@ Hash: SHA1
 DIST vlc-1.1.12.tar.bz2 26220996 RMD160 117530abc8bd3f38d9233b7a7c91a3aaa17af87c SHA1 b39de66711a33746ce12f16a50e41d3def7b1452 SHA256 6dc50d27d25a0fab55b66f9ae3aa4001082d2d86b96b0491a8dab35423be1a68
 DIST vlc-1.2.0-pre1.tar.xz 16899100 RMD160 82f49619606bba26214b7c7206d0e592ec94f9bd SHA1 72b38f2c97cad4f143b16a2891f083bfab5b5174 SHA256 263bd69c5b0cf3b363d10896f373d6dc8b78feb208d51bcbc0d7260ef507ebc0
 DIST vlc-patches-101.tar.bz2 3011 RMD160 785ba728c04f025ca8377061e82c6c865d50a736 SHA1 e9be6b192bb3d69e4bd2387a9854543e0f8b3132 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae
+DIST vlc-patches-102.tar.bz2 4286 RMD160 c8d693d88e231fe8ff5257be296f967ce592d91b SHA1 83471b1df166dfb6c1faaa6d4120c09ab7d9b9fd SHA256 649d10cb9ddb604468b05dfaa9bc0ce22af906f04e744ec671fc76472ac622be
 DIST vlc-patches-99.tar.bz2 3353 RMD160 5e4961b7a6036ddcd609af1ce001f9be8cd6e525 SHA1 b26e969bcf05751fc0fe2ffd17b5be03d7a184aa SHA256 79b68b6879b737a714075d2437a7615525242412f7cf084277ace2cbeec567e9
+EBUILD vlc-1.1.12-r1.ebuild 12526 RMD160 5fe9127e4e05cf2f41842c3a1168d081f8aca5ce SHA1 16a4cd0cfcdd2678433543066ea0fe6f76a3d08b SHA256 d51e5954374008de27e24c76c81c5b780f9ede9545eb8b9dab014e53f7867d84
 EBUILD vlc-1.1.12.ebuild 12443 RMD160 0f7d8e6fa9e24cf498e881a8365182702ab3356a SHA1 c2efc5e3ed66ceeea7c7fcc81a8666c1bd3da892 SHA256 8a3f7629154a5f8bba332a7d92156380abe1d2ba8a59865303fbf3ab34e317d4
-EBUILD vlc-1.1.9999.ebuild 12356 RMD160 4a94c2052b9b29106be368ef97220ed081ebb55f SHA1 bd9b2041cc896a051b6088a8367a02d191a243d3 SHA256 8c0dc3634fd02cee4262a3bed8d8e113a11af61a6a9422771a58f48d9a0f2647
+EBUILD vlc-1.1.9999.ebuild 12429 RMD160 5e383f68bb4d48fbf109cd86a433baf7bcfbf398 SHA1 1eab10c5f560abd693e2f240457271c88334f6e5 SHA256 e7dbfa841b7b1cebb6ff941b78c29389ff2c117458cd116ef7e6f399bfd634e7
 EBUILD vlc-1.2.0_pre1.ebuild 10912 RMD160 0fb3eefdff4f1d858549369ecbce7aed35a5efe2 SHA1 54fd68119c40a1be0faf9076809ca79e193944c7 SHA256 6fc3a47415476e1b76d775b7c9db0bfc3b725f99b6a11283d3b22835ad51a74a
-EBUILD vlc-1.2.9999.ebuild 10906 RMD160 7e0d34a43c716fcc69b09de0aeccab2dda2cc730 SHA1 371b47df1fcd26d20a743f8a107ab4c3601bfc64 SHA256 886d3d563738504a26f58b3767d5351d55d2bef66aa6ef7aef5586946c2f4ead
-EBUILD vlc-9999.ebuild 10904 RMD160 8cbcacd66ba9684df722a263c1b96ff6967b9e35 SHA1 2728dc72f4f57c95f91ac7262f5f0204ffdebcf3 SHA256 65d288989b4a1e6a5e2f2636d92bb647dccee98c2f4ee8526851877743fab5d3
-MISC ChangeLog 112538 RMD160 f64eb94bc58e9ff207ec66b409933ada2c009ca5 SHA1 57a76f308c048a7200f777e202bbd5bda8ad7174 SHA256 b76fabf06b692370a2e12e328011e87ef3d2e4f388851988f3a8f35fc59f1276
+EBUILD vlc-1.2.9999.ebuild 10919 RMD160 229e7fbfc668d84e9f09a5f42a59475ee4f76cca SHA1 ba2c1c7b331fb0760f9eff2b06dccc403afa6362 SHA256 3742f10eb9a68e1744154c69f0d0680800802bd11ab3bdade6192d5b6e34bbe0
+EBUILD vlc-9999.ebuild 10917 RMD160 2bb4eab1b9dec78ae95a06e96b5fd679c5aaa3fb SHA1 45021509f3c8d3d69c3959b6337b8c8f3ab15dce SHA256 c5caaefd7b2a5726113eada6dbe4821a196d257d51aab2cbd7d9d8477b1ba36f
+MISC ChangeLog 112805 RMD160 bf6aa6002be6db76e3bee986b6984dbe21f59672 SHA1 4466314ad40f1a75fcf89a4713fa7b4c44cd9816 SHA256 999c5547c5c31d300b16bf4b1775b48c96f73212da1c2216545bfb836d0b040a
 MISC metadata.xml 6589 RMD160 ab5b329732294a0a30a03ad4cdf08b1085dcf44a SHA1 8e4fc30a95e1a0a7f48875d6786ca85009d334f5 SHA256 b6d64afe5ef288be46fccf5a476efdbbfbe066b104e00fd952a12b545748447d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7iDdoACgkQvFcC4BYPU0oRwgCgozpufBTUYu3IRSvbS0zu3Jlu
-PeYAn28kM9uBicTR6IyQJblVO4Q/sNT8
-=gGSp
+iEYEARECAAYFAk7iaH4ACgkQvFcC4BYPU0q6EQCgnOjTEuaMD5QBWjoHrCyoYf1y
+rBEAn3ybPpfGxWB+/p3sL1Onl5dehn6j
+=vNRV
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.1.12-r1.ebuild b/media-video/vlc/vlc-1.1.12-r1.ebuild
new file mode 100644 (file)
index 0000000..e2353fa
--- /dev/null
@@ -0,0 +1,383 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.12-r1.ebuild,v 1.1 2011/12/09 19:58:47 aballier Exp $
+
+EAPI="3"
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then
+       SCM=git
+       EGIT_BOOTSTRAP="bootstrap"
+       EGIT_BRANCH=master
+       EGIT_PROJECT=${P}
+       if [ "${PV%.9999}" != "${PV}" ] ; then
+               EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
+       else
+               EGIT_REPO_URI="git://git.videolan.org/vlc.git"
+       fi
+fi
+
+inherit eutils multilib autotools toolchain-funcs gnome2 nsplugins qt4 flag-o-matic ${SCM}
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+VLC_SNAPSHOT_TIME="0013"
+
+PATCHLEVEL="102"
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="http://www.videolan.org/vlc/"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+       SRC_URI=""
+elif [[ "${P}" == *_alpha* ]]; then # Snapshots taken from nightlies.videolan.org
+       SRC_URI="http://nightlies.videolan.org/build/source/trunk-${PV/*_alpha/}-${VLC_SNAPSHOT_TIME}/${PN}-snapshot-${PV/*_alpha/}.tar.bz2"
+       MY_P="${P/_alpha*/}-git"
+elif [[ "${MY_P}" == "${P}" ]]; then
+       SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
+else
+       SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2"
+fi
+
+SRC_URI="${SRC_URI}
+       mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [ "${PV%9999}" = "${PV}" ] ; then
+       KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+else
+       KEYWORDS=""
+fi
+IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
+       debug dirac directfb dts dvb dvd elibc_glibc fbcon fluidsynth +ffmpeg flac fontconfig
+       +gcrypt ggi gme gnome gnutls httpd id3tag ieee1394 jack kate kde libass libcaca
+       libnotify libproxy libtiger libv4l libv4l2 lirc live lua matroska mmx
+       modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss
+       png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba
+       schroedinger sdl sdl-image shine shout skins speex sqlite sse stream
+       svg svga taglib theora truetype twolame udev upnp v4l vaapi vcdx vlm
+       vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
+
+RDEPEND="
+               || ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )
+               >=media-libs/libdvbpsi-0.1.6
+               a52? ( >=media-libs/a52dec-0.7.4-r3 )
+               aalib? ( media-libs/aalib x11-libs/libX11 )
+               aac? ( >=media-libs/faad2-2.6.1 )
+               alsa? ( >=media-libs/alsa-lib-1.0.23 )
+               avahi? ( >=net-dns/avahi-0.6[dbus] )
+               bidi? ( >=dev-libs/fribidi-0.10.4 )
+               cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) )
+               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 )
+               dvd? (  media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
+               elibc_glibc? ( >=sys-libs/glibc-2.8 )
+               ffmpeg? ( virtual/ffmpeg )
+               flac? ( media-libs/libogg >=media-libs/flac-1.1.2 )
+               fluidsynth? ( media-sound/fluidsynth )
+               fontconfig? ( media-libs/fontconfig )
+               gcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
+               ggi? ( media-libs/libggi )
+               gme? ( media-libs/game-music-emu )
+               gnome? ( gnome-base/gnome-vfs )
+               gnutls? ( >=net-libs/gnutls-1.7.4 >=dev-libs/libgcrypt-1.2.0 )
+               id3tag? ( media-libs/libid3tag sys-libs/zlib )
+               ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 )
+               jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
+               kate? ( >=media-libs/libkate-0.1.1 )
+               libass? ( >=media-libs/libass-0.9.6 media-libs/fontconfig )
+               libcaca? ( >=media-libs/libcaca-0.99_beta14 )
+               libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 )
+               libproxy? ( net-libs/libproxy )
+               libtiger? ( media-libs/libtiger )
+               lirc? ( app-misc/lirc )
+               live? ( >=media-plugins/live-2008.07.06 )
+               lua? ( >=dev-lang/lua-5.1 )
+               matroska? (     >=dev-libs/libebml-0.7.6 >=media-libs/libmatroska-0.8.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 )
+               nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt x11-libs/libxcb x11-libs/xcb-util )
+               ogg? ( media-libs/libogg )
+               opengl? ( virtual/opengl || ( >=x11-libs/libX11-1.3.99.901 <x11-libs/libX11-1.3.99.901[xcb] ) )
+               png? ( media-libs/libpng sys-libs/zlib )
+               projectm? ( media-libs/libprojectm )
+               pulseaudio? ( || ( >=media-sound/pulseaudio-0.9.22
+                       ( >=media-sound/pulseaudio-0.9.11 x11-libs/libX11 ) ) )
+               qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
+               remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
+               samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) )
+               schroedinger? ( >=media-libs/schroedinger-1.0.10 )
+               sdl? ( >=media-libs/libsdl-1.2.8 x11-libs/libX11
+                       sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )
+               shout? ( media-libs/libshout )
+               skins? (
+                               x11-libs/qt-gui:4 x11-libs/qt-core:4
+                               x11-libs/libXext x11-libs/libX11
+                               media-libs/freetype media-fonts/dejavu
+                          )
+               speex? ( media-libs/speex )
+               sqlite? ( >=dev-db/sqlite-3.6.0:3 )
+               svg? ( >=gnome-base/librsvg-2.9.0 )
+               svga? ( media-libs/svgalib )
+               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? ( >=sys-fs/udev-142 )
+               upnp? ( net-libs/libupnp )
+               v4l? (
+                       libv4l2? ( media-libs/libv4l )
+                       libv4l? ( media-libs/libv4l )
+                       )
+               vaapi? ( x11-libs/libva virtual/ffmpeg )
+               vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
+               vorbis? ( media-libs/libvorbis )
+               win32codecs? ( media-libs/win32codecs )
+               X? ( x11-libs/libX11 )
+               x264? ( >=media-libs/x264-0.0.20090923 )
+               xcb? ( x11-libs/libxcb x11-libs/xcb-util )
+               xml? ( dev-libs/libxml2 )
+               xosd? ( x11-libs/xosd x11-libs/libX11 )
+               zvbi? ( >=media-libs/zvbi-0.2.25 )
+               "
+
+DEPEND="${RDEPEND}
+       !!<=media-video/vlc-1.0.99999
+       alsa? ( >=media-sound/alsa-headers-1.0.23 )
+       dvb? ( sys-kernel/linux-headers )
+       kde? ( >=kde-base/kdelibs-4 )
+       v4l? ( >=sys-kernel/linux-headers-2.6.25 )
+       xcb? ( x11-proto/xproto )
+       dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+# Displays a warning if the first use flag is set but the second is not
+vlc_use_needs() {
+       use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled."
+}
+
+# Notify the user that some useflag have been forced on
+vlc_use_force() {
+       use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled."
+}
+
+# Use when $1 depends strictly on $2
+# if use $1 then enable $2
+vlc_use_enable_force() {
+       use $1 && echo "--enable-$2"
+}
+
+pkg_setup() {
+       # Useflags we need to forcefuly enable
+       vlc_use_force remoteosd gcrypt
+       vlc_use_force gnutls gcrypt
+       vlc_use_force skins truetype
+       vlc_use_force skins qt4
+       vlc_use_force vlm stream
+       vlc_use_force vaapi ffmpeg
+       vlc_use_force nsplugin xcb
+       has_version '<media-sound/pulseaudio-0.9.22' && vlc_use_force pulseaudio X
+       vlc_use_force sdl X
+       vlc_use_force aalib X
+       vlc_use_force xosd X
+
+       # Useflags that will be automagically discarded if deps are not met
+       vlc_use_needs bidi truetype
+       vlc_use_needs cddb cdda
+       vlc_use_needs fontconfig truetype
+       vlc_use_needs libv4l2 v4l
+       vlc_use_needs libv4l v4l
+       vlc_use_needs libtiger kate
+       vlc_use_needs xv xcb
+
+       if use qt4 || use skins ; then
+               qt4_pkg_setup
+       else
+               ewarn "You have disabled the qt4 useflag, ${PN} will not have any"
+               ewarn "graphical interface. Maybe that is not what you want..."
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+       if [ "${PV%9999}" != "${PV}" ] ; then
+               git_src_unpack
+       fi
+}
+
+src_prepare() {
+       if [ "${PV%9999}" != "${PV}" ] ; then
+               git_src_prepare
+       fi
+       # Make it build with libtool 1.5
+       rm -f m4/lt* m4/libtool.m4
+
+       EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+       eautoreconf
+}
+
+src_configure() {
+
+       # It would fail if -fforce-addr is used due to too few registers...
+       use x86 && filter-flags -fforce-addr
+
+       econf \
+               $(use_enable a52) \
+               $(use_enable aalib aa) \
+               $(use_enable aac faad) \
+               $(use_enable alsa) \
+               $(use_enable altivec) \
+               --disable-asademux \
+               $(use_enable atmo) \
+               $(use_enable avahi bonjour) \
+               $(use_enable bidi fribidi) \
+               $(use_enable cdda vcd) \
+               $(use_enable cddb libcddb) \
+               $(use_enable dbus) $(use_enable dbus dbus-control) \
+               $(use_enable dirac) \
+               $(use_enable directfb) \
+               $(use_enable dc1394) \
+               $(use_enable debug) \
+               $(use_enable dts dca) \
+               $(use_enable dvb) \
+               $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
+               $(use_enable fbcon fb) \
+               $(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(use_enable ffmpeg swscale) $(use_enable ffmpeg postproc) \
+               $(use_enable flac) \
+               $(use_enable fluidsynth) \
+               $(use_enable fontconfig) \
+               $(use_enable ggi) \
+               $(use_enable gme) \
+               $(use_enable gnome gnomevfs) \
+               $(use_enable gnutls) \
+               $(use_enable httpd) \
+               $(use_enable id3tag) \
+               $(use_enable ieee1394 dv) \
+               $(use_enable jack) \
+               $(use_enable kate) \
+               $(use_with kde kde-solid) \
+               $(use_enable libass) \
+               $(use_enable libcaca caca) \
+               $(use_enable gcrypt libgcrypt) \
+               $(use_enable libnotify notify) \
+               $(use_enable libproxy) \
+               --disable-libtar \
+               $(use_enable libtiger tiger) \
+               $(use_enable libv4l) \
+               $(use_enable libv4l2) \
+               $(use_enable lirc) \
+               $(use_enable live live555) \
+               $(use_enable lua) \
+               $(use_enable matroska mkv) \
+               $(use_enable mmx) \
+               $(use_enable modplug mod) \
+               $(use_enable mp3 mad) \
+               $(use_enable mpeg libmpeg2) \
+               $(use_enable mtp) \
+               $(use_enable musepack mpc) \
+               $(use_enable ncurses) \
+               $(use_enable nsplugin mozilla) --with-mozilla-pkg=libxul \
+               $(use_enable ogg) \
+               $(use_enable opengl glx) $(use_enable opengl) \
+               $(use_enable optimisememory optimize-memory) \
+               $(use_enable oss) \
+               $(use_enable png) \
+               --disable-portaudio \
+               $(use_enable projectm) \
+               $(use_enable pulseaudio pulse) \
+               $(use_enable pvr) \
+               $(use_enable qt4) \
+               $(use_enable remoteosd) \
+               $(use_enable rtsp realrtsp) \
+               $(use_enable run-as-root) \
+               $(use_enable samba smb) \
+               $(use_enable schroedinger) \
+               $(use_enable sdl) \
+               $(use_enable sdl-image) \
+               $(use_enable shine) \
+               $(use_enable shout) \
+               $(use_enable skins skins2) \
+               $(use_enable speex) \
+               $(use_enable sqlite) \
+               $(use_enable sse) \
+               $(use_enable stream sout) \
+               $(use_enable svg) \
+               $(use_enable svga svgalib) \
+               $(use_enable taglib) \
+               $(use_enable theora) \
+               $(use_enable truetype freetype) \
+               $(use_enable twolame) \
+               $(use_enable udev) \
+               $(use_enable upnp) \
+               --disable-v4l \
+               $(use_enable v4l v4l2) \
+               $(use_enable vcdx) \
+               $(use_enable vaapi libva) \
+               $(use_enable vlm) \
+               $(use_enable vorbis) \
+               $(use_enable win32codecs loader) \
+               $(use_enable wma-fixed) \
+               $(use_with X x) \
+               $(use_enable x264) \
+               $(use_enable xcb) \
+               $(use_enable xml libxml2) \
+               $(use_enable xosd) \
+               $(use_enable xv xvideo) \
+               $(use_enable zvbi) $(use_enable !zvbi telx) \
+               --disable-snapshot \
+               --disable-growl \
+               --disable-optimizations \
+               --enable-fast-install \
+               $(vlc_use_enable_force vlm sout) \
+               $(vlc_use_enable_force skins qt4) \
+               $(vlc_use_enable_force skins freetype) \
+               $(vlc_use_enable_force remoteosd libgcrypt) \
+               $(vlc_use_enable_force gnutls libgcrypt) \
+               $(vlc_use_enable_force vaapi avcodec) \
+               $(vlc_use_enable_force nsplugin xcb) \
+               $(has_version '<media-sound/pulseaudio-0.9.22' && use pulseaudio && echo '--with-x') \
+               $(use sdl && echo '--with-x') \
+               $(use xosd && echo '--with-x') \
+               $(use aalib && echo '--with-x')
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "make install failed"
+
+       dodoc AUTHORS HACKING THANKS NEWS README \
+               doc/fortunes.txt doc/intf-vcd.txt
+
+       rm -rf "${D}/usr/share/doc/vlc" \
+               "${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
+
+       if use nsplugin; then
+               dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
+               mv "${D}"/usr/$(get_libdir)/mozilla/plugins/* \
+                       "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
+       fi
+
+       use skins || rm -rf "${D}/usr/share/vlc/skins2"
+}
+
+pkg_postinst() {
+       gnome2_pkg_postinst
+
+       if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
+               einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
+               "/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
+       else
+               ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+               ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+               ewarn "If you do not do it, vlc will take a long time to load."
+       fi
+}
index 00ce04ff6f4881e635c71389a03dae193c39d3f2..927babf291f8bb73a05d91463971afa2f4bc0280 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.36 2011/12/06 12:29:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.37 2011/12/09 19:58:47 aballier Exp $
 
 EAPI="3"
 
@@ -144,7 +144,7 @@ RDEPEND="
                x264? ( >=media-libs/x264-0.0.20090923 )
                xcb? ( x11-libs/libxcb x11-libs/xcb-util )
                xml? ( dev-libs/libxml2 )
-               xosd? ( x11-libs/xosd )
+               xosd? ( x11-libs/xosd x11-libs/libX11 )
                zvbi? ( >=media-libs/zvbi-0.2.25 )
                "
 
@@ -185,6 +185,7 @@ pkg_setup() {
        vlc_use_force vaapi ffmpeg
        vlc_use_force nsplugin xcb
        has_version '<media-sound/pulseaudio-0.9.22' && vlc_use_force pulseaudio X
+       vlc_use_force xosd X
        vlc_use_force sdl X
        vlc_use_force aalib X
 
@@ -341,6 +342,7 @@ src_configure() {
                $(vlc_use_enable_force nsplugin xcb) \
                $(has_version '<media-sound/pulseaudio-0.9.22' && use pulseaudio && echo '--with-x') \
                $(use sdl && echo '--with-x') \
+               $(use xosd && echo '--with-x') \
                $(use aalib && echo '--with-x')
 }
 
index 164e56af7d703ce3d039d43d5cc1c65de950db28..c4036b18d45fc0b69c8b1a83efd1029773b9b5a2 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.2.9999.ebuild,v 1.2 2011/12/09 13:32:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.2.9999.ebuild,v 1.3 2011/12/09 19:58:47 aballier Exp $
 
 EAPI="4"
 
@@ -173,6 +173,7 @@ REQUIRED_USE="
        switcher? ( avcodec )
        vaapi? ( avcodec X )
        vlm? ( encode )
+       xosd? ( X )
        xv? ( xcb )
 "
 
index 34e23997c64aae91b25be4818621becb45d07b90..d35cd9f24c16b00e1b068898b8be53f12004b375 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.155 2011/12/09 13:32:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.156 2011/12/09 19:58:47 aballier Exp $
 
 EAPI="4"
 
@@ -173,6 +173,7 @@ REQUIRED_USE="
        switcher? ( avcodec )
        vaapi? ( avcodec X )
        vlm? ( encode )
+       xosd? ( X )
        xv? ( xcb )
 "