Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=ab9a778648a994ecc2808eef51275b32989ce925
commit ab9a778648a994ecc2808eef51275b32989ce925 Author: kikadf <[email protected]> Date: Thu Feb 26 13:17:58 2015 +0100 Fix conflict in guvcview diff --git a/source/xapps-extra/guvcview/FrugalBuild b/source/xapps-extra/guvcview/FrugalBuild index 01ec428..6cc5e0b 100644 --- a/source/xapps-extra/guvcview/FrugalBuild +++ b/source/xapps-extra/guvcview/FrugalBuild @@ -4,20 +4,12 @@ options+=('asneeded') pkgname=guvcview -<<<<<<< HEAD pkgver=2.0.1 -======= -pkgver=1.7.3 ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 pkgrel=3 pkgdesc="A video viewer and capturer for the linux uvc driver" depends=('gtk+3' 'libxau>=1.0.4-1' 'libxdmcp' 'portaudio' 'twolame' 'ffmpeg>=2.5.4' \ 'libxext>=1.0.5-3' 'libraw1394' 'libogg' 'libxdamage>=1.1.1-3' 'libxml2>=2.7.8' 'libv4l' \ -<<<<<<< HEAD 'systemd>=188' 'libpulse>=6.0' 'sdl2' 'gsl') -======= - 'systemd>=188' 'libpulse>=6.0') ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 makedepends=('intltool') options=('scriptlet') _F_sourceforge_sep="-src-" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
