[xorg-x11-drv-nvidia] Update changelog
by Nicolas Chauvet
commit 27edb67d7efac44868be46735b654c4b1c9684e3
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Jul 5 17:24:18 2017 +0200
Update changelog
xorg-x11-drv-nvidia.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 45f87a0..f71a3c3 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -33,7 +33,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 2
Version: 375.66
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -593,6 +593,10 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Wed Jul 05 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-8
+- Make libglvnd optional on rhel
+- Use boolean dependency on fedora 25 also
+
* Tue Jun 13 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-7
- Use | instead of / for sed GRUB_CMDLINE_LINUX
7 years, 4 months
[xorg-x11-drv-nvidia] Make libglvnd optional on rhel
by Nicolas Chauvet
commit 2961480447c677431b3aa680adbf5f9699e105bb
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Jul 5 10:23:16 2017 +0200
Make libglvnd optional on rhel
xorg-x11-drv-nvidia.spec | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 10820df..45f87a0 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -160,11 +160,11 @@ which is generated during the build of main package.
%package libs
Summary: Libraries for %{name}
Requires: libvdpau%{?_isa} >= 0.5
+%if 0%{?fedora} >= 25
Requires: libglvnd-egl%{?_isa} >= 0.2
Requires: libglvnd-gles%{?_isa} >= 0.2
Requires: libglvnd-glx%{?_isa} >= 0.2
Requires: libglvnd-opengl%{?_isa} >= 0.2
-%if 0%{?fedora} >= 25
Requires: egl-wayland%{?_isa} >= 1.0.0
Requires: mesa-libEGL%{?_isa} >= 13.0.3-3
Requires: mesa-libGL%{?_isa} >= 13.0.3-3
@@ -258,6 +258,9 @@ ln -sf libvdpau_nvidia.so.%{version} %{buildroot}%{_libdir}/vdpau/libvdpau_nvidi
ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
%else
ln -s libGLX_nvidia.so.%{version} %{buildroot}%{_libdir}/libGLX_indirect.so.0
+# ld.so.conf.d file
+install -m 0755 -d %{buildroot}%{_sysconfdir}/ld.so.conf.d/
+echo -e "%{_nvidia_libdir} \n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%endif
# X DDX driver and GLX extension
@@ -273,16 +276,11 @@ install -p -m 0644 nvidia.icd %{buildroot}%{_sysconfdir}/OpenCL/vendors/
install -m 0755 -d %{buildroot}%{_datadir}/vulkan/icd.d/
install -p -m 0644 nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/
%endif
-# EGL config
+
+# EGL config for libglvnd
install -m 0755 -d %{buildroot}%{_datadir}/glvnd/egl_vendor.d/
install -p -m 0644 10_nvidia.json %{buildroot}%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json
-# ld.so.conf.d file
-%if ! 0%{?fedora} >= 25
-install -m 0755 -d %{buildroot}%{_sysconfdir}/ld.so.conf.d/
-echo -e "%{_glvnd_libdir} \n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
-%endif
-
# Blacklist nouveau, autoload nvidia-uvm module after nvidia module
mkdir -p %{buildroot}%{_modprobe_d}
install -p -m 0644 %{SOURCE15} %{buildroot}%{_modprobe_d}
@@ -478,6 +476,9 @@ fi ||:
%{_dracut_conf_d}/99-nvidia-dracut.conf
%{_datadir}/X11/xorg.conf.d/nvidia.conf
%else
+# Owns the directory since libglvnd is optional here
+%dir %{_datadir}/glvnd
+%dir %{_datadir}/glvnd/egl_vendor.d
%{_datadir}/X11/xorg.conf.d/00-avoid-glamor.conf
%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
# RHEL6 uses /etc
@@ -525,7 +526,6 @@ fi ||:
%files libs
%if 0%{?rhel} || 0%{?fedora} == 24
%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
-%dir %{_libdir}
%endif
%dir %{_nvidia_libdir}
%{_libdir}/libEGL_nvidia.so.0
7 years, 4 months
[xorg-x11-drv-nvidia] Use boolean dependency on fedora 25 also
by Nicolas Chauvet
commit 1010b75899fcb7a7eb57c68f4b569069d2786402
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Jul 5 10:22:05 2017 +0200
Use boolean dependency on fedora 25 also
xorg-x11-drv-nvidia.spec | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 081cba8..10820df 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -169,13 +169,11 @@ Requires: egl-wayland%{?_isa} >= 1.0.0
Requires: mesa-libEGL%{?_isa} >= 13.0.3-3
Requires: mesa-libGL%{?_isa} >= 13.0.3-3
Requires: mesa-libGLES%{?_isa} >= 13.0.3-3
-# Boolean dependencies are not yet allowed in fedora, only for testing
-%if 0%{?fedora} >= 26
+# Boolean dependencies are only fedora
%ifarch x86_64
Requires: (%{name}-libs(x86-32) = %{?epoch}:%{version}-%{release} if libGL(x86-32))
%endif
%endif
-%endif
%ifarch x86_64 i686
Requires: vulkan-filesystem
%endif
7 years, 4 months
[wl-kmod] Rework patch for kernel >= 4.12 - thanks to Tim Thomas
by Nicolas Viéville
commit 3cf15355b80f564d401b30645d6b1d9b468aceb6
Author: Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr>
Date: Wed Jul 5 17:06:44 2017 +0200
Rework patch for kernel >= 4.12 - thanks to Tim Thomas
...kernel_4.12_add_cfg80211_roam_info_struct.patch | 39 +++++++++++++++++++---
wl-kmod.spec | 5 ++-
2 files changed, 38 insertions(+), 6 deletions(-)
---
diff --git a/wl-kmod-010_kernel_4.12_add_cfg80211_roam_info_struct.patch b/wl-kmod-010_kernel_4.12_add_cfg80211_roam_info_struct.patch
index bbc6622..cdc3ffe 100644
--- a/wl-kmod-010_kernel_4.12_add_cfg80211_roam_info_struct.patch
+++ b/wl-kmod-010_kernel_4.12_add_cfg80211_roam_info_struct.patch
@@ -1,7 +1,34 @@
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 2017-04-10 14:23:40.909434506 +0200
-+++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c 2017-06-03 15:40:21.595077248 +0200
-@@ -2440,6 +2440,9 @@
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c 2017-07-03 11:32:04.271398087 +0200
+@@ -54,7 +54,11 @@
+ #endif
+
+ static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
+- enum nl80211_iftype type, u32 *flags, struct vif_params *params);
++ enum nl80211_iftype type,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
++ u32 *flags,
++#endif
++ struct vif_params *params);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+ static s32
+ wl_cfg80211_scan(struct wiphy *wiphy,
+@@ -499,8 +503,11 @@
+
+ static s32
+ wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
+- enum nl80211_iftype type, u32 *flags,
+- struct vif_params *params)
++ enum nl80211_iftype type,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
++ u32 *flags,
++#endif
++ struct vif_params *params)
+ {
+ struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy);
+ struct wireless_dev *wdev;
+@@ -2440,6 +2447,9 @@
const wl_event_msg_t *e, void *data)
{
struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
@@ -11,7 +38,7 @@ diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_
s32 err = 0;
err = wl_get_assoc_ies(wl);
-@@ -2453,13 +2456,27 @@
+@@ -2453,13 +2463,28 @@
if (err)
return err;
@@ -31,10 +58,12 @@ diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_
#endif
(u8 *)&wl->bssid,
conn_info->req_ie, conn_info->req_ie_len,
- conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL);
+- conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL);
++ conn_info->resp_ie, conn_info->resp_ie_len,
+#else
-+ &roam_info, GFP_KERNEL);
++ &roam_info,
+#endif
++ GFP_KERNEL);
+
WL_DBG(("Report roaming result\n"));
diff --git a/wl-kmod.spec b/wl-kmod.spec
index 66c1e13..a6ec4d6 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -8,7 +8,7 @@
Name: wl-kmod
Version: 6.30.223.271
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -105,6 +105,9 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || :
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jul 05 2017 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.271-13
+- Rework patch for kernel >= 4.12 - thanks to Tim Thomas
+
* Sat Jun 03 2017 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.271-12
- Add patch for kernel >= 4.12 - add cfg80211_roam_info struct in wl_bss_roaming_done function
7 years, 4 months
[smplayer] Update smplayer to 17.7.0
by Sérgio M. Basto
commit b2955381036c92c1b0dd8bbd435b9af024465bfe
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Jul 5 15:53:31 2017 +0100
Update smplayer to 17.7.0
.gitignore | 1 +
smplayer.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bcddfa9..231c7c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ smtube-16.3.0.tar.bz2
/smplayer-17.5.0.tar.bz2
/smtube-17.5.0.tar.bz2
/smplayer-17.6.0.tar.bz2
+/smplayer-17.7.0.tar.bz2
diff --git a/smplayer.spec b/smplayer.spec
index 0a96ba7..b229418 100644
--- a/smplayer.spec
+++ b/smplayer.spec
@@ -1,5 +1,5 @@
Name: smplayer
-Version: 17.6.0
+Version: 17.7.0
%global smtube_ver 17.5.0
%global smplayer_themes_ver 17.3.0
%global smplayer_skins_ver 15.2.0
@@ -208,6 +208,9 @@ fi
%{_datadir}/smplayer/themes/
%changelog
+* Wed Jul 05 2017 Sérgio Basto <sergio(a)serjux.com> - 17.7.0-1
+- Update smplayer to 17.7.0
+
* Wed May 31 2017 Sérgio Basto <sergio(a)serjux.com> - 17.6.0-1
- Update smplayer to 17.6.0
diff --git a/sources b/sources
index 4e4770f..c7b5792 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-8f200fa8e440ecb07b96307435284dc6 smplayer-17.6.0.tar.bz2
+8f0572ecc3fb840a854bad2c2907199f smplayer-17.7.0.tar.bz2
edfc9a47bb302b4af6089b152f815d15 smtube-17.5.0.tar.bz2
33c063c5a80c5b1625f51ddbb7bfd3a1 smplayer-themes-17.3.0.tar.bz2
57e165cf9a95808fafd179e5322b7f15 smplayer-skins-15.2.0.tar.bz2
7 years, 4 months
[girl/f24: 2/2] Merge branch 'master' into f24
by Martin Gansser
commit 8bc9182e2b84266068a71ce60c1e7751af31f3d3
Merge: 9e697b5 e759d4f
Author: martinkg <mgansser(a)online.de>
Date: Wed Jul 5 16:52:02 2017 +0200
Merge branch 'master' into f24
girl.spec | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
---
7 years, 4 months
[girl/f25] Rebuild
by Martin Gansser
Summary of changes:
e759d4f... Rebuild (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 4 months
