Packman Build Service PMBS

Changes of Revision 216

vlc-beta.spec Changed

@@ -37,10 +37,6 @@
 Patch0:         vlc-beta.patch
 Patch1:         vlc.a52dec.patch
 Patch2:         vlc.hostname.patch
-%if 0%{?sle_version} == 150300
-BuildRequires:  pkgconfig(placebo) >= 321
-Patch3:         vlc.libplacebo.patch
-%endif
 Patch5:         fix_lib_version.patch
 Patch6:         fix_freerdp2_detection.patch
 Patch7:         fix_lua53_luaL_checkint.patch
@@ -139,7 +135,7 @@
 BuildRequires:  pkgconfig(zvbi-0.2) >= 0.2.28
 BuildRequires:  pkgconfig(dvdnav) >= 6.0.0
 BuildRequires:  pkgconfig(dvdread) >= 6.0.0
-BuildRequires:  pkgconfig(libplacebo) >= 2.43
+BuildRequires:  pkgconfig(libplacebo)
 BuildRequires:  pkgconfig(vulkan) >= 1.0.26
 BuildRequires:  pkgconfig(libbluray) >= 0.6.2
 %if %{with vlc_opencv}
@@ -214,7 +210,7 @@
 BuildRequires:  pkgconfig(xcb-xfixes)
 BuildRequires:  pkgconfig(vdpau) >= 0.6
 BuildRequires:  pkgconfig(libva-wayland)
-BuildRequires:  pkgconfig(wayland-client) >= 1.19.91
+BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-cursor)
 BuildRequires:  pkgconfig(wayland-egl)
 BuildRequires:  pkgconfig(wayland-protocols) >= 1.15
@@ -440,7 +436,9 @@
 %endif
 	--enable-xcb \
 	--enable-vdpau \
+%if 0
 	--enable-wayland \
+%endif
 	--enable-freetype \
 	--enable-fribidi \
 	--enable-harfbuzz \
@@ -495,7 +493,9 @@
 	--enable-gbm \
 	--enable-notify \
 	--disable-vulkan \
+%if 0
 	--enable-libplacebo \
+%endif
 	--enable-vulkan \
 	--disable-medialibrary \
 	--with-kde-solid=%{_datadir}/kde4/apps/solid \

vlc.libplacebo.patch Deleted

@@ -1,110 +0,0 @@
-revert 5be0a1e3dd35d6c93cf3766a506d3bd0ead6f9a5
---- a/configure.ac
-+++ b/configure.ac
-@@ -3163,7 +3163,7 @@ AC_ARG_ENABLE(libplacebo,
-       disable libplacebo support (default auto)))
- 
- AS_IF(test "$enable_libplacebo" != "no", 
--  PKG_CHECK_MODULES(LIBPLACEBO, libplacebo >= 2.72, 
-+  PKG_CHECK_MODULES(LIBPLACEBO, libplacebo, 
-     AC_DEFINE(HAVE_LIBPLACEBO, 1, Define to 1 if libplacebo is enabled.)
-     AC_CHECK_HEADER(libplacebo/vulkan.h, VLC_ADD_PLUGIN(placebo_vk))
-     AC_CHECK_HEADER(libplacebo/opengl.h, 
---- a/modules/video_output/libplacebo/display.c
-+++ b/modules/video_output/libplacebo/display.c
-@@ -82,8 +82,10 @@ typedef struct vout_display_sys_t
-     int lut_mode;
- #endif
- 
-+#if PL_API_VER >= 58
-     const struct pl_hook *hook;
-     char *hook_path;
-+#endif
- 
- #if PL_API_VER >= 185
-     struct pl_dovi_metadata dovi_metadata;
-@@ -204,8 +206,10 @@ static void Close(vout_display_t *vd)
-     free(sys->lut_path);
- #endif
- 
-+#if PL_API_VER >= 58
-     pl_mpv_user_shader_destroy(&sys->hook);
-     free(sys->hook_path);
-+#endif
- 
-     vlc_placebo_Release(sys->pl);
- }
-@@ -229,6 +233,10 @@ static void PictureRender(vout_display_t *vd, picture_t *pic,
- 
-     struct pl_image img = {
-         .num_planes = pic->i_planes,
-+#if PL_API_VER < 192
-+        .width      = pic->format.i_visible_width,
-+        .height     = pic->format.i_visible_height,
-+#endif
-         .color      = vlc_placebo_ColorSpace(vd->fmt),
-         .repr       = vlc_placebo_ColorRepr(vd->fmt),
-         .src_rect = {
-@@ -511,6 +517,7 @@ error:
- }
- #endif
- 
-+#if PL_API_VER >= 58
- static void LoadUserShader(vout_display_sys_t *sys, const char *filepath)
- {
-     if (!filepath || !*filepath) {
-@@ -556,6 +563,7 @@ error:
-         fclose(fs);
-     return;
- }
-+#endif
- 
- // Options
- 
-@@ -572,8 +580,10 @@ vlc_module_begin ()
-     add_shortcut ("libplacebo", "pl")
-     add_module ("pl-gpu", "libplacebo gpu", "any", PROVIDER_TEXT, PROVIDER_LONGTEXT)
- 
-+#if PL_API_VER >= 58
-     set_section("Custom shaders", NULL)
-     add_loadfile("pl-user-shader", NULL, USER_SHADER_FILE_TEXT, USER_SHADER_FILE_LONGTEXT)
-+#endif
- 
-     set_section("Scaling", NULL)
-     add_integer("pl-upscaler-preset", SCALE_BUILTIN,
-@@ -828,6 +838,7 @@ static void UpdateParams(vout_display_t *vd)
-     }
- #endif
- 
-+#if PL_API_VER >= 58
-     char *shader_file = var_InheritString(vd, "pl-user-shader");
-     LoadUserShader(sys, shader_file);
-     free(shader_file);
-@@ -837,4 +848,5 @@ static void UpdateParams(vout_display_t *vd)
-     } else {
-         sys->params.num_hooks = 0;
-     }
-+#endif
- }
---- a/modules/video_output/libplacebo/utils.h
-+++ b/modules/video_output/libplacebo/utils.h
-@@ -185,7 +185,9 @@ static const char * const lut_mode_text = {
- #define TONEMAPPING_LONGTEXT "Algorithm to use when converting from wide gamut to standard gamut, or from HDR to SDR."
- 
- static const int tone_values = {
-+#if PL_API_VER >= 68
-     PL_TONE_MAPPING_BT_2390,
-+#endif
-     PL_TONE_MAPPING_HABLE,
-     PL_TONE_MAPPING_MOBIUS,
-     PL_TONE_MAPPING_REINHARD,
-@@ -195,7 +197,9 @@ static const int tone_values = {
- };
- 
- static const char * const tone_text = {
-+#if PL_API_VER >= 68
-     "ITU-R BT.2390 EETF (recommended)",
-+#endif
-     "Hable (filmic mapping)",
-     "Mobius (linear + knee)",
-     "Reinhard (simple non-linear)",