[Frugalware-git] imgrebuild: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

Miklos Vajna vmiklos at frugalware.org
Sun May 9 13:56:34 CEST 2010


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=539ca72defed6f2f02664070486f9dc5a92702b3

commit 539ca72defed6f2f02664070486f9dc5a92702b3
Merge: 0d10abd a3b00e6
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Sun May 9 13:53:42 2010 +0200

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

* 'master' of git.frugalware.org:/pub/frugalware/frugalware-current: (204 commits)

Conflicts:
source/gnome-extra/denemo/FrugalBuild
source/gnome-extra/specimen/FrugalBuild
source/x11-extra/nvidia/FrugalBuild
source/xapps-extra/frama-c/FrugalBuild
source/xapps/mplayer/FrugalBuild
source/xlib/libquicktime/FrugalBuild
source/xmultimedia-extra/hydrogen/FrugalBuild

diff --cc source/gnome-extra/denemo/FrugalBuild
index 2068b16,bb981c6..ab9a4a0
--- a/source/gnome-extra/denemo/FrugalBuild
+++ b/source/gnome-extra/denemo/FrugalBuild
@@@ -3,10 -3,10 +3,10 @@@

pkgname=denemo
pkgver=0.8.14
- pkgrel=2
-pkgrel=3
++pkgrel=4
pkgdesc="GTK+ graphical music notation editor."
url="http://savannah.gnu.org/projects/$pkgname"
- depends=('gtk+2>=2.20.0-2' 'libxau>=1.0.4' 'libxdmcp' 'freetype2' 'guile' 'aubio' 'portaudio' 'libxml2' 'libxdamage' 'libxext' 'gtksourceview' 'fluidsynth')
-depends=('gtk+2>=2.16.2-2' 'libxau>=1.0.4' 'libxdmcp' 'freetype2' 'guile' 'aubio' 'portaudio' 'libxml2' 'libxdamage' 'libxext' 'gtksourceview' 'fluidsynth' 'jack>=0.118.0')
++depends=('gtk+2>=2.20.0-2' 'libxau>=1.0.4' 'libxdmcp' 'freetype2' 'guile' 'aubio' 'portaudio' 'libxml2' 'libxdamage' 'libxext' 'gtksourceview' 'fluidsynth' 'jack>=0.118.0')
options=('scriptlet')
groups=('gnome-extra')
archs=('i686' 'x86_64')
diff --cc source/gnome-extra/specimen/FrugalBuild
index 5c52e42,1c24cfa..d1c15fd
--- a/source/gnome-extra/specimen/FrugalBuild
+++ b/source/gnome-extra/specimen/FrugalBuild
@@@ -4,10 -4,10 +4,10 @@@
pkgname=specimen
pkgver=0.5.2_rc3
realpkgver=0.5.2-rc3
- pkgrel=2
-pkgrel=3
++pkgrel=4
pkgdesc="An open source, MIDI controllable audio sampler"
url="http://zhevny.com/specimen/"
- depends=('gtk+2>=2.20.0-2' 'libxml2' 'libgnomecanvas' 'libsndfile' 'libsamplerate' 'jack' 'phat')
-depends=('gtk+2' 'libxml2' 'libgnomecanvas' 'libsndfile' 'libsamplerate' 'jack>=0.118.0' 'phat')
++depends=('gtk+2>=2.20.0-2' 'libxml2' 'libgnomecanvas' 'libsndfile' 'libsamplerate' 'jack>=0.118.0' 'phat')
options=('scriptlet')
groups=('gnome-extra')
archs=('i686' 'x86_64')
diff --cc source/x11-extra/nvidia/FrugalBuild
index a330cfe,8aad07c..4c168f0
--- a/source/x11-extra/nvidia/FrugalBuild
+++ b/source/x11-extra/nvidia/FrugalBuild
@@@ -2,8 -2,8 +2,8 @@@
# Maintainer: Michel Hermier <hermier at frugalware.org>

pkgname=nvidia
-pkgver=195.36.15
-pkgrel=5
+pkgver=195.36.24
- pkgrel=1
++pkgrel=2
archs=('i686' 'x86_64' '!ppc')
Finclude nvidia
case "$_F_nvidia_arch" in
diff --cc source/xapps-extra/frama-c/FrugalBuild
index 9a2ae0c,cb8b7ca..25e6806
--- a/source/xapps-extra/frama-c/FrugalBuild
+++ b/source/xapps-extra/frama-c/FrugalBuild
@@@ -4,11 -4,12 +4,12 @@@
pkgname=frama-c
pkgver=20100401
rel_id="Boron"
--pkgrel=2
++pkgrel=3
pkgdesc="Static analyser for C code"
url="http://frama-c.com"
source=("$url/download/$pkgname-$rel_id-$pkgver.tar.gz")
- depends=('gtk+2' 'ocaml>=3.11.1' 'lablgtk2>=2.12.0' 'gtksourceview>=2.10.1' 'lablgtk2-gtksourceview1>=2.12.0' 'lablgtk2-gnomecanvas>=2.12.0' 'apron>=0.9.10')
-depends=('gtksourceview' 'libgnomecanvas')
++depends=('gtksourceview>=2.10.1' 'libgnomecanvas')
+ makedepends=('lablgtk2-gtksourceview2' 'lablgtk2-gnomecanvas' 'apron>=0.9.10' 'ocamlgraph' 'ocamlgraph-viewer')
options=('scriptlet')
groups=('xapps-extra')
archs=('i686' 'x86_64')
diff --cc source/xapps/mplayer/FrugalBuild
index c6eb8ee,eea37a0..d0232e1
--- a/source/xapps/mplayer/FrugalBuild
+++ b/source/xapps/mplayer/FrugalBuild
@@@ -9,16 -9,14 +9,14 @@@ _F_archive_name=MPlaye
pkgver=1.0rc2
Fuse $USE_DEVEL && pkgver=1.0rc2.29962
pkgextraver=.29962
- pkgrel=18
-pkgrel=17
++pkgrel=19
Fuse $USE_DEVEL && pkgrel=1
pkgdesc="The Movie Player"
url="http://www.mplayerhq.hu/"
- depends=('libstdc++' 'live' 'lzo' \
- 	 'gtk+2>=2.20.0-2' 'libgl' 'libsm' 'libxinerama' 'libxv' 'libxxf86dga' 'ncurses' 'sdl' \
- 	 'libdv' 'libtheora' 'vidix' 'x264>=20090416' 'xvidcore' \
- 	 'libgif' 'libjpeg>=8a' 'libpng>=1.4.1' \
- 	 'aalib' 'cdparanoia' 'lame' 'libmad' 'openal>=1.12.854' 'opencore-amr' \
- 	 'fontconfig' 'dejavu-ttf' )
+ depends=('mesa' 'fontconfig' 'libstdc++' 'libdv' 'termcap' 'libjpeg' 'libmad' \
+ 	 'libungif' 'xvidcore' 'libpng' 'sdl' 'lame' 'libxv' 'lzo' 'libsm' \
-	 'libxinerama' 'libtheora' 'cdparanoia' 'libxxf86dga' 'live' 'gtk+2>=2.20.0' \
++	 'libxinerama' 'libtheora' 'cdparanoia' 'libxxf86dga' 'live' 'gtk+2>=2.20.0-2' \
+ 	 'x264>=20100414' 'dejavu-ttf' 'openal>=1.12.854' 'vidix' 'opencore-amr' 'aalib')
[ "$CARCH" == "i686" ] && depends=(${depends[@]} 'codecs')
[ "$CARCH" != "ppc" ] && depends=(${depends[@]} 'liblirc')
groups=('xapps')
diff --cc source/xlib-extra/lablgtk2/FrugalBuild
index 4e5568b,21c7e28..a08cfe2
--- a/source/xlib-extra/lablgtk2/FrugalBuild
+++ b/source/xlib-extra/lablgtk2/FrugalBuild
@@@ -3,12 -3,13 +3,13 @@@

pkgname=lablgtk2
pkgver=2.14.0
--pkgrel=3
++pkgrel=4
pkgdesc="An Objective Caml Interface to gtk2+"
url="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html"
-depends=('gtk+2>=2.16.4-1' 'ocaml>=3.11.1-1' 'libxdamage')
+depends=('gtk+2>=2.20.0-2' 'ocaml>=3.11.1-1' 'libxdamage')
makedepends=('librsvg>=2.26.0-2' 'libglade' 'libgnomecanvas' 'gnome-panel' \
- 	'libgnomeui>=2.24.1-2' 'gtkspell' 'gtksourceview1' 'libgnomeprint')
+ 	'libgnomeui>=2.24.1-2' 'gtkspell' 'gtksourceview1' 'libgnomeprint' \
+ 	'gtksourceview')
groups=('xlib-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
diff --cc source/xlib/libquicktime/FrugalBuild
index 7a1ac8e,0de5b70..3baa6e6
--- a/source/xlib/libquicktime/FrugalBuild
+++ b/source/xlib/libquicktime/FrugalBuild
@@@ -3,9 -3,9 +3,9 @@@

pkgname=libquicktime
pkgver=1.1.5
--pkgrel=2
++pkgrel=3
pkgdesc="A library based on quicktime4linux with extensions"
- depends=('lame' 'gtk+2>=2.20.0-2' 'alsa-lib' 'libdv' 'libvorbis' 'libavc1394' 'faac>=1.25' 'faad2>=2.7' 'ffmpeg>=20090403' 'libraw1394>=2.0.0')
-depends=('lame' 'gtk+2>=2.18.6' 'alsa-lib' 'libdv' 'libvorbis' 'libavc1394' 'faac>=1.25' 'faad2>=2.7' 'ffmpeg>=20100416' 'libraw1394>=2.0.0')
++depends=('lame' 'gtk+2>=2.20.0-2' 'alsa-lib' 'libdv' 'libvorbis' 'libavc1394' 'faac>=1.25' 'faad2>=2.7' 'ffmpeg>=20100416' 'libraw1394>=2.0.0')
makedepends=('cvs' 'doxygen')
groups=('xlib')
archs=('x86_64' 'i686' 'ppc')
diff --cc source/xmultimedia-extra/hydrogen/FrugalBuild
index 3e8d7b4,68758bd..a26e2b1
--- a/source/xmultimedia-extra/hydrogen/FrugalBuild
+++ b/source/xmultimedia-extra/hydrogen/FrugalBuild
@@@ -2,13 -2,12 +2,13 @@@
# Maintainer: crazy <crazy at frugalware.org>

pkgname=hydrogen
- pkgver=0.9.4
- pkgrel=1
+ pkgver=0.9.4.1
-pkgrel=1
++pkgrel=2
pkgdesc="Hydrogen is an advanced drum machine."
- depends=('liblrdf>=0.4.0-3' 'openssl' 'libstdc++' 'jack' 'libqtgui>=4.6.2-3' 'libqtnetwork>=4.6.2-3' 'libqtxml>=4.6.2-3' 'libsndfile' 'libtar' 'libxml2')
-depends=('liblrdf>=0.4.0-7' 'libsndfile' 'jack>=0.118.0' 'qt4' 'libtar' 'zlib' 'libarchive')
-makedepends=('scons')
-Finclude sourceforge
++depends=('liblrdf>=0.4.0-3' 'openssl' 'libstdc++' 'jack>=0.118.0' 'libqtgui>=4.6.2-3' 'libqtnetwork>=4.6.2-3' 'libqtxml>=4.6.2-3' 'libsndfile' 'libtar' 'libxml2')
+makedepends=('qt4-linguist' 'scons' 'subversion')
+_F_kde_defaults=0
+Finclude sourceforge kde
url="http://www.hydrogen-music.org/"
groups=('xmultimedia-extra')
archs=('i686' 'x86_64')
@@@ -17,7 -17,6 +17,6 @@@ sha1sums=('e988710f82af858c0c688cb1d1e1
build()
{
Fcd
-	scons prefix='/usr' || Fdie
-	scons install DESTDIR=$Fdestdir prefix='/usr' || Fdie
+	QTDIR=/usr scons prefix=$Fdestdir/usr || Fdie
+	QTDIR=/usr scons prefix=$Fdestdir/usr install || Fdie
}
-


More information about the Frugalware-git mailing list