[nvidia-kmod] Patch for 4.16 kernel
by Leigh Scott
commit 028b8ade85a75131792dd0816ce2a4e3ea0d9eb1
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Mar 7 07:16:23 2018 +0000
Patch for 4.16 kernel
kernel_4.16.patch | 21 +++++++++++++++++++++
nvidia-kmod.spec | 7 ++++++-
2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/kernel_4.16.patch b/kernel_4.16.patch
new file mode 100644
index 0000000..3c31fc9
--- /dev/null
+++ b/kernel_4.16.patch
@@ -0,0 +1,21 @@
+--- a/kernel/common/inc/nv-linux.h
++++ b/kernel/common/inc/nv-linux.h
+@@ -1209,6 +1209,8 @@
+ static inline NvBool nv_dma_maps_swiotlb(struct pci_dev *dev)
+ {
+ NvBool swiotlb_in_use = NV_FALSE;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)
++#if 0
+ #if defined(CONFIG_SWIOTLB)
+ #if defined(NV_DMA_OPS_PRESENT) || defined(NV_GET_DMA_OPS_PRESENT)
+ /*
+@@ -1251,6 +1253,8 @@
+ swiotlb_in_use = (swiotlb == 1);
+ #endif
+ #endif
++#endif
++#endif
+
+ return swiotlb_in_use;
+ }
+
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index cb203a4..fd665fd 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -10,7 +10,7 @@ Name: nvidia-kmod
Epoch: 3
Version: 390.25
# Taken over by kmodtool
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -20,6 +20,7 @@ Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
Patch1: nv-linux-arm2.patch
Patch2: kernel_4.15.patch
+Patch3: kernel_4.16.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64 armv7hl
@@ -46,6 +47,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -73,6 +75,9 @@ done
%changelog
+* Tue Mar 06 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:390.25-6
+- Patch for 4.16 kernel
+
* Fri Mar 02 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 3:390.25-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 8 months
[VirtualBox-kmod] fix minor spelling mistakes
by Sérgio M. Basto
commit d2b4bdeb43971f4dec83bbe2db285c936f7ad34e
Author: René Genz <liebundartig(a)freenet.de>
Date: Mon Mar 5 22:52:17 2018 +0100
fix minor spelling mistakes
VirtualBox-kmod.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 12089b0..635a44c 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -23,7 +23,7 @@
#and when just build akmod, debuginfo will be empty.
# In prerelease builds (such as betas), this package has the same
-# major version number, while the kernel module abi is not guarranteed
+# major version number, while the kernel module abi is not guaranteed
# to be stable. This is so that we force the module update in sync with
# userspace.
#global prerel 106108
@@ -78,7 +78,7 @@ popd
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} --filterfile %{SOURCE1} 2>/dev/null
# This is hardcoded in Makefiles
-# Kto zisti, preco tu nefunguje %%without hardening ma u mna nanuk
+# who will find out why %%without hardening does not work?
%{!?with_hardening:find %{name}-%{version} -name Makefile |xargs sed 's/-DVBOX_WITH_HARDENING//' -i}
for kernel_version in %{?kernel_versions} ; do
@@ -205,7 +205,7 @@ DIRS=$(ls %{name}-%{version} |wc -l)
- Update VBox to 5.1.14
* Tue Nov 22 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.10-1
-- New upstream vesion, 5.1.10
+- New upstream version, 5.1.10
* Tue Oct 18 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.8-1
- Update VBox to 5.1.8
@@ -230,7 +230,7 @@ DIRS=$(ls %{name}-%{version} |wc -l)
* Wed Jun 29 2016 Sérgio Basto <sergio(a)serjux.com> - 5.0.24-1
- Update VirtualBox to 5.0.24
-- No more obsolete VirtualBox-OSE , simplify snippets
+- No more obsolete VirtualBox-OSE, simplify snippets
* Fri Jun 24 2016 Sérgio Basto <sergio(a)serjux.com> - 5.0.22-1
- Update to 5.0.22
6 years, 8 months
[VirtualBox] fix minor spelling mistakes
by Sérgio M. Basto
commit 3c62f12507e16cc8d339a926c27be582894addc0
Author: René Genz <liebundartig(a)freenet.de>
Date: Mon Mar 5 23:11:29 2018 +0100
fix minor spelling mistakes
VBoxOGLRun.sh | 2 +-
VirtualBox.spec | 60 ++++++++++++++++++++++++++---------------------------
vboxservice.service | 2 +-
3 files changed, 32 insertions(+), 32 deletions(-)
---
diff --git a/VBoxOGLRun.sh b/VBoxOGLRun.sh
index aa34308..a76738d 100644
--- a/VBoxOGLRun.sh
+++ b/VBoxOGLRun.sh
@@ -3,7 +3,7 @@
if VBoxClient --check3d; then
export LD_LIBRARY_PATH=/usr/lib64/VBoxGuestAdditions:/usr/lib/VBoxGuestAdditions
else
- echo "Error 3D passthru not enabled in VM settings." 1>&2
+ echo "Error 3D pass-through not enabled in VM settings." 1>&2
exit 1
fi
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 115732e..4b816db 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -10,7 +10,7 @@
#global optflags %%(echo %%{optflags} | sed 's/-specs=.*cc1 //')
# In prerelease builds (such as betas), this package has the same
-# major version number, while the kernel module abi is not guarranteed
+# major version number, while the kernel module abi is not guaranteed
# to be stable. This is so that we force the module update in sync with
# userspace.
#global prerel 106108
@@ -215,15 +215,15 @@ Conflicts: %{name} <= %{version}-%{release}
%description guest-additions
-Important note: VirtualBox-guest-additions can't be installed on Host (master)
-system because contains X11 and OpenGL drives that will mess up with your X11
+Important note: VirtualBox-guest-additions can't be installed on a Host (master)
+system because it contains X11 and OpenGL drivers that will mess up your X11
configurations.
-This subpackage replace Oracle Linux Guest Addition but just for Fedora,
-therefore should be installed only when we have one Fedora as a guest system.
-Tools that use kernel modules for supporting integration with the Host,
-including file sharing, clipboard sharing, X.org X11 video and mouse driver,
-USB and webcam proxy and Seamless mode.
+This subpackage is like the VirtualBox Guest Additions but just for Fedora,
+therefore it should be installed only in a Fedora guest system.
+This subpackage provides tools that use kernel modules for supporting
+integration with the Host, including file sharing, clipboard sharing,
+X.org X11 video and mouse driver, USB and webcam proxy and Seamless mode.
To use OpenGL pass-through mode run apps using "VBoxOGLRun foo -opt1 -opt2".
@@ -300,7 +300,7 @@ umask 0022
sed -e 's/[^[:alnum:]]//g; s/FedoraProject//' | cut -c -9)}%{?!vendor:custom}
# VirtualBox build system installs and builds in the same step,
-# not allways looking for the installed files to places they have
+# not always looking for the installed files in places they have
# really been installed to. Therefore we do not override any of
# the installation paths, but install the tree with the default
# layout under 'obj' and shuffle files around in %%install.
@@ -432,7 +432,7 @@ ln -s VBox %{buildroot}%{_bindir}/vboxwebsrv
%endif
ln -s ../..%{_libdir}/virtualbox/vbox-img %{buildroot}%{_bindir}/vbox-img
-# Components , preserve symlinks
+# Components, preserve symlinks
cp -a obj/bin/components/* %{buildroot}%{_libdir}/virtualbox/components/
# Language files
@@ -894,8 +894,8 @@ getent passwd vboxadd >/dev/null || \
- Review Scriptlets for starting vboxservice.service in guest-additions
https://fedoraproject.org/wiki/Starting_services_by_default
- Adjust vboxdrv.rules and move to 60-vboxdrv.rules as has upstream.
-- Remove Encoding key on .desktop files, Encoding key is deprectated.
-- Add a new luncher, VBoxBugReport and reorder lunchers as upstream spec
+- Remove Encoding key on .desktop files, Encoding key is deprecated.
+- Add a new launcher, VBoxBugReport and reorder launchers as upstream spec
- Move more files to sub-packages.
* Tue Sep 13 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.6-1
@@ -953,7 +953,7 @@ getent passwd vboxadd >/dev/null || \
- Update python packaging.
* Mon Apr 04 2016 Sérgio Basto <sergio(a)serjux.com> - 5.0.17-6.106108
-- More guest improvments and fixes
+- More guest improvements and fixes
* Fri Apr 01 2016 Sérgio Basto <sergio(a)serjux.com> - 5.0.17-5.106108
- Do not install vboxvideo_drv.so, instead vboxvideo.ko.
@@ -1003,10 +1003,10 @@ https://www.virtualbox.org/ticket/15205#comment:8
- Refactor no-bundles.patch and strings.patch
* Mon Oct 05 2015 Sérgio Basto <sergio(a)serjux.com> - 5.0.6-1
-- Update to VirtualBox-5.0.6 , without strings patch (need be rebased)
+- Update to VirtualBox-5.0.6, without strings patch (need be rebased)
* Wed Sep 30 2015 Sérgio Basto <sergio(a)serjux.com> - 5.0.4-2.4
-- enabled doc , vnc and webservices
+- enabled doc, vnc, and webservices
- Drop beramono patch
* Tue Sep 29 2015 Sérgio Basto <sergio(a)serjux.com> - 5.0.4-2
@@ -1021,7 +1021,7 @@ https://www.virtualbox.org/ticket/15205#comment:8
* Mon May 04 2015 Sérgio Basto <sergio(a)serjux.com> - 4.3.26-3
- Added diff_smap_4.patch from https://www.virtualbox.org/ticket/13961 ,
- may fix problems for kernel >= 3.19 , I still need disable 3D to run plasma 5
+ may fix problems for kernel >= 3.19, I still need to disable 3D to run plasma 5
( https://forums.virtualbox.org/viewtopic.php?f=6&t=64452&start=15#p320557 )
* Mon May 04 2015 Sérgio Basto <sergio(a)serjux.com> - 4.3.26-2
@@ -1032,7 +1032,7 @@ https://www.virtualbox.org/ticket/15205#comment:8
- New upstream release .
* Fri Dec 26 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-3
-- Improved strings.patch asking to install kmods VirtualBox and also intructions for devel versions.
+- Improved strings.patch asking to install kmods VirtualBox and also instructions for devel versions.
- Improved description of VirtualBox-guest, alerting to not install on Host, one conclusion on rfbz #3425 .
* Sun Dec 21 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-2
@@ -1059,7 +1059,7 @@ https://www.virtualbox.org/ticket/15205#comment:8
* Tue Jul 15 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.14-1
- New upstream release .
-- Unbunble kBuild, since KBuild from fedora is working again.
+- Unbundle kBuild, since KBuild from fedora is working again.
* Fri May 16 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.12-1
- New upstream release .
@@ -1147,7 +1147,7 @@ VirtualBox-4.3.0-no-bundles.patch, VirtualBox-4.3.0-testmangle.patch and Virtual
- New upstream release.
- Drop 00-vboxvideo.conf on guest X configuration, because this is fixed a long time ago, but we keep commented just in case.
- Drop upstreamed patch VirtualBox-4.2.8-Linux_3.9.0_rc0_compile_fix.patch .
-- Modified noupdate.patch as reflection on bug rfbz #2722 , to check updates one time a week and ask for updates of extensions pack and VBoxGuestAdditions. We should also review strings for better dialogs.
+- Modified noupdate.patch as reflection on bug rfbz #2722, to check updates one time a week and ask for updates of extensions pack and VBoxGuestAdditions. We should also review strings for better dialogs.
* Thu Mar 07 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.8-2
- Added upstreamed patch for kernels 3.9, "That fix will be part of the next maintenance
@@ -1176,7 +1176,7 @@ VirtualBox-4.3.0-no-bundles.patch, VirtualBox-4.3.0-testmangle.patch and Virtual
- VBoxGuestLib is not need for new X11-xorg, so no compile instead patch source to
build with system sources.
- Delete source bundles before patching sources and adjustments on the corresponding patches.
-- VirtualBox-4.2.0-libcxx.patch minor imporvements.
+- VirtualBox-4.2.0-libcxx.patch minor improvements.
* Mon Dec 24 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.6-1
- New upstream release.
@@ -1195,9 +1195,9 @@ VirtualBox-4.3.0-no-bundles.patch, VirtualBox-4.3.0-testmangle.patch and Virtual
* Sat Oct 27 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1
- New upstream release.
- Drop patch VirtualBox-4.2.0-xorg17.patch and add VBOX_USE_SYSTEM_XORG_HEADERS=1. Changeset r43588,
-https://www.virtualbox.org/changeset/43588/vbox , allow compile vboxvideo with system headers, and
+https://www.virtualbox.org/changeset/43588/vbox, allow compile vboxvideo with system headers, and
"As vboxmouse_drv is not needed at all for X.Org Server 1.7 and later do not build it".
-- enable-webservice on F17 and lower (stables) and disable-docs on F18 and rawhide, can't buid it
+- enable-webservice on F17 and lower (stables) and disable-docs on F18 and rawhide, can't build it
on F18 and rawhide, new libxslt and new pdflatex problems.
* Sun Sep 30 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-4
@@ -1218,7 +1218,7 @@ VirtualBox-4.2.0-xorg17.patch and split VBoxGuestLib part into VirtualBox-4.2.0-
- Revert attempt to remove 32-bits patch.
* Thu Sep 13 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.7.RC4
-- Another try to compile with 32-bits suport on x86_64.
+- Another try to compile with 32-bits support on x86_64.
* Sun Sep 09 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.6.RC4
- Update to RC4.
@@ -1235,7 +1235,7 @@ VirtualBox-4.2.0-xorg17.patch and split VBoxGuestLib part into VirtualBox-4.2.0-
- Fix ABI/API breakages in X11 1.13.
* Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.3.RC3
-- fix requires kmod, with version with prerealeses.
+- fix requires kmod, with version with prereleases.
* Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.2.RC3
- vim :retab, reformat all tabs.
@@ -1320,11 +1320,11 @@ cvs diff: VirtualBox-OSE-4.1.4-xorg17.patch was removed, no comparison available
- mesa patch only for F17 or higher
* Fri Apr 13 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.12-3
-- F17 mesa patch, fix compile fakedri and unbundle part of mesa sources, unbunble mesa source must be tested.
+- F17 mesa patch, fix compile fakedri and unbundle part of mesa sources, unbundle mesa source must be tested.
* Fri Apr 13 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.12-2
- F15 patch gsoap 2.7 which pkg-config gsoapssl++ --libs don't have -lssl -lcrypto
-- F17 kBuild workarround, but still not build in F17,
+- F17 kBuild workaround, but still not build in F17,
https://bugs.freedesktop.org/show_bug.cgi?id=47971 .
* Tue Apr 3 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.12-1
@@ -1334,8 +1334,8 @@ cvs diff: VirtualBox-OSE-4.1.4-xorg17.patch was removed, no comparison available
* Fri Mar 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.10-1
- New release.
-- Upsteam says that java stuff is fiexd , https://www.virtualbox.org/ticket/9848#comment:5
-- Upsteam says that have compile fixes for kernel 3.3-rc1 (in changelog).
+- Upstream says that java stuff is fixed, https://www.virtualbox.org/ticket/9848#comment:5
+- Upstream says that have compile fixes for kernel 3.3-rc1 (in changelog).
- backport fix for web-service with newer versions of GSOAP, Changeset 40476 and 40477 in vbox, kindly
fixed from Frank Mehnert "The real fix can be found in r40476 and r40477. You should be able to
apply these fixes to VBox 4.1.10 as well." and add -lssl and -lcrypto by my self.
@@ -1609,7 +1609,7 @@ cvs diff: VirtualBox-OSE-4.1.4-xorg17.patch was removed, no comparison available
* Thu Sep 04 2008 Lubomir Rintel <lkundrak(a)v3.sk> - 1.6.4-3
- Do the previous change correctly
-- Replace occurencies of 'vboxdrv setup'
+- Replace occurrences of 'vboxdrv setup'
* Wed Sep 03 2008 Lubomir Rintel <lkundrak(a)v3.sk> - 1.6.4-2
- Move the VboxDD* libs to a less wrong place
@@ -1637,7 +1637,7 @@ cvs diff: VirtualBox-OSE-4.1.4-xorg17.patch was removed, no comparison available
* Sun Feb 24 2008 Till Maas <opensource till name> - 1.5.6-1
- update to new version
- add BR: pulseaudio-libs-devel
-- remove uneeded recompiler patch
+- remove unneeded recompiler patch
- remove dkms subpackage (it is now a standalone package)
* Sat Feb 16 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 1.5.2-3
diff --git a/vboxservice.service b/vboxservice.service
index e5ca5ec..3eb3c0d 100644
--- a/vboxservice.service
+++ b/vboxservice.service
@@ -1,6 +1,6 @@
[Unit]
Description=VirtualBox guest services
-#RHEL7 says that Virtualization is kvm !?
+#RHEL7 says that Virtualization is kvm!?
ConditionVirtualization=|kvm
ConditionVirtualization=|oracle
6 years, 8 months
[EmptyEpsilon] New version: 2018.02.15
by Jan Kalina
commit 351b0ca55388d3e54c4dfb74033082bf59822b79
Author: Jan Kalina <jkalina(a)redhat.com>
Date: Tue Mar 6 23:07:19 2018 +0100
New version: 2018.02.15
.gitignore | 2 ++
EmptyEpsilon.spec | 11 +++++++----
sources | 4 ++--
3 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e23e7c4..0fa28d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
/SeriousProton-EE-2017.05.06.zip
/EmptyEpsilon-EE-2017.11.03.zip
/SeriousProton-EE-2017.11.03.zip
+/EmptyEpsilon-EE-2018.02.15.zip
+/SeriousProton-EE-2018.02.15.zip
diff --git a/EmptyEpsilon.spec b/EmptyEpsilon.spec
index 6373df9..4854c4a 100644
--- a/EmptyEpsilon.spec
+++ b/EmptyEpsilon.spec
@@ -1,11 +1,11 @@
-%global version_major 2017
-%global version_minor 11
-%global version_patch 03
+%global version_major 2018
+%global version_minor 02
+%global version_patch 15
Name: EmptyEpsilon
Summary: Spaceship bridge simulator game
Version: %{version_major}.%{version_minor}.%{version_patch}
-Release: 2%{?dist}
+Release: 1%{?dist}
License: GPLv2
Recommends: xclip
BuildRequires: cmake
@@ -79,6 +79,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%{_datadir}/applications/%{name}.desktop
%changelog
+* Tue Mar 6 2018 Jan Kalina <jkalina(a)redhat.com> - 2018.02.15-1
+- New version of game
+
* Fri Mar 02 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 2017.11.03-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index 4fe0156..e23600d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-39b01853b0ac51a023e37a53df88b28f EmptyEpsilon-EE-2017.11.03.zip
-5c1f51dbe41b0ba866439353c80ec59b SeriousProton-EE-2017.11.03.zip
+7ffad34a75c9888f27c214ef9f175b4c EmptyEpsilon-EE-2018.02.15.zip
+212aadc1f44b8bc4eced10b1c6e47ee8 SeriousProton-EE-2018.02.15.zip
6 years, 8 months
[xvidcore/f28] Update to 1.3.5
by Leigh Scott
Summary of changes:
de1efa1... Update to 1.3.5 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 8 months
[xvidcore] Update to 1.3.5
by Leigh Scott
commit de1efa192e0d0c155dc931e3c46e4e6d2f64e85d
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Mar 6 17:28:10 2018 +0000
Update to 1.3.5
.gitignore | 1 +
sources | 2 +-
xvidcore.spec | 51 +++++++++++++++++++++++++++++----------------------
3 files changed, 31 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4255f22..461477a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
xvidcore-1.3.2.tar.bz2
+/xvidcore-1.3.5.tar.bz2
diff --git a/sources b/sources
index 2df6024..2fda576 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e68b84e3286b7bbaa95ddc34f0fcace xvidcore-1.3.4.tar.bz2
+6877498cfc5b7f652e1a564699dba655 xvidcore-1.3.5.tar.bz2
diff --git a/xvidcore.spec b/xvidcore.spec
index 158895d..8128ce1 100644
--- a/xvidcore.spec
+++ b/xvidcore.spec
@@ -1,14 +1,12 @@
#global pre -rc1
Name: xvidcore
-Version: 1.3.4
-Release: 5%{?dist}
+Version: 1.3.5
+Release: 1%{?dist}
Summary: MPEG-4 Simple and Advanced Simple Profile codec
-
-Group: System Environment/Libraries
License: GPLv2+
URL: http://www.xvid.org/
-Source0: http://downloads.xvid.org/downloads/xvidcore-%{version}%{?pre}.tar.bz2
+Source0: http://downloads.xvid.org/downloads/%{name}-%{version}%{?pre}.tar.bz2
%ifarch %{ix86} x86_64
BuildRequires: nasm >= 2.0
@@ -25,8 +23,7 @@ many more.
%package devel
Summary: Development files for the Xvid video codec
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{_isa} = %{version}-%{release}
%description devel
This package contains header files, static library and API
@@ -34,35 +31,42 @@ documentation for the Xvid video codec.
%prep
-%setup -q -n %{name}
+%autosetup -n %{name}
chmod -x examples/*.pl
-f=AUTHORS ; iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && touch -r $f $f.utf8 && mv $f.utf8 $f
+# Convert to utf-8
+for file in AUTHORS ChangeLog; do
+ iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
+ touch -r $file $file.new && \
+ mv $file.new $file
+done
+# Fix rpmlint wrong-file-end-of-line-encoding
+for file in ChangeLog; do
+ sed "s|\r||g" $file > $file.new && \
+ touch -r $file $file.new && \
+ mv $file.new $file
+done
# Yes, we want to see the build output.
-#{__perl} -pi -e 's/^\t@(?!echo\b)/\t/' build/generic/Makefile
-
+%{__sed} -i -e 's|@$(|$(|g' build/generic/Makefile
+# Fix permissions
+%{__sed} -i -e 's|644 $(BUILD_DIR)/$(SHARED_LIB)|755 $(BUILD_DIR)/$(SHARED_LIB)|g' build/generic/Makefile
%build
cd build/generic
-export CFLAGS="$RPM_OPT_FLAGS -ffast-math"
%configure
-make %{?_smp_mflags}
-cd -
+%make_build
%install
-rm -rf $RPM_BUILD_ROOT
-make -C build/generic install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/libxvidcore.a
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/libxvidcore.so.*
+%make_install -C build/generic
+find %{buildroot} -name "*.a" -delete
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
%files
-%doc LICENSE README AUTHORS ChangeLog
+%doc README AUTHORS ChangeLog
+%license LICENSE
%{_libdir}/libxvidcore.so.*
%files devel
@@ -72,6 +76,9 @@ chmod 755 $RPM_BUILD_ROOT%{_libdir}/libxvidcore.so.*
%changelog
+* Tue Mar 06 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.3.5-1
+- Update to 1.3.5
+
* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 1.3.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 8 months
