mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
lcab: recreate patch, as diff -U0 confuses haikuporter.
Also resync the offsets of the patches of a few other recipes: * file-2.25 * x265-1.9 * libdvdnav-5.0.3 (Syncing patch offsets is not necessary but it does not hurt either.)
This commit is contained in:
@@ -1,9 +1,14 @@
|
||||
diff -U0 lcab-1.0b12/mytypes.h lcab-1.0b12-haiku/mytypes.h
|
||||
diff -u lcab-1.0b12/mytypes.h lcab-1.0b12-haiku/mytypes.h
|
||||
--- lcab-1.0b12/mytypes.h 2007-05-22 12:45:39.000000000 +0000
|
||||
+++ lcab-1.0b12-haiku/mytypes.h
|
||||
@@ -52 +52 @@
|
||||
@@ -49,6 +49,6 @@
|
||||
#define CFO_START (0x24) /* folder offset */
|
||||
#define CFI_START (0x2C) /* file offset */
|
||||
|
||||
-#define VERSION "1.0b11"
|
||||
+#define VERSION "1.0b12"
|
||||
|
||||
#endif
|
||||
diff -u lcab-1.0b12/Makefile.am lcab-1.0b12-haiku/Makefile.am
|
||||
--- lcab-1.0b12/Makefile.am 2007-05-22 12:45:39.000000000 +0000
|
||||
+++ lcab-1.0b12-haiku/Makefile.am
|
||||
|
||||
@@ -36,7 +36,7 @@ diff --git a/src/searching.c b/src/searching.c
|
||||
index f6e497e..993b9d0 100644
|
||||
--- a/src/searching.c
|
||||
+++ b/src/searching.c
|
||||
@@ -1147,6 +1147,8 @@ static int32_t dvdnav_find_vobu_by_tmap(dvdnav_t *this, dvd_state_t *state,
|
||||
@@ -1153,6 +1153,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;
|
||||
@@ -1172,8 +1174,8 @@ static int32_t dvdnav_find_vobu_by_tmap(dvdnav_t *this, dvd_state_t *state,
|
||||
@@ -1178,8 +1180,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};
|
||||
@@ -1250,7 +1252,6 @@ static int32_t dvdnav_find_vobu_by_cell_boundaries(
|
||||
@@ -1256,7 +1258,6 @@ static int32_t dvdnav_find_vobu_by_cell_boundaries(
|
||||
/* -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;
|
||||
@@ -1258,6 +1259,8 @@ dvdnav_status_t dvdnav_jump_to_sector_by_time(dvdnav_t *this,
|
||||
@@ -1264,6 +1265,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;
|
||||
|
||||
@@ -77,7 +77,7 @@ diff --git a/src/vm/vm.c b/src/vm/vm.c
|
||||
index 7e4d594..e4e8995 100644
|
||||
--- a/src/vm/vm.c
|
||||
+++ b/src/vm/vm.c
|
||||
@@ -816,10 +816,12 @@ static int process_command(vm_t *vm, link_t link_values) {
|
||||
@@ -823,10 +823,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; ?? */
|
||||
|
||||
@@ -8,7 +8,7 @@ diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
|
||||
index 353003e..6fd2cbe 100644
|
||||
--- a/source/CMakeLists.txt
|
||||
+++ b/source/CMakeLists.txt
|
||||
@@ -66,7 +66,8 @@ else()
|
||||
@@ -68,7 +68,8 @@ else()
|
||||
endif()
|
||||
|
||||
if(UNIX)
|
||||
@@ -32,7 +32,7 @@ diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
|
||||
index 6fd2cbe..bd6fbdb 100644
|
||||
--- a/source/CMakeLists.txt
|
||||
+++ b/source/CMakeLists.txt
|
||||
@@ -277,6 +277,7 @@ endif()
|
||||
@@ -290,6 +290,7 @@ endif()
|
||||
# Build options
|
||||
set(LIB_INSTALL_DIR lib CACHE STRING "Install location of libraries")
|
||||
set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables")
|
||||
@@ -40,7 +40,7 @@ index 6fd2cbe..bd6fbdb 100644
|
||||
set(EXTRA_LIB "" CACHE STRING "Extra libraries to link against")
|
||||
set(EXTRA_LINK_FLAGS "" CACHE STRING "Extra link flags")
|
||||
if(EXTRA_LINK_FLAGS)
|
||||
@@ -419,7 +420,8 @@ endif()
|
||||
@@ -440,7 +441,8 @@ endif()
|
||||
install(TARGETS x265-static
|
||||
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
|
||||
ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
|
||||
@@ -64,7 +64,7 @@ diff --git a/source/common/threadpool.cpp b/source/common/threadpool.cpp
|
||||
index 6cb815f..a4b138d 100644
|
||||
--- a/source/common/threadpool.cpp
|
||||
+++ b/source/common/threadpool.cpp
|
||||
@@ -52,6 +52,9 @@
|
||||
@@ -53,6 +53,9 @@
|
||||
|
||||
#endif
|
||||
|
||||
@@ -74,7 +74,7 @@ index 6cb815f..a4b138d 100644
|
||||
#if MACOS
|
||||
#include <sys/param.h>
|
||||
#include <sys/sysctl.h>
|
||||
@@ -91,7 +94,10 @@ void WorkerThread::threadMain()
|
||||
@@ -95,7 +98,10 @@ void WorkerThread::threadMain()
|
||||
|
||||
#if _WIN32
|
||||
SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_BELOW_NORMAL);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -up file-5.15/configure.ac.orig file-5.15/configure.ac
|
||||
--- file-5.15/configure.ac.orig 2012-02-21 12:16:29.015728640 -0700
|
||||
+++ file-5.15/configure.ac 2012-05-02 22:53:14.077594624 -0600
|
||||
@@ -142,14 +142,14 @@ else
|
||||
diff -up file-5.25/configure.ac.orig file-5.25/configure.ac
|
||||
--- file-5.25/configure.ac.orig 2015-09-16 13:51:05.000000000 +0000
|
||||
+++ file-5.25/configure.ac
|
||||
@@ -128,14 +128,14 @@ else
|
||||
WARNINGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
|
||||
-Wmissing-declarations -Wredundant-decls -Wnested-externs \
|
||||
-Wsign-compare -Wreturn-type -Wswitch -Wshadow \
|
||||
|
||||
Reference in New Issue
Block a user