[vlc] Update to today's snapshoot
by nchauvet
Summary of changes:
8dcb8e2... Update to today's snapshoot (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 10 months
[vlc/f24] Update to today's snapshoot
by nchauvet
commit 8dcb8e2a5b47711d0cdbfb500e6a7435a050003f
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jul 1 13:40:31 2016 +0200
Update to today's snapshoot
sources | 2 +-
vlc.spec | 20 ++++++++++++++++----
2 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/sources b/sources
index 3982174..fcb22c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-116dc8ed2d01337693d893eb93e36f36 vlc-3.0.0-git.tar.xz
+73283699864f11cdfa8317a60e04c952 vlc-3.0.0-git.tar.xz
diff --git a/vlc.spec b/vlc.spec
index 8243983..ce4dfde 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -32,7 +32,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.0
-Release: 0.1%{?dist}
+Release: 0.2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -175,7 +175,6 @@ Requires: kde-filesystem
Requires: dejavu-sans-fonts
Requires: dejavu-sans-mono-fonts
Requires: dejavu-serif-fonts
-Requires: qt4%{?_isa} >= %{_qt4_version}
#For xdg-sreensaver
Requires: xdg-utils
@@ -398,13 +397,18 @@ fi || :
}
%{_libdir}/vlc/plugins/video_output/libaa_plugin.so
%{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
+%{_libdir}/vlc/plugins/video_output/libegl_wl_plugin.so
+%{_libdir}/vlc/plugins/video_output/libegl_x11_plugin.so
+%{_libdir}/vlc/plugins/video_output/libgl_plugin.so
+%{_libdir}/vlc/plugins/video_output/libglx_plugin.so
+%{_libdir}/vlc/plugins/video_output/libwl_shell_surface_plugin.so
+%{_libdir}/vlc/plugins/video_output/libwl_shm_plugin.so
%{!?_without_xcb:
%{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so
-#{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
}
%{_libdir}/vlc/plugins/gui/libskins2_plugin.so
%{?_with_projectm:
@@ -444,11 +448,16 @@ fi || :
%endif
%exclude %{_libdir}/vlc/plugins/video_output/libaa_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_output/libegl_wl_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_output/libegl_x11_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_output/libgl_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_output/libglx_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_output/libwl_shell_surface_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_output/libwl_shm_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so
-#{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
}
%exclude %{_libdir}/vlc/plugins/gui/libskins2_plugin.so
%{?_with_opencv:
@@ -495,6 +504,9 @@ fi || :
%changelog
+* Fri Jul 01 2016 Nicolas Chauvet <nicolas.chauvet(a)kwizart.fr> - 3.0.0-0.2
+- Update to today snapshot
+
* Tue Jun 14 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.1
- Update to 3.0.0 - snapshot 20160614
- Switch to qt5
7 years, 10 months
[buildsys-build-rpmfusion/f24] rebuild for kernel 4.6.3-300.fc24
by nchauvet
commit 9bb157ab943e560eee54a2b12ed6bdec75873a20
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jul 1 15:04:46 2016 +0200
rebuild for kernel 4.6.3-300.fc24
buildsys-build-rpmfusion-kerneldevpkgs-current | 8 ++++----
buildsys-build-rpmfusion.spec | 8 +++++++-
2 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/buildsys-build-rpmfusion-kerneldevpkgs-current b/buildsys-build-rpmfusion-kerneldevpkgs-current
index 7ac51fc..74fad16 100644
--- a/buildsys-build-rpmfusion-kerneldevpkgs-current
+++ b/buildsys-build-rpmfusion-kerneldevpkgs-current
@@ -1,4 +1,4 @@
-4.5.5-300.fc24
-4.5.5-300.fc24smp
-4.5.5-300.fc24PAE
-4.5.5-300.fc24lpae
+4.6.3-300.fc24
+4.6.3-300.fc24smp
+4.6.3-300.fc24PAE
+4.6.3-300.fc24lpae
diff --git a/buildsys-build-rpmfusion.spec b/buildsys-build-rpmfusion.spec
index 4ccce4f..9f7d757 100644
--- a/buildsys-build-rpmfusion.spec
+++ b/buildsys-build-rpmfusion.spec
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 24
-Release: 1
+Release: 3
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jul 01 2016 Nicolas Chauvet <nicolas.chauvet(a)kwizart.fr> - 10:24-3
+- rebuild for kernel 4.6.3-300.fc24
+
+* Fri Jul 01 2016 Nicolas Chauvet <nicolas.chauvet(a)kwizart.fr> - 10:24-2
+- rebuild for kernel 4.6.3-300.fc24.x86_64
+
* Mon Jun 20 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 10:24-1
- rebuild for kernel 4.5.5-300.fc24
7 years, 10 months
[buildsys-build-rpmfusion/f24] rebuild for kernel 4.6.3-300.fc24.x86_64
by nchauvet
commit 922780a6e296fa1f92fbc6cbbe94d3cdd415933b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jul 1 14:25:45 2016 +0200
rebuild for kernel 4.6.3-300.fc24.x86_64
update-to-latest-kernels.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/update-to-latest-kernels.sh b/update-to-latest-kernels.sh
index a36f4e1..d1ec4a4 100755
--- a/update-to-latest-kernels.sh
+++ b/update-to-latest-kernels.sh
@@ -26,6 +26,6 @@ git diff -u
read
fedpkg clog; git commit -F clog -a
rm clog
-rfpkg-free push
+rfpkg push
branch=$(git rev-parse --abbrev-ref HEAD)
-rfpkg-free build ${branch}-free
+rfpkg build --target ${branch}-free
7 years, 10 months
[buildsys-build-rpmfusion/f23] rebuild for kernel 4.6.3-300.fc24.x86_64
by nchauvet
commit b874f8c79954103ca9d5ef29fb2312df1c20b33f
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jul 1 14:25:45 2016 +0200
rebuild for kernel 4.6.3-300.fc24.x86_64
update-to-latest-kernels.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/update-to-latest-kernels.sh b/update-to-latest-kernels.sh
index a36f4e1..d1ec4a4 100755
--- a/update-to-latest-kernels.sh
+++ b/update-to-latest-kernels.sh
@@ -26,6 +26,6 @@ git diff -u
read
fedpkg clog; git commit -F clog -a
rm clog
-rfpkg-free push
+rfpkg push
branch=$(git rev-parse --abbrev-ref HEAD)
-rfpkg-free build ${branch}-free
+rfpkg build --target ${branch}-free
7 years, 10 months
[buildsys-build-rpmfusion] rebuild for kernel 4.6.3-300.fc24.x86_64
by nchauvet
commit 233c806a7f48d69da1210fab3008ec40c2e6f82c
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jul 1 14:25:45 2016 +0200
rebuild for kernel 4.6.3-300.fc24.x86_64
update-to-latest-kernels.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/update-to-latest-kernels.sh b/update-to-latest-kernels.sh
index a36f4e1..d1ec4a4 100755
--- a/update-to-latest-kernels.sh
+++ b/update-to-latest-kernels.sh
@@ -26,6 +26,6 @@ git diff -u
read
fedpkg clog; git commit -F clog -a
rm clog
-rfpkg-free push
+rfpkg push
branch=$(git rev-parse --abbrev-ref HEAD)
-rfpkg-free build ${branch}-free
+rfpkg build --target ${branch}-free
7 years, 10 months
[buildsys-build-rpmfusion] rebuild for kernel 4.6.3-300.fc24.x86_64
by nchauvet
commit c8757361851077b5e0842fe2610d8d6e1ea84b70
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jul 1 14:24:11 2016 +0200
rebuild for kernel 4.6.3-300.fc24.x86_64
buildsys-build-rpmfusion-kerneldevpkgs-current | 8 ++++----
buildsys-build-rpmfusion.spec | 5 ++++-
2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/buildsys-build-rpmfusion-kerneldevpkgs-current b/buildsys-build-rpmfusion-kerneldevpkgs-current
index 4801267..329cf7e 100644
--- a/buildsys-build-rpmfusion-kerneldevpkgs-current
+++ b/buildsys-build-rpmfusion-kerneldevpkgs-current
@@ -1,4 +1,4 @@
-4.2.3-300.fc23
-4.2.3-300.fc23smp
-4.2.3-300.fc23PAE
-4.2.3-300.fc23lpae
+4.6.3-300.fc24.x86_64
+4.6.3-300.fc24.x86_64smp
+4.6.3-300.fc24.x86_64PAE
+4.6.3-300.fc24.x86_64lpae
diff --git a/buildsys-build-rpmfusion.spec b/buildsys-build-rpmfusion.spec
index 268ad1d..62339ea 100644
--- a/buildsys-build-rpmfusion.spec
+++ b/buildsys-build-rpmfusion.spec
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 25
-Release: 0.1
+Release: 0.2
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jul 01 2016 Nicolas Chauvet <nicolas.chauvet(a)kwizart.fr> - 10:25-0.2
+- rebuild for kernel 4.6.3-300.fc24.x86_64
+
* Sun Jun 12 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 10:25-0.1
- Update to 25
7 years, 10 months
[openmw] New upstream release
by Alexandre Moine
commit 37f20ee3ee9d6af72d155e3c9f933c0490d631d7
Author: Alexandre Moine <nobrakal(a)gmail.com>
Date: Fri Jul 1 14:28:35 2016 +0200
New upstream release
- Force the use of c++11 standard
.gitignore | 1 +
openmw.spec | 13 +++++++++----
sources | 2 +-
3 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4acbb42..93be932 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
openmw-0.36.1.tar.gz
openmw-0.37.0.tar.gz
openmw-0.38.0.tar.gz
+openmw-0.39.0.tar.gz
diff --git a/openmw.spec b/openmw.spec
index 614187e..611d54a 100644
--- a/openmw.spec
+++ b/openmw.spec
@@ -1,5 +1,5 @@
Name: openmw
-Version: 0.38.0
+Version: 0.39.0
Release: 1%{?dist}
Summary: Unofficial open source engine re-implementation of the game Morrowind
@@ -9,13 +9,13 @@ URL: https://openmw.org
Source0: https://github.com/OpenMW/openmw/archive/%{name}-%{version}.tar.gz
# Pass path to ffmpeg headers in CFLAGS
-Patch0: openmw.fix-ffmpeg-includedir.patch
+Patch0: %{name}.fix-ffmpeg-includedir.patch
# Unbundle dejavu-lgc-sans-mono-fonts
-Patch1: openmw.unbundle-dejavu-font.patch
+Patch1: %{name}.unbundle-dejavu-font.patch
# Unbundle tango icons
-Patch2: openmw.undundle-tango-icons.patch
+Patch2: %{name}.undundle-tango-icons.patch
BuildRequires: cmake
BuildRequires: boost-devel
@@ -94,6 +94,7 @@ rm -rf build && mkdir build && pushd build
-DMORROWIND_DATA_FILES=%{_datadir}/%{name}/data \
-DUSE_SYSTEM_TINYXML=TRUE \
-DBUILD_UNITTESTS:BOOL=TRUE \
+ -DCMAKE_CXX_STANDARD=11 \
../
make %{?_smp_mflags}
@@ -141,6 +142,10 @@ mkdir -p %{buildroot}/%{_datadir}/%{name}/data
%changelog
+* Tue May 10 2016 Alexandre Moine <nobrakal(a)gmail.com> 0.39.0-1
+- New upstream release
+- Force the use of c++11 standard
+
* Tue Jan 26 2016 Alexandre Moine <nobrakal(a)gmail.com> 0.38.0-1
- New upstream release
diff --git a/sources b/sources
index 67bb0eb..9e5d749 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2da564d29aca4ff2a29d81f364206466 openmw-0.38.0.tar.gz
+01c04b6eba8926f0c3dfc808534c9944 openmw-0.39.0.tar.gz
7 years, 10 months
[nvidia-304xx-kmod] patch for kernel-4.6
by Leigh Scott
commit 646e9c74c5d4fbeb2c95a404d78978ae053d2612
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jul 1 10:30:53 2016 +0100
patch for kernel-4.6
disable-mtrr.patch | 2 +-
linux-4.6.patch | 146 +++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-304xx-kmod.spec | 7 ++-
3 files changed, 153 insertions(+), 2 deletions(-)
---
diff --git a/disable-mtrr.patch b/disable-mtrr.patch
index c0cf224..045f394 100644
--- a/disable-mtrr.patch
+++ b/disable-mtrr.patch
@@ -6,7 +6,7 @@ Description: Disable MTRR on kernel >= 4.3
until upstream fixes it.
--- kernel/nv-linux.h.orig
+++ kernel/nv-linux.h
-@@ -256,6 +256,15 @@
+@@ -254,6 +254,15 @@
#include <linux/seq_file.h>
#endif
diff --git a/linux-4.6.patch b/linux-4.6.patch
new file mode 100644
index 0000000..3f25847
--- /dev/null
+++ b/linux-4.6.patch
@@ -0,0 +1,146 @@
+--- /dev/null
++++ b/kernel/nv-mm.h
+@@ -0,0 +1,55 @@
++/*******************************************************************************
++ Copyright (c) 2016 NVIDIA Corporation
++
++ Permission is hereby granted, free of charge, to any person obtaining a copy
++ of this software and associated documentation files (the "Software"), to
++ deal in the Software without restriction, including without limitation the
++ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++ sell copies of the Software, and to permit persons to whom the Software is
++ furnished to do so, subject to the following conditions:
++
++ The above copyright notice and this permission notice shall be
++ included in all copies or substantial portions of the Software.
++
++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
++ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++ DEALINGS IN THE SOFTWARE.
++
++*******************************************************************************/
++#ifndef __NV_MM_H__
++#define __NV_MM_H__
++
++/* get_user_pages_remote() was added by:
++ * 2016 Feb 12: 1e9877902dc7e11d2be038371c6fbf2dfcd469d7
++ *
++ * The very next commit (cde70140fed8429acf7a14e2e2cbd3e329036653)
++ * deprecated the 8-argument version of get_user_pages for the
++ * non-remote case (calling get_user_pages with current and current->mm).
++ *
++ * The guidelines are: call NV_GET_USER_PAGES_REMOTE if you need the 8-argument
++ * version that uses something other than current and current->mm. Use
++ * NV_GET_USER_PAGES if you are refering to current and current->mm.
++ *
++* Note that get_user_pages_remote() requires the caller to hold a reference on
++* the task_struct (if non-NULL) and the mm_struct. This will always be true
++* when using current and current->mm. If the kernel passes the driver a vma
++* via driver callback, the kernel holds a reference on vma->vm_mm over that
++* callback.
++ */
++
++#if defined(NV_GET_USER_PAGES_REMOTE_PRESENT)
++ #define NV_GET_USER_PAGES get_user_pages
++ #define NV_GET_USER_PAGES_REMOTE get_user_pages_remote
++#else
++ #define NV_GET_USER_PAGES(start, nr_pages, write, force, pages, vmas) \
++ get_user_pages(current, current->mm, start, nr_pages, write, force, pages, vmas)
++
++ #define NV_GET_USER_PAGES_REMOTE get_user_pages
++#endif
++
++
++#endif // __NV_MM_H__
+--- a/kernel/nv-mlock.c
++++ b/kernel/nv-mlock.c
+@@ -13,6 +13,7 @@
+
+ #include "os-interface.h"
+ #include "nv-linux.h"
++#include "nv-mm.h"
+
+ RM_STATUS NV_API_CALL nv_lock_user_pages(
+ nv_state_t *nv,
+@@ -49,7 +50,7 @@
+ }
+
+ down_read(&mm->mmap_sem);
+- ret = get_user_pages(current, mm, (unsigned long)address,
++ ret = NV_GET_USER_PAGES((unsigned long)address,
+ page_count, write, force, user_pages, NULL);
+ up_read(&mm->mmap_sem);
+ pinned = ret;
+@@ -62,7 +63,7 @@
+ else if (pinned < page_count)
+ {
+ for (i = 0; i < pinned; i++)
+- page_cache_release(user_pages[i]);
++ put_page(user_pages[i]);
+ os_free_mem(user_pages);
+ return RM_ERR_INVALID_ADDRESS;
+ }
+@@ -80,7 +81,7 @@
+ {
+ pci_unmap_page(dev, pte_array[j],
+ PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
+- page_cache_release(user_pages[j]);
++ put_page(user_pages[j]);
+ }
+ os_free_mem(user_pages);
+ return RM_ERR_OPERATING_SYSTEM;
+@@ -114,7 +115,7 @@
+ PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
+ if (write)
+ set_page_dirty_lock(user_pages[i]);
+- page_cache_release(user_pages[i]);
++ put_page(user_pages[i]);
+ }
+
+ os_free_mem(user_pages);
+
+diff --git a/kernel/conftest.sh.orig b/kernel/conftest.sh
+index d01488b..308ea8a 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -1525,6 +1525,23 @@ compile_test() {
+
+ compile_check_conftest "$CODE" "NV_NODE_END_PFN_PRESENT" "" "functions"
+ ;;
++
++ get_user_pages_remote)
++ #
++ # Determine if the function get_user_pages_remote() is
++ # present.
++ #
++ # get_user_pages_remote() was added by:
++ # 2016 Feb 12: 1e9877902dc7e11d2be038371c6fbf2dfcd469d7
++ #
++ CODE="
++ #include <linux/mm.h>
++ int conftest_get_user_pages_remote(void) {
++ get_user_pages_remote();
++ }"
++
++ compile_check_conftest "$CODE" "NV_GET_USER_PAGES_REMOTE_PRESENT" "" "functions"
++ ;;
+ esac
+ }
+
+--- a/kernel/Makefile.kbuild
++++ b/kernel/Makefile.kbuild
+@@ -187,7 +187,8 @@
+ drm_pci_set_busid \
+ write_cr4 \
+ for_each_online_node \
+- node_end_pfn
++ node_end_pfn \
++ get_user_pages_remote
+
+ #
+ # Miscellaneous NVIDIA kernel module build support targets. They are needed
+
diff --git a/nvidia-304xx-kmod.spec b/nvidia-304xx-kmod.spec
index 17bcada..b637010 100644
--- a/nvidia-304xx-kmod.spec
+++ b/nvidia-304xx-kmod.spec
@@ -8,7 +8,7 @@
Name: nvidia-304xx-kmod
Version: 304.131
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -21,6 +21,7 @@ Source0: nvidia-kmod-data-%{version}.tar.xz
Source11: nvidia-304xx-kmodtool-excludekernel-filterfile
# https://anonscm.debian.org/viewvc/pkg-nvidia/packages/nvidia-graphics-dri...
Patch0: disable-mtrr.patch
+Patch1: linux-4.6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,6 +49,7 @@ for arch in x86 x64
do
pushd nvidiapkg-${arch}
%patch0 -p0
+%patch1 -p1
popd
done
@@ -81,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jul 01 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 304.131-3
+- patch for kernel-4.6
+
* Mon Feb 15 2016 Orion Poplawski <orion(a)cora.nwra.com> - 304.131-2
- Add patch for 4.3 kernel
7 years, 10 months