diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-20 20:05:58 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-20 20:05:58 -0300 |
| commit | 1872d2123d241e0a3ef01a50fcdc4596b056bcf4 (patch) | |
| tree | a9ba894779ea4dc5df5f6d5a9bceae99f4c44e06 /community/gmerlin | |
| parent | 5a05be089c68617c86c9c555e63f2b0314451ebf (diff) | |
| parent | 005a14f92ef5d35e4c47d970cb7e69367a835958 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/balsa/PKGBUILD
community/bitcoin/PKGBUILD
community/jack2/PKGBUILD
community/kadu/PKGBUILD
community/oss/PKGBUILD
core/sudo/PKGBUILD
extra/djvulibre/PKGBUILD
extra/gtk2/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/samba/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/glib-networking/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
libre/kdenetwork-kopete-libre/PKGBUILD
multilib/jack2-multilib/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-sdl/PKGBUILD
multilib/wine/PKGBUILD
multilib/zsnes/PKGBUILD
testing/btrfs-progs/PKGBUILD
testing/dnsutils/PKGBUILD
testing/man-db/PKGBUILD
testing/postgresql/PKGBUILD
testing/postgresql/postgresql.install
testing/postgresql/postgresql.service
testing/procps-ng/PKGBUILD
testing/procps-ng/sysctl.conf
testing/sudo/PKGBUILD
testing/xf86-video-nouveau/PKGBUILD
testing/xf86-video-nouveau/xf86-video-nouveau.install
Diffstat (limited to 'community/gmerlin')
| -rw-r--r-- | community/gmerlin/PKGBUILD | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD index 9cdd89b5a..6256f16eb 100644 --- a/community/gmerlin/PKGBUILD +++ b/community/gmerlin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66294 2012-02-23 13:44:07Z allan $ +# $Id: PKGBUILD 76142 2012-09-12 05:13:57Z ebelanger $ # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=gmerlin -pkgver=1.0.0 -pkgrel=6 +pkgver=1.2.0 +pkgrel=1 pkgdesc="Multimedia architecture for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://openmovieeditor.sourceforge.net/HomePage" @@ -17,17 +17,14 @@ optdepends=('alsa-lib: for ALSA support' 'v4l-utils: for video conversion') options=('!libtool' '!makeflags') install=gmerlin.install -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz - libpng.patch) -md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6' - 'c262023434246705296d97bc7337a212') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('2f2a0880e738e71486f04c929ba067f4') build() { cd "$srcdir/$pkgname-$pkgver" rm -rf cpuinfo.sh - patch -p1 -i "$srcdir/libpng.patch" ./configure --prefix=/usr --without-doxygen sed -i 's|LIBS = -lgavl|LIBS = -lgavl -ldl -lpthread -lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lxml2 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lX11|' {lib,tests,apps/*}/Makefile sed -i 's|ln -sf $(DESTDIR)$(pkgdatadir)|ln -sf $(pkgdatadir)|' icons/Makefile |