Author: kkallio
Date: Tue Jan 24 04:50:55 2012
New Revision: 31802
URL: https://nixos.org/websvn/nix/?rev=31802&sc=1
Log:
kdenlive builds for kde48 release candidate (and kde47).
Added:
nixpkgs/trunk/pkgs/applications/video/kdenlive/qtgl-header-change.patch
Deleted:
nixpkgs/trunk/pkgs/applications/video/kdenlive/kdenlive-newmlt.patch
Modified:
nixpkgs/trunk/pkgs/applications/video/kdenlive/default.nix
nixpkgs/trunk/pkgs/development/libraries/mlt/default.nix
Modified: nixpkgs/trunk/pkgs/applications/video/kdenlive/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/video/kdenlive/default.nix Tue Jan 24
01:54:49 2012 (r31801)
+++ nixpkgs/trunk/pkgs/applications/video/kdenlive/default.nix Tue Jan 24
04:50:55 2012 (r31802)
@@ -1,19 +1,19 @@
{ stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon, mlt,
gettext
-, qimageblitz, qjson, shared_mime_info, soprano }:
+, qimageblitz, qjson, shared_mime_info, soprano, pkgconfig }:
stdenv.mkDerivation rec {
name = "kdenlive-${version}";
- version = "0.8";
+ version = "0.8.2.1";
src = fetchurl {
url = "mirror://sourceforge/kdenlive/${name}.tar.gz";
- sha256 =
"18e3390c9eb7124af5cd43819c679374aec46dcaf1fc5cdb43918db470c1076f";
+ sha256 =
"a454a0659c9673453800df8382dfdbcb87acfb9b174712ffeb46b8304bf00717";
};
- patches = [ ./kdenlive-newmlt.patch ];
+ patches = [ ./qtgl-header-change.patch ];
buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext
- qimageblitz qjson shared_mime_info soprano ];
+ qimageblitz qjson shared_mime_info soprano pkgconfig ];
meta = {
description = "Free and open source video editor";
Added: nixpkgs/trunk/pkgs/applications/video/kdenlive/qtgl-header-change.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/video/kdenlive/qtgl-header-change.patch
Tue Jan 24 04:50:55 2012 (r31802)
@@ -0,0 +1,14 @@
+Correct for changed Qt opengl includes.
+Reference: http://www.kdenlive.org/mantis/view.php?id=2396
+
+diff -Naur kdenlive-0.8.2.1.orig//src/videoglwidget.cpp
kdenlive-0.8.2.1/src/videoglwidget.cpp
+--- kdenlive-0.8.2.1.orig//src/videoglwidget.cpp 2012-01-24
00:04:53.588121469 -0430
++++ kdenlive-0.8.2.1/src/videoglwidget.cpp 2012-01-24 00:05:32.817410938
-0430
+@@ -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
Modified: nixpkgs/trunk/pkgs/development/libraries/mlt/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/mlt/default.nix Tue Jan 24
01:54:49 2012 (r31801)
+++ nixpkgs/trunk/pkgs/development/libraries/mlt/default.nix Tue Jan 24
04:50:55 2012 (r31802)
@@ -2,11 +2,11 @@
libvorbis, sox}:
stdenv.mkDerivation {
- name = "mlt-0.7.4";
+ name = "mlt-0.7.6";
src = fetchurl {
- url = mirror://sourceforge/mlt/mlt-0.7.4.tar.gz;
- sha256 = "1xcrrd3xbz9hmahgl7xf610cm97chwpxwgcajkd10mpcxbqs08i0";
+ url = mirror://sourceforge/mlt/mlt-0.7.6.tar.gz;
+ sha256 =
"f8ea8590417ea2b5543a495f2edc30636d3931932deee7a4e0d8516e9c2b58ae";
};
buildInputs = [ qt4 SDL ffmpeg libdv libxml2 libsamplerate libvorbis sox ];
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
