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

commit 65114d8cc25d5bc1732712ec9ca6db1080e66314
Merge: 8d84707 341de97
Author: kikadf <[email protected]>
Date:   Sat Feb 21 19:11:21 2015 +0100

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

Conflicts:
source/apps-extra/avidemux-cli/FrugalBuild
source/apps-extra/mplayer2/FrugalBuild
source/devel-extra/boost/FrugalBuild
source/kde-extra/kid3/FrugalBuild
source/kde/kdemultimedia/FrugalBuild
source/lib-extra/openmpi/FrugalBuild
source/multimedia/alsa-plugins/FrugalBuild
source/xapps-extra/aegisub/FrugalBuild
source/xapps-extra/blender/FrugalBuild
source/xapps-extra/guvcview/FrugalBuild
source/xapps-extra/lives/FrugalBuild
source/xapps/mplayer/FrugalBuild
source/xlib/mediastreamer/FrugalBuild
source/xlib/xine-lib/FrugalBuild
source/xmultimedia-extra/gejengel/FrugalBuild
source/xmultimedia-extra/qmmp/FrugalBuild
source/xmultimedia/ffmpeg/FrugalBuild
source/xmultimedia/vlc/FrugalBuild

diff --cc source/apps-extra/avidemux-cli/FrugalBuild
index 1206a7e,9150865..d3029ec
--- a/source/apps-extra/avidemux-cli/FrugalBuild
+++ b/source/apps-extra/avidemux-cli/FrugalBuild
@@@ -5,7 -5,7 +5,11 @@@ options+=('asneeded'

pkgname=avidemux-cli
pkgver=2.6.8
++<<<<<<< HEAD
+pkgrel=5
++=======
+ pkgrel=3
++>>>>>>> 341de97fb84524accfccd92fe4920d9c75511903
pkgdesc="A tool to edit video (filter/re-encode/split)"
depends=('glibc')
rodepends=("avidemux-core=$pkgver")
diff --cc source/apps-extra/mplayer2/FrugalBuild
index 5e95bff,4b1daca..4cac6c6
--- a/source/apps-extra/mplayer2/FrugalBuild
+++ b/source/apps-extra/mplayer2/FrugalBuild
@@@ -5,10 -5,10 +5,14 @@@ options+=('asneeded'

pkgname=mplayer2
pkgver=20130428.g6c87a98
++<<<<<<< HEAD
+pkgrel=12
++=======
+ pkgrel=10
++>>>>>>> 341de97fb84524accfccd92fe4920d9c75511903
pkgdesc="Mplayer2 is an advanced general-purpose video player. A fork of the 
original MPlayer project."
url="http://www.mplayer2.org/";
-depends=('aalib' 'cdparanoia' 'dejavu-ttf' 'faad2' 'ffmpeg>=1.0.6-6' 'jack' \
+depends=('aalib' 'cdparanoia' 'dejavu-ttf' 'faad2' 'ffmpeg>=2.5.1' 'jack' \
'ladspa_sdk' 'libass' 'libbluray' 'libbs2b' 'libcaca' 'libcdio' \
'libdca' 'libdv' 'libdvdnav>=5.0.1' 'libgl' 'liblirc' 'libmad' 'libmng' \
'libpulse>=6.0' 'libquvi>=0.9.2-2' 'libvdpau' 'libxinerama' 'libxscrnsaver' \
diff --cc source/devel-extra/boost/FrugalBuild
index 4e58ad1,99988e8..bc654b4
--- a/source/devel-extra/boost/FrugalBuild
+++ b/source/devel-extra/boost/FrugalBuild
@@@ -6,7 -6,7 +6,11 @@@

pkgname=boost
pkgver=1.50.0
++<<<<<<< HEAD
+pkgrel=5
++=======
+ pkgrel=4
++>>>>>>> 341de97fb84524accfccd92fe4920d9c75511903
pkgdesc="Boost header files , examples and tools"
_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge python
@@@ -22,7 -22,6 +26,10 @@@ source=(${source/-$pkgver/_${pkgver//./
_F_cd_path="${pkgname}_`echo $pkgver|tr . _`"
sha1sums=('ee06f89ed472cf369573f8acf9819fbc7173344e' \
'9cb9625c5c1c87505d5a75d16aaf2cc188e9a40c')
++<<<<<<< HEAD
+
++=======
++>>>>>>> 341de97fb84524accfccd92fe4920d9c75511903

subpkgs=("libboost" "libboost-static")
subdescs=('Boost libraries.' 'Boost libraries statically linked.')
diff --cc source/kde-extra/kid3/FrugalBuild
index 7b7dc33,c37e400..fe39d14
--- a/source/kde-extra/kid3/FrugalBuild
+++ b/source/kde-extra/kid3/FrugalBuild
@@@ -4,8 -4,8 +4,13 @@@
options+=('asneeded')

pkgname=kid3
++<<<<<<< HEAD
+pkgver=3.1.1
+pkgrel=3
++=======
+ pkgver=3.1.2
+ pkgrel=1
++>>>>>>> 341de97fb84524accfccd92fe4920d9c75511903
pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE."
Finclude kde sourceforge
depends=('phonon' 'id3lib' 'libtunepimp' 'attica>=0.4.0' 
"libnepomuk>=$_F_kde_ver" 'chromaprint>=0.7-2')
diff --cc source/kde/kdemultimedia/FrugalBuild
index 1d490d8,c19e6ab..4e2726d
--- a/source/kde/kdemultimedia/FrugalBuild
+++ b/source/kde/kdemultimedia/FrugalBuild
@@@ -4,7 -4,7 +4,11 @@@
options+=('asneeded')

pkgname=kdemultimedia
++<<<<<<< HEAD
+pkgrel=4
++=======
+ pkgrel=2
++>>>>>>> 341de97fb84524accfccd92fe4920d9c75511903
pkgdesc="KDE Multimedia Programs"
groups=('kde')
subpkgs=()
diff --cc source/lib-extra/openmpi/FrugalBuild
index c100744,a740bd3..6748467
--- a/source/lib-extra/openmpi/FrugalBuild
+++ b/source/lib-extra/openmpi/FrugalBuild
@@@ -5,7 -5,7 +5,11 @@@ options+=('asneeded'

pkgname=openmpi
pkgver=1.8.4
++<<<<<<< HEAD
+pkgrel=3
++=======
+ pkgrel=2
++>>>>>>> 341de97fb84524accfccd92fe4920d9c75511903
pkgdesc="A high-performance message passing library"
url="http://www.open-mpi.org/";
depends=('libstdc++')
diff --cc source/multimedia/alsa-plugins/FrugalBuild
index e35c400,9cec431..d7e8487
--- a/source/multimedia/alsa-plugins/FrugalBuild
+++ b/source/multimedia/alsa-plugins/FrugalBuild
@@@ -4,7 -4,7 +4,11 @@@

pkgname=alsa-plugins
pkgver=1.0.27
++<<<<<<< HEAD
+pkgrel=7
++=======
+ pkgrel=5
++>>>>>>> 341de97fb84524accfccd92fe4920d9c75511903
pkgdesc="Various plugins for ALSA."
url="http://www.alsa-project.org";
depends=("alsa-lib>=1.0.26")
@@@ -22,9 -22,9 +26,9 @@@ subname="alsa-plugin
subdesc="ALSA plugin for"
subprefix="/usr/lib/alsa-lib/libasound_module"

-Faddsubpkg "$subname-ffmpeg"     "$subdesc ffmpeg."     "ffmpeg>=1.0"   
"$pkgname=$pkgver" "" "" "" "" "" "" "" "" "xmultimedia"
+Faddsubpkg "$subname-ffmpeg"     "$subdesc ffmpeg."     "ffmpeg>=2.5.1"   
"$pkgname=$pkgver" "" "" "" "" "" "" "" "" "xmultimedia"
Faddsubpkg "$subname-jack"       "$subdesc jack."       "jack"          
"$pkgname=$pkgver"
- Faddsubpkg "$subname-pulseaudio" "$subdesc pulseaudio." "libpulse>=5.0"  
"$pkgname=$pkgver" "" "" "" "" "" "" "" "" "xmultimedia"
+ Faddsubpkg "$subname-pulseaudio" "$subdesc pulseaudio." 'libpulse>=6.0'
Faddsubpkg "$subname-speex"      "$subdesc speex."      "speex"         
"$pkgname=$pkgver"
Faddsubpkg "$subname-samplerate" "$subdesc samplerate." "libsamplerate" 
"$pkgname=$pkgver"

diff --cc source/xapps-extra/aegisub/FrugalBuild
index 140347e,48b920d..5e65a37
--- a/source/xapps-extra/aegisub/FrugalBuild
+++ b/source/xapps-extra/aegisub/FrugalBuild
@@@ -5,12 -5,12 +5,21 @@@ options+=('asneeded'

pkgname=aegisub
pkgver=3.1.3
++<<<<<<< HEAD
+pkgrel=6
+pkgdesc="Aegisub is a cross-platform subtitle editor."
+url="http://www.aegisub.org/";
+depends=('hunspell' 'libass' 'portaudio' 'libpulse>=6.0' 'intltool' 'libgl'\
+         'ffmpegsource>=2.20' 'wxwidget>=3.0.0-3' 'x264>=20120904' 
'libboost>=1.50-4')
+makedepends=('boost>=1.50.0-4')
++=======
+ pkgrel=3
+ pkgdesc="Aegisub is a cross-platform subtitle editor."
+ url="http://www.aegisub.org/";
+ depends=('hunspell' 'libass' 'portaudio' 'libpulse>=6.0' 'intltool' 'libgl'\
+          'ffmpegsource>=2.17-3' 'wxwidget>=3.0.0-3' 'x264>=20120904' 
'libboost')
+ makedepends=('boost>=1.50.0')
++>>>>>>> 341de97fb84524accfccd92fe4920d9c75511903
Fconfopts+=" --with-wx-config=/usr/lib/wx/config/gtk2-unicode-3.0 
--without-openal"
groups=('xapps-extra')
archs=('i686' 'x86_64')
diff --cc source/xapps-extra/blender/FrugalBuild
index 1e9a8d6,68846a9..76a7d0f
--- a/source/xapps-extra/blender/FrugalBuild
+++ b/source/xapps-extra/blender/FrugalBuild
@@@ -8,9 -8,9 +8,9 @@@
options+=('asneeded')

pkgname=blender
- pkgver=2.72
+ pkgver=2.73
pkgextraver=""
-pkgrel=1
+pkgrel=3
pkgdesc="A 3D modeling/rendering/animation/gaming application"
url="http://blender.org";
_F_gnome_iconcache="y"
@@@ -26,7 -26,7 +26,11 @@@ archs=('i686' 'x86_64'
makedepends=('cmake' 'ftgl' 'subversion' 'boost>=1.50.0')
up2date="Flasttar http://download.blender.org/source/";
source=(http://download.blender.org/source/$pkgname-$pkgver$pkgextraver.tar.gz)
++<<<<<<< HEAD
+sha1sums=('a5cf7b4a47ebaed46cd77e3a826e82ceaf9d6a59')
++=======
+ sha1sums=('f0de29ff6bc9e4be146ca2a47baec72adfaa8d83')
++>>>>>>> 341de97fb84524accfccd92fe4920d9c75511903
_F_cmake_confopts="-DCMAKE_INSTALL_PREFIX=$Fprefix \
-DCMAKE_BUILD_TYPE:STRING=Release \
-DWITH_INSTALL_PORTABLE:BOOL=OFF \
diff --cc source/xapps-extra/guvcview/FrugalBuild
index 6cc5e0b,d777fe7..01ec428
--- a/source/xapps-extra/guvcview/FrugalBuild
+++ b/source/xapps-extra/guvcview/FrugalBuild
@@@ -4,12 -4,12 +4,20 @@@
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>=1.0' \
+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-"
diff --cc source/xapps-extra/lives/FrugalBuild
index 1cefbae,394b7fc..7efdef8
--- a/source/xapps-extra/lives/FrugalBuild
+++ b/source/xapps-extra/lives/FrugalBuild
@@@ -7,7 -7,7 +7,11 @@@ options+=('asneeded'

pkgname=lives
pkgver=2.2.7
++<<<<<<< HEAD
+pkgrel=3
++=======
+ pkgrel=2
++>>>>>>> 341de97fb84524accfccd92fe4920d9c75511903
pkgdesc="LiVES is a powerful video system aimed at the digital video artist and 
VJ."
depends=('mplayer>=1.0rc3-1' 'imagemagick>=6.7.9_2-1' 'gtk+2>=2.20.0-2' 
'libjpeg>=8a' 'sox>=14.3.0' 'transcode>=1.1.7' \
'libavc1394' 'freetype2' 'libvisual-plugins' 'sdl' 'liboil' 'jack' 'procps' 
'libtirpc' 'libpulse>=6.0')
diff --cc source/xapps/mplayer/FrugalBuild
index 965b5a1,ab050cb..eb37ea8
--- a/source/xapps/mplayer/FrugalBuild
+++ b/source/xapps/mplayer/FrugalBuild
@@@ -10,7 -10,7 +10,11 @@@ USE_DEVEL=${USE_DEVEL:-"n"
pkgname=mplayer
_F_archive_name=MPlayer
pkgver=1.1.1
++<<<<<<< HEAD
+pkgrel=9
++=======
+ pkgrel=6
++>>>>>>> 341de97fb84524accfccd92fe4920d9c75511903
pkgdesc="The Movie Player"
url="http://www.mplayerhq.hu/";
depends=('a52dec' 'aalib' 'cdparanoia' 'codecs' 'faac' 'faad2' 'gsm' \
diff --cc source/xlib/mediastreamer/FrugalBuild
index 429a497,a305c7e..9fc999d
--- a/source/xlib/mediastreamer/FrugalBuild
+++ b/source/xlib/mediastreamer/FrugalBuild
@@@ -5,10 -5,10 +5,17 @@@ options+=('asneeded'

pkgname=mediastreamer
pkgver=2.10.0
++<<<<<<< HEAD
+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>=2.5.4' 'libxv' 'glew>=1.10.0' 'libupnp' 
'libpulse>=6.0')
++=======
+ pkgrel=1
+ 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>=1.10.0' 'libupnp' 
'libpulse>=6.0')
++>>>>>>> 341de97fb84524accfccd92fe4920d9c75511903
makedepends=('intltool' 'vim')
groups=('xlib')
archs=('i686' 'x86_64')
diff --cc source/xlib/xine-lib/FrugalBuild
index 8d8c7f9,033e0bc..60c58b4
--- a/source/xlib/xine-lib/FrugalBuild
+++ b/source/xlib/xine-lib/FrugalBuild
@@@ -4,13 -4,13 +4,21 @@@

pkgname=xine-lib
pkgver=1.2.6
++<<<<<<< HEAD
+pkgrel=4
++=======
+ pkgrel=2
++>>>>>>> 341de97fb84524accfccd92fe4920d9c75511903
pkgdesc="Xine multimedia playback engine libraries"
_F_sourceforge_dirname="xine"
_F_sourceforge_ext=".tar.xz"
Finclude sourceforge
url="http://xinehq.de";
++<<<<<<< HEAD
+depends=('ffmpeg>=2.5.4' 'libmpcdec' 'libxinerama' 'libpulse>=6.0' 'libdvdnav' 
\
++=======
+ depends=('ffmpeg>=1.0' 'libmpcdec' 'libxinerama' 'libpulse>=6.0' 'libdvdnav' \
++>>>>>>> 341de97fb84524accfccd92fe4920d9c75511903
'imagemagick>=6.8.9' 'libtool' 'jack' 'libmad' 'libxvmc' 'v4l-utils' \
'vcdimager' 'aalib' 'libglu' 'libvdpau' 'libmodplug' 'wavpack' \
'libbluray' 'libmng' 'libdca' 'speex')
diff --cc source/xmultimedia-extra/gejengel/FrugalBuild
index 810fea6,ab14d0d..5f2617a
--- a/source/xmultimedia-extra/gejengel/FrugalBuild
+++ b/source/xmultimedia-extra/gejengel/FrugalBuild
@@@ -7,9 -7,9 +7,13 @@@ options+=('asneeded'

pkgname=gejengel
pkgver=0.1.4
++<<<<<<< HEAD
+pkgrel=12
++=======
+ pkgrel=11
++>>>>>>> 341de97fb84524accfccd92fe4920d9c75511903
pkgdesc="An audio player which focuses on performance and simplicity"
-depends=('ffmpeg>=1.0' 'alsa-lib' 'sqlite3' 'taglib' 'lastfmlib' \
+depends=('ffmpeg>=2.5.4' 'alsa-lib' 'sqlite3' 'taglib' 'lastfmlib' \
'imagemagick>=6.8.9' 'libuuid' 'libtool' 'flac' 'libmad' 'libxdg-basedir' \
'gtkmm2' 'libpulse>=6.0' 'tcp_wrappers')
makedepends=('intltool')
diff --cc source/xmultimedia-extra/qmmp/FrugalBuild
index 582d5e3,5994901..99743d9
--- a/source/xmultimedia-extra/qmmp/FrugalBuild
+++ b/source/xmultimedia-extra/qmmp/FrugalBuild
@@@ -6,11 -6,11 +6,19 @@@ options+=('asneeded'

pkgname=qmmp
pkgver=0.8.3
++<<<<<<< HEAD
+pkgrel=3
+pkgdesc="A music player written in Qt that supports Winamp skins."
+url="http://qmmp.ylsoftware.com";
+depends=('libqtgui' 'libqtnetwork' 'libuuid' 'libsamplerate' \
+       'libqtdbus' 'ffmpeg>=2.5.1' 'taglib' 'libmpcdec' 'libmad' \
++=======
+ pkgrel=2
+ 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' \
++>>>>>>> 341de97fb84524accfccd92fe4920d9c75511903
'libcdio>=0.83' 'wavpack' 'libmms' 'curl' 'libpulse>=6.0')
makedepends=('qt4-linguist' 'libqt3support')
groups=('xmultimedia-extra')
diff --cc source/xmultimedia/ffmpeg/FrugalBuild
index e25a251,1b4d6ba..a9d06a6
--- a/source/xmultimedia/ffmpeg/FrugalBuild
+++ b/source/xmultimedia/ffmpeg/FrugalBuild
@@@ -2,17 -2,15 +2,26 @@@
# Maintainer: James Buren <[email protected]>
# Contributor: Cedrick Hannier alias Cedynamix <[email protected]>

+options+=('asneeded')
+
pkgname=ffmpeg
++<<<<<<< HEAD
+pkgver=2.5.4
+pkgrel=2
++=======
+ pkgver=1.0.6
+ pkgrel=8
++>>>>>>> 341de97fb84524accfccd92fe4920d9c75511903
pkgdesc="FFMpeg is a complete and free Internet live audio and video 
broadcasting solution for Linux/Unix."
url="http://ffmpeg.sourceforge.net/";
depends=('alsa-lib' 'a52dec' 'amrnb' 'amrwb' 'faac>=1.28' 'lame' 'libtheora' 
'libvorbis' \
-        'x264>=20131030.g1ca7bb9' 'xvidcore' 'libdc1394' 'imlib2' 
'sdl>=1.2.13-2' 'faad2>=2.7' 'gsm' \
+        'x264>=20141016' 'xvidcore' 'libdc1394' 'imlib2' 'sdl>=1.2.13-2' 
'faad2>=2.7' 'gsm' \
'opencore-amr>=0.1.2' 'libxfixes' 'libvpx' 'libva' 'libvdpau' 'libcrystalhd' \
++<<<<<<< HEAD
+        'speex' 'v4l-utils' 'rtmpdump' 'openjpeg' 'libpulse>=6.0' 'x265')
++=======
+         'speex' 'v4l-utils' 'rtmpdump' 'openjpeg' 'libpulse>=6.0')
++>>>>>>> 341de97fb84524accfccd92fe4920d9c75511903
makedepends=('freetype2' 'yasm')
groups=('xmultimedia')
archs=('i686' 'x86_64')
diff --cc source/xmultimedia/vlc/FrugalBuild
index 8e81ac3,d1f13fb..51fc0be
--- a/source/xmultimedia/vlc/FrugalBuild
+++ b/source/xmultimedia/vlc/FrugalBuild
@@@ -8,9 -8,9 +8,13 @@@ options+=('asneeded'
: ${USE_DEVEL="n"}

pkgname=vlc
-pkgver=2.0.9
+pkgver=2.1.5
pkgextraver=
++<<<<<<< HEAD
+pkgrel=3
++=======
+ pkgrel=6
++>>>>>>> 341de97fb84524accfccd92fe4920d9c75511903
pkgdesc="The cross-platform media player and streaming server."
url="http://www.videolan.org/vlc/";
depends=('e2fsprogs' 'libxpm>=3.5.8-1' 'libxdmcp' 'libshout' 'avahi' \
@@@ -116,7 -112,7 +120,11 @@@ subarchs=("${subarchs[@]}" 'i686 x86_64
subpkgs=("${subpkgs[@]}" 'vlc-pulseaudio')
subdescs=("${subdescs[@]}" 'vlc plugin for pulseaudio')
subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver")
++<<<<<<< HEAD
+subdepends=("${subdepends[@]}" "libpulse>=6.0")
++=======
+ subdepends=("${subdepends[@]}" 'libpulse>=6.0')
++>>>>>>> 341de97fb84524accfccd92fe4920d9c75511903
subgroups=("${subgroups[@]}" 'xmultimedia-extra')
subarchs=("${subarchs[@]}" 'i686 x86_64')
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to