Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77testing.git;a=commitdiff;h=7164c0c417d192abd35e78758ed0873042c56407
commit 7164c0c417d192abd35e78758ed0873042c56407 Merge: 0819f0e 289dd75 Author: DeX77 <[email protected]> Date: Sun Apr 27 13:18:34 2014 +0200 Merge ../current Conflicts: source/games-extra/stepmania/FrugalBuild source/xapps-extra/gogglesmm/FrugalBuild source/xlib-extra/lightspark/FrugalBuild source/xlib/mediastreamer/FrugalBuild source/xmultimedia-extra/qmmp/FrugalBuild diff --cc source/games-extra/stepmania/FrugalBuild index 65a4174,67b734f..1ac8b5b --- a/source/games-extra/stepmania/FrugalBuild +++ b/source/games-extra/stepmania/FrugalBuild @@@ -5,13 -5,13 +5,13 @@@ options+=('asneeded' pkgname=stepmania pkgver=5.0b2a --pkgrel=2 ++pkgrel=3 pkgdesc="A free dance and rhythm game (was previously sm-ssc)" url="http://www.stepmania.com/"; license="MIT" archs=('i686' 'x86_64') groups=('games-extra') - depends=('libmad' 'mesa' 'glew' 'ffmpeg>=1.0.6-7' 'libpng' 'gtk+2') -depends=('libmad' 'mesa' 'glew>=1.10.0' 'ffmpeg' 'libpng' 'gtk+2') ++depends=('libmad' 'mesa' 'glew>=1.10.0' 'ffmpeg>=1.0.6-7' 'libpng' 'gtk+2') _F_cd_path="stepmania-tip" sha1sums=('65f77fc4d921c7c7e707f9ec9dcd8a1f84be70a6' \ '1d37f305cb4317da75ad80bd757425f8e05049f9') diff --cc source/xapps-extra/gogglesmm/FrugalBuild index d3366d7,3cd9e71..c604eb0 --- a/source/xapps-extra/gogglesmm/FrugalBuild +++ b/source/xapps-extra/gogglesmm/FrugalBuild @@@ -6,11 -6,11 +6,12 @@@ options+=('asneeded' pkgname=gogglesmm pkgver=0.13.1 - pkgrel=3 -pkgrel=2 ++pkgrel=4 pkgdesc="Music Manager and Player" url="http://gogglesmm.github.io/"; -depends=('fox>=1.7.46' 'libxext' 'libxrender' 'libglu' 'xine-lib>=1.2.2-2' \ - 'dbus' 'taglib>=1.9' 'sqlite3' 'libxfixes' 'curl' 'libxi' 'glew>=1.10.0') +depends=('fox>=1.7.46' 'libxext' 'libxrender' 'libglu' 'xine-lib>=1.2.2-5' \ - 'dbus' 'taglib>=1.9' 'sqlite3' 'libxfixes' 'curl' 'libxi' 'glew' 'libpulse>=5.0') ++ 'dbus' 'taglib>=1.9' 'sqlite3' 'libxfixes' 'curl' 'libxi' 'glew>=1.10.0' \ ++ 'libpulse>=5.0') up2date="Fwcat https://github.com/gogglesmm/gogglesmm/releases/latest | grep -o "archive/.*.tar.gz" | egrep -o "[0-9.]+[0-9]"" Finclude gnome-scriptlet groups=('xapps-extra') diff --cc source/xlib-extra/lightspark/FrugalBuild index e6fcf2a,9ad2b97..47fa0cc --- a/source/xlib-extra/lightspark/FrugalBuild +++ b/source/xlib-extra/lightspark/FrugalBuild @@@ -5,9 -5,9 +5,10 @@@ options+=('asneeded' pkgname=lightspark pkgver=0.7.2.1 --pkgrel=2 ++pkgrel=3 pkgdesc='High performance flash player designed from scratch to be efficient on modern hardware' - depends=('libboost>=1.50.0' 'ffmpeg>=1.0' 'curl' 'gtk+2-libs' 'ftgl' 'glew>=1.9.0' 'libxml++' 'gdk-pixbuf2' 'pulseaudio>=5.0' 'dbus' 'rtmpdump') -depends=('libboost>=1.50.0' 'ffmpeg>=1.0' 'curl' 'gtk+2-libs' 'ftgl' 'glew>=1.10.0' 'libxml++' 'gdk-pixbuf2' 'pulseaudio>=2.1' 'dbus' 'rtmpdump') ++depends=('libboost>=1.50.0' 'ffmpeg>=1.0' 'curl' 'gtk+2-libs' 'ftgl' 'glew>=1.10.0' 'libxml++' \ ++ 'gdk-pixbuf2' 'pulseaudio>=5.0' 'dbus' 'rtmpdump') makedepends=('nasm' 'xulrunner' 'glproto' 'boost>=1.50.0' 'llvm>=3.4') _F_gnome_iconcache="y" _F_gnome_desktop="y" diff --cc source/xlib/mediastreamer/FrugalBuild index df904a5,f2039c8..5946202 --- a/source/xlib/mediastreamer/FrugalBuild +++ b/source/xlib/mediastreamer/FrugalBuild @@@ -5,10 -5,10 +5,10 @@@ options+=('asneeded' pkgname=mediastreamer pkgver=2.9.0 --pkgrel=2 ++pkgrel=3 pkgdesc="Library written in C that allows you to create and run audio and video streams." url="http://www.linphone.org/"; - depends=('ortp>=0.22.0' 'ffmpeg' 'libxv' 'glew' 'libupnp' 'libpulse>=5.0') -depends=('ortp>=0.22.0' 'ffmpeg' 'libxv' 'glew>=1.10.0' 'libupnp') ++depends=('ortp>=0.22.0' 'ffmpeg' 'libxv' 'glew>=1.10.0' 'libupnp' 'libpulse>=5.0') makedepends=('intltool' 'vim') groups=('xlib') archs=('i686' 'x86_64') diff --cc source/xmultimedia-extra/qmmp/FrugalBuild index 9eb6c3b,7ed11d3..4803b82 --- a/source/xmultimedia-extra/qmmp/FrugalBuild +++ b/source/xmultimedia-extra/qmmp/FrugalBuild @@@ -5,13 -5,11 +5,13 @@@ options+=('asneeded') pkgname=qmmp - pkgver=0.7.5 - pkgrel=2 + pkgver=0.7.6 + pkgrel=1 pkgdesc="A music player written in Qt that supports Winamp skins." url="http://qmmp.ylsoftware.com"; -depends=('libqtgui' 'libqtnetwork' 'libuuid' 'libsamplerate' 'libqtdbus' 'ffmpeg>=1.0' 'taglib' 'libmpcdec' 'libmad' 'libcdio>=0.83' 'wavpack' 'libmms' 'curl') +depends=('libqtgui' 'libqtnetwork' 'libuuid' 'libsamplerate' \ + 'libqtdbus' 'ffmpeg>=1.0' 'taglib' 'libmpcdec' 'libmad' \ + 'libcdio>=0.83' 'wavpack' 'libmms' 'curl' 'libpulse>=5.0') makedepends=('qt4-linguist' 'libqt3support') groups=('xmultimedia-extra') archs=('i686' 'x86_64') diff --cc source/xmultimedia-extra/xbmc/FrugalBuild index fa9d78d,fe4f090..9f33960 --- a/source/xmultimedia-extra/xbmc/FrugalBuild +++ b/source/xmultimedia-extra/xbmc/FrugalBuild @@@ -6,9 -6,9 +6,9 @@@ pkgver=12. pkgrel=3 pkgdesc="A software media player and entertainment hub for digital media." url="http://www.xbmc.org"; -depends=('libboost>=1.50.0' 'libxrandr' 'libva' 'avahi' 'libpulse' 'libmicrohttpd>=0.9.34' \ +depends=('libboost>=1.50.0' 'libxrandr' 'libva' 'avahi' 'libpulse>=5.0' 'libmicrohttpd>=0.9.34' \ 'sdlimage' 'sdl_mixer' 'jasper' 'yajl' 'libssh>=0.6.3' 'libmysqlclient' \ - 'lzo' 'glew>=1.9.0' 'fontconfig' 'fribidi' 'libcdio' 'libsamplerate' \ + 'lzo' 'glew>=1.10.0' 'fontconfig' 'fribidi' 'libcdio' 'libsamplerate' \ 'libass' 'mpeg2dec' 'libmad' 'libmodplug' 'curl' 'libbluray' \ 'rtmpdump' 'libvdpau' 'libcrystalhd' 'bluez' 'tinyxml' 'taglib>=1.8' \ 'lame') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
