Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=f8324dba7c43a5d438e8036f7d11447e860ff669

commit f8324dba7c43a5d438e8036f7d11447e860ff669
Merge: f0c60e8 87068f5
Author: kikadf <[email protected]>
Date:   Sun Dec 28 15:50:29 2014 +0100

Merge branch 'master' of 
git.frugalware.org:/home/ftp/pub/frugalware/frugalware-current

Conflicts:
source/lib-extra/openmpi/FrugalBuild
source/network-extra/baresip/FrugalBuild

diff --cc source/lib-extra/openmpi/FrugalBuild
index e356ace,9a96ad7..86360cb
--- a/source/lib-extra/openmpi/FrugalBuild
+++ b/source/lib-extra/openmpi/FrugalBuild
@@@ -4,8 -4,8 +4,13 @@@
options+=('asneeded')

pkgname=openmpi
++<<<<<<< HEAD
+pkgver=1.8.3
+pkgrel=2
++=======
+ pkgver=1.8.4
+ pkgrel=1
++>>>>>>> 87068f53930747fdfaab382f2149309f6c90e5bd
pkgdesc="A high-performance message passing library"
url="http://www.open-mpi.org/";
depends=('libstdc++')
diff --cc source/network-extra/baresip/FrugalBuild
index 57b67cd,4b364df..3407910
--- a/source/network-extra/baresip/FrugalBuild
+++ b/source/network-extra/baresip/FrugalBuild
@@@ -4,11 -4,11 +4,16 @@@
options+=('asneeded')

pkgname=baresip
++<<<<<<< HEAD
+pkgver=0.4.11
+pkgrel=2
++=======
+ pkgver=0.4.12
+ pkgrel=1
++>>>>>>> 87068f53930747fdfaab382f2149309f6c90e5bd
pkgdesc="A portable and modular SIP User-Agent with audio and video support"
url="http://www.creytiv.com";
-depends=('librem>=0.4.3' 'gstreamer' 'ffmpeg>=1.0.6-6' 'mpg123' 'celt' 
'portaudio' \
+depends=('librem>=0.4.3' 'gstreamer' 'ffmpeg>=2.5.1' 'mpg123' 'celt' 
'portaudio' \
'util-linux' 'v4l-utils')
groups=('network-extra')
archs=('i686' 'x86_64')
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to