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

commit 4b2ca47054d86a045c1cc6e184b38f17712ebd5d
Merge: be902c4 a8474c7
Author: kikadf <[email protected]>
Date:   Mon Feb 16 18:35:20 2015 +0100

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

Conflicts:
source/kde-extra/nepomuk-core/FrugalBuild
source/x11/libvdpau-va-gl/FrugalBuild

diff --cc source/kde-extra/nepomuk-core/FrugalBuild
index 0046d82,3191db8..607c778
--- a/source/kde-extra/nepomuk-core/FrugalBuild
+++ b/source/kde-extra/nepomuk-core/FrugalBuild
@@@ -4,12 -4,12 +4,16 @@@
options+=('asneeded')

pkgname=nepomuk-core
++<<<<<<< HEAD:source/kde/nepomuk-core/FrugalBuild
+pkgrel=2
++=======
+ pkgrel=3
++>>>>>>> 
a8474c7897452e426b5072833ad074fc00b5f590:source/kde-extra/nepomuk-core/FrugalBuild
pkgdesc="Central nepomuk services."
- groups=('kde')
+ groups=('kde-extra')
archs=('i686' 'x86_64')
Finclude kde
- depends=("${depends[@]}" "libkutils>=${_F_kde_ver}" "baloo>=$_F_kde_ver")
+ depends=("${depends[@]}" "libkutils>=${_F_kde_ver}" "baloo>=$_F_kde_ver" 
'soprano-backend-virtuoso')
makedepends=("${makedepends[@]}" 'doxygen' 'soprano-backend-redland' 
'soprano-backend-virtuoso' \
"libqttest>=$_F_kde_qtver" "kdelibs-compiletime>=$_F_kde_ver" 
"kdelibs>=$_F_kde_ver")

diff --cc source/x11/libvdpau-va-gl/FrugalBuild
index 9d377a0,e1c3aa1..889aa08
--- a/source/x11/libvdpau-va-gl/FrugalBuild
+++ b/source/x11/libvdpau-va-gl/FrugalBuild
@@@ -2,10 -2,10 +2,14 @@@
# Maintainer: James Buren <[email protected]>

pkgname=libvdpau-va-gl
++<<<<<<< HEAD
+pkgver=v0.3.4
++=======
+ pkgver=0.3.4
++>>>>>>> a8474c7897452e426b5072833ad074fc00b5f590
pkgrel=2
pkgdesc="VDPAU backend which converts VDPAU calls to OpenGL and VAAPI."
-depends=('libvdpau>=0.8' 'libva>=1.3.1' 'libgl' 'libglu' 'glib2' 'ffmpeg')
+depends=('libvdpau>=0.8' 'libva>=1.3.1' 'libgl' 'libglu' 'glib2' 
'ffmpeg>=2.5.1')
groups=('x11')
archs=('i686' 'x86_64')
_F_github_author=i-rinat
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to