Update patches for new upstream version.
Joachim Bauch
3 years ago
| 0 | 0 |
Description: Disable building of some internal tools that no longer link
|
| 1 | |
because internal symbols are not exported.
|
|
1 |
because internal symbols are no longer exported.
|
| 2 | 2 |
Author: Joachim Bauch <bauch@struktur.de>
|
| 3 | |
--- a/Makefile.am
|
| 4 | |
+++ b/Makefile.am
|
| 5 | |
@@ -8,10 +8,6 @@
|
| 6 | |
SUBDIRS+=dec265
|
| 7 | |
endif
|
| 8 | |
|
| 9 | |
-SUBDIRS+=enc265
|
| 10 | |
-SUBDIRS+=tools
|
| 11 | |
-SUBDIRS+=acceleration-speed
|
| 12 | |
-
|
| 13 | |
if ENABLE_SHERLOCK265
|
| 14 | |
SUBDIRS+=sherlock265
|
| 15 | |
endif
|
| 16 | 3 |
--- a/dec265/Makefile.am
|
| 17 | 4 |
+++ b/dec265/Makefile.am
|
| 18 | 5 |
@@ -1,5 +1,5 @@
|
|
| 20 | 7 |
-bin_PROGRAMS = dec265 hdrcopy
|
| 21 | 8 |
+bin_PROGRAMS = dec265
|
| 22 | 9 |
|
| 23 | |
AM_CPPFLAGS = -I../libde265
|
|
10 |
AM_CPPFLAGS = -I$(top_srcdir)/libde265 -I$(top_srcdir)
|
| 24 | 11 |
|
| 25 | 12 |
@@ -9,12 +9,6 @@
|
| 26 | 13 |
dec265_LDADD = ../libde265/libde265.la -lstdc++
|
|
| 35 | 22 |
if HAVE_VIDEOGFX
|
| 36 | 23 |
dec265_CXXFLAGS += $(VIDEOGFX_CFLAGS)
|
| 37 | 24 |
dec265_LDFLAGS += $(VIDEOGFX_LIBS)
|
|
25 |
--- a/Makefile.am
|
|
26 |
+++ b/Makefile.am
|
|
27 |
@@ -8,13 +8,6 @@
|
|
28 |
SUBDIRS+=dec265
|
|
29 |
endif
|
|
30 |
|
|
31 |
-if ENABLE_ENCODER
|
|
32 |
-SUBDIRS+=enc265
|
|
33 |
-endif
|
|
34 |
-
|
|
35 |
-SUBDIRS+=tools
|
|
36 |
-SUBDIRS+=acceleration-speed
|
|
37 |
-
|
|
38 |
if ENABLE_SHERLOCK265
|
|
39 |
SUBDIRS+=sherlock265
|
|
40 |
endif
|
debian/patches/ffmpeg_2.9.patch
less
more
| 0 | |
Description: Replace deprecated FFmpeg API
|
| 1 | |
Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
|
| 2 | |
Last-Update: <2015-11-02>
|
| 3 | |
|
| 4 | |
--- a/sherlock265/VideoDecoder.cc
|
| 5 | |
+++ b/sherlock265/VideoDecoder.cc
|
| 6 | |
@@ -237,7 +237,7 @@
|
| 7 | |
}
|
| 8 | |
width = img->get_width();
|
| 9 | |
height = img->get_height();
|
| 10 | |
- sws = sws_getContext(width, height, PIX_FMT_YUV420P, width, height, PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
|
| 11 | |
+ sws = sws_getContext(width, height, AV_PIX_FMT_YUV420P, width, height, AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
|
| 12 | |
}
|
| 13 | |
|
| 14 | |
int stride[3];
|
|
0 |
From 91e2e3bd4a881755d84fe0f96debb86573c5b238 Mon Sep 17 00:00:00 2001
|
|
1 |
From: Joachim Bauch <bauch@struktur.de>
|
|
2 |
Date: Fri, 25 Sep 2020 12:02:08 +0200
|
|
3 |
Subject: [PATCH] Import "en265.h" to get correct name mangling of exported
|
|
4 |
functions.
|
|
5 |
|
|
6 |
Without the header, "C++" name mangling will be used instead of the
|
|
7 |
required "C" names.
|
|
8 |
---
|
|
9 |
libde265/image.cc | 1 +
|
|
10 |
1 file changed, 1 insertion(+)
|
|
11 |
|
|
12 |
diff --git a/libde265/image.cc b/libde265/image.cc
|
|
13 |
index 543e74b1..07e4a22d 100644
|
|
14 |
--- a/libde265/image.cc
|
|
15 |
+++ b/libde265/image.cc
|
|
16 |
@@ -20,6 +20,7 @@
|
|
17 |
|
|
18 |
#include "image.h"
|
|
19 |
#include "decctx.h"
|
|
20 |
+#include "en265.h"
|
|
21 |
|
|
22 |
#include <stdlib.h>
|
|
23 |
#include <string.h>
|
| 3 | 3 |
Author: Joachim Bauch <bauch@struktur.de>
|
| 4 | 4 |
--- a/libde265/encoder/Makefile.am
|
| 5 | 5 |
+++ b/libde265/encoder/Makefile.am
|
| 6 | |
@@ -10,6 +10,18 @@
|
|
6 |
@@ -12,6 +12,18 @@
|
| 7 | 7 |
encpicbuf.h encpicbuf.cc \
|
| 8 | 8 |
sop.h sop.cc
|
| 9 | 9 |
|
|
| 40 | 40 |
CMakeLists.txt
|
| 41 | 41 |
--- a/configure.ac
|
| 42 | 42 |
+++ b/configure.ac
|
| 43 | |
@@ -50,9 +50,7 @@
|
|
43 |
@@ -56,9 +56,7 @@
|
| 44 | 44 |
fi
|
| 45 | 45 |
changequote([,])dnl
|
| 46 | 46 |
|
|
| 53 | 53 |
# Checks for header files.
|
| 54 | 54 |
--- a/libde265/image-io.cc
|
| 55 | 55 |
+++ b/libde265/image-io.cc
|
| 56 | |
@@ -183,7 +183,7 @@
|
|
56 |
@@ -186,7 +186,7 @@
|
| 57 | 57 |
}
|
| 58 | 58 |
|
| 59 | 59 |
|
|
| 62 | 62 |
{
|
| 63 | 63 |
if (mFH) {
|
| 64 | 64 |
fclose(mFH);
|
| 65 | |
@@ -191,7 +191,7 @@
|
|
65 |
@@ -194,7 +194,7 @@
|
| 66 | 66 |
}
|
| 67 | 67 |
|
| 68 | 68 |
|
|
| 71 | 71 |
{
|
| 72 | 72 |
assert(mFH==NULL);
|
| 73 | 73 |
|
| 74 | |
@@ -199,7 +199,7 @@
|
|
74 |
@@ -202,7 +202,7 @@
|
| 75 | 75 |
}
|
| 76 | 76 |
|
| 77 | 77 |
|
| 0 | 0 |
only_export_decoder_api.patch
|
| 1 | 1 |
disable_tools.patch
|
| 2 | |
ffmpeg_2.9.patch
|
|
2 |
fix_exported_symbols.patch
|