[nvidia-340xx-kmod/f26] Update to 340.106
by Wolfgang Ulbrich
commit 599e8566ed62e44f767f3bdf156d287e09065254
Author: raveit65 <mate(a)raveit.de>
Date: Thu Jan 18 09:37:04 2018 +0100
Update to 340.106
4.14_kernel-106.patch | 29 +++++++++++++++++++++++++++++
4.14_kernel.patch | 27 ---------------------------
nvidia-340xx-kmod.spec | 9 ++++++---
3 files changed, 35 insertions(+), 30 deletions(-)
---
diff --git a/4.14_kernel-106.patch b/4.14_kernel-106.patch
new file mode 100644
index 0000000..e5dedb0
--- /dev/null
+++ b/4.14_kernel-106.patch
@@ -0,0 +1,29 @@
+diff -uprN nvidia-340xx-kmod-340.106-orig/kernel/nv-drm.c nvidia-340xx-kmod-340.106/kernel/nv-drm.c
+--- nvidia-340xx-kmod-340.106-orig/kernel/nv-drm.c 2018-01-17 16:49:22.366243000 +0100
++++ nvidia-340xx-kmod-340.106/kernel/nv-drm.c 2018-01-17 16:50:03.685166103 +0100
+@@ -181,8 +181,12 @@ int __init nv_drm_init(
+ {
+ int ret = 0;
+ #if defined(NV_DRM_AVAILABLE)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++ ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver);
++#else
+ ret = nv_drm_pci_init(&nv_drm_driver, pci_driver);
+ #endif
++#endif
+ return ret;
+ }
+
+@@ -191,8 +195,12 @@ void nv_drm_exit(
+ )
+ {
+ #if defined(NV_DRM_AVAILABLE)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++ drm_legacy_pci_exit(&nv_drm_driver, pci_driver);
++#else
+ nv_drm_pci_exit(&nv_drm_driver, pci_driver);
+ #endif
++#endif
+ }
+
+ RM_STATUS NV_API_CALL nv_alloc_os_descriptor_handle(
diff --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec
index 59cc418..20f41e5 100644
--- a/nvidia-340xx-kmod.spec
+++ b/nvidia-340xx-kmod.spec
@@ -8,9 +8,9 @@
Name: nvidia-340xx-kmod
Epoch: 1
-Version: 340.104
+Version: 340.106
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,7 +19,7 @@ URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
Patch1: 4.11_kernel.patch
-Patch2: 4.14_kernel.patch
+Patch2: 4.14_kernel-106.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jan 17 2018 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1:340.106-1
+- Update to 340.106
+
* Thu Dec 07 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:340.104-2
- patch for kernel-4.14
6 years, 8 months
[nvidia-340xx-kmod/f27] Update to 340.106
by Wolfgang Ulbrich
commit 67cc463fef11d2e06874f878d97eb56fb7ebbf40
Author: raveit65 <mate(a)raveit.de>
Date: Thu Jan 18 09:37:04 2018 +0100
Update to 340.106
4.14_kernel-106.patch | 29 +++++++++++++++++++++++++++++
4.14_kernel.patch | 27 ---------------------------
nvidia-340xx-kmod.spec | 9 ++++++---
3 files changed, 35 insertions(+), 30 deletions(-)
---
diff --git a/4.14_kernel-106.patch b/4.14_kernel-106.patch
new file mode 100644
index 0000000..e5dedb0
--- /dev/null
+++ b/4.14_kernel-106.patch
@@ -0,0 +1,29 @@
+diff -uprN nvidia-340xx-kmod-340.106-orig/kernel/nv-drm.c nvidia-340xx-kmod-340.106/kernel/nv-drm.c
+--- nvidia-340xx-kmod-340.106-orig/kernel/nv-drm.c 2018-01-17 16:49:22.366243000 +0100
++++ nvidia-340xx-kmod-340.106/kernel/nv-drm.c 2018-01-17 16:50:03.685166103 +0100
+@@ -181,8 +181,12 @@ int __init nv_drm_init(
+ {
+ int ret = 0;
+ #if defined(NV_DRM_AVAILABLE)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++ ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver);
++#else
+ ret = nv_drm_pci_init(&nv_drm_driver, pci_driver);
+ #endif
++#endif
+ return ret;
+ }
+
+@@ -191,8 +195,12 @@ void nv_drm_exit(
+ )
+ {
+ #if defined(NV_DRM_AVAILABLE)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++ drm_legacy_pci_exit(&nv_drm_driver, pci_driver);
++#else
+ nv_drm_pci_exit(&nv_drm_driver, pci_driver);
+ #endif
++#endif
+ }
+
+ RM_STATUS NV_API_CALL nv_alloc_os_descriptor_handle(
diff --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec
index 59cc418..20f41e5 100644
--- a/nvidia-340xx-kmod.spec
+++ b/nvidia-340xx-kmod.spec
@@ -8,9 +8,9 @@
Name: nvidia-340xx-kmod
Epoch: 1
-Version: 340.104
+Version: 340.106
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,7 +19,7 @@ URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
Patch1: 4.11_kernel.patch
-Patch2: 4.14_kernel.patch
+Patch2: 4.14_kernel-106.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jan 17 2018 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1:340.106-1
+- Update to 340.106
+
* Thu Dec 07 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:340.104-2
- patch for kernel-4.14
6 years, 8 months
[nvidia-340xx-kmod] Update to 340.106
by Wolfgang Ulbrich
commit 780bcfa853a70aec46037408b41432ef2a9256c8
Author: raveit65 <mate(a)raveit.de>
Date: Thu Jan 18 09:37:04 2018 +0100
Update to 340.106
4.14_kernel-106.patch | 29 +++++++++++++++++++++++++++++
4.14_kernel.patch | 27 ---------------------------
nvidia-340xx-kmod.spec | 9 ++++++---
3 files changed, 35 insertions(+), 30 deletions(-)
---
diff --git a/4.14_kernel-106.patch b/4.14_kernel-106.patch
new file mode 100644
index 0000000..e5dedb0
--- /dev/null
+++ b/4.14_kernel-106.patch
@@ -0,0 +1,29 @@
+diff -uprN nvidia-340xx-kmod-340.106-orig/kernel/nv-drm.c nvidia-340xx-kmod-340.106/kernel/nv-drm.c
+--- nvidia-340xx-kmod-340.106-orig/kernel/nv-drm.c 2018-01-17 16:49:22.366243000 +0100
++++ nvidia-340xx-kmod-340.106/kernel/nv-drm.c 2018-01-17 16:50:03.685166103 +0100
+@@ -181,8 +181,12 @@ int __init nv_drm_init(
+ {
+ int ret = 0;
+ #if defined(NV_DRM_AVAILABLE)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++ ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver);
++#else
+ ret = nv_drm_pci_init(&nv_drm_driver, pci_driver);
+ #endif
++#endif
+ return ret;
+ }
+
+@@ -191,8 +195,12 @@ void nv_drm_exit(
+ )
+ {
+ #if defined(NV_DRM_AVAILABLE)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++ drm_legacy_pci_exit(&nv_drm_driver, pci_driver);
++#else
+ nv_drm_pci_exit(&nv_drm_driver, pci_driver);
+ #endif
++#endif
+ }
+
+ RM_STATUS NV_API_CALL nv_alloc_os_descriptor_handle(
diff --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec
index 59cc418..20f41e5 100644
--- a/nvidia-340xx-kmod.spec
+++ b/nvidia-340xx-kmod.spec
@@ -8,9 +8,9 @@
Name: nvidia-340xx-kmod
Epoch: 1
-Version: 340.104
+Version: 340.106
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,7 +19,7 @@ URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
Patch1: 4.11_kernel.patch
-Patch2: 4.14_kernel.patch
+Patch2: 4.14_kernel-106.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jan 17 2018 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1:340.106-1
+- Update to 340.106
+
* Thu Dec 07 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:340.104-2
- patch for kernel-4.14
6 years, 8 months
[dvdstyler] fix build with ffmpeg-3.5
by Leigh Scott
commit 13632e71668fe5e303c4f3a51da43a56ce4732fa
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Jan 18 08:31:38 2018 +0000
fix build with ffmpeg-3.5
dvdstyler.spec | 2 ++
ffmpeg35_buildfix.patch | 12 ++++++++++++
sources | 2 +-
3 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/dvdstyler.spec b/dvdstyler.spec
index a18f37c..a6cb519 100644
--- a/dvdstyler.spec
+++ b/dvdstyler.spec
@@ -13,6 +13,7 @@ License: GPLv2+
URL: http://www.dvdstyler.de/
Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}%{?prerel}...
Patch1: dvdstyler-wxwin.m4.patch
+Patch2: ffmpeg35_buildfix.patch
# build
BuildRequires: automake autoconf
BuildRequires: gettext
@@ -57,6 +58,7 @@ create navigational DVD menus similar to those found on most commercial DVDs.
%prep
%setup -q -n DVDStyler-%{version}%{?prerel}
%patch1 -p1
+%patch2 -p1
#{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h
%build
diff --git a/ffmpeg35_buildfix.patch b/ffmpeg35_buildfix.patch
new file mode 100644
index 0000000..1ca0e8e
--- /dev/null
+++ b/ffmpeg35_buildfix.patch
@@ -0,0 +1,12 @@
+--- a/src/mediaenc_ffmpeg.cpp
++++ b/src/mediaenc_ffmpeg.cpp
+@@ -223,7 +223,7 @@
+ c->time_base = (AVRational){ 1, c->sample_rate };
+ // some formats want stream headers to be separate
+ if(m_outputCtx->oformat->flags & AVFMT_GLOBALHEADER)
+- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+
+ return true;
+ }
+
diff --git a/sources b/sources
index b33f8fc..d3642f1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eea373502e284466229030dadef1c7a8 DVDStyler-3.0.4.tar.bz2
+5008ea1488809fb0ca877b4e617ae5a7 DVDStyler-3.0.4.tar.bz2
6 years, 8 months
[dvbcut] fix build with ffmpeg-3.5
by Leigh Scott
commit 9dae09d3f57fc14e3106af86ad748d3bc14f21b4
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Jan 18 08:20:28 2018 +0000
fix build with ffmpeg-3.5
dvbcut.spec | 2 ++
ffmpeg35_buildfix.patch | 12 ++++++++++++
2 files changed, 14 insertions(+)
---
diff --git a/dvbcut.spec b/dvbcut.spec
index 76a4cde..6cdca46 100644
--- a/dvbcut.spec
+++ b/dvbcut.spec
@@ -28,6 +28,7 @@ Patch7: %{name}-svn179-ffmpeg-0.11.1.patch
Patch8: %{name}-svn179-ffmpeg-2.0-compatibility.patch
Patch9: %{name}-svn179-ffmpeg-2.4.3-compatibility.patch
Patch10: %{name}-svn179-ffmpeg-3.0.3-compatibility.patch
+Patch11: ffmpeg35_buildfix.patch
BuildRequires: autoconf
BuildRequires: qt3-devel
@@ -66,6 +67,7 @@ dvbcut can use Mplayer if available.
%patch8 -b .ffmpeg-2.0
%patch9 -p1 -b .ffmpeg-2.4.3
%patch10 -p1 -b .ffmpeg-3.0.3
+%patch11 -p1 -b .ffmpeg35
# Fix QTDIR libs in configure
sed -i 's,$QTDIR/$mr_libdirname,$QTDIR/lib,' configure.in
diff --git a/ffmpeg35_buildfix.patch b/ffmpeg35_buildfix.patch
new file mode 100644
index 0000000..d52a835
--- /dev/null
+++ b/ffmpeg35_buildfix.patch
@@ -0,0 +1,12 @@
+--- a/src/stream.h
++++ b/src/stream.h
+@@ -94,7 +94,7 @@
+ // assume default is OK, so just comment out.
+ // avcc->lmax= FF_QP2LAMBDA * 2;
+ if (interlaced)
+- avcc->flags |= CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME;
++ avcc->flags |= AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_INTERLACED_ME;
+ }
+
+ friend class mpgfile;
+
6 years, 8 months
[mp4tools] Rebuilt for ffmpeg-3.5 git
by Leigh Scott
commit a4babf6cf3bee25a9fb6034ca9ad38797eaa85b2
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Jan 18 08:09:36 2018 +0000
Rebuilt for ffmpeg-3.5 git
mp4tools.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/mp4tools.spec b/mp4tools.spec
index 594df40..6b6dab4 100644
--- a/mp4tools.spec
+++ b/mp4tools.spec
@@ -2,7 +2,7 @@
Name: mp4tools
Version: 3.5
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A free cross-platform tool to manipulate MP4 files
License: GPLv2
URL: http://www.mp4joiner.org
@@ -99,6 +99,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/mp4splitter.desktop
%{_datadir}/pixmaps/mp4splitter.png
%changelog
+* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.5-5
+- Rebuilt for ffmpeg-3.5 git
+
* Tue Jan 09 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 3.5-4
- Add RR gpac
6 years, 8 months
[motion] Rebuilt for ffmpeg-3.5 git
by Leigh Scott
commit 95a3b02356336e2b05ae02b91aee40cf85a139fe
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Jan 18 08:09:02 2018 +0000
Rebuilt for ffmpeg-3.5 git
motion.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/motion.spec b/motion.spec
index 2751f6d..59ee1e1 100644
--- a/motion.spec
+++ b/motion.spec
@@ -24,7 +24,7 @@
%global nextver 4.1.1
Name: motion
Version: %{nextver}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
@@ -129,6 +129,9 @@ find /var/motion -user root -group root -exec chown motion:video '{}' ';'
%{_tmpfilesdir}/%{name}.conf
%changelog
+* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 4.1.1-2
+- Rebuilt for ffmpeg-3.5 git
+
* Wed Jan 10 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 4.1.1-1
- Update to 4.1.1 release
- Fix perms on motion.service (rfbz 4753)
6 years, 8 months
[moc] Rebuilt for ffmpeg-3.5 git
by Leigh Scott
commit d3c31069c896e10e9d3d952203c6dd1b408725c3
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Jan 18 08:08:31 2018 +0000
Rebuilt for ffmpeg-3.5 git
moc.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/moc.spec b/moc.spec
index fc15c09..c9244a3 100644
--- a/moc.spec
+++ b/moc.spec
@@ -10,7 +10,7 @@
Name: moc
Summary: Music on Console - Console audio player for Linux/UNIX
Version: 2.6
-Release: 0.21.alpha3%{?dist}
+Release: 0.22.alpha3%{?dist}
License: GPLv3+
URL: http://moc.daper.net
@@ -86,6 +86,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/moc/decoder_plugins/*.la
%{_libdir}/%{name}/
%changelog
+* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6-0.22.alpha3
+- Rebuilt for ffmpeg-3.5 git
+
* Thu Dec 07 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 2.6-0.21.alpha3
- Use GPLv3+ license only
6 years, 8 months
[lives] Rebuilt for ffmpeg-3.5 git
by Leigh Scott
commit b7df8f2e22ce2ae10e2ad3772affeef50b8e3853
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Jan 18 08:07:48 2018 +0000
Rebuilt for ffmpeg-3.5 git
lives.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/lives.spec b/lives.spec
index f65c8da..dea20e8 100644
--- a/lives.spec
+++ b/lives.spec
@@ -13,7 +13,7 @@
Name: lives
Version: 2.8.7
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Video editor and VJ tool
License: GPLv3+ and LGPLv3+
URL: http://lives-video.com
@@ -183,6 +183,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.
%{_datadir}/appdata/LiVES.appdata.xml
%changelog
+* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.8.7-5
+- Rebuilt for ffmpeg-3.5 git
+
* Tue Oct 17 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.8.7-4
- Rebuild for ffmpeg update
6 years, 8 months
[lightspark] Rebuilt for ffmpeg-3.5 git
by Leigh Scott
commit a6d75c296692199199d749a3eef5b027d58653c2
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Jan 18 08:07:07 2018 +0000
Rebuilt for ffmpeg-3.5 git
lightspark.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/lightspark.spec b/lightspark.spec
index 030b6b5..9051499 100644
--- a/lightspark.spec
+++ b/lightspark.spec
@@ -23,7 +23,7 @@
Name: lightspark
Version: %{major}
-Release: %{?pre:0.}%{rel}%{?git_snapshot:.%{date}git}%{?pre:.%{pre}}%{?dist}
+Release: %{?pre:0.}%{rel}%{?git_snapshot:.%{date}git}%{?pre:.%{pre}}%{?dist}.1
Summary: An alternative Flash Player implementation
License: LGPLv3+
URL: http://lightspark.github.io/
@@ -166,6 +166,9 @@ fi
%changelog
+* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.8.0-2.1
+- Rebuilt for ffmpeg-3.5 git
+
* Tue Oct 17 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 0.8.0-2
- Rebuild for ffmpeg update
6 years, 8 months