4 files changed, 68 insertions, 0 deletions
diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix
new file mode 100644
index 00000000000..70dcad49c97
--- /dev/null
+++ b/pkgs/applications/video/avxsynth/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, ffmpeg, autoconf, automake, libtool, pkgconfig, log4cpp
+, pango, cairo, python, libjpeg, ffms
+, enableQt ? true, qt4}:
+
+stdenv.mkDerivation rec {
+  name = "avxsynth-4.0-e153e672bf";
+
+  src = fetchurl {
+    url = https://github.com/avxsynth/avxsynth/tarball/e153e672bf;
+    name = "${name}.tar.gz";
+    sha256 = "16l2ld8k1nfsms6jd9d9r4l247xxbncsak66w87icr20yzyhs14s";
+  };
+
+  buildInputs = [ ffmpeg autoconf automake libtool pkgconfig log4cpp pango cairo python
+    libjpeg ffms ]
+    ++ stdenv.lib.optional enableQt qt4;
+
+  preConfigure = "autoreconf -vfi";
+
+  meta = {
+    homepage = https://github.com/avxsynth/avxsynth/wiki;
+    license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix
new file mode 100644
index 00000000000..38371ec276d
--- /dev/null
+++ b/pkgs/development/libraries/ffms/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, zlib, ffmpeg, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "ffms-2.17";
+  
+  src = fetchurl {
+    url = http://ffmpegsource.googlecode.com/files/ffms-2.17-src.tar.bz2;
+    sha256 = "0gb42hrwnldz3zjlk4llx85dvxysxlfrdf5yy3fay8r8k1vpl7wr";
+  };
+
+  NIX_CFLAGS_COMPILE = "-fPIC";
+
+  buildInputs = [ zlib ffmpeg pkgconfig ];
+
+  meta = {
+    homepage = http://code.google.com/p/ffmpegsource/;
+    description = "Libav/ffmpeg based source library for easy frame accurate access";
+    license = "MIT";
+  };
+}
diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix
new file mode 100644
index 00000000000..2b255307558
--- /dev/null
+++ b/pkgs/development/libraries/log4cpp/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "log4cpp-1.1";
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/log4cpp/${name}.tar.gz";
+    sha256 = "1d386ws9v6f9bxma4dh5m6nzr4k2rv5q96xl5bp5synlmghd2ny2";
+  };
+
+  meta = {
+    homepage = http://log4cpp.sourceforge.net/;
+    description = "A logging framework for C++ patterned after Apache log4j";
+    license = "LGPLv2.1+";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 379c55982fa..3b385ffac2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3657,6 +3657,8 @@ let
     vpxSupport = !stdenv.isMips;
   };
 
+  ffms = callPackage ../development/libraries/ffms { };
+
   fftw = callPackage ../development/libraries/fftw {
     singlePrecision = false;
   };
@@ -4576,6 +4578,8 @@ let
    guile = guile_1_8;
   };
 
+  log4cpp = callPackage ../development/libraries/log4cpp { };
+
   log4cxx = callPackage ../development/libraries/log4cxx { };
 
   log4cplus = callPackage ../development/libraries/log4cplus { };
@@ -6593,6 +6597,8 @@ let
     eigen = eigen2;
   };
 
+  avxsynth = callPackage ../applications/video/avxsynth { };
+
   awesome = callPackage ../applications/window-managers/awesome {
     lua = lua5;
     cairo = cairo.override { xcbSupport = true; };