diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/smpeg2 | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/smpeg2')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/smpeg2/default.nix | 17 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/smpeg2/hufftable-uint_max.patch | 33 |
2 files changed, 7 insertions, 43 deletions
diff --git a/nixpkgs/pkgs/development/libraries/smpeg2/default.nix b/nixpkgs/pkgs/development/libraries/smpeg2/default.nix index d57cc91f26e2..48281ba04ec1 100644 --- a/nixpkgs/pkgs/development/libraries/smpeg2/default.nix +++ b/nixpkgs/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 ] diff --git a/nixpkgs/pkgs/development/libraries/smpeg2/hufftable-uint_max.patch b/nixpkgs/pkgs/development/libraries/smpeg2/hufftable-uint_max.patch deleted file mode 100644 index 165feb4428c2..000000000000 --- a/nixpkgs/pkgs/development/libraries/smpeg2/hufftable-uint_max.patch +++ /dev/null @@ -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}, |