[dptfxtract] Package dptfxtract (#5268)
by Benjamin Berg
commit 4e1b0e44e173e1ba6ec93a0b8378ed54170ba711
Author: Benjamin Berg <bberg(a)redhat.com>
Date: Sat Jun 8 14:22:57 2019 +0200
Package dptfxtract (#5268)
.gitignore | 1 +
dptfxtract.service | 42 +++++++++++++++++++++++++++++++++++
dptfxtract.spec | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
4 files changed, 108 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..85f32fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/v1.3.tar.gz
diff --git a/dptfxtract.service b/dptfxtract.service
new file mode 100644
index 0000000..8e0a68f
--- /dev/null
+++ b/dptfxtract.service
@@ -0,0 +1,42 @@
+[Unit]
+Description=Create thermald configuration using dptfxtract
+
+PropagatesReloadTo=thermald.service
+Before=thermald.service
+
+# Ensure the target directory exists
+ConditionPathExists=/var/run/thermald/
+# The file in /etc is prefered when it exists, so don't extract data in that case
+ConditionPathExists=!/etc/thermald/thermal-conf.xml.auto
+
+[Service]
+Type=oneshot
+ExecStart=/usr/libexec/dptfxtract -o /var/run/thermald/
+Restart=no
+
+NoNewPrivileges=yes
+LimitCPU=10
+LimitDATA=50M
+LimitNPROC=1
+
+ProtectHome=yes
+ProtectSystem=full
+ReadWritePaths=/var/run/thermald/
+PrivateTmp=yes
+PrivateDevices=yes
+PrivateNetwork=yes
+PrivateUsers=yes
+ProtectKernelTunables=yes
+ProtectKernelModules=yes
+ProtectControlGroups=yes
+RestrictAddressFamilies=
+RestrictNamespaces=
+LockPersonality=yes
+MemoryDenyWriteExecute=yes
+RestrictRealtime=yes
+RestrictSUIDSGID=yes
+SystemCallFilter=@basic-io @file-system @signal @process ioctl mprotect brk
+SystemCallArchitectures=native
+
+[Install]
+WantedBy=thermald.service
diff --git a/dptfxtract.spec b/dptfxtract.spec
new file mode 100644
index 0000000..09846bc
--- /dev/null
+++ b/dptfxtract.spec
@@ -0,0 +1,64 @@
+Name: dptfxtract
+Version: 1.3
+Release: 1%{?dist}
+Summary: Utility to generate a thermald configuration from DPTF
+
+License: Redistributable, no modification permitted
+URL: https://github.com/intel/dptfxtract
+ExclusiveArch: x86_64
+Source0: https://github.com/intel/dptfxtract/archive/v%{version}.tar.gz
+Source1: dptfxtract.service
+
+BuildRequires: systemd-rpm-macros
+Requires: thermald
+
+%{?systemd_requires}
+
+%global debug_package %{nil}
+
+%description
+This is a companion tool to Linux Thermal Daemon (thermald). This tool tries to
+reuse some of the tables used by "Intel ® Dynamic Platform and Thermal
+Framework (Intel® DPTF)" by converting to the thermal_conf.xml format used by
+thermald.
+
+Integration with thermald is included so that that a thermald configuration
+will be created automatically if thermald is enabled.
+
+%prep
+%autosetup
+
+%build
+
+%post
+%systemd_post dptfxtract.service
+systemctl try-restart thermald.service
+
+%preun
+%systemd_preun dptfxtract.service
+
+%postun
+%systemd_postun_with_restart dptfxtract.service
+
+%install
+mkdir -p %{buildroot}%{_libexecdir}
+mkdir -p %{buildroot}%{_unitdir}
+mkdir -p %{buildroot}%{_unitdir}/thermald.service.wants
+mkdir -p %{buildroot}usr/share/doc/dptfxtract
+
+install -m 755 dptfxtract %{buildroot}%{_libexecdir}/dptfxtract
+install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
+ln -s ../dptfxtract.service %{buildroot}%{_unitdir}/thermald.service.wants/dptfxtract.service
+
+%files
+%{_libexecdir}/dptfxtract
+%{_unitdir}/dptfxtract.service
+%dir %{_unitdir}/thermald.service.wants
+%{_unitdir}/thermald.service.wants/dptfxtract.service
+%license COPYING
+%doc README.txt
+
+
+%changelog
+* Sat Jun 08 2019 Benjamin Berg <bberg(a)redhat.com> - 1.3-1
+- Package dptfxtract (#5268)
diff --git a/sources b/sources
index e69de29..ddf2bbb 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+9caf01728b0d2f71fa9c3af462de3e2c v1.3.tar.gz
4 years, 11 months
[mpd/f29] Update to 0.21.10
by Leigh Scott
Summary of changes:
f6be7e5... Update to 0.21.10 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 11 months
[mpd/f30] Update to 0.21.10
by Leigh Scott
Summary of changes:
f6be7e5... Update to 0.21.10 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 11 months
[mpd] Update to 0.21.10
by Leigh Scott
commit f6be7e518dc00055a5685e9897ed14e36950dbf4
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sat Jun 8 08:16:40 2019 +0100
Update to 0.21.10
mpd.spec | 5 ++++-
sources | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/mpd.spec b/mpd.spec
index 3ccc27e..a468648 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -16,7 +16,7 @@
Name: mpd
Epoch: 1
-Version: 0.21.9
+Version: 0.21.10
Release: 1%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
@@ -225,6 +225,9 @@ fi
%changelog
+* Sat Jun 08 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 1:0.21.10-1
+- Update to 0.21.10
+
* Wed May 22 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 1:0.21.9-1
- Update to 0.21.9
diff --git a/sources b/sources
index e1dfc83..6745fef 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-24edbe20f40ffd280acd9bb6d08a4c60 mpd-0.21.9.tar.xz
-5efc3021f8145d99ee84d56ba9c7e978 mpd-0.21.9.tar.xz.sig
+718c41f3d445cea15e481724767c920b mpd-0.21.10.tar.xz
+3a31cc882e00fae29911ede09d98b51d mpd-0.21.10.tar.xz.sig
4 years, 11 months
[vlc/el7: 3/3] Merge branch 'master' into el7
by Leigh Scott
commit cb27dfff992df0d4147d57266081e161fef71fe2
Merge: 99cc242 a64717f
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Jun 7 23:53:36 2019 +0100
Merge branch 'master' into el7
libplacebo_patch_1.patch | 86 ++++++++++++++++++++++++++++++++++++++++++++++++
vlc.spec | 10 ++++--
2 files changed, 93 insertions(+), 3 deletions(-)
---
4 years, 11 months
[vlc/f29] (2 commits) ...Clean patch
by Leigh Scott
Summary of changes:
4eba8ad... Enable libplacebo (*)
a64717f... Clean patch (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 11 months
[vlc/f30] (2 commits) ...Clean patch
by Leigh Scott
Summary of changes:
4eba8ad... Enable libplacebo (*)
a64717f... Clean patch (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 11 months
[vlc] Clean patch
by Leigh Scott
commit a64717f628333bf0ed2826568f480efa3423bb59
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Fri Jun 7 23:12:14 2019 +0100
Clean patch
libplacebo_patch_1.patch | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/libplacebo_patch_1.patch b/libplacebo_patch_1.patch
index 9052c63..c8a73a0 100644
--- a/libplacebo_patch_1.patch
+++ b/libplacebo_patch_1.patch
@@ -1,13 +1,13 @@
-From 943b3096d213731a92f3932cfba1c593fe48d7d0 Mon Sep 17 00:00:00 2001
+From 78dff2f7ec405d423da4431fc873cd5182e594c8 Mon Sep 17 00:00:00 2001
From: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri, 7 Jun 2019 22:24:42 +0100
Subject: Adapt patch from videolan mailing list
https://mailman.videolan.org/pipermail/vlc-devel/2019-May/124293.html
---
- .../video_output/opengl/fragment_shaders.c | 6 ++++
- modules/video_output/opengl/vout_helper.h | 30 +++++++++++++++++--
- 2 files changed, 34 insertions(+), 2 deletions(-)
+ .../video_output/opengl/fragment_shaders.c | 6 +++++
+ modules/video_output/opengl/vout_helper.h | 27 +++++++++++++++++--
+ 2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/modules/video_output/opengl/fragment_shaders.c b/modules/video_output/opengl/fragment_shaders.c
index 8c1f67ee7a..f6fb2be6c5 100644
@@ -28,10 +28,10 @@ index 8c1f67ee7a..f6fb2be6c5 100644
struct pl_color_space dst_space = pl_color_space_unknown;
diff --git a/modules/video_output/opengl/vout_helper.h b/modules/video_output/opengl/vout_helper.h
-index 978669f89c..49a823abb7 100644
+index 978669f89c..cfc256530e 100644
--- a/modules/video_output/opengl/vout_helper.h
+++ b/modules/video_output/opengl/vout_helper.h
-@@ -148,6 +148,18 @@ static const char * const tone_text[] = {
+@@ -148,6 +148,15 @@ static const char * const tone_text[] = {
#define TONEMAP_DESAT_TEXT "Tone-mapping desaturation coefficient"
#define TONEMAP_DESAT_LONGTEXT "How strongly to desaturate overbright colors towards white. 0.0 disables this behavior."
@@ -44,13 +44,10 @@ index 978669f89c..49a823abb7 100644
+#define DESAT_BASE_TEXT "Desaturation base"
+#define DESAT_BASE_LONGTEXT "Controls the starting offset of the desaturation curve. Brightness values below this base will always be colorimetrically tone mapped (never desaturated)."
+
-+#define MAX_BOOST_TEXT "Maximum brightness boost"
-+#define MAX_BOOST_LONGTEXT "Maximum allowed brightness boost to compensate for dark scenes. A value of 1.0 means no brightness boost is allowed."
-+
#define TONEMAP_WARN_TEXT "Highlight clipped pixels"
#define TONEMAP_WARN_LONGTEXT "Debugging tool to indicate which pixels were clipped as part of the tone mapping process."
-@@ -171,6 +183,21 @@ static const char * const dither_text[] = {
+@@ -171,6 +180,21 @@ static const char * const dither_text[] = {
#define DEPTH_TEXT "Dither depth override (0 = framebuffer depth)"
#define DEPTH_LONGTEXT "Overrides the detected framebuffer depth. Useful to dither to lower bit depths than otherwise required."
@@ -72,7 +69,7 @@ index 978669f89c..49a823abb7 100644
#define add_glopts_placebo() \
set_section("Colorspace conversion", NULL) \
add_integer("rendering-intent", pl_color_map_default_params.intent, \
-@@ -184,10 +211,9 @@ static const char * const dither_text[] = {
+@@ -184,10 +208,9 @@ static const char * const dither_text[] = {
add_integer("tone-mapping", PL_TONE_MAPPING_HABLE, \
TONEMAPPING_TEXT, TONEMAPPING_LONGTEXT, false) \
change_integer_list(tone_values, tone_text) \
4 years, 11 months
[vlc] Enable libplacebo
by Leigh Scott
commit 4eba8ade0d69cfea0fd0bf9d6762c32326c0c3f0
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Fri Jun 7 23:01:25 2019 +0100
Enable libplacebo
libplacebo_patch_1.patch | 89 ++++++++++++++++++++++++++++++++++++++++++++++++
vlc.spec | 10 ++++--
2 files changed, 96 insertions(+), 3 deletions(-)
---
diff --git a/libplacebo_patch_1.patch b/libplacebo_patch_1.patch
new file mode 100644
index 0000000..9052c63
--- /dev/null
+++ b/libplacebo_patch_1.patch
@@ -0,0 +1,89 @@
+From 943b3096d213731a92f3932cfba1c593fe48d7d0 Mon Sep 17 00:00:00 2001
+From: Leigh Scott <leigh123linux(a)gmail.com>
+Date: Fri, 7 Jun 2019 22:24:42 +0100
+Subject: Adapt patch from videolan mailing list
+ https://mailman.videolan.org/pipermail/vlc-devel/2019-May/124293.html
+
+---
+ .../video_output/opengl/fragment_shaders.c | 6 ++++
+ modules/video_output/opengl/vout_helper.h | 30 +++++++++++++++++--
+ 2 files changed, 34 insertions(+), 2 deletions(-)
+
+diff --git a/modules/video_output/opengl/fragment_shaders.c b/modules/video_output/opengl/fragment_shaders.c
+index 8c1f67ee7a..f6fb2be6c5 100644
+--- a/modules/video_output/opengl/fragment_shaders.c
++++ b/modules/video_output/opengl/fragment_shaders.c
+@@ -616,7 +616,13 @@ opengl_fragment_shader_init_impl(opengl_tex_converter_t *tc, GLenum tex_target,
+ color_params.intent = var_InheritInteger(tc->gl, "rendering-intent");
+ color_params.tone_mapping_algo = var_InheritInteger(tc->gl, "tone-mapping");
+ color_params.tone_mapping_param = var_InheritFloat(tc->gl, "tone-mapping-param");
++# if PL_API_VER >= 10
++ color_params.desaturation_strength = var_InheritFloat(tc->gl, "desat-strength");
++ color_params.desaturation_exponent = var_InheritFloat(tc->gl, "desat-exponent");
++ color_params.desaturation_base = var_InheritFloat(tc->gl, "desat-base");
++# else
+ color_params.tone_mapping_desaturate = var_InheritFloat(tc->gl, "tone-mapping-desat");
++# endif
+ color_params.gamut_warning = var_InheritBool(tc->gl, "tone-mapping-warn");
+
+ struct pl_color_space dst_space = pl_color_space_unknown;
+diff --git a/modules/video_output/opengl/vout_helper.h b/modules/video_output/opengl/vout_helper.h
+index 978669f89c..49a823abb7 100644
+--- a/modules/video_output/opengl/vout_helper.h
++++ b/modules/video_output/opengl/vout_helper.h
+@@ -148,6 +148,18 @@ static const char * const tone_text[] = {
+ #define TONEMAP_DESAT_TEXT "Tone-mapping desaturation coefficient"
+ #define TONEMAP_DESAT_LONGTEXT "How strongly to desaturate overbright colors towards white. 0.0 disables this behavior."
+
++#define DESAT_STRENGTH_TEXT "Desaturation strength"
++#define DESAT_STRENGTH_LONGTEXT "How strongly to desaturate bright spectral colors towards white. 0.0 disables this behavior, 1.0 enables full desaturation (hollywood-style)"
++
++#define DESAT_EXPONENT_TEXT "Desaturation exponent"
++#define DESAT_EXPONENT_LONGTEXT "Controls the steepness of the desaturation curve. If you set this to 0.0, the curve will be flat, i.e. desaturation always enabled (hollywood-style)."
++
++#define DESAT_BASE_TEXT "Desaturation base"
++#define DESAT_BASE_LONGTEXT "Controls the starting offset of the desaturation curve. Brightness values below this base will always be colorimetrically tone mapped (never desaturated)."
++
++#define MAX_BOOST_TEXT "Maximum brightness boost"
++#define MAX_BOOST_LONGTEXT "Maximum allowed brightness boost to compensate for dark scenes. A value of 1.0 means no brightness boost is allowed."
++
+ #define TONEMAP_WARN_TEXT "Highlight clipped pixels"
+ #define TONEMAP_WARN_LONGTEXT "Debugging tool to indicate which pixels were clipped as part of the tone mapping process."
+
+@@ -171,6 +183,21 @@ static const char * const dither_text[] = {
+ #define DEPTH_TEXT "Dither depth override (0 = framebuffer depth)"
+ #define DEPTH_LONGTEXT "Overrides the detected framebuffer depth. Useful to dither to lower bit depths than otherwise required."
+
++
++#if PL_API_VER >= 10
++#define add_desat_params() \
++ add_float("desat-strength", pl_color_map_default_params.desaturation_strength, \
++ DESAT_STRENGTH_TEXT, DESAT_STRENGTH_LONGTEXT, false) \
++ add_float("desat-exponent", pl_color_map_default_params.desaturation_exponent, \
++ DESAT_EXPONENT_TEXT, DESAT_EXPONENT_LONGTEXT, false) \
++ add_float("desat-base", pl_color_map_default_params.desaturation_base, \
++ DESAT_BASE_TEXT, DESAT_BASE_LONGTEXT, false)
++#else
++#define add_desat_params() \
++ add_float("tone-mapping-desat", pl_color_map_default_params.tone_mapping_desaturate, \
++ TONEMAP_DESAT_TEXT, TONEMAP_DESAT_LONGTEXT, false)
++#endif
++
+ #define add_glopts_placebo() \
+ set_section("Colorspace conversion", NULL) \
+ add_integer("rendering-intent", pl_color_map_default_params.intent, \
+@@ -184,10 +211,9 @@ static const char * const dither_text[] = {
+ add_integer("tone-mapping", PL_TONE_MAPPING_HABLE, \
+ TONEMAPPING_TEXT, TONEMAPPING_LONGTEXT, false) \
+ change_integer_list(tone_values, tone_text) \
++ add_desat_params() \
+ add_float("tone-mapping-param", pl_color_map_default_params.tone_mapping_param, \
+ TONEMAP_PARAM_TEXT, TONEMAP_PARAM_LONGTEXT, true) \
+- add_float("tone-mapping-desat", pl_color_map_default_params.tone_mapping_desaturate, \
+- TONEMAP_DESAT_TEXT, TONEMAP_DESAT_LONGTEXT, false) \
+ add_bool("tone-mapping-warn", false, TONEMAP_WARN_TEXT, TONEMAP_WARN_LONGTEXT, false) \
+ set_section("Dithering", NULL) \
+ add_integer("dither-algo", -1, DITHER_TEXT, DITHER_LONGTEXT, false) \
+--
+2.21.0
+
diff --git a/vlc.spec b/vlc.spec
index d5d552d..c09065c 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -43,12 +43,12 @@ Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
Version: 3.0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_tag:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
Patch0: https://github.com/RPi-Distro/vlc/raw/stretch-rpt/debian/patches/mmal_8.p...
-
+Patch1: libplacebo_patch_1.patch
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: fontpackages-devel
@@ -126,7 +126,7 @@ BuildRequires: libtiger-devel
BuildRequires: libtiff-devel
BuildRequires: pkgconfig(libidn)
BuildRequires: pkgconfig(libjpeg)
-#BuildRequires: pkgconfig(libplacebo)
+BuildRequires: pkgconfig(libplacebo)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(libvncclient)
BuildRequires: libupnp-devel
@@ -284,6 +284,7 @@ VLC media player extras modules.
%{?_with_rpi:
%patch0 -p1
}
+%patch1 -p1
%if 0%{?rhel} == 7
. /opt/rh/devtoolset-7/enable
@@ -541,6 +542,9 @@ fi || :
%changelog
+* Fri Jun 07 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 1:3.0.7-2
+- Enable libplacebo
+
* Fri Jun 07 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 1:3.0.7-1
- Update to 3.0.7
4 years, 11 months