Add new version with patchset to fix strict aliasing and make wx build without permis...

Package-Manager: portage-2.1.1_pre1

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 63be6e6b0b020ef3b36e00d96fe1ff6e92308c5e..bbdebdeafcebe8ede4f87ecd6c39e2b028d36ab2 100644 (file)
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.168 2006/06/16 23:21:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.169 2006/06/18 11:42:34 flameeyes Exp $
+
+*vlc-0.8.5-r3 (18 Jun 2006)
+
+  18 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> +vlc-0.8.5-r3.ebuild:
+  Add new version with patchset to fix strict aliasing and make wx build
+  without permissive.
 
 *vlc-0.8.5-r2 (16 Jun 2006)
 

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 82a9555c61da161d0eff670c6460997c08cce512..795f8cd9d8718799efed6e7a81fbf74cd4da6962 100644 (file)
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -9,6 +9,7 @@ DIST vlc-patches-1.tar.bz2 2149
 DIST vlc-patches-13.tar.bz2 7504
 DIST vlc-patches-16.tar.bz2 10206 RMD160 e9edce6e298a74cb08eec00bcadac6097f772cbf SHA1 81864732b0669dd944c9b6c7efbb3e2362b66471 SHA256 d537ec6e05cbeef04179435e2aabcc9bc9c876063000fd5b037184fabad8c5aa
 DIST vlc-patches-23.tar.bz2 8412 RMD160 b5adc7a8779eacbdf803ad12eec3286eb8f518bd SHA1 28541b739366213d4244abd6bce8c2b4fdfe6904 SHA256 96430bdcbc3e527e69c016877fa042ccd98972e4a3c72357b97ce0550090f6f5
+DIST vlc-patches-24.tar.bz2 11197 RMD160 2c5adc96529ed002de81ccca42d4299956560b10 SHA1 a4f8c87a5efe864ffc2c5ac764a29f966b17bc71 SHA256 f487c4a8a5ff2a4e8158047bfc35296a970f4a41389e5d884a74ff25df52ec0f
 DIST vlc-patches-7.tar.bz2 4696
 EBUILD vlc-0.8.1-r1.ebuild 6040 RMD160 1378b1d36f6b69b17201d9604cd365d0590da496 SHA1 3e0c50f28f9b5392d12d2c52aaee5e5ec4b17bd6 SHA256 b56acb63f7ee2f918c9f128abc5fb40938ac8f0aa20dcf14c23cf960ffa5a977
 MD5 160a009b44c4d5931803a92669c32960 vlc-0.8.1-r1.ebuild 6040
@@ -30,10 +31,14 @@ EBUILD vlc-0.8.5-r2.ebuild 7122 RMD160 a37c93a802bbe06924ce0fe6ddbaa9bbac77abe4
 MD5 5dd5bafce17c79e1c2707cefaca13b7f vlc-0.8.5-r2.ebuild 7122
 RMD160 a37c93a802bbe06924ce0fe6ddbaa9bbac77abe4 vlc-0.8.5-r2.ebuild 7122
 SHA256 9b8c6daf75806d2c4d4aa0b19217051e9ead656699770cb6228c8eb946d4e7aa vlc-0.8.5-r2.ebuild 7122
-MISC ChangeLog 32064 RMD160 8ab3e8e7385dcc2eb0c085809ebd1be92e257e75 SHA1 2187d0b89de737409231eff45edbd1efdcac892b SHA256 030d0d4732bd51fe9df6f2eb86b06be0482ee6d7674a02c79b6f069186f1933d
-MD5 2e76a4b066f79c40582da54440faeac4 ChangeLog 32064
-RMD160 8ab3e8e7385dcc2eb0c085809ebd1be92e257e75 ChangeLog 32064
-SHA256 030d0d4732bd51fe9df6f2eb86b06be0482ee6d7674a02c79b6f069186f1933d ChangeLog 32064
+EBUILD vlc-0.8.5-r3.ebuild 7122 RMD160 3fe637bfa4e77bf666b4be869231211c7810d8b2 SHA1 01e030819d39cb066a054e6ecc41df4066ef815d SHA256 754b9ff67c39c33b3738e8f54884316f594d8c2344eee11e92820326f986af2c
+MD5 975d8903dab0094d169c65673c5c2423 vlc-0.8.5-r3.ebuild 7122
+RMD160 3fe637bfa4e77bf666b4be869231211c7810d8b2 vlc-0.8.5-r3.ebuild 7122
+SHA256 754b9ff67c39c33b3738e8f54884316f594d8c2344eee11e92820326f986af2c vlc-0.8.5-r3.ebuild 7122
+MISC ChangeLog 32264 RMD160 d55c363f99bd57e40360363e2a5cb41f1ac237ea SHA1 bb1a4db63441f2404811ecadaf4c944b610848e4 SHA256 b5b14254c59c8ed31500f3482af85c563de64d221f9b6886c7b757d166c44c91
+MD5 dba302cf338aafff1bf93c819994cd69 ChangeLog 32264
+RMD160 d55c363f99bd57e40360363e2a5cb41f1ac237ea ChangeLog 32264
+SHA256 b5b14254c59c8ed31500f3482af85c563de64d221f9b6886c7b757d166c44c91 ChangeLog 32264
 MISC metadata.xml 249 RMD160 bccf7e953ea1336e9ec1e722af1592e5f7cbd732 SHA1 fc3811086b04b8f498738e2461158e2f17da5fb4 SHA256 c88de03d7b2aa4afd88762ce6d56e5bb25db4699fad09c6e3e3323fb42a150c0
 MD5 3f1662be15aab3fab1e7d11145f8f043 metadata.xml 249
 RMD160 bccf7e953ea1336e9ec1e722af1592e5f7cbd732 metadata.xml 249
@@ -53,10 +58,13 @@ SHA256 ecfd8c4a8edf5a58d299acaff67a316567d2e802bd676a356fbb113ce28779a8 files/di
 MD5 8cba483fad21eabad8d8056d3d1d6eec files/digest-vlc-0.8.5-r2 476
 RMD160 340c3973fc2366fc93c7ea9a737877931e0acf5c files/digest-vlc-0.8.5-r2 476
 SHA256 8676a97d2e15bc2c05a9e09abfd42404f733ee019a406ee007a002d2306fde9e files/digest-vlc-0.8.5-r2 476
+MD5 f3a01c509d8c00e9f9b63bdb1f42ead6 files/digest-vlc-0.8.5-r3 479
+RMD160 d2af3f2c3e8b25fd975559e7ed009047ff1f85cb files/digest-vlc-0.8.5-r3 479
+SHA256 ed51f0df4b25d6a51a1a9254fe22a0058d8112b1b669f09e641a2c4932b1e85e files/digest-vlc-0.8.5-r3 479
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEkzzuAiZjviIA2XgRAkvsAKDGPHrKfH//BL0zHvoBntaRlSgudQCfZ8T5
-qOySQ1O2Jkgrm8C1Y3n0O3o=
-=lwEl
+iD8DBQFElTw3AiZjviIA2XgRAoXqAJ48hydvZnCh0o/1jU+OgXEibK5ndwCg7+2K
+NFwBgDHcY1raLyyponFV0bE=
+=R6Fz
 -----END PGP SIGNATURE-----

diff --git a/media-video/vlc/files/digest-vlc-0.8.5-r3 b/media-video/vlc/files/digest-vlc-0.8.5-r3
new file mode 100644 (file)
index 0000000..5200de6
--- /dev/null
+++ b/media-video/vlc/files/digest-vlc-0.8.5-r3
@@ -0,0 +1,6 @@
+MD5 16bb5bf87ed94879a8eb7b0ff9b4f16f vlc-0.8.5.tar.bz2 8562996
+RMD160 d24140a5b4bf771754028090e103bb5c171e4fd8 vlc-0.8.5.tar.bz2 8562996
+SHA256 48bc557bec16b48a304e5e760aef10e1c3cca2d74a011bc900bd1768d9ee79fa vlc-0.8.5.tar.bz2 8562996
+MD5 03fbf764a92ba4bc6ecf68717a740f16 vlc-patches-24.tar.bz2 11197
+RMD160 2c5adc96529ed002de81ccca42d4299956560b10 vlc-patches-24.tar.bz2 11197
+SHA256 f487c4a8a5ff2a4e8158047bfc35296a970f4a41389e5d884a74ff25df52ec0f vlc-patches-24.tar.bz2 11197

diff --git a/media-video/vlc/vlc-0.8.5-r3.ebuild b/media-video/vlc/vlc-0.8.5-r3.ebuild
new file mode 100644 (file)
index 0000000..d9aa157
--- /dev/null
+++ b/media-video/vlc/vlc-0.8.5-r3.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.5-r3.ebuild,v 1.1 2006/06/18 11:42:34 flameeyes Exp $
+
+inherit eutils wxwidgets nsplugins multilib autotools toolchain-funcs
+
+MY_P="${P/_beta/-test}"
+
+PATCHLEVEL="24"
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="http://www.videolan.org/vlc/"
+
+[[ ${MY_P} != "${P}" ]] && \
+       SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2" \
+       || SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
+
+SRC_URI="${SRC_URI}
+       mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="a52 3dfx nls debug altivec httpd vlm gnutls live v4l cdda ogg matroska
+dvb dvd vcd ffmpeg dts flac mpeg vorbis theora X opengl truetype svg fbcon svga
+oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc stream
+mp3 xv bidi sdl png xml samba daap corba screen mod speex nsplugin shout rtsp
+win32codecs skins hal avahi xinerama cddb directfb upnp"
+
+RDEPEND="cdda? ( >=dev-libs/libcdio-0.71
+                       cddb? ( >=media-libs/libcddb-1.2.0 ) )
+               live? ( >=media-plugins/live-2005.01.29 )
+               dvd? (  media-libs/libdvdread
+                               media-libs/libdvdcss
+                               >=media-libs/libdvdnav-0.1.9
+                               media-libs/libdvdplay )
+               esd? ( media-sound/esound )
+               ogg? ( media-libs/libogg )
+               matroska? (
+                       >=dev-libs/libebml-0.7.6
+                       >=media-libs/libmatroska-0.7.5 )
+               mp3? ( media-libs/libmad )
+               ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050226-r1 )
+               a52? ( >=media-libs/a52dec-0.7.4-r3 )
+               dts? ( >=media-libs/libdts-0.0.2-r3 )
+               flac? ( media-libs/flac )
+               mpeg? ( >=media-libs/libmpeg2-0.3.2 )
+               vorbis? ( media-libs/libvorbis )
+               theora? ( media-libs/libtheora )
+               truetype? ( media-libs/freetype
+                       media-fonts/ttf-bitstream-vera )
+               svga? ( media-libs/svgalib )
+               ggi? ( media-libs/libggi )
+               aalib? ( media-libs/aalib )
+               libcaca? ( media-libs/libcaca )
+               arts? ( kde-base/arts )
+               alsa? ( media-libs/alsa-lib )
+               wxwindows? ( >=x11-libs/wxGTK-2.6.2-r1 )
+               ncurses? ( sys-libs/ncurses )
+               xosd? ( x11-libs/xosd )
+               lirc? ( app-misc/lirc )
+               3dfx? ( media-libs/glide-v3 )
+               bidi? ( >=dev-libs/fribidi-0.10.4 )
+               gnutls? ( >=net-libs/gnutls-1.0.17 )
+               sys-libs/zlib
+               png? ( media-libs/libpng )
+               media-libs/libdvbpsi
+               sdl? ( >=media-libs/libsdl-1.2.8 )
+               xml? ( dev-libs/libxml2 )
+               samba? ( net-fs/samba )
+               vcd? ( >=dev-libs/libcdio-0.72
+                       >=media-video/vcdimager-0.7.21 )
+               daap? ( >=media-libs/libopendaap-0.3.0 )
+               corba? ( >=gnome-base/orbit-2.8.0
+                       >=dev-libs/glib-2.3.2 )
+               v4l? ( sys-kernel/linux-headers )
+               dvb? ( sys-kernel/linux-headers )
+               mod? ( media-libs/libmodplug )
+               speex? ( media-libs/speex )
+               svg? ( >=gnome-base/librsvg-2.5.0 )
+               nsplugin? ( >=net-libs/gecko-sdk-1.7.8 )
+               shout? ( media-libs/libshout )
+               win32codecs? ( media-libs/win32codecs )
+               hal? ( sys-apps/hal )
+               avahi? ( >=net-dns/avahi-0.6 )
+               X? ( || ( (
+                               x11-libs/libX11
+                               x11-libs/libXext
+                               xv? ( x11-libs/libXv )
+                               xinerama? ( x11-libs/libXinerama )
+                       ) virtual/x11 )
+                       opengl? ( virtual/opengl )
+               )
+               directfb? ( dev-libs/DirectFB )
+               upnp? ( >=net-misc/upnp-1.2 )"
+
+DEPEND="${RDEPEND}
+       X? ( || ( (
+                       x11-proto/xproto
+                       x11-proto/xextproto
+                       xinerama? ( x11-proto/xineramaproto )
+               ) virtual/x11 )
+       )
+       dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+       if use wxwindows; then
+               WX_GTK_VER="2.6"
+               need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
+       fi
+
+       if use skins && ! use truetype; then
+               eerror "Trying to build with skins support but without truetype."
+               die "You have to use 'truetype' to use 'skins'"
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+       AT_M4DIR="m4" eautoreconf
+}
+
+src_compile () {
+       use nsplugin && myconf="${myconf} --with-mozilla-sdk-path=/usr/$(get_libdir)/gecko-sdk"
+
+       use wxwindows && \
+               myconf="${myconf} --with-wx-config=$(basename ${WX_CONFIG}) --with-wx-config-path=$(dirname ${WX_CONFIG})"
+
+       use vlm && \
+               myconf="${myconf} --enable-vlm --enable-sout" || \
+               myconf="${myconf} --disable-vlm"
+
+       if use directfb; then
+               myconf="${myconf} --enable-directfb --with-directfb=/usr"
+               append-flags "-I /usr/include/directfb"
+       else
+               myconf="${myconf} --disable-directfb"
+       fi
+
+       econf \
+               $(use_enable altivec) \
+               $(use_enable stream sout) \
+               $(use_enable httpd) \
+               $(use_enable gnutls) \
+               $(use_enable v4l) \
+               $(use_enable cdda) $(use_enable cdda cddax)\
+               $(use_enable cddb libcddb) \
+               $(use_enable vcd) $(use_enable vcd vcdx) \
+               $(use_enable dvb) $(use_enable dvb pvr) \
+               $(use_enable ogg) \
+               $(use_enable matroska mkv) \
+               $(use_enable flac) \
+               $(use_enable vorbis) \
+               $(use_enable theora) \
+               $(use_enable X x11) \
+               $(use_enable xv xvideo) \
+               $(use_enable xinerama) \
+               $(use_enable opengl glx) $(use_enable opengl) \
+               $(use_enable truetype freetype) \
+               $(use_enable bidi fribidi) \
+               $(use_enable dvd dvdread) $(use_enable dvd dvdplay) $(use_enable dvd dvdnav) \
+               $(use_enable fbcon fb) \
+               $(use_enable svga svgalib) \
+               $(use_enable 3dfx glide) \
+               $(use_enable aalib aa) \
+               $(use_enable libcaca caca) \
+               $(use_enable oss) \
+               $(use_enable esd) \
+               $(use_enable arts) \
+               $(use_enable alsa) \
+               $(use_enable wxwindows wxwidgets) \
+               $(use_enable ncurses) \
+               $(use_enable xosd) \
+               $(use_enable lirc) \
+               $(use_enable live livedotcom) $(use_with live livedotcom-tree /usr/lib/live) \
+               $(use_enable mp3 mad) \
+               $(use_enable a52) \
+               $(use_enable dts) \
+               $(use_enable mpeg libmpeg2) \
+               $(use_enable ggi) \
+               $(use_enable 3dfx glide) \
+               $(use_enable sdl) \
+               $(use_enable png) \
+               $(use_enable xml libxml2) \
+               $(use_enable samba smb) \
+               $(use_enable daap) \
+               $(use_enable corba) \
+               $(use_enable mod) \
+               $(use_enable speex) \
+               $(use_enable nsplugin mozilla) \
+               $(use_enable shout) \
+               $(use_enable rtsp) $(use_enable rtsp realrtsp) \
+               $(use_enable win32codecs loader) \
+               $(use_enable skins skins2) \
+               $(use_enable hal) \
+               $(use_enable avahi bonjour) \
+               $(use_enable ffmpeg) \
+               $(use_enable upnp) \
+               --disable-faad \
+               --disable-jack \
+               --disable-dv \
+               --disable-libvc1 \
+               --disable-snapshot \
+               --disable-growl \
+               --disable-pth \
+               --disable-portaudio \
+               --disable-x264 \
+               --enable-utf8 \
+               ${myconf} || die "configuration failed"
+
+       if [[ $(gcc-major-version) == 2 ]]; then
+               sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
+       fi
+
+       emake || die "make of VLC failed"
+}
+
+src_install() {
+       make DESTDIR="${D}" plugindir="/usr/$(get_libdir)/${PLUGINS_DIR}" install || die "Installation failed!"
+
+       dodoc AUTHORS MAINTAINERS HACKING THANKS TODO NEWS README \
+               doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
+
+       rm -rf ${D}/usr/share/doc/vlc \
+               ${D}/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
+
+       use skins || rm -rf ${D}/usr/share/vlc/skins2
+
+       for res in 16 32 48; do
+               insinto /usr/share/icons/hicolor/${res}x${res}/apps/
+               newins ${S}/share/vlc${res}x${res}.png vlc.png
+       done
+
+       use wxwindows && domenu "${S}/debian/vlc.desktop"
+}