diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 08:45:19 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 08:45:19 +0000 |
commit | 2ced89b7f14a817d0507747efa22bedaec10e423 (patch) | |
tree | 84a7421d43e02c590b7828d0ab34f1b8e2b1fab5 /pkgs/applications/video | |
parent | b1762c6b49f7fb6469a71e1b59b1f96fcc4dfef2 (diff) | |
parent | ecea8900e7f7278b58d7604aa8a3d5a7ba65bc8f (diff) | |
download | nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar.gz nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar.bz2 nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar.lz nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar.xz nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar.zst nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.zip |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31846
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/MPlayer/default.nix | 14 | ||||
-rw-r--r-- | pkgs/applications/video/kdenlive/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/video/kdenlive/kdenlive-newmlt.patch | 70 | ||||
-rw-r--r-- | pkgs/applications/video/kdenlive/qtgl-header-change.patch | 14 | ||||
-rw-r--r-- | pkgs/applications/video/vlc/default.nix | 18 |
5 files changed, 34 insertions, 92 deletions
diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index 348a5e7e3237..0566b4bbe291 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -61,19 +61,19 @@ let license = "unfree"; }; } else null; - + ffmpegGit = fetchgit { url = "git://git.videolan.org/ffmpeg.git"; - rev = "80d156d"; - sha256 = "6d0124621491b8adc5f1bfb426ab137efc72dab99a89835aa3c30b970cb14004"; + rev = "9e53f62be1a171eaf9620958c225d42cf5142a30"; + sha256 = "be0ef2a394c82a0eee0be66bc0b943d37efb90f74ce1030aa89606109434c943"; }; - - mplayerRev = "33472"; + + mplayerRev = "34586"; in stdenv.mkDerivation rec { - name = "mplayer-r${mplayerRev}"; + name = "mplayer-${mplayerRev}"; src = fetchsvn { # Old kind of URL: @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { url = "svn://svn.mplayerhq.hu/mplayer/trunk"; rev = "${mplayerRev}"; - sha256 = "01b0b5x6li8c2m2mam7mabmk02npvprcwrim00a51sdlvqxh309v"; + sha256 = "5688add3256b5de8e0410194232aaaeb01531bb507459ffe4f07e69cb2d81bd7"; }; prePatch = '' diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index 6db6e630d325..c133c90f8e92 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -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"; diff --git a/pkgs/applications/video/kdenlive/kdenlive-newmlt.patch b/pkgs/applications/video/kdenlive/kdenlive-newmlt.patch deleted file mode 100644 index b3a772a7ac6e..000000000000 --- a/pkgs/applications/video/kdenlive/kdenlive-newmlt.patch +++ /dev/null @@ -1,70 +0,0 @@ -From http://kdenlive.org/forum/cant-start-kdnlive-sdl-module-missing-mlt - -Kdenlive 0.8 tries to detect mlt by reading from stderr, but between -mlt 0.7.2 and 0.7.4 mlt this has changed from stderr to stdout. -=================================================================== ---- kdenlive-0.8/src.orig/wizard.cpp 2011-04-26 21:44:22.000000000 +0200 -+++ kdenlive-0.8/src/wizard.cpp 2011-07-21 18:22:18.470831892 +0200 -@@ -214,7 +214,7 @@ - button(QWizard::NextButton)->setEnabled(false); - } else { - checkProcess.waitForFinished(); -- QByteArray result = checkProcess.readAllStandardError(); -+ QByteArray result = checkProcess.readAllStandardOutput(); - - // Check MLT avformat module - QTreeWidgetItem *avformatItem = new QTreeWidgetItem(m_mltCheck.programList, QStringList() << QString() << i18n("Avformat module (FFmpeg)")); -@@ -246,7 +246,7 @@ - kDebug() << "// Error querying MLT's version"; - } else { - checkProcess.waitForFinished(); -- mltVersion = checkProcess.readAllStandardError(); -+ mltVersion = checkProcess.readAllStandardOutput(); - mltVersion = mltVersion.section('\n', 0, 0).simplified(); - mltVersion = mltVersion.section(' ', -1).simplified(); - version = 1000 * mltVersion.section('.', 0, 0).toInt() + 100 * mltVersion.section('.', 1, 1).toInt() + mltVersion.section('.', 2, 2).toInt(); -@@ -275,7 +275,7 @@ - kDebug() << "// Error parsing MLT's avformat codecs"; - } else { - checkProcess2.waitForFinished(); -- QByteArray codecList = checkProcess2.readAllStandardError(); -+ QByteArray codecList = checkProcess2.readAllStandardOutput(); - QString acodecList(codecList); - QStringList result; - QStringList alist = acodecList.split('\n', QString::SkipEmptyParts); -@@ -292,7 +292,7 @@ - kDebug() << "// Error parsing MLT's avformat codecs"; - } else { - checkProcess2.waitForFinished(); -- QByteArray codecList = checkProcess2.readAllStandardError(); -+ QByteArray codecList = checkProcess2.readAllStandardOutput(); - QString vcodecList(codecList); - QStringList result; - QStringList vlist = vcodecList.split('\n', QString::SkipEmptyParts); -@@ -309,7 +309,7 @@ - kDebug() << "// Error parsing MLT's avformat codecs"; - } else { - checkProcess2.waitForFinished(); -- QByteArray codecList = checkProcess2.readAllStandardError(); -+ QByteArray codecList = checkProcess2.readAllStandardOutput(); - QString vcodecList(codecList); - QStringList result; - QStringList vlist = vcodecList.split('\n', QString::SkipEmptyParts); -@@ -606,7 +606,7 @@ - - checkProcess.waitForFinished(); - -- QByteArray result = checkProcess.readAllStandardError(); -+ QByteArray result = checkProcess.readAllStandardOutput(); - if (!result.contains("- avformat")) errorMessage.append(i18n("MLT's avformat (FFMPEG) module not found. Please check your FFMPEG and MLT install. Kdenlive will not work until this issue is fixed.") + "\n");*/ - - QProcess checkProcess2; -@@ -616,7 +616,7 @@ - - checkProcess2.waitForFinished(); - -- QByteArray result = checkProcess2.readAllStandardError(); -+ QByteArray result = checkProcess2.readAllStandardOutput(); - if (!result.contains("sdl") || !result.contains("sdl_preview")) errorMessage.append(i18n("MLT's SDL module not found. Please check your MLT install. Kdenlive will not work until this issue is fixed.") + '\n'); - - if (!errorMessage.isEmpty()) { diff --git a/pkgs/applications/video/kdenlive/qtgl-header-change.patch b/pkgs/applications/video/kdenlive/qtgl-header-change.patch new file mode 100644 index 000000000000..91d9f13737bd --- /dev/null +++ b/pkgs/applications/video/kdenlive/qtgl-header-change.patch @@ -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 diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 471a4c4a76f7..8e11dd6068d6 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl, xlibs, libdvdnav , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib -, pkgconfig, dbus, hal, fribidi, qt4, freefont_ttf -, libvorbis, libtheora, speex, lua, libgcrypt, libupnp +, pkgconfig, dbus, fribidi, qt4, freefont_ttf +, libvorbis, libtheora, speex, lua5, libgcrypt, libupnp , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg , mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz @@ -10,29 +10,27 @@ stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "1.1.11"; + version = "1.1.13"; patchPhase = ''sed -e "s@/bin/echo@echo@g" -i configure''; src = fetchurl { - url = "mirror://sourceforge/vlc/${name}.tar.bz2"; - sha256 = "1jz1yklvh5apy2ygqwnyq61mhg09h0fn32hdygxfsaxq12z609b8"; + url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.bz2"; + sha256 = "1h93jdx89dfgxlnw66lfcdk9kisadm689zanvgkzbfb3si2frv83"; }; buildInputs = [ perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread - pkgconfig dbus hal fribidi qt4 libvorbis libtheora speex lua libgcrypt + dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib libkate libtiger libv4l samba liboggz libass libdvbpsi ] ++ (with xlibs; [ xlibs.xlibs libXv libXvMC libXpm xcbutil libva ]); + buildNativeInputs = [ pkgconfig ]; + configureFlags = [ "--enable-alsa" - "--disable-glx" - "--disable-remoteosd" - "--disable-dbus" - "--disable-dbus-control" "--with-kde-solid=$out/share/apps/solid/actions" ]; |