diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-15 11:36:24 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-15 11:36:24 -0300 |
commit | 7caeeae33fd491dbea5044168bbc50197963118c (patch) | |
tree | 2ceec96ef9e1897d921d05f2fc5c5dda2ad893e9 /community/kdenlive | |
parent | 2f39e56def6dadf0746b6e96e756518f1af9396b (diff) | |
parent | 3d151dfc8e08b65c2c1d4b5e8081562d56ee7d41 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ginac/PKGBUILD
community/gnash/PKGBUILD
community/haskell-tar/PKGBUILD
community/libdlna/PKGBUILD
community/mplayer2/PKGBUILD
community/musescore/PKGBUILD
community/open-vm-tools-modules/PKGBUILD
community/paraview/PKGBUILD
community/picard/PKGBUILD
core/idnkit/PKGBUILD
core/ifenslave/PKGBUILD
extra/audacious/PKGBUILD
extra/avidemux/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/graphite/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/k3b/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/koffice/PKGBUILD
extra/kradio/PKGBUILD
extra/libreoffice/PKGBUILD
extra/mediastreamer/PKGBUILD
extra/poppler/PKGBUILD
extra/vlc/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
Diffstat (limited to 'community/kdenlive')
-rw-r--r-- | community/kdenlive/PKGBUILD | 19 | ||||
-rw-r--r-- | community/kdenlive/glu.patch | 11 |
2 files changed, 21 insertions, 9 deletions
diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index 27b2c395c..c08d91af7 100644 --- a/community/kdenlive/PKGBUILD +++ b/community/kdenlive/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55304 2011-09-09 16:08:23Z spupykin $ +# $Id: PKGBUILD 58466 2011-11-12 20:42:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zuf <kontakt.zuf@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=kdenlive -pkgver=0.8svn20110722 +pkgver=0.8.2 pkgrel=2 pkgdesc="A non-linear video editor for Linux" arch=('i686' 'x86_64' 'mips64el') @@ -12,20 +12,21 @@ url="http://www.kdenlive.org/" license=('GPL') depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz' 'libqzeitgeist') -makedepends=('automoc4' 'cmake' 'gettext') +makedepends=('automoc4' 'cmake' 'gettext' 'mesa') install=kdenlive.install options=('docs') -#source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -source=("http://arch.p5n.pp.ru/~sergej/dl/kdenlive-${pkgver}.tar.bz2") -md5sums=('390fcbce02274ee99b2a6d6a234bef0c') +source=("http://downloads.sourceforge.net/kdenlive/kdenlive-${pkgver}.tar.gz" + glu.patch) +md5sums=('0836842f489f6142cee101842ac76c54' + 'fd6c5fe46419ee505c562363d41f6e9f') build() { export LDFLAGS="$LDFLAGS -lX11" - cd "${srcdir}" - mkdir build || true + mkdir -p build cd build - cmake ../${pkgname}-${pkgver} \ + (cd ../kdenlive-${pkgver} && patch -p1 <$srcdir/glu.patch) + cmake ../kdenlive-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_INSTALL_DIR=/usr/lib \ diff --git a/community/kdenlive/glu.patch b/community/kdenlive/glu.patch new file mode 100644 index 000000000..a4c2f21fb --- /dev/null +++ b/community/kdenlive/glu.patch @@ -0,0 +1,11 @@ +diff -wbBur kdenlive-0.8.2/src/videoglwidget.cpp kdenlive-0.8.2.my/src/videoglwidget.cpp +--- kdenlive-0.8.2/src/videoglwidget.cpp 2011-10-31 22:46:21.000000000 +0400 ++++ kdenlive-0.8.2.my/src/videoglwidget.cpp 2011-11-02 14:54:10.000000000 +0400 +@@ -2,6 +2,7 @@ + #include <QtGui> + #include <QtOpenGL> + #include "videoglwidget.h" ++#include <GL/glu.h> + + #ifndef GL_TEXTURE_RECTANGLE_EXT + #define GL_TEXTURE_RECTANGLE_EXT GL_TEXTURE_RECTANGLE_NV |