/[gentoo-x86]/media-video/vlc/vlc-9999.ebuild
Gentoo

Diff of /media-video/vlc/vlc-9999.ebuild

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.63 Revision 1.82
1# Copyright 1999-2010 Gentoo Foundation 1# Copyright 1999-2010 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.63 2010/04/07 16:04:46 patrick Exp $ 3# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.82 2010/07/18 10:16:06 aballier Exp $
4 4
5EAPI="2" 5EAPI="3"
6 6
7SCM="" 7SCM=""
8if [ "${PV%9999}" != "${PV}" ] ; then 8if [ "${PV%9999}" != "${PV}" ] ; then
9 SCM=git 9 SCM=git
10 EGIT_BOOTSTRAP="bootstrap" 10 EGIT_BOOTSTRAP="bootstrap"
22MY_PV="${PV/_/-}" 22MY_PV="${PV/_/-}"
23MY_PV="${MY_PV/-beta/-test}" 23MY_PV="${MY_PV/-beta/-test}"
24MY_P="${PN}-${MY_PV}" 24MY_P="${PN}-${MY_PV}"
25VLC_SNAPSHOT_TIME="0013" 25VLC_SNAPSHOT_TIME="0013"
26 26
27PATCHLEVEL="84" 27PATCHLEVEL="86"
28DESCRIPTION="VLC media player - Video player and streamer" 28DESCRIPTION="VLC media player - Video player and streamer"
29HOMEPAGE="http://www.videolan.org/vlc/" 29HOMEPAGE="http://www.videolan.org/vlc/"
30if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild 30if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
31 SRC_URI="" 31 SRC_URI=""
32elif [[ "${P}" == *_alpha* ]]; then # Snapshots taken from nightlies.videolan.org 32elif [[ "${P}" == *_alpha* ]]; then # Snapshots taken from nightlies.videolan.org
45SLOT="0" 45SLOT="0"
46 46
47KEYWORDS="" 47KEYWORDS=""
48IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394 48IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
49 debug dirac directfb dts dvb dvd elibc_glibc fbcon fluidsynth +ffmpeg flac fontconfig 49 debug dirac directfb dts dvb dvd elibc_glibc fbcon fluidsynth +ffmpeg flac fontconfig
50 +gcrypt ggi gnome gnutls httpd id3tag ieee1394 jack kate libass libcaca 50 +gcrypt ggi gnome gnutls httpd id3tag ieee1394 jack kate kde libass libcaca
51 libnotify libproxy libtiger libv4l libv4l2 lirc live lua matroska mmx 51 libnotify libproxy libtiger libv4l libv4l2 lirc live lua matroska mmx
52 modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss 52 modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss
53 png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba 53 png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba
54 schroedinger sdl sdl-image shine shout skins speex sqlite sse stream 54 schroedinger sdl sdl-image shine shout skins speex sqlite sse stream
55 svg svga taglib theora truetype twolame udev upnp v4l v4l2 vcdx vlm 55 svg svga taglib theora truetype twolame udev upnp v4l v4l2 vaapi vcdx vlm
56 vorbis win32codecs wma-fixed x264 +xcb xml xosd xv zvbi" 56 vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
57 57
58RDEPEND=" 58RDEPEND="
59 !!<=media-video/vlc-1.0.99999
60 sys-libs/zlib 59 sys-libs/zlib
61 >=media-libs/libdvbpsi-0.1.6 60 >=media-libs/libdvbpsi-0.1.6
62 a52? ( >=media-libs/a52dec-0.7.4-r3 ) 61 a52? ( >=media-libs/a52dec-0.7.4-r3 )
63 aalib? ( media-libs/aalib ) 62 aalib? ( media-libs/aalib )
64 aac? ( >=media-libs/faad2-2.6.1 ) 63 aac? ( >=media-libs/faad2-2.6.1 )
65 alsa? ( media-libs/alsa-lib ) 64 alsa? ( media-libs/alsa-lib )
66 avahi? ( >=net-dns/avahi-0.6 ) 65 avahi? ( >=net-dns/avahi-0.6[dbus] )
67 bidi? ( >=dev-libs/fribidi-0.10.4 ) 66 bidi? ( >=dev-libs/fribidi-0.10.4 )
68 cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) ) 67 cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) )
69 dbus? ( >=sys-apps/dbus-1.0.2 ) 68 dbus? ( >=sys-apps/dbus-1.0.2 )
70 dc1394? ( >=sys-libs/libraw1394-2.0.1 69 dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
71 >=media-libs/libdc1394-2.0.2 )
72 dirac? ( >=media-video/dirac-0.10.0 ) 70 dirac? ( >=media-video/dirac-0.10.0 )
73 directfb? ( dev-libs/DirectFB sys-libs/zlib ) 71 directfb? ( dev-libs/DirectFB sys-libs/zlib )
74 dts? ( media-libs/libdca ) 72 dts? ( media-libs/libdca )
75 dvd? ( media-libs/libdvdread 73 dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
76 >=media-libs/libdvdnav-0.1.9
77 media-libs/libdvdplay )
78 elibc_glibc? ( >=sys-libs/glibc-2.8 ) 74 elibc_glibc? ( >=sys-libs/glibc-2.8 )
79 ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20090201 ) 75 ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20090201 )
80 flac? ( media-libs/libogg 76 flac? ( media-libs/libogg >=media-libs/flac-1.1.2 )
81 >=media-libs/flac-1.1.2 )
82 fluidsynth? ( media-sound/fluidsynth ) 77 fluidsynth? ( media-sound/fluidsynth )
83 fontconfig? ( media-libs/fontconfig ) 78 fontconfig? ( media-libs/fontconfig )
84 gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) 79 gcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
85 ggi? ( media-libs/libggi ) 80 ggi? ( media-libs/libggi )
86 gnome? ( gnome-base/gnome-vfs ) 81 gnome? ( gnome-base/gnome-vfs )
87 gnutls? ( >=net-libs/gnutls-1.7.4 ) 82 gnutls? ( >=net-libs/gnutls-1.7.4 >=dev-libs/libgcrypt-1.2.0 )
88 id3tag? ( media-libs/libid3tag sys-libs/zlib ) 83 id3tag? ( media-libs/libid3tag sys-libs/zlib )
89 ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) 84 ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 )
90 jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) 85 jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
91 kate? ( >=media-libs/libkate-0.1.1 ) 86 kate? ( >=media-libs/libkate-0.1.1 )
92 libass? ( >=media-libs/libass-0.9.6 media-libs/fontconfig ) 87 libass? ( >=media-libs/libass-0.9.6 media-libs/fontconfig )
95 libproxy? ( net-libs/libproxy ) 90 libproxy? ( net-libs/libproxy )
96 libtiger? ( media-libs/libtiger ) 91 libtiger? ( media-libs/libtiger )
97 lirc? ( app-misc/lirc ) 92 lirc? ( app-misc/lirc )
98 live? ( >=media-plugins/live-2008.07.06 ) 93 live? ( >=media-plugins/live-2008.07.06 )
99 lua? ( >=dev-lang/lua-5.1 ) 94 lua? ( >=dev-lang/lua-5.1 )
100 matroska? ( 95 matroska? ( >=dev-libs/libebml-0.7.6 >=media-libs/libmatroska-0.8.0 )
101 >=dev-libs/libebml-0.7.6
102 >=media-libs/libmatroska-0.8.0 )
103 modplug? ( >=media-libs/libmodplug-0.8 ) 96 modplug? ( >=media-libs/libmodplug-0.8.8.1 )
104 mp3? ( media-libs/libmad ) 97 mp3? ( media-libs/libmad )
105 mpeg? ( >=media-libs/libmpeg2-0.3.2 ) 98 mpeg? ( >=media-libs/libmpeg2-0.3.2 )
106 mtp? ( >=media-libs/libmtp-0.3.0 ) 99 mtp? ( >=media-libs/libmtp-1.0.0 )
107 musepack? ( >=media-sound/musepack-tools-444 ) 100 musepack? ( >=media-sound/musepack-tools-444 )
108 ncurses? ( sys-libs/ncurses ) 101 ncurses? ( sys-libs/ncurses )
109 nsplugin? ( >=net-libs/xulrunner-1.8 x11-libs/libXpm x11-libs/libXt <net-libs/xulrunner-1.9.2 ) 102 nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt )
110 ogg? ( media-libs/libogg ) 103 ogg? ( media-libs/libogg )
111 opengl? ( virtual/opengl ) 104 opengl? ( virtual/opengl x11-libs/libX11[xcb] )
112 png? ( media-libs/libpng sys-libs/zlib ) 105 png? ( media-libs/libpng sys-libs/zlib )
113 projectm? ( media-libs/libprojectm ) 106 projectm? ( media-libs/libprojectm )
114 pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) 107 pulseaudio? ( >=media-sound/pulseaudio-0.9.11
108 !X? ( >=media-sound/pulseaudio-0.9.11[-X] ) )
115 qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 ) 109 qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
116 remoteosd? ( >=dev-libs/libgcrypt-1.2.0 ) 110 remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
117 samba? ( || ( >=net-fs/samba-3.4.6[smbclient] 111 samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) )
118 <net-fs/samba-3.4 ) )
119 schroedinger? ( >=media-libs/schroedinger-1.0.6 ) 112 schroedinger? ( >=media-libs/schroedinger-1.0.6 )
120 sdl? ( >=media-libs/libsdl-1.2.8 113 sdl? ( >=media-libs/libsdl-1.2.8
121 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) 114 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )
122 shout? ( media-libs/libshout ) 115 shout? ( media-libs/libshout )
123 skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXext x11-libs/libX11 ) 116 skins? (
117 x11-libs/qt-gui:4 x11-libs/qt-core:4
118 x11-libs/libXext x11-libs/libX11
119 media-libs/freetype media-fonts/dejavu
120 )
124 speex? ( media-libs/speex ) 121 speex? ( media-libs/speex )
125 sqlite? ( >=dev-db/sqlite-3.6.0:3 ) 122 sqlite? ( >=dev-db/sqlite-3.6.0:3 )
126 svg? ( >=gnome-base/librsvg-2.9.0 ) 123 svg? ( >=gnome-base/librsvg-2.9.0 )
127 svga? ( media-libs/svgalib ) 124 svga? ( media-libs/svgalib )
128 taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) 125 taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
129 theora? ( >=media-libs/libtheora-1.0_beta3 ) 126 theora? ( >=media-libs/libtheora-1.0_beta3 )
130 truetype? ( media-libs/freetype 127 truetype? ( media-libs/freetype media-fonts/dejavu )
131 media-fonts/dejavu )
132 twolame? ( media-sound/twolame ) 128 twolame? ( media-sound/twolame )
133 udev? ( >=sys-fs/udev-142 ) 129 udev? ( >=sys-fs/udev-142 )
134 upnp? ( net-libs/libupnp ) 130 upnp? ( net-libs/libupnp )
135 v4l2? ( libv4l2? ( media-libs/libv4l ) ) 131 v4l2? ( libv4l2? ( media-libs/libv4l ) )
136 v4l? ( libv4l? ( media-libs/libv4l ) ) 132 v4l? ( libv4l? ( media-libs/libv4l ) )
133 vaapi? ( x11-libs/libva >=media-video/ffmpeg-0.5_p22846 )
137 vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) 134 vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
138 vorbis? ( media-libs/libvorbis ) 135 vorbis? ( media-libs/libvorbis )
139 win32codecs? ( media-libs/win32codecs ) 136 win32codecs? ( media-libs/win32codecs )
137 X? ( x11-libs/libX11 )
140 x264? ( >=media-libs/x264-0.0.20090923 ) 138 x264? ( >=media-libs/x264-0.0.20090923 )
141 xcb? ( x11-libs/libxcb x11-libs/xcb-util ) 139 xcb? ( x11-libs/libxcb x11-libs/xcb-util )
142 xml? ( dev-libs/libxml2 ) 140 xml? ( dev-libs/libxml2 )
143 xosd? ( x11-libs/xosd ) 141 xosd? ( x11-libs/xosd )
144 zvbi? ( >=media-libs/zvbi-0.2.25 ) 142 zvbi? ( >=media-libs/zvbi-0.2.25 )
145 " 143 "
146 144
147DEPEND="${RDEPEND} 145DEPEND="${RDEPEND}
146 !!<=media-video/vlc-1.0.99999
148 dvb? ( sys-kernel/linux-headers ) 147 dvb? ( sys-kernel/linux-headers )
148 kde? ( >=kde-base/kdelibs-4 )
149 v4l? ( sys-kernel/linux-headers ) 149 v4l? ( sys-kernel/linux-headers )
150 v4l2? ( >=sys-kernel/linux-headers-2.6.25 ) 150 v4l2? ( >=sys-kernel/linux-headers-2.6.25 )
151 xcb? ( x11-proto/xproto ) 151 xcb? ( x11-proto/xproto )
152 dev-util/pkgconfig" 152 dev-util/pkgconfig"
153 153
161# Notify the user that some useflag have been forced on 161# Notify the user that some useflag have been forced on
162vlc_use_force() { 162vlc_use_force() {
163 use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled." 163 use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled."
164} 164}
165 165
166# Use when $2 depends strictly on $3 166# Use when $1 depends strictly on $2
167# if use $1 then enable $2 and $3, otherwise disable $2 167# if use $1 then enable $2
168vlc_use_enable_force() { 168vlc_use_enable_force() {
169 if use $1 ; then 169 use $1 && echo "--enable-$2"
170 echo "--enable-$2 --enable-$3"
171 else
172 echo "--disable-$2"
173 fi
174} 170}
175 171
176pkg_setup() { 172pkg_setup() {
177 if has_version '<=media-video/vlc-1.0.99999'; then 173 # Useflags we need to forcefuly enable
178 eerror "Please unmerge vlc-1.0.x first before installing ${P}" 174 vlc_use_force remoteosd gcrypt
179 eerror "If you don't do that, some plugins will get linked against" 175 vlc_use_force gnutls gcrypt
180 eerror "the old ${PN} version and will not work."
181 die "Unmerge vlc 1.0.x first"
182 fi
183 vlc_use_needs skins truetype 176 vlc_use_force skins truetype
184 vlc_use_force skins qt4 177 vlc_use_force skins qt4
178 vlc_use_force vlm stream
179 vlc_use_force vaapi ffmpeg
180
181 # Useflags that will be automagically discarded if deps are not met
185 vlc_use_needs bidi truetype 182 vlc_use_needs bidi truetype
186 vlc_use_force remoteosd gcrypt 183 vlc_use_needs cddb cdda
187 vlc_use_needs fontconfig truetype 184 vlc_use_needs fontconfig truetype
188 vlc_use_needs libv4l2 v4l2 185 vlc_use_needs libv4l2 v4l2
189 vlc_use_needs libv4l v4l 186 vlc_use_needs libv4l v4l
190 vlc_use_needs libtiger kate 187 vlc_use_needs libtiger kate
191 vlc_use_needs xv xcb 188 vlc_use_needs xv xcb
192 vlc_use_needs cddb cdda 189
193 if use qt4 || use skins ; then 190 if use qt4 || use skins ; then
194 qt4_pkg_setup 191 qt4_pkg_setup
195 else 192 else
196 ewarn "You have disabled the qt4 useflag, ${PN} will not have any" 193 ewarn "You have disabled the qt4 useflag, ${PN} will not have any"
197 ewarn "graphical interface. Maybe that is not what you want..." 194 ewarn "graphical interface. Maybe that is not what you want..."
218 215
219src_configure() { 216src_configure() {
220 217
221 # It would fail if -fforce-addr is used due to too few registers... 218 # It would fail if -fforce-addr is used due to too few registers...
222 use x86 && filter-flags -fforce-addr 219 use x86 && filter-flags -fforce-addr
223
224 local MOZILLA_PC
225
226 if use nsplugin; then
227 if has_version 'net-libs/xulrunner:1.9' ; then
228 MOZILLA_PC=libxul
229 else
230 MOZILLA_PC=xulrunner-plugin
231 fi
232 fi
233 220
234 econf \ 221 econf \
235 $(use_enable a52) \ 222 $(use_enable a52) \
236 $(use_enable aalib aa) \ 223 $(use_enable aalib aa) \
237 $(use_enable aac faad) \ 224 $(use_enable aac faad) \
262 $(use_enable httpd) \ 249 $(use_enable httpd) \
263 $(use_enable id3tag) \ 250 $(use_enable id3tag) \
264 $(use_enable ieee1394 dv) \ 251 $(use_enable ieee1394 dv) \
265 $(use_enable jack) \ 252 $(use_enable jack) \
266 $(use_enable kate) \ 253 $(use_enable kate) \
254 $(use_with kde kde-solid) \
267 $(use_enable libass) \ 255 $(use_enable libass) \
268 $(use_enable libcaca caca) \ 256 $(use_enable libcaca caca) \
269 $(use_enable gcrypt libgcrypt) \ 257 $(use_enable gcrypt libgcrypt) \
270 $(use_enable libnotify notify) \ 258 $(use_enable libnotify notify) \
271 $(use_enable libproxy) \ 259 $(use_enable libproxy) \
282 $(use_enable mp3 mad) \ 270 $(use_enable mp3 mad) \
283 $(use_enable mpeg libmpeg2) \ 271 $(use_enable mpeg libmpeg2) \
284 $(use_enable mtp) \ 272 $(use_enable mtp) \
285 $(use_enable musepack mpc) \ 273 $(use_enable musepack mpc) \
286 $(use_enable ncurses) \ 274 $(use_enable ncurses) \
287 $(use_enable nsplugin mozilla) --with-mozilla-pkg="${MOZILLA_PC}" \ 275 $(use_enable nsplugin mozilla) --with-mozilla-pkg=libxul \
288 $(use_enable ogg) \ 276 $(use_enable ogg) \
289 $(use_enable opengl glx) $(use_enable opengl) \ 277 $(use_enable opengl glx) $(use_enable opengl) \
290 $(use_enable optimisememory optimize-memory) \ 278 $(use_enable optimisememory optimize-memory) \
291 $(use_enable oss) \ 279 $(use_enable oss) \
292 $(use_enable png) \ 280 $(use_enable png) \
293 --disable-portaudio \ 281 --disable-portaudio \
294 $(use_enable projectm) \ 282 $(use_enable projectm) \
295 $(use_enable pulseaudio pulse) \ 283 $(use_enable pulseaudio pulse) \
296 $(use_enable pvr) \ 284 $(use_enable pvr) \
297 $(use_enable qt4) \ 285 $(use_enable qt4) \
286 $(use_enable remoteosd) \
298 $(use_enable rtsp realrtsp) \ 287 $(use_enable rtsp realrtsp) \
299 $(use_enable run-as-root) \ 288 $(use_enable run-as-root) \
300 $(use_enable samba smb) \ 289 $(use_enable samba smb) \
301 $(use_enable schroedinger) \ 290 $(use_enable schroedinger) \
302 $(use_enable sdl) \ 291 $(use_enable sdl) \
317 $(use_enable udev) \ 306 $(use_enable udev) \
318 $(use_enable upnp) \ 307 $(use_enable upnp) \
319 $(use_enable v4l) \ 308 $(use_enable v4l) \
320 $(use_enable v4l2) \ 309 $(use_enable v4l2) \
321 $(use_enable vcdx) \ 310 $(use_enable vcdx) \
311 $(use_enable vaapi libva) \
312 $(use_enable vlm) \
322 $(use_enable vorbis) \ 313 $(use_enable vorbis) \
323 $(use_enable win32codecs loader) \ 314 $(use_enable win32codecs loader) \
324 $(use_enable wma-fixed) \ 315 $(use_enable wma-fixed) \
316 $(use_with X x) \
325 $(use_enable x264) \ 317 $(use_enable x264) \
326 $(use_enable xcb) \ 318 $(use_enable xcb) \
327 $(use_enable xml libxml2) \ 319 $(use_enable xml libxml2) \
328 $(use_enable xosd) \ 320 $(use_enable xosd) \
329 $(use_enable xv xvideo) \ 321 $(use_enable xv xvideo) \
330 $(use_enable zvbi) $(use_enable !zvbi telx) \ 322 $(use_enable zvbi) $(use_enable !zvbi telx) \
331 --disable-snapshot \ 323 --disable-snapshot \
332 --disable-growl \ 324 --disable-growl \
333 --disable-optimizations \ 325 --disable-optimizations \
334 --enable-fast-install \ 326 --enable-fast-install \
335 $(vlc_use_enable_force vlm vlm sout) \ 327 $(vlc_use_enable_force vlm sout) \
336 $(vlc_use_enable_force skins skins2 qt4) \ 328 $(vlc_use_enable_force skins qt4) \
329 $(vlc_use_enable_force skins freetype) \
337 $(vlc_use_enable_force remoteosd remoteosd libgcrypt) 330 $(vlc_use_enable_force remoteosd libgcrypt) \
331 $(vlc_use_enable_force gnutls libgcrypt) \
332 $(vlc_use_enable_force vaapi avcodec)
338} 333}
339 334
340src_install() { 335src_install() {
341 emake DESTDIR="${D}" install || die "make install failed" 336 emake DESTDIR="${D}" install || die "make install failed"
342 337
343 dodoc AUTHORS HACKING THANKS NEWS README \ 338 dodoc AUTHORS HACKING THANKS NEWS README \
344 doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt 339 doc/fortunes.txt doc/intf-vcd.txt
345 340
346 rm -rf "${D}/usr/share/doc/vlc" \ 341 rm -rf "${D}/usr/share/doc/vlc" \
347 "${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico} 342 "${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
348 343
349 if use nsplugin; then 344 if use nsplugin; then
351 mv "${D}"/usr/$(get_libdir)/mozilla/plugins/* \ 346 mv "${D}"/usr/$(get_libdir)/mozilla/plugins/* \
352 "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/" 347 "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
353 fi 348 fi
354 349
355 use skins || rm -rf "${D}/usr/share/vlc/skins2" 350 use skins || rm -rf "${D}/usr/share/vlc/skins2"
356
357 for res in 16 32 48; do
358 insinto /usr/share/icons/hicolor/${res}x${res}/apps/
359 newins "${S}"/share/vlc${res}x${res}.png vlc.png
360 done
361} 351}
362 352
363pkg_postinst() { 353pkg_postinst() {
364 gnome2_pkg_postinst 354 gnome2_pkg_postinst
365 355
366 if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then 356 if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
367 einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen" 357 einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
368 "/usr/$(get_libdir)/vlc/vlc-cache-gen" 358 "/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
369 else 359 else
370 ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)" 360 ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
371 ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually" 361 ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
372 ewarn "If you do not do it, vlc will take a long time to load." 362 ewarn "If you do not do it, vlc will take a long time to load."
373 fi 363 fi

Legend:
Removed from v.1.63  
changed lines
  Added in v.1.82

  ViewVC Help
Powered by ViewVC 1.1.20