smpeg2: unstable-2017-10-18 -> unstable-2022-05-26

This commit is contained in:
Artturin 2022-06-11 19:31:09 +03:00
parent ad5243d940
commit 3da65d0955
2 changed files with 7 additions and 43 deletions

View file

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

View file

@ -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},