New version, 0.8.4 final: closed bug #113590; applied formats patch by solar; transfo...

Package-Manager: portage-2.0.53_rc7

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index eed5b07e0089655e761be6804241486883d19f82..a78ccd098bacdf5eb69914739c7f8ee2c003e95a 100644 (file)
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.117 2005/11/27 12:06:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.118 2005/11/27 15:00:52 flameeyes Exp $
+
+*vlc-0.8.4 (27 Nov 2005)
+
+  27 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -vlc-0.8.4_beta3.ebuild, +vlc-0.8.4.ebuild:
+  New version, 0.8.4 final: closed bug #113590; applied formats patch by
+  solar; transformed sed lines in patches; fixed tests for avahi and hal to
+  avoid misunderstanding if someone tries to enable them; build DTS support as
+  plugin instead of builtin; removed comments inside the code as the
+  maintainer's guide carry all the needed informations; old for deprecated
+  interfaces are removed from upstream's package.
 
   27 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.4_beta3.ebuild:
   Remove bonjour support or vlc would fail if avahi 0.6 is installed. See bug

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 6bb68b5dd48195e210acc2e2db0b006313771e21..51b13003dc743b6c338df93215e37bda83aaa077 100644 (file)
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1a58964e2e28acaadb32108708a9a5b9 ChangeLog 23341
+MD5 1394a5ba310df7bce26b160971e55a65 ChangeLog 23889
 MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r1 127
 MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r1 127
 MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r2 127
-MD5 2faf48fde07bcbec2998cac8acc93613 files/digest-vlc-0.8.4_beta3 133
+MD5 d84791584b167d4cf96f365498050a62 files/digest-vlc-0.8.4 127
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 985ef1204c12d8382a06256f63dc4a4e vlc-0.8.1-r1.ebuild 6675
 MD5 34c899e9870f05ff49336006f2a0ab92 vlc-0.8.2-r1.ebuild 7576
 MD5 06b1c25d0b8b20d67db5a61f4c8078f5 vlc-0.8.2-r2.ebuild 7458
-MD5 41fe8c14fb6cceb60dc7c97003ab447b vlc-0.8.4_beta3.ebuild 7751
+MD5 c7260ce34328b0bb07e6c71813959374 vlc-0.8.4.ebuild 7045
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDiaFUAiZjviIA2XgRAsN1AJ9c89rgtC/eIJZUqVsKZFsq4e+0qgCg5hVk
-HPlR3TIK375uKHcqx2j/Unk=
-=Grji
+iD8DBQFDico4AiZjviIA2XgRAr9LAJ9C8u/41qb73ljFsjA9fEbWpuvJgQCeJdm9
+D/JA8mUvUdHk+jToIdeKS4I=
+=oTGG
 -----END PGP SIGNATURE-----

diff --git a/media-video/vlc/files/digest-vlc-0.8.4 b/media-video/vlc/files/digest-vlc-0.8.4
new file mode 100644 (file)
index 0000000..3f1231b
--- /dev/null
+++ b/media-video/vlc/files/digest-vlc-0.8.4
@@ -0,0 +1,2 @@
+MD5 5e94de5a374d2cab2a8d6f315204cc71 vlc-0.8.4.tar.bz2 7245500
+MD5 353db21cbfd732fd87430d8c29071bf5 vlc-patches-8.tar.bz2 4889

diff --git a/media-video/vlc/files/digest-vlc-0.8.4_beta3 b/media-video/vlc/files/digest-vlc-0.8.4_beta3
deleted file mode 100644 (file)
index e6ec1c7..0000000
--- a/media-video/vlc/files/digest-vlc-0.8.4_beta3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 74e1b3323e79f74185557daec0ad02e4 vlc-0.8.4-test3.tar.bz2 6757625
-MD5 46cf14ce7547add1f85634831b32e8b5 vlc-patches-7.tar.bz2 4696

diff --git a/media-video/vlc/vlc-0.8.4_beta3.ebuild b/media-video/vlc/vlc-0.8.4.ebuild
similarity index 81%
rename from media-video/vlc/vlc-0.8.4_beta3.ebuild
rename to media-video/vlc/vlc-0.8.4.ebuild
index 5887a246677dfc583c237b67d926628b14f2ba5f..513a442cba8de6ba8a008a2bde1a0ddd8a90265a 100644 (file)
--- a/media-video/vlc/vlc-0.8.4_beta3.ebuild
+++ b/media-video/vlc/vlc-0.8.4.ebuild
@@ -1,15 +1,20 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4_beta3.ebuild,v 1.3 2005/11/27 12:06:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4.ebuild,v 1.1 2005/11/27 15:00:52 flameeyes Exp $
 
-inherit libtool eutils wxwidgets flag-o-matic nsplugins multilib autotools toolchain-funcs
+inherit eutils wxwidgets flag-o-matic nsplugins multilib autotools toolchain-funcs
 
 MY_P="${P/_beta/-test}"
 
-PATCHLEVEL="7"
+PATCHLEVEL="8"
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"
-SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2
+
+[[ ${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"
@@ -36,8 +41,8 @@ RDEPEND="cdda? ( >=dev-libs/libcdio-0.71
                        >=media-libs/libmatroska-0.7.5 )
                mp3? ( media-libs/libmad )
                ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050226-r1 )
-               a52? ( media-libs/a52dec )
-               dts? ( media-libs/libdts )
+               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 )
@@ -85,6 +90,8 @@ RDEPEND="cdda? ( >=dev-libs/libcdio-0.71
 DEPEND="${RDEPEND}
        =sys-devel/automake-1.6*
        sys-devel/autoconf
+       sys-devel/libtool
+       sys-devel/autoconf
        dev-util/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
@@ -102,22 +109,10 @@ pkg_setup() {
 
 src_unpack() {
        unpack ${A}
-
-       # We only have glide v3 in portage
        cd ${S}
 
-       EPATCH_EXCLUDE="050_all_nomozconfig.patch 030_all_amd64-cpudetect.patch
-               090_all_samba-3.0.20.patch 040_all_cast.patch 070_all_debug.patch"
        EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
        AT_M4DIR="m4" eautoreconf
-
-       sed -i -e \
-               "s:/usr/include/glide:/usr/include/glide3:;s:glide2x:glide3:" \
-               configure || die "sed glide failed."
-
-       # Fix the default font
-       sed -i -e "s:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/ttf-bitstream-vera/VeraBd.ttf:" modules/misc/freetype.c
 }
 
 src_compile () {
@@ -151,8 +146,6 @@ src_compile () {
                myconf="${myconf} --disable-ffmpeg"
        fi
 
-       # Portaudio support needs at least v19
-       # pth (threads) support is quite unstable with latest ffmpeg/libmatroska.
        econf \
                $(use_enable altivec) \
                $(use_enable unicode utf8) \
@@ -221,7 +214,7 @@ src_compile () {
                sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
        fi
 
-       emake -j1 || die "make of VLC failed"
+       emake || die "make of VLC failed"
 }
 
 src_install() {
@@ -230,12 +223,8 @@ src_install() {
        dodoc AUTHORS MAINTAINERS HACKING THANKS TODO NEWS README \
                doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
 
-       rm -r ${D}/usr/share/vlc/vlc*.png ${D}/usr/share/vlc/vlc*.xpm ${D}/usr/share/vlc/vlc*.ico \
-               ${D}/usr/share/vlc/kvlc*.png ${D}/usr/share/vlc/kvlc*.xpm ${D}/usr/share/vlc/qvlc*.png \
-               ${D}/usr/share/vlc/qvlc*.xpm ${D}/usr/share/vlc/gvlc*.png ${D}/usr/share/vlc/gvlc*.xpm \
-               ${D}/usr/share/vlc/gvlc*.ico ${D}/usr/share/vlc/gnome-vlc*.png \
-               ${D}/usr/share/vlc/gnome-vlc*.xpm ${D}/usr/share/vlc/skins2 \
-               ${D}/usr/share/doc/vlc
+       rm -rf ${D}/usr/share/vlc/skins2 ${D}/usr/share/doc/vlc \
+               ${D}/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
 
        for res in 16 32 48; do
                insinto /usr/share/icons/hicolor/${res}x${res}/apps/