mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 11:40:06 +02:00
libbdplus: remove libtool file.
* fix use of reserved name index.
This commit is contained in:
@@ -5,9 +5,10 @@ movies. It is intended for software that want to support Blu-ray playback \
|
||||
HOMEPAGE="https://www.videolan.org/developers/libbdplus.html"
|
||||
COPYRIGHT="2011-2015 VideoLAN"
|
||||
LICENSE="GNU LGPL v2.1"
|
||||
REVISION="2"
|
||||
REVISION="3"
|
||||
SOURCE_URI="https://download.videolan.org/pub/videolan/libbdplus/$portVersion/libbdplus-$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="a631cae3cd34bf054db040b64edbfc8430936e762eb433b1789358ac3d3dc80a"
|
||||
PATCHES="libbdplus-0.1.2.patchset"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
@@ -57,6 +58,8 @@ INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
rm $libDir/libbdplus.la
|
||||
|
||||
prepareInstalledDevelLibs libbdplus
|
||||
fixPkgconfig
|
||||
|
||||
|
||||
49
media-libs/libbdplus/patches/libbdplus-0.1.2.patchset
Normal file
49
media-libs/libbdplus/patches/libbdplus-0.1.2.patchset
Normal file
@@ -0,0 +1,49 @@
|
||||
From f3c73966a3089e96e14f2138f72482fcd7ca3c8f Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Wed, 7 Dec 2016 15:35:35 +0000
|
||||
Subject: index is reserved.
|
||||
|
||||
|
||||
diff --git a/src/examples/convtab_dump.c b/src/examples/convtab_dump.c
|
||||
index 3a55a26..e1e55a5 100644
|
||||
--- a/src/examples/convtab_dump.c
|
||||
+++ b/src/examples/convtab_dump.c
|
||||
@@ -29,7 +29,7 @@
|
||||
// raw table
|
||||
#define MAX_TAB_SIZE 64*1024*1024
|
||||
uint8_t tab[MAX_TAB_SIZE];
|
||||
-uint32_t index[0xffff];
|
||||
+uint32_t index_table[0xffff];
|
||||
|
||||
static size_t _read_tab(const char *file)
|
||||
{
|
||||
@@ -97,9 +97,9 @@ int main(int argc, char **argv)
|
||||
|
||||
printf(" Segment %d: %d entries\n", segment, numEntries);
|
||||
|
||||
- // read index table
|
||||
+ // read index_table table
|
||||
for (entry = 0; entry < numEntries; entry++) {
|
||||
- index[entry] = FETCH4(&tab[offset]);
|
||||
+ index_table[entry] = FETCH4(&tab[offset]);
|
||||
offset += 4;
|
||||
}
|
||||
|
||||
@@ -125,12 +125,12 @@ int main(int argc, char **argv)
|
||||
memcpy(patch1, &tab[ offset ], sizeof(patch1));
|
||||
offset += 5;
|
||||
|
||||
- uint64_t off0 = (( (uint64_t)index[entry] +
|
||||
+ uint64_t off0 = (( (uint64_t)index_table[entry] +
|
||||
(uint64_t)patch0_address_adjust) *
|
||||
(uint64_t)0xC0 +
|
||||
(uint64_t)patch0_buffer_offset);
|
||||
|
||||
- uint64_t off1 = (( (uint64_t)index[entry] +
|
||||
+ uint64_t off1 = (( (uint64_t)index_table[entry] +
|
||||
(uint64_t)patch0_address_adjust +
|
||||
(uint64_t)patch1_address_adjust) *
|
||||
(uint64_t)0xC0 +
|
||||
--
|
||||
2.10.2
|
||||
|
||||
Reference in New Issue
Block a user