[vlc/f25: 11/11] Merge remote-tracking branch 'origin/master' into f25
by Nicolas Chauvet
commit 2a1d65334eacf4cf8d66b904ff98e31061534052
Merge: 8ab3052 e473e9b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Jun 28 17:27:34 2017 +0200
Merge remote-tracking branch 'origin/master' into f25
0001-qt-Prefer-XCB-over-Wayland.patch | 43 +++++++++++++++++++++++++++++++++++
vlc.spec | 8 ++++++-
2 files changed, 50 insertions(+), 1 deletion(-)
---
6 years, 9 months
[vlc/f25: 6/11] Update to 20170622 Disable wayland
by Nicolas Chauvet
commit 0e4c427e3e8ef866d2187e14201f0902d3eb583b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Jun 22 15:00:22 2017 +0200
Update to 20170622
Disable wayland
sources | 2 +-
vlc.spec | 15 +++++++++++----
2 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/sources b/sources
index 2e5f0c8..cdf0c5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9ab20cd4701953312516a55c253981df vlc-3.0.0-20170601-0240-git.tar.xz
+bdfcc87417a09e5d2eff2eb488364214 vlc-3.0.0-20170622-0939-git.tar.xz
diff --git a/vlc.spec b/vlc.spec
index 0e4c882..3b47c7e 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,5 +1,5 @@
-%global vlc_date 20170601
-%global vlc_rc -%{?vlc_date}-0240-git
+%global vlc_date 20170622
+%global vlc_rc -%{?vlc_date}-0939-git
%if 0%{?vlc_rc:1}
%global vlc_url http://nightlies.videolan.org/build/source/
%else
@@ -29,7 +29,7 @@
%global _with_freerdp 1
%global _with_projectm 1
%global _with_schroedinger 1
-%global _with_wayland 1
+%global _with_wayland 0
%endif
%ifarch x86_64 i686
%global _with_crystalhd 1
@@ -39,7 +39,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.0
-Release: 0.26%{?vlc_date:snap.%{vlc_date}git}%{?dist}
+Release: 0.28%{?vlc_date:.git%{vlc_date}}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -183,11 +183,13 @@ BuildRequires: xorg-x11-proto-devel
%{?_with_workaround_circle_deps:BuildRequires: phonon-backend-gstreamer}
+%{?_with_wayland:
# Fedora 25 Workstation default to wayland but not all
# Boolean deps will handle this better when allowed
%if 0%{?fedora} >= 25
Recommends: qt5-qtwayland%{_isa}
%endif
+}
Provides: %{name}-xorg%{_isa} = %{version}-%{release}
@@ -546,6 +548,11 @@ fi || :
%changelog
+* Thu Jun 22 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.28.git20170622
+- Update snapshoot
+- Disable wayland support for now
+- Update release field
+
* Thu Jun 01 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.2620170601git
- Update to 20170601 snapshot
6 years, 9 months
[vlc/f25] (11 commits) ...Merge remote-tracking branch 'origin/master' into f25
by Nicolas Chauvet
Summary of changes:
d189058... Update to 20170601 (*)
1ca99a1... Update verrel (*)
25ff030... Update to 20170601 (*)
81006fa... Update verrel (*)
d7e2d97... Update to 20170622 Disable wayland (*)
0e4c427... Update to 20170622 Disable wayland
8ab3052... Merge branch 'f25' of ssh://pkgs.rpmfusion.org/free/vlc int
7e3651d... Restore wayland with a patch - rhbz#4552 (*)
fc67f81... Update changelog (*)
e473e9b... Add patch (*)
2a1d653... Merge remote-tracking branch 'origin/master' into f25
(*) This commit already existed in another branch; no separate mail sent
6 years, 9 months
[ndiswrapper-kmod] Patch for 4.11 kernel
by Leigh Scott
commit 8c955b234f75c2c4c6bc1c38ac82c25629ff164a
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jun 28 14:26:15 2017 +0100
Patch for 4.11 kernel
ndiswrapper-4.11-kernel.patch | 47 +++++++++++++++++++++++++++++++++++++++++++
ndiswrapper-kmod.spec | 9 +++++++--
2 files changed, 54 insertions(+), 2 deletions(-)
---
diff --git a/ndiswrapper-4.11-kernel.patch b/ndiswrapper-4.11-kernel.patch
new file mode 100644
index 0000000..248b518
--- /dev/null
+++ b/ndiswrapper-4.11-kernel.patch
@@ -0,0 +1,47 @@
+--- a/driver/ndis.c
++++ b/driver/ndis.c
+@@ -2258,7 +2258,9 @@
+ WARNING("empty packet ignored");
+ continue;
+ }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0)
+ wnd->net_dev->last_rx = jiffies;
++#endif
+ /* get total number of bytes in packet */
+ NdisGetFirstBufferFromPacketSafe(packet, &buffer, &virt,
+ &length, &total_length,
+@@ -2346,7 +2348,9 @@
+ ERROR("nmb is NULL");
+ EXIT3(return);
+ }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0)
+ wnd->net_dev->last_rx = jiffies;
++#endif
+
+ if (look_ahead_size < packet_size) {
+ struct ndis_packet *packet;
+@@ -2461,7 +2465,9 @@
+ WARNING("illegal packet");
+ EXIT3(return);
+ }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0)
+ wnd->net_dev->last_rx = jiffies;
++#endif
+ oob_data = NDIS_PACKET_OOB_DATA(packet);
+ skb_size = sizeof(oob_data->header) + oob_data->look_ahead_size +
+ bytes_txed;
+
+--- a/driver/ntoskernel.h
++++ b/driver/ntoskernel.h
+@@ -48,6 +48,10 @@
+ #include <linux/workqueue.h>
+ #include <linux/vmalloc.h>
+
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
++#include <linux/sched/signal.h>
++#endif
+
+ #if !defined(CONFIG_X86) && !defined(CONFIG_X86_64)
+ #error "this module is for x86 or x86_64 architectures only"
+
diff --git a/ndiswrapper-kmod.spec b/ndiswrapper-kmod.spec
index cba6389..540d6b1 100644
--- a/ndiswrapper-kmod.spec
+++ b/ndiswrapper-kmod.spec
@@ -13,14 +13,15 @@
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.61
-Release: 1%{?pre}%{?dist}
+Release: 2%{?pre}%{?dist}
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
Source0: http://downloads.sf.net/ndiswrapper/ndiswrapper-%{version}%{?pre}.tar.gz
Source11: ndiswrapper-kmodtool-excludekernel-filterfile
Patch0: ndiswrapper-kmod-nomodinfo.patch
-Patch1: ndiswrapper-4.7-kernel.patch
+Patch1: ndiswrapper-4.7-kernel.patch
+Patch2: ndiswrapper-4.11-kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -52,6 +53,7 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfi
%setup -q -c -T -a 0 -n %{name}-%{version}%{?pre}
(cd ndiswrapper-%{version}%{?pre} ;
%patch0 -p1 -b .orig
+%patch2 -p1 -b .orig
)
sed -i 's|/sbin/depmod -a|/bin/true|' ndiswrapper-%{version}%{?pre}/driver/Makefile
for kernel_version in %{?kernel_versions} ; do
@@ -79,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jun 28 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.61-2
+- Patch for 4.11 kernel
+
* Tue Jun 27 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 1.61-1
- Update to 1.61
6 years, 9 months
