diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-02 18:00:18 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-02 18:02:35 +0100 |
| commit | bae1d2619114abb36d636273329ed6d3ae157055 (patch) | |
| tree | 9a9c785204458547c0fc6b6b10357abd379a0fdd /community/gmerlin | |
| parent | f3a6a3f3b315c15fe04bb44a40020c3842c8ef21 (diff) | |
| parent | 98aa0004e23472ee63753fded33cd55d8b942f36 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/canorus/PKGBUILD
community/celt-0.7/PKGBUILD
community/djview4/PKGBUILD
community/erlang-sdl/PKGBUILD
community/erlang/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/glitz/PKGBUILD
community/gmerlin/PKGBUILD
community/gmic/PKGBUILD
community/goldendict/PKGBUILD
community/google-gadgets/PKGBUILD
community/highlight/PKGBUILD
community/jack2/PKGBUILD
community/kvirc/PKGBUILD
community/launchy/PKGBUILD
community/mplayer2/PKGBUILD
community/mumble/PKGBUILD
community/mupdf/PKGBUILD
community/projectm/PKGBUILD
community/psimedia/PKGBUILD
community/pyqt3/PKGBUILD
community/qps/PKGBUILD
community/qstardict/PKGBUILD
community/qsynergy/PKGBUILD
community/synergy/PKGBUILD
community/units/PKGBUILD
community/yagf/PKGBUILD
extra/automoc4/PKGBUILD
extra/avahi/PKGBUILD
extra/avidemux/PKGBUILD
extra/bzflag/PKGBUILD
extra/cagibi/PKGBUILD
extra/cairo/PKGBUILD
extra/calligra/PKGBUILD
extra/cmake/PKGBUILD
extra/dssi/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/glu/PKGBUILD
extra/graphviz/PKGBUILD
extra/hylafax/PKGBUILD
extra/kdesdk/PKGBUILD
extra/libbluedevil/PKGBUILD
extra/liblastfm/PKGBUILD
extra/liborigin2/PKGBUILD
extra/libpng/PKGBUILD
extra/libqzeitgeist/PKGBUILD
extra/libx11/PKGBUILD
extra/mesa/PKGBUILD
extra/mpg123/PKGBUILD
extra/mtr/PKGBUILD
extra/mysql/PKGBUILD
extra/netpbm/PKGBUILD
extra/nspr/PKGBUILD
extra/polkit-qt/PKGBUILD
extra/poppler/PKGBUILD
extra/prison/PKGBUILD
extra/pyqt/PKGBUILD
extra/qimageblitz/PKGBUILD
extra/qscintilla/PKGBUILD
extra/qsynth/PKGBUILD
extra/qt-assistant-compat/PKGBUILD
extra/qt-gstreamer/PKGBUILD
extra/qt/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/qwt/PKGBUILD
extra/samba/PKGBUILD
extra/sane/PKGBUILD
extra/smplayer/PKGBUILD
extra/soprano/PKGBUILD
extra/texmacs/PKGBUILD
extra/tomcat-native/PKGBUILD
extra/transmission/PKGBUILD
extra/wpa_supplicant_gui/PKGBUILD
libre/lame-libre/PKGBUILD
libre/linux-libre/PKGBUILD
libre/mesa-demos-libre/PKGBUILD
Diffstat (limited to 'community/gmerlin')
| -rw-r--r-- | community/gmerlin/PKGBUILD | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD index bc20723c3..add431133 100644 --- a/community/gmerlin/PKGBUILD +++ b/community/gmerlin/PKGBUILD @@ -1,5 +1,5 @@ -# $Id: PKGBUILD 82329 2013-01-15 11:35:00Z allan $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> +# $Id: PKGBUILD 85325 2013-03-01 02:43:05Z cinelli $ +# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> pkgname=gmerlin pkgver=1.2.0 @@ -19,14 +19,17 @@ optdepends=('alsa-lib: for ALSA support' options=('!libtool') install=gmerlin.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz - cdio-api-fixes.patch) + cdio-api-fixes.patch + gmerlin-texi.patch) md5sums=('2f2a0880e738e71486f04c929ba067f4' - 'd0e407f01435394a0cfe04acb3c1a4cc') + 'd0e407f01435394a0cfe04acb3c1a4cc' + '33a4dce06b7560fc839055c5a872435f') build() { cd "$srcdir/$pkgname-$pkgver" patch -Np1 -i "$srcdir/cdio-api-fixes.patch" + patch -Np1 -i "$srcdir/gmerlin-texi.patch" rm -rf cpuinfo.sh |