[vlc/f26] Update to 3.0.1
by Nicolas Chauvet
commit 7373e788e25183e12cbd59f0075dec62adc01a85
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Feb 27 19:07:29 2018 +0100
Update to 3.0.1
sources | 2 +-
vlc.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 60c16f7..69626ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a953d8b90e56f06828c4ca8e390c5c9b vlc-3.0.0.tar.xz
+32292f9fc6eab0b00432cdd574fc9eae vlc-3.0.1.tar.xz
diff --git a/vlc.spec b/vlc.spec
index 234d701..dab8b27 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,4 +1,4 @@
-%global vlc_vers 3.0.0
+%global vlc_vers 3.0.1
#global vlc_date 20180202
#global vlc_rc rc9
#global vlc_tag -%%{?vlc_date}-0233-%%{?vlc_rc}
@@ -43,7 +43,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: %{vlc_vers}
-Release: 3%{?dist}
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -550,6 +550,9 @@ fi || :
%changelog
+* Tue Feb 27 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.1-1
+- Update to 3.0.1
+
* Mon Feb 26 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-3
- Add libplacebo support
6 years, 2 months
[vlc/f26] Revert "update for libplacebo v0.4.0 API changes"
by Nicolas Chauvet
commit 9360d1457c7f109bcd7a1c1c7bbcb4931fa8375a
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Feb 27 18:59:56 2018 +0100
Revert "update for libplacebo v0.4.0 API changes"
This reverts commit 394a600156ddda355d1dd754838319bda85487f0.
...es_video_output_opengl_fragment_shaders.c.patch | 40 ----------------------
vlc.spec | 4 ---
2 files changed, 44 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 4a2d96e..234d701 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -48,9 +48,6 @@ License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_rc:%{vlc_vers}/}vlc-%{vlc_vers}%{?vlc_tag}.tar.xz
-# opengl: update for libplacebo v0.4.0 API changes
-# https://git.videolan.org/?p=vlc/vlc-3.0.git;a=commit;h=f33a7b19f0a55e70f1...
-Patch0: modules_video_output_opengl_fragment_shaders.c.patch
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
@@ -270,7 +267,6 @@ VLC media player extras modules.
%prep
%setup -q -n %{name}-%{vlc_vers}%{?vlc_rc:-%{vlc_rc}}
-%patch0 -p1
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
./bootstrap
6 years, 2 months
[vlc/f26] update for libplacebo v0.4.0 API changes
by Nicolas Chauvet
commit 769011a047a03a6a7a5f7a8a442011c0c9c3eb1e
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Feb 27 08:40:45 2018 +0000
update for libplacebo v0.4.0 API changes
...es_video_output_opengl_fragment_shaders.c.patch | 40 ++++++++++++++++++++++
vlc.spec | 4 +++
2 files changed, 44 insertions(+)
---
diff --git a/modules_video_output_opengl_fragment_shaders.c.patch b/modules_video_output_opengl_fragment_shaders.c.patch
new file mode 100644
index 0000000..6e0ffc6
--- /dev/null
+++ b/modules_video_output_opengl_fragment_shaders.c.patch
@@ -0,0 +1,40 @@
+X-Git-Url: https://git.videolan.org/?p=vlc%2Fvlc-3.0.git;a=blobdiff_plain;f=modules%...
+
+diff --git a/modules/video_output/opengl/fragment_shaders.c b/modules/video_output/opengl/fragment_shaders.c
+index f959d9a69c..0c91a4db76 100644
+--- a/modules/video_output/opengl/fragment_shaders.c
++++ b/modules/video_output/opengl/fragment_shaders.c
+@@ -399,11 +399,18 @@ tc_base_prepare_shader(const opengl_tex_converter_t *tc,
+ continue;
+
+ struct pl_shader_var sv = res->variables[i];
++#if PL_API_VER >= 4
++ struct pl_var var = sv.var;
++ // libplacebo doesn't need anything else anyway
++ if (var.type != PL_VAR_FLOAT)
++ continue;
++#else
+ struct ra_var var = sv.var;
+-
+ // libplacebo doesn't need anything else anyway
+ if (var.type != RA_VAR_FLOAT)
+ continue;
++#endif
++
+ if (var.dim_m > 1 && var.dim_m != var.dim_v)
+ continue;
+
+@@ -657,7 +664,12 @@ opengl_fragment_shader_init_impl(opengl_tex_converter_t *tc, GLenum tex_target,
+ tc->uloc.pl_vars = calloc(res->num_variables, sizeof(GLint));
+ for (int i = 0; i < res->num_variables; i++) {
+ struct pl_shader_var sv = res->variables[i];
+- ADDF("uniform %s %s;\n", ra_var_glsl_type_name(sv.var), sv.var.name);
++#if PL_API_VER >= 4
++ const char *glsl_type_name = pl_var_glsl_type_name(sv.var);
++#else
++ const char *glsl_type_name = ra_var_glsl_type_name(sv.var);
++#endif
++ ADDF("uniform %s %s;\n", glsl_type_name, sv.var.name);
+ }
+
+ // We can't handle these yet, but nothing we use requires them, either
diff --git a/vlc.spec b/vlc.spec
index 234d701..4a2d96e 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -48,6 +48,9 @@ License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_rc:%{vlc_vers}/}vlc-%{vlc_vers}%{?vlc_tag}.tar.xz
+# opengl: update for libplacebo v0.4.0 API changes
+# https://git.videolan.org/?p=vlc/vlc-3.0.git;a=commit;h=f33a7b19f0a55e70f1...
+Patch0: modules_video_output_opengl_fragment_shaders.c.patch
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
@@ -267,6 +270,7 @@ VLC media player extras modules.
%prep
%setup -q -n %{name}-%{vlc_vers}%{?vlc_rc:-%{vlc_rc}}
+%patch0 -p1
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
./bootstrap
6 years, 2 months
[vlc/f26] Update for libplacebo
by Nicolas Chauvet
commit 68a444009f86486f58bbc98bc905eb13dc8db181
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Feb 26 23:08:08 2018 +0100
Update for libplacebo
vlc.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 7cce5f7..234d701 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -43,7 +43,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: %{vlc_vers}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -121,6 +121,7 @@ BuildRequires: libtar-devel
BuildRequires: libtheora-devel
BuildRequires: libtiger-devel
BuildRequires: libtiff-devel
+BuildRequires: pkgconfig(libplacebo)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(libvncclient)
BuildRequires: libupnp-devel
@@ -549,6 +550,9 @@ fi || :
%changelog
+* Mon Feb 26 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-3
+- Add libplacebo support
+
* Sun Feb 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.0-2
- Enable microdns (rfbz#4793)
6 years, 2 months
[vlc/f26] Enable microdns (rfbz#4793)
by Nicolas Chauvet
commit 9bbfe1548db1c6eb073f69421de4b452e90834b3
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Feb 18 14:08:02 2018 +0000
Enable microdns (rfbz#4793)
vlc.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index b4fed1f..7cce5f7 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -43,7 +43,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: %{vlc_vers}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -150,6 +150,7 @@ BuildRequires: pcre-devel
BuildRequires: pkgconfig(libarchive) >= 3.1.0
BuildRequires: pkgconfig(libpulse) >= 0.9.8
BuildRequires: pkgconfig(libsecret-1) >= 0.18
+BuildRequires: pkgconfig(microdns)
BuildRequires: pkgconfig(protobuf-lite) >= 2.5
BuildRequires: pkgconfig(Qt5Core) >= 5.5
BuildRequires: pkgconfig(Qt5Gui) >= 5.5
@@ -548,6 +549,9 @@ fi || :
%changelog
+* Sun Feb 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.0-2
+- Enable microdns (rfbz#4793)
+
* Fri Feb 09 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.0-1
- Update to 3.0.0 release
6 years, 2 months
[vlc/f26] Workaround opencv failure
by Nicolas Chauvet
commit cd12e86ffa5491b3e9a90d4ca7007d0aa861d53b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Feb 2 12:24:51 2018 +0100
Workaround opencv failure
vlc.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/vlc.spec b/vlc.spec
index 2c261cc..b4fed1f 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -141,7 +141,9 @@ BuildRequires: lua-devel
BuildRequires: minizip-devel
%{?_with_libmpeg2:BuildRequires: mpeg2dec-devel >= 0.3.2}
BuildRequires: ncurses-devel
+%if 0%{?fedora} && 0%{?fedora} < 28
%{?_with_opencv:BuildRequires: pkgconfig(opencv)}
+%endif
BuildRequires: openslp-devel
Buildrequires: opus-devel
BuildRequires: pcre-devel
6 years, 2 months
[vlc/f27] (5 commits) ...Update to 3.0.1
by Nicolas Chauvet
Summary of changes:
5800209... Enable microdns (rfbz#4793) (*)
1872979... Update for libplacebo (*)
394a600... update for libplacebo v0.4.0 API changes (*)
473cfc9... Revert "update for libplacebo v0.4.0 API changes" (*)
210c68c... Update to 3.0.1 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 2 months
[vlc] Update to 3.0.1
by Nicolas Chauvet
commit 210c68c930dfc3d6c8c67486cc96b20639875715
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Feb 27 19:07:29 2018 +0100
Update to 3.0.1
sources | 2 +-
vlc.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 60c16f7..69626ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a953d8b90e56f06828c4ca8e390c5c9b vlc-3.0.0.tar.xz
+32292f9fc6eab0b00432cdd574fc9eae vlc-3.0.1.tar.xz
diff --git a/vlc.spec b/vlc.spec
index d7d66ad..233572f 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,4 +1,4 @@
-%global vlc_vers 3.0.0
+%global vlc_vers 3.0.1
#global vlc_date 20180202
#global vlc_rc rc9
#global vlc_tag -%%{?vlc_date}-0233-%%{?vlc_rc}
@@ -43,7 +43,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: %{vlc_vers}
-Release: 3%{?dist}
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -548,6 +548,9 @@ fi || :
%changelog
+* Tue Feb 27 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.1-1
+- Update to 3.0.1
+
* Mon Feb 26 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-3
- Add libplacebo support
6 years, 2 months
[vlc] Revert "update for libplacebo v0.4.0 API changes"
by Nicolas Chauvet
commit 473cfc94931724b95c78706e0fdf8150b10ec58c
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Feb 27 18:59:56 2018 +0100
Revert "update for libplacebo v0.4.0 API changes"
This reverts commit 394a600156ddda355d1dd754838319bda85487f0.
...es_video_output_opengl_fragment_shaders.c.patch | 40 ----------------------
vlc.spec | 4 ---
2 files changed, 44 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 400e8b0..d7d66ad 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -48,9 +48,6 @@ License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_rc:%{vlc_vers}/}vlc-%{vlc_vers}%{?vlc_tag}.tar.xz
-# opengl: update for libplacebo v0.4.0 API changes
-# https://git.videolan.org/?p=vlc/vlc-3.0.git;a=commit;h=f33a7b19f0a55e70f1...
-Patch0: modules_video_output_opengl_fragment_shaders.c.patch
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
@@ -268,7 +265,6 @@ VLC media player extras modules.
%prep
%setup -q -n %{name}-%{vlc_vers}%{?vlc_rc:-%{vlc_rc}}
-%patch0 -p1
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
./bootstrap
6 years, 2 months
