haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

libdvdnav: bump (#5972)

Browse Source
This commit is contained in:
extrowerk
2021-06-08 16:25:15 +02:00
committed by GitHub
parent cc1ea1dc1f
commit 0d86bd636d
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media-libs/libdvdnav/libdvdnav-6.0.1.recipe → media-libs/libdvdnav/libdvdnav-6.1.1.recipe
View File

@@ -5,9 +5,9 @@ HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html"
COPYRIGHT="2000 Rich Wareham
2001-2004 the dvdnav project"
LICENSE="GNU GPL v2"
REVISION="3"
REVISION="1"
SOURCE_URI="https://download.videolan.org/pub/videolan/libdvdnav/$portVersion/libdvdnav-$portVersion.tar.bz2"
CHECKSUM_SHA256="e566a396f1950017088bfd760395b0565db44234195ada5413366c9d23926733"
CHECKSUM_SHA256="c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48"
PATCHES="libdvdnav-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -15,7 +15,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
libdvdnav$secondaryArchSuffix = $portVersion
lib:libdvdnav$secondaryArchSuffix = 4.2.0 compat >= 4
lib:libdvdnav$secondaryArchSuffix = 4.3.0 compat >= 4
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -24,7 +24,7 @@ REQUIRES="
PROVIDES_devel="
libdvdnav${secondaryArchSuffix}_devel = $portVersion
devel:libdvdnav$secondaryArchSuffix = 4.2.0 compat >= 4
devel:libdvdnav$secondaryArchSuffix = 4.3.0 compat >= 4
"
REQUIRES_devel="
libdvdnav$secondaryArchSuffix == $portVersion base

24
media-libs/libdvdnav/patches/libdvdnav-6.0.1.patchset → media-libs/libdvdnav/patches/libdvdnav-6.1.1.patchset
View File

@@ -1,11 +1,11 @@
From 1312fe411468d2bf4f64afe8e318d43a195e34a6 Mon Sep 17 00:00:00 2001
From eedd89fb24097a19e4f14ff1525e9296eebe067b Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 3 Sep 2014 15:37:19 +0000
Subject: haiku patch
diff --git a/configure.ac b/configure.ac
index 3eff01a..6b14c25 100644
index 595378b..fe71f5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,10 +84,12 @@ case $host in
@@ -23,20 +23,20 @@ index 3eff01a..6b14c25 100644
AC_CHECK_LIB(pthread, pthread_create,
[THREAD_LIBS="-lpthread"],
--
1.8.3.4
2.30.2
From 89577dcab8e80a283ab361c137565c20009b9da1 Mon Sep 17 00:00:00 2001
From 50582ee27e442625dfa0439566a3d2e1f14588b1 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 3 Sep 2014 19:54:24 +0000
Subject: gcc2 fix
diff --git a/src/searching.c b/src/searching.c
index f6e497e..993b9d0 100644
index 263f8df..f361b30 100644
--- a/src/searching.c
+++ b/src/searching.c
@@ -1153,6 +1153,8 @@ static int32_t dvdnav_find_vobu_by_tmap(dvdnav_t *this, dvd_state_t *state,
@@ -1199,6 +1199,8 @@ static int32_t dvdnav_find_vobu_by_tmap(dvdnav_t *this, dvd_state_t *state,
uint64_t seek_offset = 0;
uint32_t seek_idx = 0;
int32_t result = 0;
@@ -45,7 +45,7 @@ index f6e497e..993b9d0 100644
dvdnav_pos_data_t *cell_bgn_lo = NULL;
dvdnav_pos_data_t *cell_bgn_hi = NULL;
dvdnav_pos_data_t *jump_lo = NULL;
@@ -1178,8 +1180,8 @@ static int32_t dvdnav_find_vobu_by_tmap(dvdnav_t *this, dvd_state_t *state,
@@ -1225,8 +1227,8 @@ static int32_t dvdnav_find_vobu_by_tmap(dvdnav_t *this, dvd_state_t *state,
/* calc time of jump_time relative to cell_bgn_lo */
seek_offset = jump->time - cell_bgn_lo->time;
seek_idx = (uint32_t)(seek_offset / args->tmap_interval);
@@ -56,7 +56,7 @@ index f6e497e..993b9d0 100644
/* get tmap entries on either side of jump_time */
jump_lo = &(dvdnav_pos_data_t){0};
@@ -1256,7 +1258,6 @@ static int32_t dvdnav_find_vobu_by_cell_boundaries(
@@ -1303,7 +1305,6 @@ static int32_t dvdnav_find_vobu_by_cell_boundaries(dvdnav_t *this,
/* -1: Before. Always jump to a time that is < time_in_pts_ticks */
dvdnav_status_t dvdnav_jump_to_sector_by_time(dvdnav_t *this,
uint64_t time_in_pts_ticks, int32_t mode) {
@@ -64,7 +64,7 @@ index f6e497e..993b9d0 100644
int32_t result = DVDNAV_STATUS_ERR;
dvd_state_t *state = NULL;
uint32_t sector_off = 0;
@@ -1264,6 +1265,8 @@ dvdnav_status_t dvdnav_jump_to_sector_by_time(dvdnav_t *this,
@@ -1311,6 +1312,8 @@ dvdnav_status_t dvdnav_jump_to_sector_by_time(dvdnav_t *this,
dvdnav_cell_data_t *cell_data = NULL;
dvdnav_jump_args_t *args = NULL;
@@ -74,10 +74,10 @@ index f6e497e..993b9d0 100644
/* convert time to milliseconds */
jump->time = time_in_pts_ticks / 90;
diff --git a/src/vm/vm.c b/src/vm/vm.c
index 7e4d594..e4e8995 100644
index 6c64e59..e707f9c 100644
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -823,10 +823,12 @@ static int process_command(vm_t *vm, link_t link_values) {
@@ -895,10 +895,12 @@ static int process_command(vm_t *vm, link_t link_values) {
/* These should never be set in SystemSpace and/or MenuSpace */
/* vm->state.TTN_REG = rsm_tt; ?? */
/* vm->state.TT_PGCN_REG = vm->state.rsm_pgcN; ?? */
@@ -91,5 +91,5 @@ index 7e4d594..e4e8995 100644
if(link_values.data1 != 0)
vm->state.HL_BTNN_REG = link_values.data1 << 10;
--
1.8.3.4
2.30.2