Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump.git;a=commitdiff;h=5e826fcf1b7d05da9347be1dc823dcc0d6fe05f0
commit 5e826fcf1b7d05da9347be1dc823dcc0d6fe05f0 Merge: 0af07bd f3cb390 Author: Melko <[email protected]> Date: Thu Sep 6 20:45:02 2012 +0200 Merge remote-tracking branch 'current/master' Conflicts: source/e17-extra/emotion/FrugalBuild source/xapps-extra/qpdfview/FrugalBuild source/xlib/xine-lib/FrugalBuild source/xmultimedia-extra/dvd-slideshow/FrugalBuild source/xmultimedia-extra/opencv/FrugalBuild diff --cc source/e17-extra/emotion/FrugalBuild index eef75b0,a9230bc..7a97183 --- a/source/e17-extra/emotion/FrugalBuild +++ b/source/e17-extra/emotion/FrugalBuild @@@ -2,10 -2,10 +2,10 @@@ # Maintainer: jercel <[email protected]> pkgname=emotion - pkgver=1.0.1 + pkgver=1.7.0 pkgrel=2 pkgdesc="Video playback library for E17" - depends=('edje>=1.2.1' 'xine-lib>=1.2.1-1' 'gstreamer') -depends=('edje>=1.7.0' 'xine-lib' 'gstreamer') ++depends=('edje>=1.7.0' 'xine-lib>=1.2.1-1' 'gstreamer') makedepends=('subversion') groups=('e17-extra' 'e17-core') archs=('i686' 'x86_64') diff --cc source/xapps-extra/qpdfview/FrugalBuild index 7e17d4c,f348e26..f7e6911 --- a/source/xapps-extra/qpdfview/FrugalBuild +++ b/source/xapps-extra/qpdfview/FrugalBuild @@@ -2,10 -2,10 +2,10 @@@ # Maintainer: Slown <[email protected]> pkgname=qpdfview - pkgver=0.3.2 - pkgrel=2 + pkgver=0.3.3 + pkgrel=1 pkgdesc="qpdfview is a tabbed PDF viewer using the poppler library" -depends=('poppler-qt4' 'cups' 'libqtdbus') +depends=('poppler-qt4>=0.20.3' 'cups' 'libqtdbus') groups=('xapps-extra') archs=('i686' 'x86_64') Finclude launchpad diff --cc source/xlib/xine-lib/FrugalBuild index d52f3ac,a0386ce..7db23a7 --- a/source/xlib/xine-lib/FrugalBuild +++ b/source/xlib/xine-lib/FrugalBuild @@@ -10,12 -10,11 +10,12 @@@ _F_sourceforge_dirname="xine _F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://xinehq.de"; -depends=('libxml2>=2.7.8' 'imagemagick>=6.6.8_5-3' 'aalib' 'libmng' 'libtheora' 'libvorbis' \ +depends=('libxml2>=2.7.8' 'imagemagick>=6.7.9_2-1' 'aalib' 'libmng' 'libtheora' 'libvorbis' \ 'faad2>=2.7' 'flac>=1.1.4' 'libxvmc' 'libxv' \ 'speex' 'wavpack' 'libmpcdec' 'freetype2>=2.3.4' 'fontconfig' \ - 'mesa' 'libx11' 'libxxf86vm' 'ffmpeg>=0.10' 'x264>=20120213' 'libtool' \ + 'mesa' 'libx11' 'libxxf86vm' 'ffmpeg>=0.11.1' 'x264>=20120213' 'libtool' \ - 'libxvmc' 'libxinerama' 'libjpeg' 'libmpcdec' 'libtiff' 'libraw1394>=2.0.0-1') + 'libxvmc' 'libxinerama' 'libjpeg' 'libmpcdec' 'libtiff' 'libraw1394>=2.0.0-1' \ + 'libcdio' 'vcdimager') options=('scriptlet') makedepends=('esd>=0.2.41' 'sdl>=1.2.14-2' 'jack>=0.118.0') groups=('xlib') diff --cc source/xmultimedia-extra/dvd-slideshow/FrugalBuild index c35996a,51d2374..798dca7 --- a/source/xmultimedia-extra/dvd-slideshow/FrugalBuild +++ b/source/xmultimedia-extra/dvd-slideshow/FrugalBuild @@@ -8,7 -8,7 +8,7 @@@ pkgver=0.8.4_ _pkgver=${pkgver/_/-} pkgrel=3 pkgdesc="dvd-slideshow makes a DVD slideshow video with menus from a text file listing of pictures, effects, and audio tracks." - rodepends=('imagemagick>=6.7.9_2-1' 'libdvdread>=4.1.3' 'dvdauthor' 'ffmpeg>=0.10' 'lame' 'mjpegtools' 'sox>=14.3.2') -rodepends=('imagemagick>=6.6.8_5' 'libdvdread>=4.1.3' 'dvdauthor' 'ffmpeg>=0.11.1' 'lame' 'mjpegtools' 'sox>=14.3.2') ++rodepends=('imagemagick>=6.7.9_2-1' 'libdvdread>=4.1.3' 'dvdauthor' 'ffmpeg>=0.11.1' 'lame' 'mjpegtools' 'sox>=14.3.2') depends=() Finclude sourceforge up2date="$up2date | tr - _" diff --cc source/xmultimedia-extra/opencv/FrugalBuild index 9562925,db7c121..1c2aef0 --- a/source/xmultimedia-extra/opencv/FrugalBuild +++ b/source/xmultimedia-extra/opencv/FrugalBuild @@@ -6,8 -6,8 +6,8 @@@ pkgver=2.4. pkgrel=2 pkgdesc="Intel(R) Open Source Computer Vision Library" url="http://opencv.willowgarage.com"; - depends=('jasper' 'gst-plugins-base' 'openexr' \ + depends=('jasper' 'gst-plugins-base' 'openexr' 'ffmpeg>=0.11.1' \ - 'gtk+2' 'xine-lib>=1.1.20-2' 'libdc1394' 'v4l-utils') + 'gtk+2' 'xine-lib>=1.2.1-1' 'libdc1394' 'v4l-utils') makedepends=('doxygen' 'numpy' 'eigen') _F_sourceforge_ext=".tar.bz2" _F_sourceforge_name="OpenCV" @@@ -27,5 -28,5 +28,4 @@@ groups=('xmultimedia-extra' archs=('i686' 'x86_64') _F_cd_path="$_F_sourceforge_name-$pkgver" sha1sums=('96ff27b87e0f028d1d16201afebabec4e0c72367') - options=('noccache') - # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
