* Teletext support for zapping.

svn path=/nixpkgs/trunk/; revision=719

pkgs/applications/video/zapping/builder.sh

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 buildinputs="$pkgconfig $perl $python $x11 $libgnomeui \
-  $libglade $scrollkeeper $esound $gettext"
+  $libglade $scrollkeeper $esound $gettext $zvbi $libjpeg $libpng"
 . $stdenv/setup || exit 1
 
 # !!! hack; this is because $linuxHeaders/config.h includes some

pkgs/applications/video/zapping/default.nix

@@ -1,12 +1,19 @@
-{ stdenv, fetchurl, pkgconfig, perl, python, x11, libgnomeui
-, libglade, scrollkeeper, esound, gettext }:
+{ teletextSupport ? true
+, jpegSupport ? true
+, pngSupport ? true
+, stdenv, fetchurl, pkgconfig, perl, python, x11, libgnomeui
+, libglade, scrollkeeper, esound, gettext
+, zvbi ? null, libjpeg ? null, libpng ? null }:
 
 assert !isNull pkgconfig && !isNull perl && !isNull python &&
   !isNull x11 && !isNull libgnomeui && !isNull libglade &&
   !isNull scrollkeeper && !isNull esound && !isNull gettext;
 
-# !!! zvbi library
-# !!! arts, jpeg, png, rte
+assert teletextSupport -> !isNull zvbi && zvbi.pngSupport
+  && pngSupport && zvbi.libpng == libpng;
+
+assert jpegSupport -> !isNull libjpeg;
+assert pngSupport -> !isNull libpng;
 
 derivation {
   name = "zapping-0.7cvs6";
@@ -18,6 +25,10 @@ derivation {
     md5 = "cdedc0088c70f4520c37066ec05cb996";
   };
 
+  teletextSupport = teletextSupport;
+  jpegSupport = jpegSupport;
+  pngSupport = pngSupport;
+
   stdenv = stdenv;
   pkgconfig = pkgconfig;
   perl = perl;
@@ -28,4 +39,7 @@ derivation {
   scrollkeeper = scrollkeeper;
   esound = esound;
   gettext = gettext;
+  zvbi = if teletextSupport then zvbi else null;
+  libjpeg = if jpegSupport then libjpeg else null;
+  libpng = if pngSupport then libpng else null;
 }