Codebase list kodi-inputstream-adaptive / 2d206a6
Drop patches merged upstream Signed-off-by: Vasyl Gello <vasek.gello@gmail.com> Vasyl Gello 2 years ago
5 changed file(s) with 77 addition(s) and 126 deletion(s). Raw diff Collapse all Expand all
+76
-0
debian/patches/0001-Use-packaged-libwebm.patch less more
0 Subject: Use packaged libwebm
1 Author: Vasyl Gello <vasek.gello@gmail.com>
2 Forwarded: not-needed
3
4 ---
5
6 --- a/CMakeLists.txt
7 +++ b/CMakeLists.txt
8 @@ -56,7 +56,6 @@
9 include_directories(${INCLUDES}
10 ${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways (becomes done in future)
11 lib/libbento4/Core
12 - lib/webm_parser/include
13 )
14
15 set(CMAKE_FIND_FRAMEWORK LAST)
16 @@ -66,6 +65,11 @@
17 include_directories(${EXPAT_INCLUDE_DIRS})
18 list(APPEND DEPLIBS ${EXPAT_LIBRARIES})
19
20 +include(FindWEBM)
21 +find_package(WEBM REQUIRED)
22 +include_directories(${WEBM_INCLUDE_DIRS})
23 +list(APPEND DEPLIBS ${WEBM_LIBRARIES})
24 +
25 if(WIN32)
26 add_definitions(-DXML_STATIC -D_CRT_NONSTDC_NO_DEPRECATE)
27 list(APPEND DEPLIBS ws2_32)
28 @@ -77,8 +81,6 @@
29
30 add_subdirectory(lib/mpegts)
31
32 -add_subdirectory(lib/webm_parser)
33 -
34 if(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedded)
35 set(BENTOUSESTCFS 1)
36 add_subdirectory(lib/libbento4)
37 @@ -91,7 +93,6 @@
38
39 list(APPEND DEPLIBS bento4)
40 list(APPEND DEPLIBS mpegts)
41 -list(APPEND DEPLIBS webm_parser)
42
43 build_addon(inputstream.adaptive ADP DEPLIBS)
44
45 --- /dev/null
46 +++ b/FindWEBM.cmake
47 @@ -0,0 +1,28 @@
48 +# - Try to find webm
49 +# Once done this will define
50 +#
51 +# WEBM_FOUND - system has libwebm
52 +# WEBM_INCLUDE_DIRS - the libwebm include directory
53 +# WEBM_LIBRARIES - The libwebm libraries
54 +
55 +if(PKG_CONFIG_FOUND)
56 + pkg_check_modules(PC_WEBM libwebm QUIET)
57 +endif()
58 +
59 +find_path(WEBM_INCLUDE_DIR webm/webm_parser.h PATHS ${PC_WEBM_INCLUDEDIR})
60 +find_library(WEBM_LIBRARY webm libwebm PATHS ${PC_WEBM_LIBDIR})
61 +
62 +set(WEBM_VERSION ${PC_WEBM_VERSION})
63 +
64 +include(FindPackageHandleStandardArgs)
65 +find_package_handle_standard_args(WEBM
66 + REQUIRED_VARS WEBM_INCLUDE_DIR WEBM_LIBRARY
67 + VERSION_VAR WEBM_VERSION)
68 +
69 +if(WEBM_FOUND)
70 + set(WEBM_LIBRARIES ${WEBM_LIBRARY})
71 + set(WEBM_INCLUDE_DIRS ${WEBM_INCLUDE_DIR})
72 +endif()
73 +
74 +
75 +mark_as_advanced(WEBM_INCLUDE_DIRS WEBM_LIBRARIES)
+0
-27
debian/patches/0001-powerpc-support.diff less more
0 Subject: Declare configuration for PPC64
1 Author: Christian Marillat <marillat@debian.org>
2 Forwarded: not-needed
3
4 --- a/wvdecrypter/cdm/build/build_config.h
5 +++ b/wvdecrypter/cdm/build/build_config.h
6 @@ -138,8 +138,18 @@
7 #define ARCH_CPU_32_BITS 1
8 #define ARCH_CPU_LITTLE_ENDIAN 1
9 #endif
10 -#else
11 -#error Please add support for your architecture in build/build_config.h
12 +#elif (defined(__PPC64__) || defined(__PPC__)) && defined(__BIG_ENDIAN__)
13 +#define ARCH_CPU_PPC64_FAMILY 1
14 +#define ARCH_CPU_PPC64 1
15 +#define ARCH_CPU_64_BITS 1
16 +#define ARCH_CPU_BIG_ENDIAN 1
17 +#elif defined(__PPC64__)
18 +#define ARCH_CPU_PPC64_FAMILY 1
19 +#define ARCH_CPU_PPC64 1
20 +#define ARCH_CPU_64_BITS 1
21 +#define ARCH_CPU_LITTLE_ENDIAN 1
22 +# else
23 +#error Please add support for your architecture in build/build_config.
24 #endif
25
26 // Type detection for wchar_t.
+0
-76
debian/patches/0002-Use-packaged-libwebm.patch less more
0 Subject: Use packaged libwebm
1 Author: Vasyl Gello <vasek.gello@gmail.com>
2 Forwarded: not-needed
3
4 ---
5
6 --- a/CMakeLists.txt
7 +++ b/CMakeLists.txt
8 @@ -56,7 +56,6 @@
9 include_directories(${INCLUDES}
10 ${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways (becomes done in future)
11 lib/libbento4/Core
12 - lib/webm_parser/include
13 )
14
15 set(CMAKE_FIND_FRAMEWORK LAST)
16 @@ -66,6 +65,11 @@
17 include_directories(${EXPAT_INCLUDE_DIRS})
18 list(APPEND DEPLIBS ${EXPAT_LIBRARIES})
19
20 +include(FindWEBM)
21 +find_package(WEBM REQUIRED)
22 +include_directories(${WEBM_INCLUDE_DIRS})
23 +list(APPEND DEPLIBS ${WEBM_LIBRARIES})
24 +
25 if(WIN32)
26 add_definitions(-DXML_STATIC -D_CRT_NONSTDC_NO_DEPRECATE)
27 list(APPEND DEPLIBS ws2_32)
28 @@ -77,8 +81,6 @@
29
30 add_subdirectory(lib/mpegts)
31
32 -add_subdirectory(lib/webm_parser)
33 -
34 if(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedded)
35 set(BENTOUSESTCFS 1)
36 add_subdirectory(lib/libbento4)
37 @@ -91,7 +93,6 @@
38
39 list(APPEND DEPLIBS bento4)
40 list(APPEND DEPLIBS mpegts)
41 -list(APPEND DEPLIBS webm_parser)
42
43 build_addon(inputstream.adaptive ADP DEPLIBS)
44
45 --- /dev/null
46 +++ b/FindWEBM.cmake
47 @@ -0,0 +1,28 @@
48 +# - Try to find webm
49 +# Once done this will define
50 +#
51 +# WEBM_FOUND - system has libwebm
52 +# WEBM_INCLUDE_DIRS - the libwebm include directory
53 +# WEBM_LIBRARIES - The libwebm libraries
54 +
55 +if(PKG_CONFIG_FOUND)
56 + pkg_check_modules(PC_WEBM libwebm QUIET)
57 +endif()
58 +
59 +find_path(WEBM_INCLUDE_DIR webm/webm_parser.h PATHS ${PC_WEBM_INCLUDEDIR})
60 +find_library(WEBM_LIBRARY webm libwebm PATHS ${PC_WEBM_LIBDIR})
61 +
62 +set(WEBM_VERSION ${PC_WEBM_VERSION})
63 +
64 +include(FindPackageHandleStandardArgs)
65 +find_package_handle_standard_args(WEBM
66 + REQUIRED_VARS WEBM_INCLUDE_DIR WEBM_LIBRARY
67 + VERSION_VAR WEBM_VERSION)
68 +
69 +if(WEBM_FOUND)
70 + set(WEBM_LIBRARIES ${WEBM_LIBRARY})
71 + set(WEBM_INCLUDE_DIRS ${WEBM_INCLUDE_DIR})
72 +endif()
73 +
74 +
75 +mark_as_advanced(WEBM_INCLUDE_DIRS WEBM_LIBRARIES)
+0
-20
debian/patches/0003-riscv-support.patch less more
0 --- a/wvdecrypter/cdm/build/build_config.h
1 +++ b/wvdecrypter/cdm/build/build_config.h
2 @@ -148,6 +148,17 @@
3 #define ARCH_CPU_PPC64 1
4 #define ARCH_CPU_64_BITS 1
5 #define ARCH_CPU_LITTLE_ENDIAN 1
6 +#elif defined(__riscv) || defined(__riscv__)
7 +#define ARCH_CPU_RISCV_FAMILY 1
8 +#define ARCH_CPU_RISCV 1
9 +#define ARCH_CPU_LITTLE_ENDIAN 1
10 +#if defined(__riscv_xlen)
11 +# if (__riscv_xlen == 64)
12 +# define ARCH_CPU_64_BITS 1
13 +# else
14 +# define ARCH_CPU_32_BITS 1
15 +# endif
16 +#endif
17 # else
18 #error Please add support for your architecture in build/build_config.
19 #endif
+1
-3
debian/patches/series less more
0 0001-powerpc-support.diff
1 0002-Use-packaged-libwebm.patch
2 0003-riscv-support.patch
0 0001-Use-packaged-libwebm.patch