[mpv/f26] Update to 0.27.1
by Leigh Scott
Summary of changes:
45b63c3... Update to 0.27.1 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[mpv/f27] Update to 0.27.1
by Leigh Scott
commit 45b63c3f030cd0ddd2fad8ed3a43ec8bc6e61a1c
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Feb 11 07:31:38 2018 +0000
Update to 0.27.1
mpv.spec | 21 +++++----------------
sources | 2 +-
2 files changed, 6 insertions(+), 17 deletions(-)
---
diff --git a/mpv.spec b/mpv.spec
index 96cabe2..5174d5a 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -1,5 +1,5 @@
Name: mpv
-Version: 0.27.0
+Version: 0.27.1
Release: 1%{?dist}
Summary: Movie player playing most video formats and DVDs
License: GPLv2+
@@ -126,21 +126,7 @@ waf install --destdir=%{buildroot}
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}/%{name}
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
+%ldconfig_scriptlets libs
%files
%docdir %{_docdir}/%{name}
@@ -163,6 +149,9 @@ fi
%{_libdir}/pkgconfig/mpv.pc
%changelog
+* Sun Feb 11 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.27.1-1
+- Update to 0.27.1
+
* Fri Sep 15 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 0.27.0-1
- Update to 0.27.0
- Enable libarchive support (play .zip, .iso and other formats)
diff --git a/sources b/sources
index 69fc15b..6dc42dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec86f42b091d891f9a932de0f6e873ad mpv-0.27.0.tar.gz
+d6f7cfde99e14a571950c5b66d17abaa mpv-0.27.1.tar.gz
6 years, 7 months
[mpv] Update to 0.28.1
by Leigh Scott
commit 0eee0701eb9934f5e6792d25248563724c0a4b7c
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Feb 11 07:25:38 2018 +0000
Update to 0.28.1
mpv.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/mpv.spec b/mpv.spec
index cd52376..d572210 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -1,6 +1,6 @@
Name: mpv
-Version: 0.28.0
-Release: 3%{?dist}
+Version: 0.28.1
+Release: 1%{?dist}
Summary: Movie player playing most video formats and DVDs
License: GPLv2+ and LGPLv2+
URL: http://%{name}.io/
@@ -151,6 +151,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}
%{_libdir}/pkgconfig/mpv.pc
%changelog
+* Sun Feb 11 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.28.1-1
+- Update to 0.28.1
+
* Thu Feb 08 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.28.0-3
- Fix missing build requires
diff --git a/sources b/sources
index 7379916..de8ad23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2ee9b57091fdc80c91a7fca1aae0e396 mpv-0.28.0.tar.gz
+6c233a8cbcdaa0f180651b8bf0f8f72f mpv-0.28.1.tar.gz
6 years, 7 months
[nvidia-kmod] Patch for 4.15 kernel
by Leigh Scott
commit e3618d0216f075a28a976a58105ada0b343c240b
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Feb 10 12:03:10 2018 +0000
Patch for 4.15 kernel
kernel_4.15.patch | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-kmod.spec | 7 ++-
2 files changed, 187 insertions(+), 1 deletion(-)
---
diff --git a/kernel_4.15.patch b/kernel_4.15.patch
new file mode 100644
index 0000000..93e11f0
--- /dev/null
+++ b/kernel_4.15.patch
@@ -0,0 +1,181 @@
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index 292d7da..5f254e1 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -2123,6 +2123,7 @@ compile_test() {
+ #endif
+ #include <drm/drm_atomic.h>
+ #include <drm/drm_atomic_helper.h>
++ #include <linux/version.h>
+ #if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)
+ #error DRM not enabled
+ #endif
+@@ -2146,8 +2147,12 @@ compile_test() {
+ /* 2014-12-18 88a48e297b3a3bac6022c03babfb038f1a886cea */
+ i = DRIVER_ATOMIC;
+
++ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ /* 2015-04-10 df63b9994eaf942afcdb946d27a28661d7dfbf2a */
+ for_each_crtc_in_state(s, c, cs, i) { }
++ #else
++ for_each_new_crtc_in_state(s, c, cs, i) {}
++ #endif
+
+ /* 2015-05-18 036ef5733ba433760a3512bb5f7a155946e2df05 */
+ a = offsetof(struct drm_mode_config_funcs, atomic_state_alloc);
+diff --git a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c
+index cf16b6f..a66ae5a 100644
+--- a/kernel/nvidia-drm/nvidia-drm-connector.c
++++ b/kernel/nvidia-drm/nvidia-drm-connector.c
+@@ -33,6 +33,7 @@
+
+ #include <drm/drm_atomic.h>
+ #include <drm/drm_atomic_helper.h>
++#include <linux/version.h>
+
+ static void nv_drm_connector_destroy(struct drm_connector *connector)
+ {
+@@ -87,7 +88,11 @@ static enum drm_connector_status __nv_drm_connector_detect_internal(
+ break;
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ encoder = drm_encoder_find(dev, connector->encoder_ids[i]);
++#else
++ encoder = drm_encoder_find(dev, NULL, connector->encoder_ids[i]);
++#endif
+
+ if (encoder == NULL) {
+ BUG_ON(encoder != NULL);
+diff --git a/kernel/nvidia-drm/nvidia-drm-crtc.c b/kernel/nvidia-drm/nvidia-drm-crtc.c
+index b54128a..d820dc2 100644
+--- a/kernel/nvidia-drm/nvidia-drm-crtc.c
++++ b/kernel/nvidia-drm/nvidia-drm-crtc.c
+@@ -37,6 +37,7 @@
+
+ #include <drm/drm_atomic.h>
+ #include <drm/drm_atomic_helper.h>
++#include <linux/version.h>
+
+ static const u32 nv_default_supported_plane_drm_formats[] = {
+ DRM_FORMAT_ARGB1555,
+@@ -141,7 +142,11 @@ static int nv_drm_plane_atomic_check(struct drm_plane *plane,
+ goto done;
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ for_each_crtc_in_state(plane_state->state, crtc, crtc_state, i) {
++#else
++ for_each_new_crtc_in_state(plane_state->state, crtc, crtc_state, i) {
++#endif
+ struct nv_drm_crtc_state *nv_crtc_state = to_nv_crtc_state(crtc_state);
+ struct NvKmsKapiHeadRequestedConfig *head_req_config =
+ &nv_crtc_state->req_config;
+@@ -365,7 +370,11 @@ static int nv_drm_crtc_atomic_check(struct drm_crtc *crtc,
+
+ req_config->flags.displaysChanged = NV_TRUE;
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ for_each_connector_in_state(crtc_state->state,
++#else
++ for_each_new_connector_in_state(crtc_state->state,
++#endif
+ connector, connector_state, j) {
+ if (connector_state->crtc != crtc) {
+ continue;
+@@ -613,7 +622,11 @@ int nv_drm_get_crtc_crc32_ioctl(struct drm_device *dev,
+ goto done;
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ crtc = drm_crtc_find(dev, params->crtc_id);
++#else
++ crtc = drm_crtc_find(dev, NULL, params->crtc_id);
++#endif
+ if (!crtc) {
+ ret = -ENOENT;
+ goto done;
+diff --git a/kernel/nvidia-drm/nvidia-drm-modeset.c b/kernel/nvidia-drm/nvidia-drm-modeset.c
+index da15d89..91f64ea 100644
+--- a/kernel/nvidia-drm/nvidia-drm-modeset.c
++++ b/kernel/nvidia-drm/nvidia-drm-modeset.c
+@@ -33,6 +33,7 @@
+ #include <drm/drm_atomic.h>
+ #include <drm/drm_atomic_helper.h>
+ #include <drm/drm_crtc.h>
++#include <linux/version.h>
+
+ struct nv_drm_atomic_state {
+ struct NvKmsKapiRequestedModeSetConfig config;
+@@ -110,7 +111,11 @@ nv_drm_atomic_apply_modeset_config(struct drm_device *dev,
+ memset(requested_config, 0, sizeof(*requested_config));
+
+ /* Loop over affected crtcs and construct NvKmsKapiRequestedModeSetConfig */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ for_each_crtc_in_state(state, crtc, crtc_state, i) {
++#else
++ for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
++#endif
+ /*
+ * When commiting a state, the new state is already stored in
+ * crtc->state. When checking a proposed state, the proposed state is
+@@ -178,7 +183,11 @@ void nv_drm_atomic_helper_commit_tail(struct drm_atomic_state *state)
+ nv_drm_write_combine_flush();
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ for_each_crtc_in_state(state, crtc, crtc_state, i) {
++#else
++ for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
++#endif
+ struct nv_drm_crtc *nv_crtc = to_nv_crtc(crtc);
+ struct nv_drm_crtc_state *nv_crtc_state = to_nv_crtc_state(crtc->state);
+ struct nv_drm_flip *nv_flip = nv_crtc_state->nv_flip;
+@@ -282,7 +291,11 @@ static void nv_drm_atomic_commit_task_callback(struct work_struct *work)
+ ret);
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ for_each_crtc_in_state(state, crtc, crtc_state, i) {
++#else
++ for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
++#endif
+ struct nv_drm_crtc *nv_crtc = to_nv_crtc(crtc);
+
+ if (wait_event_timeout(
+@@ -351,7 +364,11 @@ static int nv_drm_atomic_commit_internal(
+ * condition between two/more nvKms->applyModeSetConfig() on single
+ * crtc and generate flip events in correct order.
+ */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ for_each_crtc_in_state(state, crtc, crtc_state, i) {
++#else
++ for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
++#endif
+ struct nv_drm_device *nv_dev = to_nv_device(dev);
+ struct nv_drm_crtc *nv_crtc = to_nv_crtc(crtc);
+
+@@ -372,7 +389,11 @@ static int nv_drm_atomic_commit_internal(
+ }
+ }
+ } else {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ for_each_crtc_in_state(state, crtc, crtc_state, i) {
++#else
++ for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
++#endif
+ struct nv_drm_crtc *nv_crtc = to_nv_crtc(crtc);
+
+ if (atomic_read(&nv_crtc->has_pending_commit) ||
+@@ -388,7 +409,11 @@ static int nv_drm_atomic_commit_internal(
+ * flip events.
+ */
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ for_each_crtc_in_state(state, crtc, crtc_state, i) {
++#else
++ for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
++#endif
+ struct nv_drm_crtc *nv_crtc = to_nv_crtc(crtc);
+
+ atomic_set(&nv_crtc->has_pending_commit, true);
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 4f42fed..9735598 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -10,7 +10,7 @@ Name: nvidia-kmod
Epoch: 2
Version: 390.25
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,6 +19,7 @@ URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
Patch1: nv-linux-arm2.patch
+Patch2: kernel_4.15.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64 armv7hl
@@ -44,6 +45,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
# patch loop
%patch0 -p1
%patch1 -p1
+%patch2 -p1
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -71,6 +73,9 @@ done
%changelog
+* Sat Feb 10 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2:390.25-2
+- Patch for 4.15 kernel
+
* Mon Jan 29 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2:390.25-1
- Update to 390.25 release
6 years, 7 months
[xpra-codecs-freeworld] Update to 2.2.4
by Antonio
commit 007d554a7af0bbfa5d38470a16c75d4210175053
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Feb 9 22:51:36 2018 +0100
Update to 2.2.4
.gitignore | 1 +
sources | 2 +-
xpra-codecs-freeworld-ffmpeg35.patch | 16 ----------------
xpra-codecs-freeworld.spec | 6 +++++-
4 files changed, 7 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 79150a2..9ad4797 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ xpra-0.16.3.tar.xz
/xpra-2.2.1.tar.xz
/xpra-2.2.2.tar.xz
/xpra-2.2.3.tar.xz
+/xpra-2.2.4.tar.xz
diff --git a/sources b/sources
index 89e8804..d2d947e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c983399558c92627ba1c3b5e120341ee xpra-2.2.3.tar.xz
+66c4d05216f12068d0cec042e36f1523 xpra-2.2.4.tar.xz
diff --git a/xpra-codecs-freeworld-ffmpeg35.patch b/xpra-codecs-freeworld-ffmpeg35.patch
index 4772089..04abf51 100644
--- a/xpra-codecs-freeworld-ffmpeg35.patch
+++ b/xpra-codecs-freeworld-ffmpeg35.patch
@@ -1,19 +1,3 @@
---- src/xpra/codecs/dec_avcodec2/decoder.pyx (revision 18085)
-+++ src/xpra/codecs/dec_avcodec2/decoder.pyx (revision 18086)
-@@ -53,5 +53,5 @@
-
- cdef extern from "libavcodec/avcodec.h":
-- int CODEC_FLAG2_FAST
-+ int AV_CODEC_FLAG2_FAST
-
- ctypedef struct AVFrame:
-@@ -359,5 +359,5 @@
- self.codec_ctx.thread_type = 2 #FF_THREAD_SLICE: allow more than one thread per frame
- self.codec_ctx.thread_count = 0 #auto
-- self.codec_ctx.flags2 |= CODEC_FLAG2_FAST #may cause "no deblock across slices" - which should be fine
-+ self.codec_ctx.flags2 |= AV_CODEC_FLAG2_FAST #may cause "no deblock across slices" - which should be fine
- r = avcodec_open2(self.codec_ctx, self.codec, NULL)
- if r<0:
--- src/xpra/codecs/enc_ffmpeg/encoder.pyx (revision 18087)
+++ src/xpra/codecs/enc_ffmpeg/encoder.pyx (revision 18088)
@@ -135,42 +135,34 @@
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 21d710a..498f5e1 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -18,7 +18,7 @@
%endif
Name: xpra-codecs-freeworld
-Version: 2.2.3
+Version: 2.2.4
Release: 1%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
@@ -110,6 +110,10 @@ find %{buildroot}%{python2_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
+* Fri Feb 09 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 2.2.4-1
+- Update to 2.2.4
+- Modify patch for ffmpeg-3.5
+
* Sun Jan 21 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 2.2.3-1
- Update to 2.2.3
- Patched for ffmpeg-3.5
6 years, 7 months
[vlc/f26: 7/7] Merge branch 'master' into f26
by Leigh Scott
commit 2424e17c686e54779926df7cc7faf57148b71547
Merge: 5fd0b08 65ce926
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Feb 9 13:59:04 2018 +0000
Merge branch 'master' into f26
...-lua-don-t-call-directly-config_GetLibDir.patch | 38 ----
...-Revert-qt-add-Wayland-run-time-detection.patch | 191 ---------------------
0001-qt-Prefer-XCB-over-Wayland.patch | 43 -----
disable_hidpi_scaling.patch | 14 --
sources | 2 +-
vlc.spec | 30 ++--
6 files changed, 21 insertions(+), 297 deletions(-)
---
6 years, 7 months
[vlc/f26] (7 commits) ...Merge branch 'master' into f26
by Leigh Scott
Summary of changes:
b0cd75c... Workaround opencv failure (*)
967f8a8... Revert "Workaround opencv failure" (*)
9a5f073... Better workaround (*)
95bbfb9... Rebuild (live555-2018.01.29) (*)
0d6a7d3... Minor updates (*)
65ce926... Update to 3.0.0 release (*)
2424e17... Merge branch 'master' into f26
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[vlc/f27] (6 commits) ...Update to 3.0.0 release
by Leigh Scott
Summary of changes:
b0cd75c... Workaround opencv failure (*)
967f8a8... Revert "Workaround opencv failure" (*)
9a5f073... Better workaround (*)
95bbfb9... Rebuild (live555-2018.01.29) (*)
0d6a7d3... Minor updates (*)
65ce926... Update to 3.0.0 release (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months