[EmptyEpsilon/f26] (3 commits) ...Upgrade to EE-2017.11.03
by Jan Kalina
Summary of changes:
d1a12d0... Binarie sources should be saved using rfpkg new-sources (*)
d29ab9c... Delete binaries files (*)
69f0c8f... Upgrade to EE-2017.11.03 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 4 months
[EmptyEpsilon/f27] (3 commits) ...Upgrade to EE-2017.11.03
by Jan Kalina
Summary of changes:
d1a12d0... Binarie sources should be saved using rfpkg new-sources (*)
d29ab9c... Delete binaries files (*)
69f0c8f... Upgrade to EE-2017.11.03 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 4 months
[vlc/f26] Update snapshot
by Nicolas Chauvet
Summary of changes:
ea1fce4... Update snapshot (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 4 months
[vlc/f27] Update snapshot
by Nicolas Chauvet
Summary of changes:
ea1fce4... Update snapshot (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 4 months
[vlc] Update snapshot
by Nicolas Chauvet
commit ea1fce48eeaa3df40559d46c0d7ed33f1da3946d
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Dec 16 00:16:21 2017 +0100
Update snapshot
sources | 2 +-
vlc.spec | 20 +++++++++-----------
2 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/sources b/sources
index ed8255a..0e6f807 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a50a2e61fb12fa9960d2816198e4ad25 vlc-3.0.0-20171208-0223-rc1.tar.xz
+dc04590647f51b07027560efe19aecd4 vlc-3.0.0-20171215-0223-rc2.tar.xz
diff --git a/vlc.spec b/vlc.spec
index 5697e11..a0ddc56 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,5 +1,6 @@
-%global vlc_date 20171208
-%global vlc_rc -%{?vlc_date}-0223-rc1
+%global vlc_date 20171215
+%global vlc_rc rc2
+%global vlc_tag -%{?vlc_date}-0223-%{?vlc_rc}
%if 0%{?vlc_rc:1}
%global vlc_url https://nightlies.videolan.org/build/source/
%else
@@ -39,11 +40,11 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.0
-Release: 0.43%{?vlc_date:.git%{vlc_date}}%{?dist}
+Release: 0.44%{?vlc_date:.git%{vlc_date}}%{?vlc_rc}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
-Source0: %{vlc_url}/%{?!vlc_rc:%{version}/}vlc-%{version}%{?vlc_rc}.tar.xz
+Source0: %{vlc_url}/%{?!vlc_rc:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
#https://trac.videolan.org/vlc/ticket/18383
Patch0: 0001-qt-Prefer-XCB-over-Wayland.patch
@@ -128,9 +129,6 @@ BuildRequires: lirc-devel
BuildRequires: kernel-headers
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glu)
-%if 0%{?fedora} < 24
-BuildRequires: libmusicbrainz-devel
-%endif
BuildRequires: libsamplerate-devel
BuildRequires: libshout-devel
BuildRequires: lua-devel
@@ -252,7 +250,7 @@ VLC media player extras modules.
%prep
-%setup -q -n %{name}-%{version}%{?vlc_rc:-rc1}
+%setup -q -n %{name}-%{version}%{?vlc_rc:-%{vlc_rc}}
%patch0 -p1 -b .wl
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
@@ -490,9 +488,6 @@ fi || :
}
%{!?_without_xcb:
%exclude %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
-%if 0%{?fedora} < 17
-%exclude %{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so
-%endif
%exclude %{_libdir}/vlc/plugins/control/libxcb_hotkeys_plugin.so
%exclude %{_libdir}/vlc/plugins/services_discovery/libxcb_apps_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libaa_plugin.so
@@ -554,6 +549,9 @@ fi || :
%changelog
+* Fri Dec 15 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.44.git20171215
+- Update to 20171215
+
* Fri Dec 08 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.43.git20171208
- Update to 20171208
6 years, 4 months
[EmptyEpsilon] Upgrade to EE-2017.11.03
by Jan Kalina
commit 69f0c8f9ec6d794fe5690c8189ba42550c6898a4
Author: Jan Kalina <jkalina(a)redhat.com>
Date: Fri Dec 15 23:13:29 2017 +0100
Upgrade to EE-2017.11.03
.gitignore | 2 ++
EmptyEpsilon.spec | 7 +++++--
sources | 4 ++--
3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ede0189..e23e7c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
/EmptyEpsilon-EE-2017.05.06.zip
/SeriousProton-EE-2017.05.06.zip
+/EmptyEpsilon-EE-2017.11.03.zip
+/SeriousProton-EE-2017.11.03.zip
diff --git a/EmptyEpsilon.spec b/EmptyEpsilon.spec
index 8e85208..24c49d4 100644
--- a/EmptyEpsilon.spec
+++ b/EmptyEpsilon.spec
@@ -1,6 +1,6 @@
%global version_major 2017
-%global version_minor 05
-%global version_patch 06
+%global version_minor 11
+%global version_patch 03
Name: EmptyEpsilon
Summary: Spaceship bridge simulator game
@@ -79,6 +79,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%{_datadir}/applications/%{name}.desktop
%changelog
+* Fri Dec 15 2017 Jan Kalina <jkalina(a)redhat.com> - 2017.11.03-1
+- New version of game
+
* Tue Sep 5 2017 Jan Kalina <jkalina(a)redhat.com> - 2017.05.06-1
- New version of game, applied fixes from rpmfushion review
diff --git a/sources b/sources
index 19136d2..4fe0156 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0b135e45afd4a439f76dc14979ef193e EmptyEpsilon-EE-2017.05.06.zip
-cca233366579d712daac4f899da14478 SeriousProton-EE-2017.05.06.zip
+39b01853b0ac51a023e37a53df88b28f EmptyEpsilon-EE-2017.11.03.zip
+5c1f51dbe41b0ba866439353c80ec59b SeriousProton-EE-2017.11.03.zip
6 years, 4 months
[ndiswrapper-kmod] Patch for 4.13 kernel
by Leigh Scott
commit 7553ac7d6afe9bf34e6b153d62ed3489e36c568c
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Dec 14 08:04:39 2017 +0000
Patch for 4.13 kernel
ndiswrapper-4.13-kernel.patch | 30 ++++++++++++++++++++++++++++++
ndiswrapper-4.7-kernel.patch | 13 -------------
ndiswrapper-kmod.spec | 12 ++++++++----
3 files changed, 38 insertions(+), 17 deletions(-)
---
diff --git a/ndiswrapper-4.13-kernel.patch b/ndiswrapper-4.13-kernel.patch
new file mode 100644
index 0000000..4e68634
--- /dev/null
+++ b/ndiswrapper-4.13-kernel.patch
@@ -0,0 +1,30 @@
+From eeac7ab831b3097005dadc64dd323f54ade30323 Mon Sep 17 00:00:00 2001
+From: Felix Yan <felixonmars(a)archlinux.org>
+Date: Mon, 11 Sep 2017 12:52:36 +0800
+Subject: [PATCH] Add support for linux 4.13+
+
+---
+ ndiswrapper/driver/ntoskernel.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/ndiswrapper/driver/ntoskernel.h b/ndiswrapper/driver/ntoskernel.h
+index f1c52e51..1422bd4d 100644
+--- a/ndiswrapper/driver/ntoskernel.h
++++ b/ndiswrapper/driver/ntoskernel.h
+@@ -119,9 +119,16 @@ static cpumask_t cpumasks[NR_CPUS];
+ */
+ #include <asm/dma-mapping.h>
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0)
+ #define PCI_DMA_ALLOC_COHERENT(pci_dev,size,dma_handle) \
+ dma_alloc_coherent(&pci_dev->dev,size,dma_handle, \
+ GFP_KERNEL | __GFP_REPEAT)
++#else
++#define PCI_DMA_ALLOC_COHERENT(pci_dev,size,dma_handle) \
++ dma_alloc_coherent(&pci_dev->dev,size,dma_handle, \
++ GFP_KERNEL | __GFP_RETRY_MAYFAIL)
++#endif
++
+ #define PCI_DMA_FREE_COHERENT(pci_dev,size,cpu_addr,dma_handle) \
+ dma_free_coherent(&pci_dev->dev,size,cpu_addr,dma_handle)
+ #define PCI_DMA_MAP_SINGLE(pci_dev,addr,size,direction) \
diff --git a/ndiswrapper-kmod.spec b/ndiswrapper-kmod.spec
index 5e8602c..4a001a9 100644
--- a/ndiswrapper-kmod.spec
+++ b/ndiswrapper-kmod.spec
@@ -13,15 +13,15 @@
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.61
-Release: 3%{?pre}%{?dist}
+Release: 4%{?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
-Patch2: ndiswrapper-4.11-kernel.patch
+Patch1: ndiswrapper-4.11-kernel.patch
+Patch2: ndiswrapper-4.13-kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -53,7 +53,8 @@ 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
+%patch1 -p1 -b .orig
+%patch2 -p2 -b .orig
)
sed -i 's|/sbin/depmod -a|/bin/true|' ndiswrapper-%{version}%{?pre}/driver/Makefile
for kernel_version in %{?kernel_versions} ; do
@@ -81,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Dec 14 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.61-4
+- Patch for 4.13 kernel
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1.61-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
6 years, 4 months
[xorg-x11-drv-nvidia] Add fallback message
by Nicolas Chauvet
commit d3b56f55d27f4955de5a6b0e82a3561cd881f1a1
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Dec 14 08:47:18 2017 +0100
Add fallback message
nvidia-fallback.service | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/nvidia-fallback.service b/nvidia-fallback.service
index 2645446..5ffd760 100644
--- a/nvidia-fallback.service
+++ b/nvidia-fallback.service
@@ -10,6 +10,7 @@ ConditionPathExists=!/sys/module/nvidia
Type=oneshot
RemainAfterExit=yes
ExecStart=-/sbin/modprobe nouveau
+ExecStartPost=-/bin/plymouth message --text="NVIDIA driver missing. Falling back to nouveau"
[Install]
6 years, 4 months