[vlc] Fixup macosx
by Nicolas Chauvet
commit 06401810e6c4d3080ddc77d7f8af35ce8a1dddeb
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Feb 20 21:55:49 2017 +0100
Fixup macosx
vlc.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/vlc.spec b/vlc.spec
index 47042b3..3e76023 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -350,6 +350,9 @@ touch %{buildroot}%{_libdir}/vlc/plugins/plugins.dat
appstream-util validate-relax --nonet \
%{buildroot}/%{_datadir}/appdata/*.appdata.xml || :
+#Fixup
+rm -rf %{buildroot}/%{_datadir}/macosx
+
%find_lang %{name}
7 years, 9 months
[nvidia-340xx-kmod] patch for kernel-4.10
by Leigh Scott
commit 124769c6a45d26c2a3c88f8eb494befe99cf78d2
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Feb 20 20:55:32 2017 +0000
patch for kernel-4.10
4.10.0_kernel.patch | 131 +++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-340xx-kmod.spec | 7 ++-
2 files changed, 137 insertions(+), 1 deletion(-)
---
diff --git a/4.10.0_kernel.patch b/4.10.0_kernel.patch
new file mode 100644
index 0000000..f4297b1
--- /dev/null
+++ b/4.10.0_kernel.patch
@@ -0,0 +1,131 @@
+From 983a2ca221a371e08bb5ad11758a729cfa5aa88c Mon Sep 17 00:00:00 2001
+From: Alberto Milone <alberto.milone(a)canonical.com>
+Date: Wed, 15 Feb 2017 17:05:55 +0100
+Subject: [PATCH 1/1] Add support for Linux 4.10
+
+---
+ nv-linux.h | 7 +++++++
+ nv-pat.c | 40 ++++++++++++++++++++++++++++++++++++++++
+ uvm/nvidia_uvm_lite.c | 4 ++++
+ 3 files changed, 51 insertions(+)
+
+diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
+index e7068e3..2d62492 100644
+--- a/kernel/nv-linux.h
++++ b/kernel/nv-linux.h
+@@ -2082,6 +2082,8 @@ static inline NvU64 nv_node_end_pfn(int nid)
+ * 2016 Dec 14:5b56d49fc31dbb0487e14ead790fc81ca9fb2c99
+ */
+
++#include <linux/version.h>
++
+ #if defined(NV_GET_USER_PAGES_REMOTE_PRESENT)
+ #if defined(NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS)
+ #define NV_GET_USER_PAGES get_user_pages
+@@ -2129,8 +2131,13 @@ static inline NvU64 nv_node_end_pfn(int nid)
+
+ #else
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+ return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
+ pages, vmas);
++#else
++ return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
++ pages, vmas, NULL);
++#endif
+
+ #endif
+
+diff --git a/kernel/nv-pat.c b/kernel/nv-pat.c
+index a725533..cec6f3f 100644
+--- a/kernel/nv-pat.c
++++ b/kernel/nv-pat.c
+@@ -203,6 +203,7 @@ void nv_disable_pat_support(void)
+ }
+
+ #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+ static int
+ nvidia_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
+ {
+@@ -234,6 +235,34 @@ static struct notifier_block nv_hotcpu_nfb = {
+ .notifier_call = nvidia_cpu_callback,
+ .priority = 0
+ };
++#else
++static int nvidia_cpu_online(unsigned int hcpu)
++{
++ unsigned int cpu = get_cpu();
++ if (cpu == hcpu)
++ nv_setup_pat_entries(NULL);
++ else
++ NV_SMP_CALL_FUNCTION(nv_setup_pat_entries, (void *)(long int)hcpu, 1);
++
++ put_cpu();
++
++ return 0;
++}
++
++static int nvidia_cpu_down_prep(unsigned int hcpu)
++{
++ unsigned int cpu = get_cpu();
++ if (cpu == hcpu)
++ nv_restore_pat_entries(NULL);
++ else
++ NV_SMP_CALL_FUNCTION(nv_restore_pat_entries, (void *)(long int)hcpu, 1);
++
++ put_cpu();
++
++ return 0;
++}
++#endif
++
+ #endif
+
+ int nv_init_pat_support(nv_stack_t *sp)
+@@ -255,7 +284,14 @@ int nv_init_pat_support(nv_stack_t *sp)
+ #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
+ if (nv_pat_mode == NV_PAT_MODE_BUILTIN)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+ if (register_hotcpu_notifier(&nv_hotcpu_nfb) != 0)
++#else
++ if (cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,
++ "gpu/nvidia:online",
++ nvidia_cpu_online,
++ nvidia_cpu_down_prep) != 0)
++#endif
+ {
+ nv_disable_pat_support();
+ nv_printf(NV_DBG_ERRORS,
+@@ -280,7 +316,11 @@ void nv_teardown_pat_support(void)
+ {
+ nv_disable_pat_support();
+ #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+ unregister_hotcpu_notifier(&nv_hotcpu_nfb);
++#else
++ cpuhp_remove_state_nocalls(CPUHP_AP_ONLINE_DYN);
++#endif
+ #endif
+ }
+ }
+diff --git a/kernel/uvm/nvidia_uvm_lite.c b/kernel/uvm/nvidia_uvm_lite.c
+index 9627f60..2158b45 100644
+--- a/kernel/uvm/nvidia_uvm_lite.c
++++ b/kernel/uvm/nvidia_uvm_lite.c
+@@ -820,7 +820,11 @@ done:
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+ unsigned long vaddr = (unsigned long)vmf->virtual_address;
++#else
++ unsigned long vaddr = (unsigned long)vmf->address;
++#endif
+ struct page *page = NULL;
+ int retval;
+
+--
+2.7.4
+
diff --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec
index b4bad5f..cd2324d 100644
--- a/nvidia-340xx-kmod.spec
+++ b/nvidia-340xx-kmod.spec
@@ -10,7 +10,7 @@ Name: nvidia-340xx-kmod
Epoch: 1
Version: 340.102
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,6 +19,7 @@ URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
Patch1: 4.9.0_kernel.patch
+Patch2: 4.10.0_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,6 +49,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
# patch loop
%patch0 -p1
%patch1 -p1
+%patch2 -p1
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -95,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Feb 20 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:340.102-2
+- patch for kernel-4.10
+
* Wed Feb 15 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:340.102-1
- Update to 340.102
7 years, 9 months
[vlc] Add BRs
by Nicolas Chauvet
commit feda414a4ae490e586d39f3b3285a88428ceb31b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Feb 20 18:02:58 2017 +0100
Add BRs
vlc.spec | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 7d66457..47042b3 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -151,6 +151,7 @@ BuildRequires: pkgconfig(speexdsp) >= 1.0.5
%{?_with_wayland:
BuildRequires: pkgconfig(wayland-client) >= 1.5.91
BuildRequires: pkgconfig(wayland-egl)
+BuildRequires: pkgconfig(wayland-protocols)
}
%{?_with_schroedinger:BuildRequires: schroedinger-devel >= 1.0.10}
BuildRequires: sqlite-devel
@@ -412,8 +413,9 @@ fi || :
%{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
%{?_with_wayland:
%{_libdir}/vlc/plugins/video_output/libegl_wl_plugin.so
-%{_libdir}/vlc/plugins/video_output/libwl_shell_surface_plugin.so
+%{_libdir}/vlc/plugins/video_output/libwl_shell_plugin.so
%{_libdir}/vlc/plugins/video_output/libwl_shm_plugin.so
+
}
%{_libdir}/vlc/plugins/video_output/libegl_x11_plugin.so
%{_libdir}/vlc/plugins/video_output/libgl_plugin.so
@@ -472,7 +474,7 @@ fi || :
%exclude %{_libdir}/vlc/plugins/video_output/libglx_plugin.so
%{?_with_wayland:
%exclude %{_libdir}/vlc/plugins/video_output/libegl_wl_plugin.so
-%exclude %{_libdir}/vlc/plugins/video_output/libwl_shell_surface_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_output/libwl_shell_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libwl_shm_plugin.so
}
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
7 years, 9 months
[vlc] Update changelog
by Nicolas Chauvet
commit 308f0750d7f4942f3ad0cbeae18673ab19b45366
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Feb 20 17:51:25 2017 +0100
Update changelog
sources | 2 +-
vlc.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/sources b/sources
index d95895f..12f2529 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b56db6077cdc228b11b4772335ad1b07 vlc-3.0.0-20170109-0241-git.tar.xz
+68b532bf5162405b89011d5fbf8dacce vlc-3.0.0-20170220-0237-git.tar.xz
diff --git a/vlc.spec b/vlc.spec
index 8bb2948..7d66457 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -38,7 +38,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.0
-Release: 0.16%{?dist}
+Release: 0.17%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -521,6 +521,11 @@ fi || :
%changelog
+* Mon Feb 20 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.17
+- Update to 20170220 snapshot
+- Clean merged patch, unrevert wayland runtime detection
+- Switch source url on purpose
+
* Tue Jan 31 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.16
- Add daala support
7 years, 9 months
[vlc] Clean merged patch, disable wayland runtime detection revert
by Nicolas Chauvet
commit 67f13a8f32cef7d4081a4d14fccf5b954f958b91
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Feb 20 17:39:41 2017 +0100
Clean merged patch, disable wayland runtime detection revert
0001-Fix-lirc-activation-after-detection.patch | 32 --------------------------
vlc.spec | 4 +---
2 files changed, 1 insertion(+), 35 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 2409cf6..8bb2948 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -44,7 +44,6 @@ Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_rc:%{version}/}vlc-%{version}%{?vlc_rc}.tar.xz
Patch0: disable_hidpi_scaling.patch
-Patch1: 0001-Fix-lirc-activation-after-detection.patch
Patch2: 0001-Revert-qt-add-Wayland-run-time-detection.patch
BuildRequires: desktop-file-utils
@@ -244,8 +243,7 @@ VLC media player extras modules.
%prep
%setup -q -n %{name}-%{version}%{?vlc_rc:-git}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+#patch2 -p1
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
./bootstrap
7 years, 9 months
[vlc] Bump for today
by Nicolas Chauvet
commit 942cfaa24b4ec5e08b1234d85e989ea69d114ae4
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Feb 20 17:30:37 2017 +0100
Bump for today
vlc.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index ef15d0a..52bfb79 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,4 +1,4 @@
-%global vlc_rc -20170109-0241-git
+%global vlc_rc -20170220-0237-git
%global _with_bootstrap 1
%global _with_workaround_circle_deps 1
%if 0%{?!_without_freeworld:1}
7 years, 9 months
[live555] Update to 2017.01.26
by Nicolas Chauvet
commit 314188485d183aa9d738da5fb7331e669d299a82
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Feb 20 10:37:10 2017 +0100
Update to 2017.01.26
.gitignore | 5 +----
live555.spec | 6 +++++-
sources | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 358bed1..d829e5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-live.2014.10.21.tar.gz
-/live.2016.07.19.tar.gz
-/live.2016.10.21.tar.gz
-/live.2016.11.28.tar.gz
+/live.*.tar.gz
diff --git a/live555.spec b/live555.spec
index 41ab4a9..45612de 100644
--- a/live555.spec
+++ b/live555.spec
@@ -1,5 +1,5 @@
Name: live555
-Version: 2016.11.28
+Version: 2017.01.26
Release: 1%{?dist}
Summary: Live555.com streaming libraries
@@ -117,6 +117,10 @@ chmod +x %{buildroot}%{_libdir}/*.so*
%changelog
+* Mon Feb 20 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2017.01.26-1
+- Update to 2017.01.26
+- Switch to %%{rpmmacrodir}
+
* Mon Dec 12 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 2016.11.28-1
- Update to 2016.11.28
- Switch to RPM based macros
diff --git a/sources b/sources
index cbbdd76..06c2913 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-60dcc25f77364f40d630dbd6ab354ea0 live.2016.11.28.tar.gz
+9656e2e818cb2f34987ded2593802fba live.2017.01.26.tar.gz
7 years, 9 months
[live555] Switch to rpmmacrodir
by Nicolas Chauvet
commit 6b7db9941340ba0370c19a897718a44f9b1a7fce
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Feb 20 10:34:40 2017 +0100
Switch to rpmmacrodir
live555.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/live555.spec b/live555.spec
index ae91a7c..41ab4a9 100644
--- a/live555.spec
+++ b/live555.spec
@@ -78,12 +78,12 @@ sed -i -e "s|-O2|%{optflags}|" \
%make_install PREFIX=%{_prefix} LIBDIR=%{_libdir}
#RPM Macros support
-mkdir -p %{buildroot}%{_sysconfdir}/rpm
-cat > %{buildroot}%{_sysconfdir}/rpm/macros.live555 << EOF
+mkdir -p %{buildroot}%{rpmmacrodir}
+cat > %{buildroot}%{rpmmacrodir}/macros.%{name} << EOF
# live555 RPM Macros
%live555_version %{version}
EOF
-touch -r COPYING %{buildroot}%{_sysconfdir}/rpm/macros.live555
+touch -r COPYING %{buildroot}%{rpmmacrodir}/macros.%{name}
#Fix library dependency detection
chmod +x %{buildroot}%{_libdir}/*.so*
@@ -105,7 +105,7 @@ chmod +x %{buildroot}%{_libdir}/*.so*
%files devel
%doc COPYING README
-%config %{_sysconfdir}/rpm/macros.live555
+%{rpmmacrodir}/macros.%{name}
%{_libdir}/libBasicUsageEnvironment.so
%{_libdir}/libgroupsock.so
%{_libdir}/libliveMedia.so
7 years, 9 months
