September 2016 - rpmfusion-commits

by nchauvet

commit 59746701dd30ca5d8890d64ca47113c560f71646 Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Thu Sep 8 09:07:15 2016 +0200 Disable opencv for f25 ffmpeg.spec | 6 ++++++ 1 file changed, 6 insertions(+) --- diff --git a/ffmpeg.spec b/ffmpeg.spec index 53e9829..781326a 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -4,6 +4,12 @@ #global date 20110612 #global rel rc1 +%if 0%{?fedora} >= 25 +# OpenCV 3.X has an overlinking issue - unsuitable for core libraries +# Reported as https://github.com/opencv/opencv/issues/7001 +%global _without_opencv 1 +%endif + %if 0%{?rhel} %global _without_frei0r 1 %global _without_opencv 1

8 years, 2 months

1
0
0 / 0

[wl-kmod/f23] Add patch for kernel >= 4.8 - add cfg80211_scan_info struct in cfg80211_scan_done call

by Nicolas Viéville

Summary of changes: 69c510c... Add patch for kernel >= 4.8 - add cfg80211_scan_info struct (*) (*) This commit already existed in another branch; no separate mail sent

8 years, 2 months

1
0
0 / 0

[wl-kmod/f24] Add patch for kernel >= 4.8 - add cfg80211_scan_info struct in cfg80211_scan_done call

by Nicolas Viéville

Summary of changes: 69c510c... Add patch for kernel >= 4.8 - add cfg80211_scan_info struct (*) (*) This commit already existed in another branch; no separate mail sent

8 years, 2 months

1
0
0 / 0

[wl-kmod/f25] Add patch for kernel >= 4.8 - add cfg80211_scan_info struct in cfg80211_scan_done call

by Nicolas Viéville

Summary of changes: 69c510c... Add patch for kernel >= 4.8 - add cfg80211_scan_info struct (*) (*) This commit already existed in another branch; no separate mail sent

8 years, 2 months

1
0
0 / 0

[wl-kmod] Add patch for kernel >= 4.8 - add cfg80211_scan_info struct in cfg80211_scan_done call

by Nicolas Viéville

commit 69c510c4457cea34c3080acaa9ea87781ba8e8b7 Author: Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> Date: Thu Sep 8 00:40:59 2016 +0200 Add patch for kernel >= 4.8 - add cfg80211_scan_info struct in cfg80211_scan_done call ..._kernel_4.8_add_cfg80211_scan_info_struct.patch | 51 ++++++++++++++++++++++ wl-kmod.spec | 7 ++- 2 files changed, 57 insertions(+), 1 deletion(-) --- diff --git a/wl-kmod-007_kernel_4.8_add_cfg80211_scan_info_struct.patch b/wl-kmod-007_kernel_4.8_add_cfg80211_scan_info_struct.patch new file mode 100644 index 0000000..51de084 --- /dev/null +++ b/wl-kmod-007_kernel_4.8_add_cfg80211_scan_info_struct.patch @@ -0,0 +1,51 @@ +diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_hybrid.c hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c +--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_hybrid.c 2016-09-07 22:38:13.303835653 +0200 ++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c 2016-09-07 22:54:53.550730661 +0200 +@@ -2439,8 +2439,17 @@ + s32 err = 0; + + if (wl->scan_request) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ struct cfg80211_scan_info info = { ++ .aborted = true, ++ }; ++#endif + WL_DBG(("%s: Aborting scan\n", __FUNCTION__)); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ cfg80211_scan_done(wl->scan_request, &info); ++#else + cfg80211_scan_done(wl->scan_request, true); ++#endif + wl->scan_request = NULL; + } + +@@ -2541,7 +2550,14 @@ + + scan_done_out: + if (wl->scan_request) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ struct cfg80211_scan_info info = { ++ .aborted = false, ++ }; ++ cfg80211_scan_done(wl->scan_request, &info); ++#else + cfg80211_scan_done(wl->scan_request, false); ++#endif + wl->scan_request = NULL; + } + rtnl_unlock(); +@@ -2970,7 +2986,14 @@ + s32 err = 0; + + if (wl->scan_request) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ struct cfg80211_scan_info info = { ++ .aborted = true, ++ }; ++ cfg80211_scan_done(wl->scan_request, &info); ++#else + cfg80211_scan_done(wl->scan_request, true); ++#endif + wl->scan_request = NULL; + } + diff --git a/wl-kmod.spec b/wl-kmod.spec index e3daceb..c733a55 100644 --- a/wl-kmod.spec +++ b/wl-kmod.spec @@ -8,7 +8,7 @@ Name: wl-kmod Version: 6.30.223.271 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Kernel module for Broadcom wireless devices Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -22,6 +22,7 @@ Patch2: wl-kmod-003_gcc_4.9_remove_TIME_DATE_macros.patch Patch3: wl-kmod-004_kernel_4.3_rdtscl_to_rdtsc.patch Patch4: wl-kmod-005_kernel_4.7_IEEE80211_BAND_to_NL80211_BAND.patch Patch5: wl-kmod-006_gcc_6_fix_indentation_warnings.patch +Patch6: wl-kmod-007_kernel_4.8_add_cfg80211_scan_info_struct.patch BuildRequires: %{_bindir}/kmodtool @@ -66,6 +67,7 @@ pushd %{name}-%{version}-src %patch3 -p1 -b .kernel_4.3_rdtscl_to_rdtsc.patch %patch4 -p1 -b .kernel_4.7_IEEE80211_BAND_to_NL80211_BAND %patch5 -p1 -b .gcc_6_fix_indentation_warnings +%patch6 -p1 -b .kernel_4.8_add_cfg80211_scan_info_struct popd for kernel_version in %{?kernel_versions} ; do @@ -95,6 +97,9 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || : rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 07 2016 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.271-7 +- Add patch for kernel >= 4.8 - add cfg80211_scan_info struct in cfg80211_scan_done call + * Fri Sep 02 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 6.30.223.271-6 - Fix 4.7 kernel patch

8 years, 2 months

1
0
0 / 0

[VirtualBox/f24] (3 commits) ...git add modify_for_4_8_bo_move.patch smap.diff

by Sérgio M. Basto

Summary of changes: 19a1d1b... Delete VirtualBox-5.0.12-strings.patch (*) 82650ea... Fixes for linux kernel-4.8-rc4, fixes from openSUSE (*) 1400e0e... git add modify_for_4_8_bo_move.patch smap.diff (*) (*) This commit already existed in another branch; no separate mail sent

8 years, 2 months

1
0
0 / 0

[VirtualBox-kmod/f25] Force use VirtualBox-kmodsrc >= 5.1.4-3

by Sérgio M. Basto

Summary of changes: 914b475... Force use VirtualBox-kmodsrc >= 5.1.4-3 (*) (*) This commit already existed in another branch; no separate mail sent

8 years, 2 months

1
0
0 / 0

[VirtualBox/f25] (3 commits) ...git add modify_for_4_8_bo_move.patch smap.diff

by Sérgio M. Basto

Summary of changes: 19a1d1b... Delete VirtualBox-5.0.12-strings.patch (*) 82650ea... Fixes for linux kernel-4.8-rc4, fixes from openSUSE (*) 1400e0e... git add modify_for_4_8_bo_move.patch smap.diff (*) (*) This commit already existed in another branch; no separate mail sent

8 years, 2 months

1
0
0 / 0

[VirtualBox-kmod] Force use VirtualBox-kmodsrc >= 5.1.4-3

by Sérgio M. Basto

commit 914b4758288bf4b8d3aa4ba71da1088ca03a7ad9 Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Wed Sep 7 08:48:27 2016 +0100 Force use VirtualBox-kmodsrc >= 5.1.4-3 VirtualBox-kmod.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec index 6789db7..215f5ac 100644 --- a/VirtualBox-kmod.spec +++ b/VirtualBox-kmod.spec @@ -18,7 +18,7 @@ #global prerel RC4 %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')} -%global vboxrel 1 +%global vboxrel 3 %global vboxreltag %{?vboxrel:-%{vboxrel}} # Allow only root to access vboxdrv regardless of the file mode # use only for debugging! @@ -28,7 +28,7 @@ Name: VirtualBox-kmod Version: 5.1.4 #Release: 1%%{?prerel:.%%{prerel}}%%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Kernel module for VirtualBox Group: System Environment/Kernel @@ -106,6 +106,9 @@ DIRS=$(ls %{name}-%{version} |wc -l) %changelog +* Wed Sep 07 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.4-2 +- Force use VirtualBox-kmodsrc >= 5.1.4-3 + * Tue Sep 06 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.4-1 - Update VBox to 5.1.4

8 years, 2 months

1
0
0 / 0

[VirtualBox] git add modify_for_4_8_bo_move.patch smap.diff

by Sérgio M. Basto

commit 1400e0e3f184e66fc1d09d8cc28bee6a1d3ac0de Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Wed Sep 7 08:21:25 2016 +0100 git add modify_for_4_8_bo_move.patch smap.diff From: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox or https://build.opensuse.org/package/show/Virtualization/virtualbox I don't know the difference of this 2 links. modify_for_4_8_bo_move.patch | 56 ++++++++++++++++++++++++++++++++++++++++++++ smap.diff | 17 ++++++++++++++ 2 files changed, 73 insertions(+) --- diff --git a/modify_for_4_8_bo_move.patch b/modify_for_4_8_bo_move.patch new file mode 100644 index 0000000..d4a3704 --- /dev/null +++ b/modify_for_4_8_bo_move.patch @@ -0,0 +1,56 @@ +Index: VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_ttm.c +=================================================================== +--- VirtualBox-5.1.4.orig/src/VBox/Additions/linux/drm/vbox_ttm.c ++++ VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_ttm.c +@@ -221,7 +221,11 @@ static int vbox_bo_move(struct ttm_buffe + struct ttm_mem_reg *new_mem) + { + int r; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) + r = ttm_bo_move_memcpy(bo, evict, no_wait_gpu, new_mem); ++#else ++ r = ttm_bo_move_memcpy(bo, evict, interruptible, no_wait_gpu, new_mem); ++#endif + return r; + } + +Index: VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_drv.c +=================================================================== +--- VirtualBox-5.1.4.orig/src/VBox/Additions/linux/drm/vbox_drv.c ++++ VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_drv.c +@@ -244,9 +244,14 @@ static int vbox_master_set(struct drm_de + return 0; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) + static void vbox_master_drop(struct drm_device *dev, + struct drm_file *file_priv, + bool from_release) ++#else ++static void vbox_master_drop(struct drm_device *dev, ++ struct drm_file *file_priv) ++#endif + { + struct vbox_private *vbox = dev->dev_private; + vbox->initial_mode_queried = false; +Index: VirtualBox-5.1.4/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +=================================================================== +--- VirtualBox-5.1.4.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c ++++ VirtualBox-5.1.4/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +@@ -35,7 +35,7 @@ + #include <iprt/assert.h> + #include <iprt/err.h> + #include "r0drv/alloc-r0drv.h" +- ++#include <linux/kmemleak.h> + + #if (defined(RT_ARCH_AMD64) || defined(DOXYGEN_RUNNING)) && !defined(RTMEMALLOC_EXEC_HEAP) + # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23) +@@ -294,6 +294,7 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb + fFlags &= ~RTMEMHDR_FLAG_KMALLOC; + pHdr = vmalloc(cb + sizeof(*pHdr)); + } ++ kmemleak_not_leak(pHdr); + } + else + pHdr = vmalloc(cb + sizeof(*pHdr)); diff --git a/smap.diff b/smap.diff new file mode 100644 index 0000000..b9a4347 --- /dev/null +++ b/smap.diff @@ -0,0 +1,17 @@ +Index: VirtualBox-5.1.4/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +=================================================================== +--- VirtualBox-5.1.4.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c ++++ VirtualBox-5.1.4/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +@@ -50,6 +50,12 @@ + # include <iprt/power.h> + # define VBOX_WITH_SUSPEND_NOTIFICATION + #endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0) ++# include <asm/smap.h> ++#else ++static inline void clac(void) { } ++static inline void stac(void) { } ++#endif + + #include <linux/sched.h> + #include <linux/miscdevice.h>

8 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits September 2016