merge #7299: gstreamer: Darwin fixes

Solved trivial merge conflicts.

pkgs/applications/audio/cdparanoia/default.nix

@@ -2,14 +2,25 @@
 
 stdenv.mkDerivation rec {
   name = "cdparanoia-III-10.2";
-  
+
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/cdparanoia/${name}.src.tgz";
     sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80";
   };
 
   preConfigure = "unset CC";
-  
+
+  patches = stdenv.lib.optionals stdenv.isDarwin [ 
+    (fetchurl {
+      url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch";
+      sha1 = "c86e573f51e6d58d5f349b22802a7a7eeece9fcd";
+    })
+    (fetchurl {
+      url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/patch-paranoia_paranoia.c.10.4.diff";
+      sha1 = "d7dc121374df3b82e82adf544df7bf1eec377bdb";
+    })
+  ];
+
   meta = {
     homepage = http://xiph.org/paranoia;
     description = "A tool and library for reading digital audio from CDs";

pkgs/development/libraries/gstreamer/bad/default.nix

@@ -5,11 +5,14 @@
 , openjpeg, libopus, librsvg
 , wildmidi, fluidsynth, libvdpau, wayland
 , libwebp, xvidcore, gnutls
-, mesa
+, mesa, libintlOrEmpty
 }:
 
 assert faacSupport -> faac != null;
 
+let
+  inherit (stdenv.lib) optional optionalString;
+in
 stdenv.mkDerivation rec {
   name = "gst-plugins-bad-1.4.5";
 
@@ -23,7 +26,7 @@ stdenv.mkDerivation rec {
       a real live maintainer, or some actual wide use.
     '';
     license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ iyzsong ];
   };
 
@@ -39,7 +42,15 @@ stdenv.mkDerivation rec {
     faad2 libass libkate libmms
     libmodplug mpeg2dec mpg123
     openjpeg libopus librsvg
-    wildmidi fluidsynth libvdpau wayland
+    fluidsynth libvdpau
     libwebp xvidcore gnutls mesa
-  ] ++ stdenv.lib.optional faacSupport faac;
+  ]
+    ++ libintlOrEmpty
+    ++ optional faacSupport faac
+    ++ optional stdenv.isLinux wayland
+    # wildmidi requires apple's OpenAL
+    # TODO: package apple's OpenAL, fix wildmidi, include on Darwin
+    ++ optional (!stdenv.isDarwin) wildmidi;
+
+  LDFLAGS = optionalString stdenv.isDarwin "-lintl";
 }

pkgs/development/libraries/gstreamer/base/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, python, gstreamer, gobjectIntrospection
 , orc, alsaLib, libXv, pango, libtheora
-, cdparanoia, libvisual
+, cdparanoia, libvisual, libintlOrEmpty
 }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     description = "Base plugins and helper libraries";
     homepage = "http://gstreamer.freedesktop.org";
     license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ iyzsong ];
   };
 
@@ -24,12 +24,23 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    orc alsaLib libXv pango libtheora
+    orc libXv pango libtheora cdparanoia
-    cdparanoia libvisual
+  ]
-  ];
+  ++ libintlOrEmpty
+  ++ stdenv.lib.optional stdenv.isLinux alsaLib
+  ++ stdenv.lib.optional (!stdenv.isDarwin) libvisual;
 
   propagatedBuildInputs = [ gstreamer ];
 
+  configureFlags = if stdenv.isDarwin then [ 
+    # Does not currently build on Darwin
+    "--disable-libvisual"
+    # Undefined symbols _cdda_identify and _cdda_identify_scsi in cdparanoia
+    "--disable-cdparanoia"
+  ] else null;
+
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
+
   enableParallelBuilding = true;
 }
 

pkgs/development/libraries/gstreamer/core/default.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     description = "Open source multimedia framework";
     homepage = "http://gstreamer.freedesktop.org";
     license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ iyzsong ];
   };
 

pkgs/development/libraries/gstreamer/ges/default.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     description = "Library for creation of audio/video non-linear editors";
     homepage    = "http://gstreamer.freedesktop.org";
     license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ iyzsong ];
   };
 

pkgs/development/libraries/gstreamer/gnonlin/default.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
       applications. It introduces the concept of a timeline.
     '';
     license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ iyzsong ];
   };
 

pkgs/development/libraries/gstreamer/good/default.nix

@@ -3,9 +3,12 @@
 , libv4l, libdv, libavc1394, libiec61883
 , libvpx, speex, flac, taglib
 , cairo, gdk_pixbuf, aalib, libcaca
-, libsoup, pulseaudio
+, libsoup, pulseaudio, libintlOrEmpty
 }:
 
+let
+  inherit (stdenv.lib) optionals optionalString;
+in
 stdenv.mkDerivation rec {
   name = "gst-plugins-good-1.4.5";
 
@@ -18,7 +21,7 @@ stdenv.mkDerivation rec {
       code, LGPL or LGPL-compatible for the supporting library).
     '';
     license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ iyzsong ];
   };
 
@@ -31,9 +34,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gst-plugins-base orc bzip2
-    libv4l libdv libavc1394 libiec61883
+    libdv libvpx speex flac taglib
-    libvpx speex flac taglib
     cairo gdk_pixbuf aalib libcaca
-    libsoup pulseaudio
+    libsoup
-  ];
+  ]
+  ++ libintlOrEmpty
+  ++ optionals stdenv.isLinux [ libv4l pulseaudio libavc1394 libiec61883 ];
+
+  LDFLAGS = optionalString stdenv.isDarwin "-lintl";
 }

pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix

@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo
 , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
 , libiec61883, libavc1394, taglib, pulseaudio, gdk_pixbuf, orc
-, glib, gstreamer, bzip2, libsoup
+, glib, gstreamer, bzip2, libsoup, libintlOrEmpty
 , # Whether to build no plugins that have external dependencies
   # (except the PulseAudio plugin).
   minimalDeps ? false
@@ -23,11 +23,15 @@ stdenv.mkDerivation rec {
   configureFlags = "--enable-experimental --disable-oss";
 
   buildInputs =
-    [ pkgconfig glib gstreamer gst_plugins_base pulseaudio ]
+    [ pkgconfig glib gstreamer gst_plugins_base ]
+    ++ stdenv.lib.optional stdenv.isLinux [ pulseaudio ]
+    ++ libintlOrEmpty
     ++ stdenv.lib.optionals (!minimalDeps)
       [ aalib libcaca cairo libdv flac libjpeg libpng speex
         taglib bzip2 libvpx gdk_pixbuf orc libsoup ];
 
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
+
   enableParallelBuilding = true;
 
   meta = {
@@ -36,7 +40,7 @@ stdenv.mkDerivation rec {
     description = "`Good' plug-ins for GStreamer";
 
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
 
     license = stdenv.lib.licenses.lgpl2Plus;
   };

pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix

@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
-, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc }:
+, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
   name = "gst-plugins-ugly-0.10.19";
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc ];
+    [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc ] ++ libintlOrEmpty;
+
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
 
   enableParallelBuilding = true;
 
@@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
     description = "‘Ugly’ (potentially patent-encumbered) plug-ins for GStreamer";
 
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
 
     license = stdenv.lib.licenses.lgpl2Plus;
   };

pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch

@@ -0,0 +1,14 @@
+diff --git a/gst/gstdatetime.c b/gst/gstdatetime.c
+index 60f709f..cdc7e75 100644
+--- a/gst/gstdatetime.c
++++ b/gst/gstdatetime.c
+@@ -21,8 +21,8 @@
+ #include "config.h"
+ #endif
+ 
+-#include "glib-compat-private.h"
+ #include "gst_private.h"
++#include "glib-compat-private.h"
+ #include "gstdatetime.h"
+ #include <glib.h>
+ #include <math.h>

pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix

@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     sed -i -e 's/^   /\t/' docs/gst/Makefile.in docs/libs/Makefile.in docs/plugins/Makefile.in
+  ''
+  + stdenv.lib.optionalString stdenv.isDarwin ''
+    # Applying this patch manually to avoid a rebuild on Linux. Feel free to refactor later
+    # See https://trac.macports.org/ticket/40783 for explanation of patch
+    patch -p1 < ${./darwin.patch}
   '';
 
   configureFlags = ''

pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.gtkmm.org/;
     license = stdenv.lib.licenses.lgpl2Plus;
     maintainers = "Philip Lykke Carlsen <plcplc@gmail.com>";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 
 }

pkgs/development/libraries/gstreamer/ugly/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, python
 , gst-plugins-base, orc
 , a52dec, libcdio, libdvdread
-, lame, libmad, libmpeg2, x264
+, lame, libmad, libmpeg2, x264, libintlOrEmpty
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       like. The code might be widely known to present patent problems.
     '';
     license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ iyzsong ];
   };
 
@@ -32,5 +32,7 @@ stdenv.mkDerivation rec {
     gst-plugins-base orc
     a52dec libcdio libdvdread
     lame libmad libmpeg2 x264
-  ];
+  ] ++ libintlOrEmpty;
+
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
 }

pkgs/development/libraries/libavc1394/default.nix

@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
   meta = { 
     description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set";
     homepage = http://sourceforge.net/projects/libavc1394/;
-    license = [ "GPL" "LGPL" ];
+    license = stdenv.lib.licenses.lgpl21Plus;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/development/libraries/libdv/default.nix

@@ -1,28 +1,31 @@
-{ composableDerivation, fetchurl }:
+{ stdenv, fetchurl, popt }:
-
-let inherit (composableDerivation) edf; in
-
-composableDerivation.composableDerivation {} {
-
-  flags = { }
-    # TODO! implement flags
-    # I want to get kino and cinelerra working. That's why I don't spend more time on this now
-    // edf { name = "libtool_lock"; } #avoid locking (might break parallel builds)
-    // edf { name ="asm"; } #disable use of architecture specific assembly code
-    // edf { name ="sdl"; } #enable use of SDL for display
-    // edf { name ="gtk"; } #disable use of gtk for display
-    // edf { name ="xv"; } #disable use of XVideo extension for display
-    // edf { name ="gprof"; }; #enable compiler options for gprof profiling
 
+stdenv.mkDerivation rec {
   name = "libdv-1.0.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/libdv/libdv-1.0.0.tar.gz;
+    url = "mirror://sourceforge/libdv/${name}.tar.gz";
     sha256 = "1fl96f2xh2slkv1i1ix7kqk576a0ak1d33cylm0mbhm96d0761d3";
   };
 
-  meta = {
+  # This fixes an undefined symbol: _sched_setscheduler error on compile.
+  # See the apple docs: http://cl.ly/2HeF bottom of the "Finding Imported Symbols" section
+  LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup";
+
+  configureFlags = [
+    "--disable-asm"
+    "--disable-sdl"
+    "--disable-gtk"
+    "--disable-xv"
+    "--disable-gprof"
+  ];
+
+  buildInputs = [ popt ];
+
+  meta = with stdenv.lib; {
     description = "Software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards";
     homepage = http://sourceforge.net/projects/libdv/;
+    license = licenses.lgpl21Plus;
+    platforms = platforms.unix;
   };
 }

pkgs/development/libraries/libiec61883/default.nix

@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ pkgconfig ];
-  
+
   propagatedBuildInputs = [ libraw1394 ];
 
   meta = with stdenv.lib; {
     homepage = http://www.linux1394.org;
-    license = "LGPL";
+    license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
   };

pkgs/development/libraries/libmodplug/default.nix

@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
     description = "MOD playing library";
     homepage    = "http://modplug-xmms.sourceforge.net/";
     license     = licenses.publicDomain;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ raskin ];
   };
 

pkgs/development/libraries/libraw1394/default.nix

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface";
     homepage = "https://ieee1394.wiki.kernel.org/index.php/Libraries#libraw1394";
-    license = ["GPL" "LGPL"];
+    license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
   };

pkgs/development/libraries/libvdpau/default.nix

@@ -12,8 +12,6 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ xorg.libX11 ];
 
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--build=x86_64";
-
   meta = with stdenv.lib; {
     homepage = http://people.freedesktop.org/~aplattner/vdpau/;
     description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)";