[kodi] Update to 17 beta 7
by Michael Cronenworth
commit 2ae897bdd622d48f123a62dba600eb7c718fc3e2
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Mon Dec 19 08:43:10 2016 -0600
Update to 17 beta 7
.gitignore | 2 +-
kodi-generate-tarball-xz.sh | 2 +-
kodi.spec | 7 +++++--
sources | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 13c4b27..54079b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kodi-17.0b6-patched.tar.xz
+/kodi-17.0b7-patched.tar.xz
diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh
index 40f41f2..5a290c8 100755
--- a/kodi-generate-tarball-xz.sh
+++ b/kodi-generate-tarball-xz.sh
@@ -1,7 +1,7 @@
#!/bin/sh
MAJORVERSION=17
-MINORVERSION=0b6
+MINORVERSION=0b7
#GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96
#GITSHORT=ge988513
CODENAME=Krypton
diff --git a/kodi.spec b/kodi.spec
index 54c37c8..4e65eca 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -1,4 +1,4 @@
-%global PRERELEASE b6
+%global PRERELEASE b7
#global DIRVERSION %{version}
#global GITCOMMIT Gotham_r2-ge988513
# use the line below for pre-releases
@@ -8,7 +8,7 @@
Name: kodi
Version: 17.0
-Release: 0.9%{?dist}
+Release: 0.10%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -410,6 +410,9 @@ fi
%changelog
+* Mon Dec 19 2016 Michael Cronenworth <mike(a)cchtml.com> - 17.0-0.10
+- Kodi 17 beta 7
+
* Sun Dec 11 2016 Michael Cronenworth <mike(a)cchtml.com> - 17.0-0.9
- Kodi 17 beta 6
- Drop libcec patch, now upstream
diff --git a/sources b/sources
index 5faeaca..2112eb8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-08c93b0627635fde158e7428fa14d268 kodi-17.0b6-patched.tar.xz
+3434b2f4e7ad6eac47b35c6176d6c030 kodi-17.0b7-patched.tar.xz
7 years, 11 months
[nvidia-kmod/f24: 7/7] fix merge
by Leigh Scott
commit 8a68c941d4555c0c6e2123ffc6f878f75cbcde35
Merge: b9f5a82 e9bdd6f
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Dec 19 11:57:22 2016 +0000
fix merge
nv-linux-arm.patch | 2 +-
nv-linux-arm2.patch | 2 +-
nvidia-4.8_kernel.patch | 81 -------------------------------------------------
nvidia-kmod.spec | 21 ++++++++-----
4 files changed, 16 insertions(+), 90 deletions(-)
---
7 years, 11 months
[nvidia-kmod/f24] (7 commits) ...fix merge
by Leigh Scott
Summary of changes:
358ee8e... Update to 370.23 beta (*)
c39036f... Update to 370.28 (*)
332a4cb... fix merge (*)
847e626... Update to 375.10 beta release (*)
ab65b90... Update to 375.20 (*)
e9bdd6f... Update to 375.26 (*)
8a68c94... fix merge
(*) This commit already existed in another branch; no separate mail sent
7 years, 11 months
[xorg-x11-drv-nvidia/f24: 25/25] fix merge
by Leigh Scott
commit 52853305694bc4995a3e23e6cd75ed6fe6c73639
Merge: e4897dd c9c60e0
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Dec 19 10:50:35 2016 +0000
fix merge
.gitignore | 21 ++++++++---
00-ignoreabi.conf | 4 ++
nvidia-old.conf | 8 ++++
nvidia.conf | 3 ++
sources | 6 +--
xorg-x11-drv-nvidia.spec | 95 ++++++++++++++++++++++++++++++++++--------------
6 files changed, 101 insertions(+), 36 deletions(-)
---
7 years, 11 months
[xorg-x11-drv-nvidia/f24] (25 commits) ...fix merge
by Leigh Scott
Summary of changes:
78f133d... Update to 370.28 (*)
0890182... glvnd lib needed for non-glvnd setup (*)
7ed2449... fix merge (*)
12dec79... fix gitignore (*)
3af5c0c... add xorg abi override (*)
0079640... add xorg abi override (*)
bed268e... fix source number (*)
6cdb041... fix override file (*)
d11d966... edit changelog (*)
e6141b3... Merge branch 'master' into f25 (*)
e02f136... fix missing % (*)
01510f4... Merge branch 'master' into f25 (*)
6ecfbc0... Switch to system libglvnd (*)
62bcab1... Add libglvnd path to ld.so.conf.d conf file (*)
99add75... readd description (*)
2e7b89b... Update to 375.10 beta release (*)
9e01fee... /etc/glvnd/egl_vendor.d/10_nvidia.json (*)
c8a9eb7... Add glvnd/egl_vendor.d file (*)
c329399... Update to 375.20 (*)
c0605a9... Update to 375.26 release (*)
20f9b84... Change conf files for Prime support (*)
ae4b9c7... remove file (*)
7d312c4... Fix nvidia.conf (*)
c9c60e0... Add conditionals for f24 (*)
5285330... fix merge
(*) This commit already existed in another branch; no separate mail sent
7 years, 11 months
[xorg-x11-drv-nvidia/f25: 5/5] Merge branch 'master' into f25
by Leigh Scott
commit 61a8770bf3ab5fa4df9b7ba24079586b24e8dc15
Merge: 4c2f268 c9c60e0
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Dec 19 10:38:51 2016 +0000
Merge branch 'master' into f25
nvidia-old.conf | 8 ++++++++
nvidia.conf | 3 +++
xorg-x11-drv-nvidia.spec | 28 ++++++++++++++++++++++++----
3 files changed, 35 insertions(+), 4 deletions(-)
---
7 years, 11 months
[xorg-x11-drv-nvidia/f25] (5 commits) ...Merge branch 'master' into f25
by Leigh Scott
Summary of changes:
20f9b84... Change conf files for Prime support (*)
ae4b9c7... remove file (*)
7d312c4... Fix nvidia.conf (*)
c9c60e0... Add conditionals for f24 (*)
61a8770... Merge branch 'master' into f25
(*) This commit already existed in another branch; no separate mail sent
7 years, 11 months
[xorg-x11-drv-nvidia] Add conditionals for f24
by Leigh Scott
commit c9c60e01018db6ce6033c87ccef7822a9b482189
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Dec 19 09:59:18 2016 +0000
Add conditionals for f24
nvidia-old.conf | 8 ++++++++
xorg-x11-drv-nvidia.spec | 21 +++++++++++++++++++--
2 files changed, 27 insertions(+), 2 deletions(-)
---
diff --git a/nvidia-old.conf b/nvidia-old.conf
new file mode 100644
index 0000000..9c5e953
--- /dev/null
+++ b/nvidia-old.conf
@@ -0,0 +1,8 @@
+#This file is provided by xorg-x11-drv-nvidia
+#Do not edit
+
+Section "OutputClass"
+ Identifier "nvidia"
+ MatchDriver "nvidia-drm"
+ Driver "nvidia"
+EndSection
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 7acd541..b008f57 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 375.26
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -18,10 +18,12 @@ URL: http://www.nvidia.com/
Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%...
Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
Source4: ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/%{version}/NVIDIA-Linux...
+Source2: 99-nvidia.conf
Source3: nvidia-xorg.conf
Source5: 00-avoid-glamor.conf
Source6: blacklist-nouveau.conf
Source7: alternate-install-present
+Source8: nvidia-old.conf
Source9: nvidia-settings.desktop
Source10: nvidia.conf
Source11: 00-ignoreabi.conf
@@ -262,6 +264,11 @@ rm $RPM_BUILD_ROOT%{_nvidia_libdir}/libnvidia-{cfg,tls}.so
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
+%if 0%{?fedora} <= 24
+install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
+touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
+%endif
# Comment Xorg abi override
#install -pm 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
@@ -289,12 +296,16 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/nvidia
install -p -m 0644 nvidia-application-profiles-%{version}-{rc,key-documentation} $RPM_BUILD_ROOT%{_datadir}/nvidia
#Install the output class configuration file - xorg-server >= 1.16
-%if 0%{?fedora} >= 21
+%if 0%{?fedora} >= 25
mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
install -pm 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf
sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf
touch -r %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf
%endif
+%if 0%{?fedora} <= 24
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
+install -pm 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf
+%endif
#Avoid prelink to mess with nvidia libs - rfbz#3258
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d
@@ -436,6 +447,9 @@ fi ||:
%config %{_sysconfdir}/glvnd/egl_vendor.d/10_nvidia.json
%dir %{_sysconfdir}/nvidia
%ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf
+%if 0%{?fedora} <= 24
+%config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
+%endif
%config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
# Comment Xorg abi override
#%%config %%{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf
@@ -552,6 +566,9 @@ fi ||:
%{_nvidia_libdir}/libGLX_nvidia.so
%changelog
+* Mon Dec 19 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:375.26-4
+- Add conditionals for f24
+
* Mon Dec 19 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:375.26-3
- Fix nvidia.conf
7 years, 11 months
[xorg-x11-drv-nvidia] Fix nvidia.conf
by Leigh Scott
commit 7d312c4d2b5e94d82d657d1a1bc0df7bbd8813d5
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Dec 19 08:45:46 2016 +0000
Fix nvidia.conf
nvidia.conf | 2 +-
xorg-x11-drv-nvidia.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/nvidia.conf b/nvidia.conf
index 19864d0..9315780 100644
--- a/nvidia.conf
+++ b/nvidia.conf
@@ -7,5 +7,5 @@ Section "OutputClass"
Driver "nvidia"
Option "AllowEmptyInitialConfiguration"
Option "PrimaryGPU" "yes"
- ModulePath "/usr/lib64/nvidia/xorg"
+ ModulePath "@LIBDIR@/xorg/modules"
EndSection
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 7bb928f..7acd541 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 375.26
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -292,6 +292,8 @@ install -p -m 0644 nvidia-application-profiles-%{version}-{rc,key-documentation}
%if 0%{?fedora} >= 21
mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
install -pm 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf
+sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf
+touch -r %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf
%endif
#Avoid prelink to mess with nvidia libs - rfbz#3258
@@ -550,6 +552,9 @@ fi ||:
%{_nvidia_libdir}/libGLX_nvidia.so
%changelog
+* Mon Dec 19 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:375.26-3
+- Fix nvidia.conf
+
* Sun Dec 18 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:375.26-2
- Change conf files for Prime support
7 years, 11 months
