/[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.67 Revision 1.85
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.67 2010/04/12 14:42:38 aballier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.85 2010/07/20 06:54:30 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="85" 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 gnome gnutls httpd 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 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 )
86 gnome? ( gnome-base/gnome-vfs ) 80 gnome? ( gnome-base/gnome-vfs )
87 gnutls? ( >=net-libs/gnutls-1.7.4 ) 81 gnutls? ( >=net-libs/gnutls-1.7.4 >=dev-libs/libgcrypt-1.2.0 )
88 id3tag? ( media-libs/libid3tag sys-libs/zlib )
89 ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) 82 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 ) 83 jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
91 kate? ( >=media-libs/libkate-0.1.1 ) 84 kate? ( >=media-libs/libkate-0.1.1 )
92 libass? ( >=media-libs/libass-0.9.6 media-libs/fontconfig ) 85 libass? ( >=media-libs/libass-0.9.6 media-libs/fontconfig )
93 libcaca? ( >=media-libs/libcaca-0.99_beta14 ) 86 libcaca? ( >=media-libs/libcaca-0.99_beta14 )
95 libproxy? ( net-libs/libproxy ) 88 libproxy? ( net-libs/libproxy )
96 libtiger? ( media-libs/libtiger ) 89 libtiger? ( media-libs/libtiger )
97 lirc? ( app-misc/lirc ) 90 lirc? ( app-misc/lirc )
98 live? ( >=media-plugins/live-2008.07.06 ) 91 live? ( >=media-plugins/live-2008.07.06 )
99 lua? ( >=dev-lang/lua-5.1 ) 92 lua? ( >=dev-lang/lua-5.1 )
100 matroska? ( 93 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 ) 94 modplug? ( >=media-libs/libmodplug-0.8.8.1 )
104 mp3? ( media-libs/libmad ) 95 mp3? ( media-libs/libmad )
105 mpeg? ( >=media-libs/libmpeg2-0.3.2 ) 96 mpeg? ( >=media-libs/libmpeg2-0.3.2 )
106 mtp? ( >=media-libs/libmtp-0.3.0 ) 97 mtp? ( >=media-libs/libmtp-1.0.0 )
107 musepack? ( >=media-sound/musepack-tools-444 ) 98 musepack? ( >=media-sound/musepack-tools-444 )
108 ncurses? ( sys-libs/ncurses ) 99 ncurses? ( sys-libs/ncurses )
109 nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt ) 100 nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt )
110 ogg? ( media-libs/libogg ) 101 ogg? ( media-libs/libogg )
111 opengl? ( virtual/opengl ) 102 opengl? ( virtual/opengl x11-libs/libX11[xcb] )
112 png? ( media-libs/libpng sys-libs/zlib ) 103 png? ( media-libs/libpng sys-libs/zlib )
113 projectm? ( media-libs/libprojectm ) 104 projectm? ( media-libs/libprojectm )
114 pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) 105 pulseaudio? ( >=media-sound/pulseaudio-0.9.11
106 !X? ( >=media-sound/pulseaudio-0.9.11[-X] ) )
115 qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 ) 107 qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
116 remoteosd? ( >=dev-libs/libgcrypt-1.2.0 ) 108 remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
117 samba? ( || ( >=net-fs/samba-3.4.6[smbclient] 109 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 ) 110 schroedinger? ( >=media-libs/schroedinger-1.0.6 )
120 sdl? ( >=media-libs/libsdl-1.2.8 111 sdl? ( >=media-libs/libsdl-1.2.8
121 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) 112 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )
122 shout? ( media-libs/libshout ) 113 shout? ( media-libs/libshout )
123 skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXext x11-libs/libX11 ) 114 skins? (
115 x11-libs/qt-gui:4 x11-libs/qt-core:4
116 x11-libs/libXext x11-libs/libX11
117 media-libs/freetype media-fonts/dejavu
118 )
124 speex? ( media-libs/speex ) 119 speex? ( media-libs/speex )
125 sqlite? ( >=dev-db/sqlite-3.6.0:3 ) 120 sqlite? ( >=dev-db/sqlite-3.6.0:3 )
126 svg? ( >=gnome-base/librsvg-2.9.0 ) 121 svg? ( >=gnome-base/librsvg-2.9.0 )
127 svga? ( media-libs/svgalib )
128 taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) 122 taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
129 theora? ( >=media-libs/libtheora-1.0_beta3 ) 123 theora? ( >=media-libs/libtheora-1.0_beta3 )
130 truetype? ( media-libs/freetype 124 truetype? ( media-libs/freetype media-fonts/dejavu )
131 media-fonts/dejavu )
132 twolame? ( media-sound/twolame ) 125 twolame? ( media-sound/twolame )
133 udev? ( >=sys-fs/udev-142 ) 126 udev? ( >=sys-fs/udev-142 )
134 upnp? ( net-libs/libupnp ) 127 upnp? ( net-libs/libupnp )
135 v4l2? ( libv4l2? ( media-libs/libv4l ) ) 128 v4l2? ( libv4l2? ( media-libs/libv4l ) )
136 v4l? ( libv4l? ( media-libs/libv4l ) ) 129 v4l? ( libv4l? ( media-libs/libv4l ) )
130 vaapi? ( x11-libs/libva >=media-video/ffmpeg-0.5_p22846 )
137 vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) 131 vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
138 vorbis? ( media-libs/libvorbis ) 132 vorbis? ( media-libs/libvorbis )
139 win32codecs? ( media-libs/win32codecs ) 133 win32codecs? ( media-libs/win32codecs )
134 X? ( x11-libs/libX11 )
140 x264? ( >=media-libs/x264-0.0.20090923 ) 135 x264? ( >=media-libs/x264-0.0.20090923 )
141 xcb? ( x11-libs/libxcb x11-libs/xcb-util ) 136 xcb? ( x11-libs/libxcb x11-libs/xcb-util )
142 xml? ( dev-libs/libxml2 ) 137 xml? ( dev-libs/libxml2 )
143 xosd? ( x11-libs/xosd ) 138 xosd? ( x11-libs/xosd )
144 zvbi? ( >=media-libs/zvbi-0.2.25 ) 139 zvbi? ( >=media-libs/zvbi-0.2.25 )
145 " 140 "
146 141
147DEPEND="${RDEPEND} 142DEPEND="${RDEPEND}
143 !!<=media-video/vlc-1.1.99999
148 dvb? ( sys-kernel/linux-headers ) 144 dvb? ( sys-kernel/linux-headers )
145 kde? ( >=kde-base/kdelibs-4 )
149 v4l? ( sys-kernel/linux-headers ) 146 v4l? ( sys-kernel/linux-headers )
150 v4l2? ( >=sys-kernel/linux-headers-2.6.25 ) 147 v4l2? ( >=sys-kernel/linux-headers-2.6.25 )
151 xcb? ( x11-proto/xproto ) 148 xcb? ( x11-proto/xproto )
152 dev-util/pkgconfig" 149 dev-util/pkgconfig"
153 150
161# Notify the user that some useflag have been forced on 158# Notify the user that some useflag have been forced on
162vlc_use_force() { 159vlc_use_force() {
163 use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled." 160 use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled."
164} 161}
165 162
166# Use when $2 depends strictly on $3 163# Use when $1 depends strictly on $2
167# if use $1 then enable $2 and $3, otherwise disable $2 164# if use $1 then enable $2
168vlc_use_enable_force() { 165vlc_use_enable_force() {
169 if use $1 ; then 166 use $1 && echo "--enable-$2"
170 echo "--enable-$2 --enable-$3"
171 else
172 echo "--disable-$2"
173 fi
174} 167}
175 168
176pkg_setup() { 169pkg_setup() {
177 if has_version '<=media-video/vlc-1.0.99999'; then 170 # Useflags we need to forcefuly enable
178 eerror "Please unmerge vlc-1.0.x first before installing ${P}" 171 vlc_use_force remoteosd gcrypt
179 eerror "If you don't do that, some plugins will get linked against" 172 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 173 vlc_use_force skins truetype
184 vlc_use_force skins qt4 174 vlc_use_force skins qt4
175 vlc_use_force vlm stream
176 vlc_use_force vaapi ffmpeg
177
178 # Useflags that will be automagically discarded if deps are not met
185 vlc_use_needs bidi truetype 179 vlc_use_needs bidi truetype
186 vlc_use_force remoteosd gcrypt 180 vlc_use_needs cddb cdda
187 vlc_use_needs fontconfig truetype 181 vlc_use_needs fontconfig truetype
188 vlc_use_needs libv4l2 v4l2 182 vlc_use_needs libv4l2 v4l2
189 vlc_use_needs libv4l v4l 183 vlc_use_needs libv4l v4l
190 vlc_use_needs libtiger kate 184 vlc_use_needs libtiger kate
191 vlc_use_needs xv xcb 185 vlc_use_needs xv xcb
192 vlc_use_needs cddb cdda 186
193 if use qt4 || use skins ; then 187 if use qt4 || use skins ; then
194 qt4_pkg_setup 188 qt4_pkg_setup
195 else 189 else
196 ewarn "You have disabled the qt4 useflag, ${PN} will not have any" 190 ewarn "You have disabled the qt4 useflag, ${PN} will not have any"
197 ewarn "graphical interface. Maybe that is not what you want..." 191 ewarn "graphical interface. Maybe that is not what you want..."
244 $(use_enable fbcon fb) \ 238 $(use_enable fbcon fb) \
245 $(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(use_enable ffmpeg swscale) $(use_enable ffmpeg postproc) \ 239 $(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(use_enable ffmpeg swscale) $(use_enable ffmpeg postproc) \
246 $(use_enable flac) \ 240 $(use_enable flac) \
247 $(use_enable fluidsynth) \ 241 $(use_enable fluidsynth) \
248 $(use_enable fontconfig) \ 242 $(use_enable fontconfig) \
249 $(use_enable ggi) \
250 $(use_enable gnome gnomevfs) \ 243 $(use_enable gnome gnomevfs) \
251 $(use_enable gnutls) \ 244 $(use_enable gnutls) \
252 $(use_enable httpd) \ 245 $(use_enable httpd) \
253 $(use_enable id3tag) \
254 $(use_enable ieee1394 dv) \ 246 $(use_enable ieee1394 dv) \
255 $(use_enable jack) \ 247 $(use_enable jack) \
256 $(use_enable kate) \ 248 $(use_enable kate) \
249 $(use_with kde kde-solid) \
257 $(use_enable libass) \ 250 $(use_enable libass) \
258 $(use_enable libcaca caca) \ 251 $(use_enable libcaca caca) \
259 $(use_enable gcrypt libgcrypt) \ 252 $(use_enable gcrypt libgcrypt) \
260 $(use_enable libnotify notify) \ 253 $(use_enable libnotify notify) \
261 $(use_enable libproxy) \ 254 $(use_enable libproxy) \
274 $(use_enable mtp) \ 267 $(use_enable mtp) \
275 $(use_enable musepack mpc) \ 268 $(use_enable musepack mpc) \
276 $(use_enable ncurses) \ 269 $(use_enable ncurses) \
277 $(use_enable nsplugin mozilla) --with-mozilla-pkg=libxul \ 270 $(use_enable nsplugin mozilla) --with-mozilla-pkg=libxul \
278 $(use_enable ogg) \ 271 $(use_enable ogg) \
279 $(use_enable opengl glx) $(use_enable opengl) \ 272 $(use_enable opengl glx) \
280 $(use_enable optimisememory optimize-memory) \ 273 $(use_enable optimisememory optimize-memory) \
281 $(use_enable oss) \ 274 $(use_enable oss) \
282 $(use_enable png) \ 275 $(use_enable png) \
283 --disable-portaudio \ 276 --disable-portaudio \
284 $(use_enable projectm) \ 277 $(use_enable projectm) \
285 $(use_enable pulseaudio pulse) \ 278 $(use_enable pulseaudio pulse) \
286 $(use_enable pvr) \ 279 $(use_enable pvr) \
287 $(use_enable qt4) \ 280 $(use_enable qt4) \
281 $(use_enable remoteosd) \
288 $(use_enable rtsp realrtsp) \ 282 $(use_enable rtsp realrtsp) \
289 $(use_enable run-as-root) \ 283 $(use_enable run-as-root) \
290 $(use_enable samba smb) \ 284 $(use_enable samba smb) \
291 $(use_enable schroedinger) \ 285 $(use_enable schroedinger) \
292 $(use_enable sdl) \ 286 $(use_enable sdl) \
297 $(use_enable speex) \ 291 $(use_enable speex) \
298 $(use_enable sqlite) \ 292 $(use_enable sqlite) \
299 $(use_enable sse) \ 293 $(use_enable sse) \
300 $(use_enable stream sout) \ 294 $(use_enable stream sout) \
301 $(use_enable svg) \ 295 $(use_enable svg) \
302 $(use_enable svga svgalib) \
303 $(use_enable taglib) \ 296 $(use_enable taglib) \
304 $(use_enable theora) \ 297 $(use_enable theora) \
305 $(use_enable truetype freetype) \ 298 $(use_enable truetype freetype) \
306 $(use_enable twolame) \ 299 $(use_enable twolame) \
307 $(use_enable udev) \ 300 $(use_enable udev) \
308 $(use_enable upnp) \ 301 $(use_enable upnp) \
309 $(use_enable v4l) \ 302 $(use_enable v4l) \
310 $(use_enable v4l2) \ 303 $(use_enable v4l2) \
311 $(use_enable vcdx) \ 304 $(use_enable vcdx) \
305 $(use_enable vaapi libva) \
306 $(use_enable vlm) \
312 $(use_enable vorbis) \ 307 $(use_enable vorbis) \
313 $(use_enable win32codecs loader) \ 308 $(use_enable win32codecs loader) \
314 $(use_enable wma-fixed) \ 309 $(use_enable wma-fixed) \
310 $(use_with X x) \
315 $(use_enable x264) \ 311 $(use_enable x264) \
316 $(use_enable xcb) \ 312 $(use_enable xcb) \
317 $(use_enable xml libxml2) \ 313 $(use_enable xml libxml2) \
318 $(use_enable xosd) \ 314 $(use_enable xosd) \
319 $(use_enable xv xvideo) \ 315 $(use_enable xv xvideo) \
320 $(use_enable zvbi) $(use_enable !zvbi telx) \ 316 $(use_enable zvbi) $(use_enable !zvbi telx) \
321 --disable-snapshot \ 317 --disable-snapshot \
322 --disable-growl \ 318 --disable-growl \
323 --disable-optimizations \ 319 --disable-optimizations \
324 --enable-fast-install \ 320 --enable-fast-install \
325 $(vlc_use_enable_force vlm vlm sout) \ 321 $(vlc_use_enable_force vlm sout) \
326 $(vlc_use_enable_force skins skins2 qt4) \ 322 $(vlc_use_enable_force skins qt4) \
323 $(vlc_use_enable_force skins freetype) \
327 $(vlc_use_enable_force remoteosd remoteosd libgcrypt) 324 $(vlc_use_enable_force remoteosd libgcrypt) \
325 $(vlc_use_enable_force gnutls libgcrypt) \
326 $(vlc_use_enable_force vaapi avcodec)
328} 327}
329 328
330src_install() { 329src_install() {
331 emake DESTDIR="${D}" install || die "make install failed" 330 emake DESTDIR="${D}" install || die "make install failed"
332 331
341 mv "${D}"/usr/$(get_libdir)/mozilla/plugins/* \ 340 mv "${D}"/usr/$(get_libdir)/mozilla/plugins/* \
342 "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/" 341 "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
343 fi 342 fi
344 343
345 use skins || rm -rf "${D}/usr/share/vlc/skins2" 344 use skins || rm -rf "${D}/usr/share/vlc/skins2"
346
347 for res in 16 32 48; do
348 insinto /usr/share/icons/hicolor/${res}x${res}/apps/
349 newins "${S}"/share/vlc${res}x${res}.png vlc.png
350 done
351} 345}
352 346
353pkg_postinst() { 347pkg_postinst() {
354 gnome2_pkg_postinst 348 gnome2_pkg_postinst
355 349
356 if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then 350 if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
357 einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/" 351 einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
358 "/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/" 352 "/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
359 else 353 else
360 ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)" 354 ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
361 ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually" 355 ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
362 ewarn "If you do not do it, vlc will take a long time to load." 356 ewarn "If you do not do it, vlc will take a long time to load."
363 fi 357 fi

Legend:
Removed from v.1.67  
changed lines
  Added in v.1.85

  ViewVC Help
Powered by ViewVC 1.1.20