Merge pull request #177309 from Artturin/smpegupdates

smpeg: 390 -> 0.4.5

pkgs/development/libraries/smpeg/default.nix

@@ -1,13 +1,14 @@
-{ lib, stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  pname = "smpeg-svn";
-  version = "390";
-
-  src = fetchsvn {
-    url = "svn://svn.icculus.org/smpeg/trunk";
-    rev = version;
-    sha256 = "0ynwn7ih5l2b1kpzpibns9bb9wzfjak7mgrb1ji0dkn2q5pv6lr0";
+  pname = "smpeg";
+  version = "0.4.5";
+
+  src = fetchFromGitHub {
+    owner = "icculus";
+    repo = "smpeg";
+    rev = "release_${builtins.replaceStrings ["."] ["_"] version}";
+    sha256 = "sha256-nq/i7cFGpJXIuTwN/ScLMX7FN8NMdgdsRM9xOD3uycs=";
   };
 
   patches = [
@@ -19,10 +20,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ SDL gtk2 libGLU libGL ];
-
   nativeBuildInputs = [ autoconf automake libtool m4 pkg-config makeWrapper ];
 
+  buildInputs = [ SDL gtk2 libGLU libGL ];
+
   preConfigure = ''
     touch NEWS AUTHORS ChangeLog
     sh autogen.sh

pkgs/development/libraries/smpeg2/default.nix

@@ -2,7 +2,7 @@
 , autoconf
 , automake
 , darwin
-, fetchsvn
+, fetchFromGitHub
 , makeWrapper
 , pkg-config
 , SDL2
@@ -10,18 +10,15 @@
 
 stdenv.mkDerivation rec {
   pname = "smpeg2";
-  version = "unstable-2017-10-18";
+  version = "unstable-2022-05-26";
 
-  src = fetchsvn {
-    url = "svn://svn.icculus.org/smpeg/trunk";
-    rev = "413";
-    sha256 = "193amdwgxkb1zp7pgr72fvrdhcg3ly72qpixfxxm85rzz8g2kr77";
+  src = fetchFromGitHub {
+    owner = "icculus";
+    repo = "smpeg";
+    rev = "c5793e5f3f2765fc09c24380d7e92136a0e33d3b";
+    sha256 = "sha256-Z0u83K1GIXd0jUYo5ZyWUH2Zt7Hn8z+yr06DAtAEukw=";
   };
 
-  patches = [
-    ./hufftable-uint_max.patch
-  ];
-
   nativeBuildInputs = [ autoconf automake makeWrapper pkg-config ];
 
   buildInputs = [ SDL2 ]

pkgs/development/libraries/smpeg2/hufftable-uint_max.patch

@@ -1,33 +0,0 @@
---- a/audio/hufftable.cpp
-+++ b/audio/hufftable.cpp
-@@ -9,6 +9,7 @@
- #include "config.h"
- #endif
- 
-+#include <climits>
- #include "MPEGaudio.h"
- 
- static const unsigned int
-@@ -550,11 +551,11 @@ htd33[ 31][2]={{ 16,  1},{  8,  1},{  4,
- 
- const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
- {
--  { 0, 0-1, 0-1, 0,  0, htd33},
-+  { 0, UINT_MAX, UINT_MAX, 0,  0, htd33},
-   { 1, 2-1, 2-1, 0,  7,htd01},
-   { 2, 3-1, 3-1, 0, 17,htd02},
-   { 3, 3-1, 3-1, 0, 17,htd03},
--  { 4, 0-1, 0-1, 0,  0, htd33},
-+  { 4, UINT_MAX, UINT_MAX, 0,  0, htd33},
-   { 5, 4-1, 4-1, 0, 31,htd05},
-   { 6, 4-1, 4-1, 0, 31,htd06},
-   { 7, 6-1, 6-1, 0, 71,htd07},
-@@ -564,7 +565,7 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN
-   {11, 8-1, 8-1, 0,127,htd11},
-   {12, 8-1, 8-1, 0,127,htd12},
-   {13,16-1,16-1, 0,511,htd13},
--  {14, 0-1, 0-1, 0,  0, htd33},
-+  {14, UINT_MAX, UINT_MAX, 0,  0, htd33},
-   {15,16-1,16-1, 0,511,htd15},
-   {16,16-1,16-1, 1,511,htd16},
-   {17,16-1,16-1, 2,511,htd16},