Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'

3 files changed, 16 insertions, 33 deletions

diff --git a/nixpkgs/pkgs/development/libraries/smpeg2/default.nix b/nixpkgs/pkgs/development/libraries/smpeg2/default.nix
index fc42ab989eb0..270e418174e4 100644
--- a/nixpkgs/pkgs/development/libraries/smpeg2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/smpeg2/default.nix
@@ -1,21 +1,28 @@
-{ stdenv, darwin, fetchsvn, autoconf, automake, pkgconfig, makeWrapper, SDL2 }:
+{ stdenv
+, autoconf
+, automake
+, darwin
+, fetchsvn
+, makeWrapper
+, pkg-config
+, SDL2
+}:
 
 stdenv.mkDerivation rec {
-  name = "smpeg2-svn${version}";
-  version = "412";
+  pname = "smpeg2";
+  version = "unstable-2017-10-18";
 
   src = fetchsvn {
     url = "svn://svn.icculus.org/smpeg/trunk";
-    rev = version;
-    sha256 = "1irf2d8f150j8cx8lbb0pz1rijap536crsz0mw871xrh6wd2fd96";
+    rev = "413";
+    sha256 = "193amdwgxkb1zp7pgr72fvrdhcg3ly72qpixfxxm85rzz8g2kr77";
   };
 
   patches = [
-    ./gcc6.patch
-    ./sdl2.patch
+    ./hufftable-uint_max.patch
   ];
 
-  nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ];
+  nativeBuildInputs = [ autoconf automake makeWrapper pkg-config ];
 
   buildInputs = [ SDL2 ]
     ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
@@ -25,10 +32,8 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    sed -e 's,#include "\(SDL.*.h\)",#include <SDL2/\1>,' -i $out/include/smpeg2/*.h
-
     wrapProgram $out/bin/smpeg2-config \
-      --prefix PATH ":" "${pkgconfig}/bin" \
+      --prefix PATH ":" "${pkg-config}/bin" \
       --prefix PKG_CONFIG_PATH ":" "${SDL2.dev}/lib/pkgconfig"
   '';
 
diff --git a/nixpkgs/pkgs/development/libraries/smpeg2/gcc6.patch b/nixpkgs/pkgs/development/libraries/smpeg2/hufftable-uint_max.patch
index 165feb4428c2..165feb4428c2 100644
--- a/nixpkgs/pkgs/development/libraries/smpeg2/gcc6.patch
+++ b/nixpkgs/pkgs/development/libraries/smpeg2/hufftable-uint_max.patch
diff --git a/nixpkgs/pkgs/development/libraries/smpeg2/sdl2.patch b/nixpkgs/pkgs/development/libraries/smpeg2/sdl2.patch
deleted file mode 100644
index 63bc352976ec..000000000000
--- a/nixpkgs/pkgs/development/libraries/smpeg2/sdl2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/smpeg2-config.in b/smpeg2-config.in
-index 5cce954..0e61939 100644
---- a/smpeg2-config.in
-+++ b/smpeg2-config.in
-@@ -42,7 +42,7 @@ while test $# -gt 0; do
-       if test @includedir@ != /usr/include ; then
-         includes=-I@includedir@
-       fi
--      echo $includes -I@includedir@/smpeg2 `@SDL_CONFIG@ --cflags`
-+      echo $includes -I@includedir@/smpeg2 `@SDL2_CONFIG@ --cflags`
-       ;;
-     --libs)
-       if [ "`uname`" = "SunOS" ]; then
-@@ -50,7 +50,7 @@ while test $# -gt 0; do
-       else
-         libdirs="-L@libdir@ @SMPEG_RLD_FLAGS@"
-       fi
--      echo $libdirs -lsmpeg2 `@SDL_CONFIG@ --libs`
-+      echo $libdirs -lsmpeg2 `@SDL2_CONFIG@ --libs`
-       ;;
-     *)
-       echo "${usage}" 1>&2