summaryrefslogtreecommitdiff
path: root/community/gmerlin
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-11-07 11:24:34 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-11-07 11:24:34 -0300
commita607668699d0ed030ac69ed31969dfa266439e38 (patch)
tree5b3e076437e78d8624668454afc1d82750d54c8a /community/gmerlin
parent6b015d22b5b59eddb6e8c40989017d8492ac912c (diff)
parenta4d309341dbcd3c28ee68e818c1d5ef54114adf8 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/libraw/PKGBUILD community-testing/virtualbox-modules/PKGBUILD community-testing/virtualbox-modules/virtualbox-modules.install community-testing/virtualbox/PKGBUILD community-testing/virtualbox/vboxdrv-reference.patch community-testing/virtualbox/virtualbox.install community-testing/vtk/PKGBUILD community/audex/PKGBUILD community/critter/PKGBUILD community/egoboo/PKGBUILD community/fcgiwrap/PKGBUILD community/hping/PKGBUILD community/libesmtp/PKGBUILD community/lockdev/PKGBUILD community/pidgin-musictracker/PKGBUILD community/pidgin-otr/PKGBUILD community/pylibacl/PKGBUILD community/pypanel/PKGBUILD community/rdiff-backup/PKGBUILD community/steghide/PKGBUILD community/tabbed/PKGBUILD community/transset-df/PKGBUILD community/wyrd/PKGBUILD core/openldap/PKGBUILD core/sqlite3/PKGBUILD extra/fltk/PKGBUILD extra/thunar/PKGBUILD extra/xfce4-clipman-plugin/PKGBUILD multilib/lib32-acl/PKGBUILD multilib/lib32-alsa-oss/PKGBUILD multilib/lib32-glib2/PKGBUILD multilib/lib32-libffi/PKGBUILD multilib/lib32-libmng/PKGBUILD multilib/lib32-libpciaccess/PKGBUILD multilib/lib32-libusb-compat/PKGBUILD multilib/lib32-libusb/PKGBUILD multilib/wine/PKGBUILD
Diffstat (limited to 'community/gmerlin')
-rw-r--r--community/gmerlin/PKGBUILD12
1 files changed, 6 insertions, 6 deletions
diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD
index e0c68877d..5b71ad824 100644
--- a/community/gmerlin/PKGBUILD
+++ b/community/gmerlin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 54036 2011-08-12 13:08:25Z lfleischer $
+# $Id: PKGBUILD 57805 2011-11-03 09:25:18Z spupykin $
# Maintainer: Mateusz Herych <heniekk@gmail.com>
pkgname=gmerlin
pkgver=1.0.0
-pkgrel=2
+pkgrel=3
pkgdesc="Multimedia architecture for Linux"
arch=('i686' 'x86_64' 'mips64el')
url="http://openmovieeditor.sourceforge.net/HomePage"
@@ -11,10 +11,10 @@ license=('GPL')
depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'mesa' 'libvisual' 'libcdio>=0.82' 'musicbrainz' 'mjpegtools')
makedepends=('alsa-lib' 'jack' 'libquicktime' 'pulseaudio' 'v4l-utils')
optdepends=('alsa-lib: for ALSA support'
- 'jack: for JACK support'
- 'libquicktime: for movie encoding'
- 'pulseaudio: for PulseAudio support'
- 'v4l-utils: for video conversion')
+ 'jack: for JACK support'
+ 'libquicktime: for movie encoding'
+ 'pulseaudio: for PulseAudio support'
+ 'v4l-utils: for video conversion')
source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
options=('!libtool')
md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6')