Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=jackwip.git;a=commitdiff;h=743e1122e91d8302ab9c232d66da77118542b6ae
commit 743e1122e91d8302ab9c232d66da77118542b6ae Merge: 0d567cf 5c007a6 Author: exceed <[email protected]> Date: Sat May 14 23:19:57 2011 +0200 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/multimedia/pulseaudio/FrugalBuild source/xmultimedia-extra/vlc/FrugalBuild diff --cc source/multimedia/pulseaudio/FrugalBuild index 48b19b2,8f1638b..8cd3acc --- a/source/multimedia/pulseaudio/FrugalBuild +++ b/source/multimedia/pulseaudio/FrugalBuild @@@ -3,13 -3,13 +3,13 @@@ pkgname=pulseaudio pkgver=0.9.22 --pkgrel=2 ++pkgrel=3 pkgdesc="PulseAudio is a sound server with an advanced plugin system" url="http://pulseaudio.org/"; depends=('speex' 'liboil' 'audiofile' 'libsndfile' 'libtool' 'libatomic_ops' 'libsamplerate' 'flac' 'glib2' \ 'alsa-lib' 'libtool' 'libasyncns' 'libcap>=2.19-2') -makedepends=('avahi' 'gnome-audio' 'bluez>=4.61' 'jack>=0.118.0' 'intltool' 'hal' 'gconf' \ +makedepends=('avahi' 'gnome-audio' 'bluez>=4.61' 'jack>=0.120.1' 'intltool' 'hal' 'gconf' \ - 'libsm' 'libx11' 'libice' 'libxtst' 'xproto' 'kbproto' 'xcb-util') + 'libsm' 'libx11' 'libice' 'libxtst' 'xproto' 'kbproto' 'xcb-util>=0.3.8') groups=('multimedia') archs=('i686' 'x86_64' 'ppc') up2date="Flasttar http://pulseaudio.org/wiki/DownloadPulseAudio#Sourcecode"; diff --cc source/xmultimedia-extra/vlc/FrugalBuild index 86dd502,46237c7..01e6c54 --- a/source/xmultimedia-extra/vlc/FrugalBuild +++ b/source/xmultimedia-extra/vlc/FrugalBuild @@@ -5,14 -5,14 +5,14 @@@ pkgname=vlc pkgver=1.1.9 pkgextraver= -pkgrel=3 +pkgrel=4 pkgdesc="The cross-platform media player and streaming server." url="http://www.videolan.org/vlc/"; -depends=('hal' 'e2fsprogs' 'libxpm>=3.5.8-1' 'libxdmcp' 'libshout' 'avahi' 'libdvbpsi>=0.1.7' 'libsmbclient' 'vcdimager>=0.7.24' 'libdvdnav>=4.1.3' \ +depends=('hal' 'e2fsprogs' 'libxdmcp' 'libshout' 'avahi' 'libdvbpsi>=0.1.7' 'libsmbclient' 'vcdimager>=0.7.24' 'libdvdnav>=4.1.3' \ 'alsa-lib' 'libgcrypt' 'lua' 'fribidi' 'freetype2' 'librsvg>=2.26.3' 'ffmpeg>=0.6' 'mesa>=7.7.1-1' \ 'libxvmc' 'aalib' 'libmad' 'libdca' 'mpeg2dec' 'twolame' 'sdlimage' 'libqtgui' 'taglib' 'libmusicbrainz' 'libid3tag' \ - 'sysfsutils' 'libmatroska' 'libmpcdec>=1.2.6-2' 'libmodplug' 'live' 'libupnp>=1.6.13' 'libcaca') + 'sysfsutils' 'libmatroska' 'libmpcdec>=1.2.6-2' 'libmodplug' 'live' 'libupnp>=1.6.13' 'libcaca' 'xcb-util>=0.3.8') -makedepends=('seamonkey' 'samba' 'cvs' 'xulrunner') +makedepends=('seamonkey' 'samba' 'cvs' 'xulrunner' 'libxpm>=3.5.8-1' 'jack>=O.120.1') _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome-scriptlet @@@ -116,16 -109,9 +116,15 @@@ build( ./compile || return 1 Fmakeinstall plugindir=/usr/lib/mozilla/plugins/ \ vlcintf_xptdir=/usr/lib/mozilla/plugins/ + + Fsplit $pkgname-plugin /usr/share/vlc/mozilla/* + Fsplit $pkgname-plugin /usr/lib/mozilla/plugins/libvlcplugin.* + + Fsplit $pkgname-jack /usr/lib/vlc/plugins/access/libaccess_jack_plugin.* + Fsplit $pkgname-jack /usr/lib/vlc/plugins/audio_output/libjack_plugin.* + Frm /usr/share/vlc/{,k,q,g,gnome-}vlc*.{png,xpm,ico} Fbuild_gnome_scriptlet -- } # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
