Fix also sdl-image automagic in stable vlc

Package-Manager: portage-2.1.2-r9

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 03c67b2cbe4e3a8b4029de845e395c033d9abf44..8ac78edebfadee0c4f366f877d350e494b553ade 100644 (file)
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.216 2007/02/10 14:35:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.217 2007/02/10 15:09:33 aballier Exp $
+
+  10 Feb 2007; Alexis Ballier <aballier@gentoo.org> vlc-0.8.6-r1.ebuild:
+  Fix also sdl-image automagic in stable vlc
 
   10 Feb 2007; Alexis Ballier <aballier@gentoo.org> vlc-0.8.6_p18636.ebuild:
   Remove sdl-image automagic, added as a useflag, bug #165177

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 964b21a6899ef1318b061152a4ef418174bb46b3..a2d235fb071e38eb3f7a8b847f2167a8fab986b2 100644 (file)
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -3,34 +3,33 @@ Hash: SHA1
 
 DIST vlc-0.8.6.tar.bz2 10506025 RMD160 0ec4cea5562d0aeaada9a9c533caa5489764d52d SHA1 86c038fdca2b6c8665e83e302a1a7a5e64a6b912 SHA256 17b114d1fe0177c6639b3fb0985c47362bcf1a405bf5fb401aeffb5dc9b3dba7
 DIST vlc-0.8.6_p18636.tar.bz2 10732448 RMD160 7be1851933e13cb8938ace4139324fae1485eaa1 SHA1 fff2d45fc24f6782ce3fd90ac7a3a9ec4d905d7d SHA256 8d1dbee4b95f460457beddfa02fd4ab9ff162815e9d82f11a96c4e4f03aa09fe
-DIST vlc-patches-34.tar.bz2 10391 RMD160 403f755734ed1fbb2c63346547ca91bd37ef227f SHA1 fad648f0618318b55dea0c04c2e8116e65b00895 SHA256 0d50a8b1c1104dcd4603d105990db36d90a3880c5e00ecdf65579a23f71d4fc6
 DIST vlc-patches-35.tar.bz2 11019 RMD160 a79a774e94be36824745d415a7743d4b74abc76e SHA1 43a69371056b3c7b35871971c5e1938a76a903c4 SHA256 3b74d69405b107569b47b33342e78d7c7ef8ac10cdc486bef6803975853405fa
-EBUILD vlc-0.8.6-r1.ebuild 8150 RMD160 3c36dc5cb99d96ce9d8ebdeba0df9dff4224e4ac SHA1 993448488684281fe89396ece49c40beea376f6d SHA256 b61eaadf9e2b072c11869d9355bdb123b563cf47303a16243b3c8d2f70674a83
-MD5 5fcff6b498a3c89699c237e2b8f7de63 vlc-0.8.6-r1.ebuild 8150
-RMD160 3c36dc5cb99d96ce9d8ebdeba0df9dff4224e4ac vlc-0.8.6-r1.ebuild 8150
-SHA256 b61eaadf9e2b072c11869d9355bdb123b563cf47303a16243b3c8d2f70674a83 vlc-0.8.6-r1.ebuild 8150
+EBUILD vlc-0.8.6-r1.ebuild 8227 RMD160 a6a1f2197735087f74cd4b25f490cac96b2d4b73 SHA1 2337f56f6b334920f11c6c3b04d4590fd0c41720 SHA256 881a9cdd069b861b5a334632047fbb06098575d1b71b6820c831cf08ad53c14d
+MD5 65a91aec00b72efb450805896bf795f3 vlc-0.8.6-r1.ebuild 8227
+RMD160 a6a1f2197735087f74cd4b25f490cac96b2d4b73 vlc-0.8.6-r1.ebuild 8227
+SHA256 881a9cdd069b861b5a334632047fbb06098575d1b71b6820c831cf08ad53c14d vlc-0.8.6-r1.ebuild 8227
 EBUILD vlc-0.8.6_p18636.ebuild 8378 RMD160 e135ac3015f4ad2e9657ff6c6e54f4a63dd9f960 SHA1 408f8880785ff9ba53339429b297f8ad73601aac SHA256 fcb21dc91c4ea62dddb39ff04778d66c4fe03edf07d13a77746116043bbc4cc7
 MD5 99116a97fc49e8182ec9a8a06a4f58d8 vlc-0.8.6_p18636.ebuild 8378
 RMD160 e135ac3015f4ad2e9657ff6c6e54f4a63dd9f960 vlc-0.8.6_p18636.ebuild 8378
 SHA256 fcb21dc91c4ea62dddb39ff04778d66c4fe03edf07d13a77746116043bbc4cc7 vlc-0.8.6_p18636.ebuild 8378
-MISC ChangeLog 39653 RMD160 7b74e84d11e2297cc5185c29c41ff3b8549dcd17 SHA1 faaeaf564a6666524118827d85143e39683df4d9 SHA256 ecf24d0f473944e1581294e07513997c1f9de5027538517f54003338e93eea79
-MD5 f03b5c781b707999dfc7dd0145feadaf ChangeLog 39653
-RMD160 7b74e84d11e2297cc5185c29c41ff3b8549dcd17 ChangeLog 39653
-SHA256 ecf24d0f473944e1581294e07513997c1f9de5027538517f54003338e93eea79 ChangeLog 39653
+MISC ChangeLog 39772 RMD160 9ed5ab4c79c450055853328d84064bd1cabd1544 SHA1 ae0bc96e7ee42acbd872ba55be2e0feaa3b7b9c1 SHA256 9fb1cc0cfe18af444f16e70e364a49642b02b0327a1b0393b977081341e2aa1b
+MD5 3ad5a7803ed6f949d66b92e1ce853d88 ChangeLog 39772
+RMD160 9ed5ab4c79c450055853328d84064bd1cabd1544 ChangeLog 39772
+SHA256 9fb1cc0cfe18af444f16e70e364a49642b02b0327a1b0393b977081341e2aa1b ChangeLog 39772
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 metadata.xml 225
-MD5 085cb3c46ec7f8068cf67cd8ce8bcbc8 files/digest-vlc-0.8.6-r1 482
-RMD160 e98d1e8b3f974ea0e8d1161dace44a9f78fd03d9 files/digest-vlc-0.8.6-r1 482
-SHA256 416ee7d523b58002f6b9ac144f5462affb202555a8c54c78e4ef03864bc966ad files/digest-vlc-0.8.6-r1 482
+MD5 230426f67daeed9b9f0c3bbd528e41ae files/digest-vlc-0.8.6-r1 482
+RMD160 2326ae282698d28cfbe95d95db832976a19de328 files/digest-vlc-0.8.6-r1 482
+SHA256 7425090a91cdb71c2704d5e50c9bafd43f32d3b24e3beaadf960130fce2ecb99 files/digest-vlc-0.8.6-r1 482
 MD5 1ee1269a091b81b5138f88ceb160a913 files/digest-vlc-0.8.6_p18636 503
 RMD160 f894a66b46d9d831dbe55804b2b50aa3d9490345 files/digest-vlc-0.8.6_p18636 503
 SHA256 59e6acba8cd278a6390780d4a4b3c488df47b82a64fefaed11764e048e9e1016 files/digest-vlc-0.8.6_p18636 503
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFzdhEvFcC4BYPU0oRAn3FAJ9MVa1649htfp6JQGWVl6UXep+TrgCgtggJ
-hqGAXCAjtUO6rxtOqT3uCb4=
-=6VkQ
+iD8DBQFFzeA2vFcC4BYPU0oRAjaiAJ4uooiQqaQYUmgRs6HnWKvWVtMH0QCfdQQ+
+TZFH730MsapL6PMHkzOnCLs=
+=R9IG
 -----END PGP SIGNATURE-----

diff --git a/media-video/vlc/files/digest-vlc-0.8.6-r1 b/media-video/vlc/files/digest-vlc-0.8.6-r1
index 722fc2260cc6e423c7c79f67efe42acaa49e3a24..d13d4a980eb520ba2277269ece492a699669aaa0 100644 (file)
--- a/media-video/vlc/files/digest-vlc-0.8.6-r1
+++ b/media-video/vlc/files/digest-vlc-0.8.6-r1
@@ -1,6 +1,6 @@
 MD5 77a275f3408c4c9feae451d4eae47f89 vlc-0.8.6.tar.bz2 10506025
 RMD160 0ec4cea5562d0aeaada9a9c533caa5489764d52d vlc-0.8.6.tar.bz2 10506025
 SHA256 17b114d1fe0177c6639b3fb0985c47362bcf1a405bf5fb401aeffb5dc9b3dba7 vlc-0.8.6.tar.bz2 10506025
-MD5 6be0e25388c648db5fc3dfa4f171f8c6 vlc-patches-34.tar.bz2 10391
-RMD160 403f755734ed1fbb2c63346547ca91bd37ef227f vlc-patches-34.tar.bz2 10391
-SHA256 0d50a8b1c1104dcd4603d105990db36d90a3880c5e00ecdf65579a23f71d4fc6 vlc-patches-34.tar.bz2 10391
+MD5 fdab9a3cd8b160d293f00f2076f1e3e6 vlc-patches-35.tar.bz2 11019
+RMD160 a79a774e94be36824745d415a7743d4b74abc76e vlc-patches-35.tar.bz2 11019
+SHA256 3b74d69405b107569b47b33342e78d7c7ef8ac10cdc486bef6803975853405fa vlc-patches-35.tar.bz2 11019

diff --git a/media-video/vlc/vlc-0.8.6-r1.ebuild b/media-video/vlc/vlc-0.8.6-r1.ebuild
index 590366006b08afae6231a0096521223373c9dc62..513300c67847c1edd93b3cf66a49d28e96cb99ad 100644 (file)
--- a/media-video/vlc/vlc-0.8.6-r1.ebuild
+++ b/media-video/vlc/vlc-0.8.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6-r1.ebuild,v 1.10 2007/02/10 10:50:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6-r1.ebuild,v 1.11 2007/02/10 15:09:33 aballier Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -13,7 +13,7 @@ MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-beta/-test}"
 MY_P="${PN}-${MY_PV}"
 
-PATCHLEVEL="34"
+PATCHLEVEL="35"
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"
 
@@ -31,7 +31,7 @@ KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="a52 3dfx debug altivec httpd vlm gnutls live v4l cdda ogg matroska
 dvb dvd vcd 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 mod speex shout rtsp
+mp3 xv bidi sdl sdl-image png xml samba daap corba mod speex shout rtsp
 win32codecs skins hal avahi xinerama cddb directfb upnp nsplugin seamonkey
 optimisememory libnotify"
 
@@ -75,7 +75,8 @@ RDEPEND="
                sys-libs/zlib
                png? ( media-libs/libpng )
                media-libs/libdvbpsi
-               sdl? ( >=media-libs/libsdl-1.2.8 )
+               sdl? ( >=media-libs/libsdl-1.2.8
+                       sdl-image? ( media-libs/sdl-image ) )
                xml? ( dev-libs/libxml2 )
                samba? ( net-fs/samba )
                vcd? ( >=dev-libs/libcdio-0.72
@@ -214,6 +215,7 @@ src_compile () {
                $(use_enable ggi) \
                $(use_enable 3dfx glide) \
                $(use_enable sdl) \
+               $(use_enable sdl-image) \
                $(use_enable png) \
                $(use_enable xml libxml2) \
                $(use_enable samba smb) \