Changes of Revision 104

vlc-beta.spec Changed
x
 
1
@@ -37,6 +37,7 @@
2
 Patch0:         vlc-beta.patch
3
 Patch1:         vlc.a52dec.patch
4
 Patch2:         vlc.hostname.patch
5
+Patch3:         vlc.libplacebo.patch
6
 Patch5:         fix_lib_version.patch
7
 Patch6:         fix_freerdp2_detection.patch
8
 Patch7:         fix_lua53_luaL_checkint.patch
9
@@ -131,7 +132,7 @@
10
 BuildRequires:  pkgconfig(zvbi-0.2) >= 0.2.28
11
 BuildRequires:  pkgconfig(dvdnav) >= 6.0.0
12
 BuildRequires:  pkgconfig(dvdread) >= 6.0.0
13
-BuildRequires:  pkgconfig(libplacebo) >= 2.72
14
+BuildRequires:  pkgconfig(libplacebo) >= 2.43
15
 BuildRequires:  pkgconfig(vulkan) >= 1.0.26
16
 BuildRequires:  pkgconfig(libbluray) >= 0.6.2
17
 %if %{with vlc_opencv}
18
@@ -493,7 +494,7 @@
19
    --enable-vlc \
20
    --enable-nls
21
 
22
-%make_build
23
+%make_build --no-print-directory
24
 
25
 %install
26
 %make_install
27
vlc.libplacebo.patch Added
99
 
1
@@ -0,0 +1,97 @@
2
+revert 5be0a1e3dd35d6c93cf3766a506d3bd0ead6f9a5
3
+--- a/modules/video_output/libplacebo/display.c
4
++++ b/modules/video_output/libplacebo/display.c
5
+@@ -82,8 +82,10 @@ typedef struct vout_display_sys_t
6
+     int lut_mode;
7
+ #endif
8
+ 
9
++#if PL_API_VER >= 58
10
+     const struct pl_hook *hook;
11
+     char *hook_path;
12
++#endif
13
+ } vout_display_sys_t;
14
+ 
15
+ // Display callbacks
16
+@@ -204,8 +206,10 @@ static void Close(vout_display_t *vd)
17
+     free(sys->lut_path);
18
+ #endif
19
+ 
20
++#if PL_API_VER >= 58
21
+     pl_mpv_user_shader_destroy(&sys->hook);
22
+     free(sys->hook_path);
23
++#endif
24
+ 
25
+     vlc_placebo_Release(sys->pl);
26
+ }
27
+@@ -229,6 +233,8 @@ static void PictureRender(vout_display_t *vd, picture_t *pic,
28
+ 
29
+     struct pl_image img = {
30
+         .num_planes = pic->i_planes,
31
++        .width      = pic->format.i_visible_width,
32
++        .height     = pic->format.i_visible_height,
33
+         .color      = vlc_placebo_ColorSpace(vd->fmt),
34
+         .repr       = vlc_placebo_ColorRepr(vd->fmt),
35
+         .src_rect = {
36
+@@ -511,6 +517,7 @@ error:
37
+ }
38
+ #endif
39
+ 
40
++#if PL_API_VER >= 58
41
+ static void LoadUserShader(vout_display_sys_t *sys, const char *filepath)
42
+ {
43
+     if (!filepath || !*filepath) {
44
+@@ -556,6 +563,7 @@ error:
45
+         fclose(fs);
46
+     return;
47
+ }
48
++#endif
49
+ 
50
+ // Options
51
+ 
52
+@@ -572,8 +580,10 @@ vlc_module_begin ()
53
+     add_shortcut ("libplacebo", "pl")
54
+     add_module ("pl-gpu", "libplacebo gpu", NULL, PROVIDER_TEXT, PROVIDER_LONGTEXT)
55
+ 
56
++#if PL_API_VER >= 58
57
+     set_section("Custom shaders", NULL)
58
+     add_loadfile("pl-user-shader", NULL, USER_SHADER_FILE_TEXT, USER_SHADER_FILE_LONGTEXT)
59
++#endif
60
+ 
61
+     set_section("Scaling", NULL)
62
+     add_integer("pl-upscaler-preset", SCALE_BUILTIN,
63
+@@ -828,6 +838,7 @@ static void UpdateParams(vout_display_t *vd)
64
+     }
65
+ #endif
66
+ 
67
++#if PL_API_VER >= 58
68
+     char *shader_file = var_InheritString(vd, "pl-user-shader");
69
+     LoadUserShader(sys, shader_file);
70
+     free(shader_file);
71
+@@ -837,4 +848,5 @@ static void UpdateParams(vout_display_t *vd)
72
+     } else {
73
+         sys->params.num_hooks = 0;
74
+     }
75
++#endif
76
+ }
77
+--- a/modules/video_output/libplacebo/utils.h
78
++++ b/modules/video_output/libplacebo/utils.h
79
+@@ -185,7 +185,9 @@ static const char * const lut_mode_text[] = {
80
+ #define TONEMAPPING_LONGTEXT "Algorithm to use when converting from wide gamut to standard gamut, or from HDR to SDR."
81
+ 
82
+ static const int tone_values[] = {
83
++#if PL_API_VER >= 68
84
+     PL_TONE_MAPPING_BT_2390,
85
++#endif
86
+     PL_TONE_MAPPING_HABLE,
87
+     PL_TONE_MAPPING_MOBIUS,
88
+     PL_TONE_MAPPING_REINHARD,
89
+@@ -195,7 +197,9 @@ static const int tone_values[] = {
90
+ };
91
+ 
92
+ static const char * const tone_text[] = {
93
++#if PL_API_VER >= 68
94
+     "ITU-R BT.2390 EETF (recommended)",
95
++#endif
96
+     "Hable (filmic mapping)",
97
+     "Mobius (linear + knee)",
98
+     "Reinhard (simple non-linear)",
99