mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
smpeg, fix SOURCE_URI, patch (kudos to OscarL for providing the one from smpeg2) (#7731)
This commit is contained in:
40
media-libs/smpeg/patches/smpeg-0.4.5.patchset
Normal file
40
media-libs/smpeg/patches/smpeg-0.4.5.patchset
Normal file
@@ -0,0 +1,40 @@
|
||||
From 22fc03245957de878b2c4f6ecd22fa928826ea5f Mon Sep 17 00:00:00 2001
|
||||
From: Oscar Lesta <oscar.lesta@gmail.com>
|
||||
Date: Wed, 28 Dec 2022 16:26:01 -0300
|
||||
Subject: Fix -Wnarroring error.
|
||||
|
||||
error: narrowing conversion of ‘-1’ from ‘int’ to ‘unsigned int’ inside { }
|
||||
|
||||
Patch taken from Gentoo's patch for GCC 6.
|
||||
|
||||
|
||||
diff --git a/audio/hufftable.cpp b/audio/hufftable.cpp
|
||||
index 6bc8e86..5414ae3 100644
|
||||
--- a/audio/hufftable.cpp
|
||||
+++ b/audio/hufftable.cpp
|
||||
@@ -550,11 +550,11 @@ htd33[ 31][2]={{ 16, 1},{ 8, 1},{ 4, 1},{ 2, 1},{ 0, 0},{ 0, 1},
|
||||
|
||||
const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
|
||||
{
|
||||
- { 0, 0-1, 0-1, 0, 0, htd33},
|
||||
+ { 0, ~0u, ~0u, 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, ~0u, ~0u, 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 +564,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,~0u, ~0u, 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},
|
||||
--
|
||||
2.37.3
|
||||
|
||||
@@ -6,9 +6,11 @@ software patents in the United States."
|
||||
HOMEPAGE="http://www.icculus.org/smpeg"
|
||||
COPYRIGHT="1999-2004 Sam Lantinga, Joe Tennies."
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="7"
|
||||
SOURCE_URI="http://www.libsdl.org/projects/SDL_mixer/libs/old/smpeg-0.4.5.zip"
|
||||
CHECKSUM_SHA256="8d4e4a6bc1892279ae7727e192df0ad0cef5927d50090f846e0bf3ba1b8f3d41"
|
||||
REVISION="8"
|
||||
SOURCE_URI="https://github.com/icculus/smpeg/archive/refs/tags/release_$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="e2e53bfd2e6401e2c29e5eb3929be0e8698bc9e4c9d731751f67e77b408f1f74"
|
||||
SOURCE_DIR="smpeg-release_$portVersion"
|
||||
PATCHES="smpeg-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
@@ -65,7 +67,7 @@ BUILD()
|
||||
autoconf
|
||||
chmod +x configure
|
||||
|
||||
runConfigure ./configure
|
||||
runConfigure ./configure --disable-static
|
||||
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user