summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ffmpeg/A01-h264-recovery-point.patch4
-rw-r--r--contrib/ffmpeg/P01-solaris.patch4
-rw-r--r--contrib/ffmpeg/P02-darwin-pic.patch6
-rw-r--r--contrib/ffmpeg/module.defs2
-rw-r--r--contrib/libbluray/A01-filter-dup.patch80
-rw-r--r--contrib/x264/A00-version-string.patch23
6 files changed, 111 insertions, 8 deletions
diff --git a/contrib/ffmpeg/A01-h264-recovery-point.patch b/contrib/ffmpeg/A01-h264-recovery-point.patch
index b9c29dc3a..353f18e9f 100644
--- a/contrib/ffmpeg/A01-h264-recovery-point.patch
+++ b/contrib/ffmpeg/A01-h264-recovery-point.patch
@@ -1,5 +1,5 @@
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
-index 54f6186..2647d5d 100644
+index 8625b0f..e862701 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2164,6 +2164,7 @@ static void flush_dpb(AVCodecContext *avctx)
@@ -10,7 +10,7 @@ index 54f6186..2647d5d 100644
}
static int init_poc(H264Context *h)
-@@ -3995,9 +3996,18 @@ again:
+@@ -4001,9 +4002,18 @@ again:
if ((err = decode_slice_header(hx, h)))
break;
diff --git a/contrib/ffmpeg/P01-solaris.patch b/contrib/ffmpeg/P01-solaris.patch
index 29633e323..399aabc3a 100644
--- a/contrib/ffmpeg/P01-solaris.patch
+++ b/contrib/ffmpeg/P01-solaris.patch
@@ -1,8 +1,8 @@
diff --git a/configure b/configure
-index aa31ea0..773e6bf 100755
+index 6ab04ae..1c8ab46 100755
--- a/configure
+++ b/configure
-@@ -3167,7 +3167,7 @@ EOF
+@@ -3171,7 +3171,7 @@ EOF
check_cc <<EOF || die "endian test failed"
unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
EOF
diff --git a/contrib/ffmpeg/P02-darwin-pic.patch b/contrib/ffmpeg/P02-darwin-pic.patch
index b3f883eae..f512416a1 100644
--- a/contrib/ffmpeg/P02-darwin-pic.patch
+++ b/contrib/ffmpeg/P02-darwin-pic.patch
@@ -1,8 +1,8 @@
diff --git a/configure b/configure
-index aa31ea0..a7f5380 100755
+index 6ab04ae..fa9f980 100755
--- a/configure
+++ b/configure
-@@ -2889,6 +2889,7 @@ case $target_os in
+@@ -2893,6 +2893,7 @@ case $target_os in
AVSERVERLDFLAGS=-Wl,-bind_at_load
objformat="macho"
enabled x86_64 && objformat="macho64"
@@ -10,7 +10,7 @@ index aa31ea0..a7f5380 100755
enabled_any pic shared ||
{ check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; }
;;
-@@ -3091,7 +3092,7 @@ esc(){
+@@ -3095,7 +3096,7 @@ esc(){
echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $LIBAV_CONFIGURATION)" >config.fate
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index e30b1bcc5..70982af11 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -1,7 +1,7 @@
$(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,YASM BZIP2 ZLIB FDKAAC))
$(eval $(call import.CONTRIB.defs,FFMPEG))
-FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libav-v9.3.tar.bz2
+FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libav-v9.6.tar.bz2
FFMPEG.CONFIGURE.deps =
FFMPEG.CONFIGURE.env =
diff --git a/contrib/libbluray/A01-filter-dup.patch b/contrib/libbluray/A01-filter-dup.patch
new file mode 100644
index 000000000..608f8dd1b
--- /dev/null
+++ b/contrib/libbluray/A01-filter-dup.patch
@@ -0,0 +1,80 @@
+diff --git a/src/libbluray/bdnav/navigation.c b/src/libbluray/bdnav/navigation.c
+index c8dc307..26d0000 100644
+--- a/src/libbluray/bdnav/navigation.c
++++ b/src/libbluray/bdnav/navigation.c
+@@ -32,9 +32,25 @@
+ #include <stdlib.h>
+ #include <string.h>
+
++static int _stream_cmp(MPLS_STREAM *a, MPLS_STREAM *b)
++{
++ if (a->stream_type == b->stream_type &&
++ a->coding_type == b->coding_type &&
++ a->pid == b->pid &&
++ a->subpath_id == b->subpath_id &&
++ a->subclip_id == b->subclip_id &&
++ a->format == b->format &&
++ a->rate == b->rate &&
++ a->char_code == b->char_code &&
++ memcmp(a->lang, b->lang, 4) == 0) {
++ return 1;
++ }
++ return 0;
++}
++
+ static int _filter_dup(MPLS_PL *pl_list[], unsigned count, MPLS_PL *pl)
+ {
+- unsigned ii, jj;
++ unsigned ii, jj, kk;
+
+ for (ii = 0; ii < count; ii++) {
+ if (pl->list_count != pl_list[ii]->list_count) {
+@@ -54,7 +70,48 @@ static int _filter_dup(MPLS_PL *pl_list[], unsigned count, MPLS_PL *pl)
+ pi1->out_time != pi2->out_time) {
+ break;
+ }
++ if (pi1->stn.num_video != pi2->stn.num_video ||
++ pi1->stn.num_audio != pi2->stn.num_audio ||
++ pi1->stn.num_pg != pi2->stn.num_pg ||
++ pi1->stn.num_ig != pi2->stn.num_ig ||
++ pi1->stn.num_secondary_audio != pi2->stn.num_secondary_audio ||
++ pi1->stn.num_secondary_video != pi2->stn.num_secondary_video) {
++ break;
++ }
++ for (kk = 0; kk < pi1->stn.num_video; kk++) {
++ if (!_stream_cmp(&pi1->stn.video[kk], &pi2->stn.video[kk])) {
++ goto next;
++ }
++ }
++ for (kk = 0; kk < pi1->stn.num_audio; kk++) {
++ if (!_stream_cmp(&pi1->stn.audio[kk], &pi2->stn.audio[kk])) {
++ goto next;
++ }
++ }
++ for (kk = 0; kk < pi1->stn.num_pg; kk++) {
++ if (!_stream_cmp(&pi1->stn.pg[kk], &pi2->stn.pg[kk])) {
++ goto next;
++ }
++ }
++ for (kk = 0; kk < pi1->stn.num_ig; kk++) {
++ if (!_stream_cmp(&pi1->stn.ig[kk], &pi2->stn.ig[kk])) {
++ goto next;
++ }
++ }
++ for (kk = 0; kk < pi1->stn.num_secondary_audio; kk++) {
++ if (!_stream_cmp(&pi1->stn.secondary_audio[kk],
++ &pi2->stn.secondary_audio[kk])) {
++ goto next;
++ }
++ }
++ for (kk = 0; kk < pi1->stn.num_secondary_video; kk++) {
++ if (!_stream_cmp(&pi1->stn.secondary_video[kk],
++ &pi2->stn.secondary_video[kk])) {
++ goto next;
++ }
++ }
+ }
++next:
+ if (jj != pl->list_count) {
+ continue;
+ }
diff --git a/contrib/x264/A00-version-string.patch b/contrib/x264/A00-version-string.patch
new file mode 100644
index 000000000..dcd4ec628
--- /dev/null
+++ b/contrib/x264/A00-version-string.patch
@@ -0,0 +1,23 @@
+diff --git a/x264.h b/x264.h
+index e5a1600..f635d9e 100644
+--- a/x264.h
++++ b/x264.h
+@@ -41,7 +41,17 @@
+
+ #include "x264_config.h"
+
+-#define X264_BUILD 130
++/*
++ * Define the full version explicitly so that it survives a git --archive.
++ *
++ * Patch will break every time X264_BUILD changes, so that we don't forget to
++ * update it ;-)
++ */
++#ifdef X264_VERSION
++#undef X264_VERSION
++#endif
++#define X264_BUILD 130
++#define X264_VERSION " r2273 b3065e6"
+
+ /* Application developers planning to link against a shared library version of
+ * libx264 from a Microsoft Visual Studio or similar development environment
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-11 10:48:26 +0000