[libopenshot-audio/el7: 15/16] Fix conflicts with master.
by Richard Shaw
commit f8876b6ccaef5a54528d04e1c868784c42c9fd02
Merge: db28097 a5823c1
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Tue Nov 21 07:08:48 2017 -0600
Fix conflicts with master.
.gitignore | 4 ++++
libopenshot-audio.spec | 31 ++++++++++++++++++++++++++++---
sources | 4 ++++
3 files changed, 36 insertions(+), 3 deletions(-)
---
diff --cc sources
index 9f19d65,198f8ce..83dcff4
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
+1bb08aef04135d1cc3a842de23b7c519 libopenshot-audio-0.0.3.tar.gz
++=======
+ 09cc90dbdc97450b9023ff4a56aa2279 libopenshot-audio-0.1.4.tar.gz
++>>>>>>> master
6 years, 5 months
[libopenshot-audio/el7] (16 commits) ...Fix conflicts with master.
by Richard Shaw
Summary of changes:
ead934f... *** empty log message *** (*)
37f08d1... Fix build dependency. (*)
52c9cd4... * Mon May 18 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - (*)
73d86ba... * Thu Jun 25 2015 Sérgio Basto <sergio(a)serjux.com> - 0.0.4 (*)
97a6740... * Mon Nov 16 2015 Richard Shaw <hobbes1069(a)gmail.com> - 0.0 (*)
2f9eea5... Add libXrandr-devel as a build requirement. (*)
731ed54... Update to latest upstream release. (*)
5092aef... Merge branch 'master' of ssh://pkgs.kwizart.net/free/rpms/l (*)
5e79293... Update to latest upstream release. (*)
5e76888... Update to latest upstream release. (*)
fd3d861... Update to latest upstream release. (*)
3570ed9... - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass (*)
dac07aa... - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass (*)
a5823c1... Update libopenshot-audio to 0.1.4 (*)
f8876b6... Fix conflicts with master.
076144c... Fix conflicts with master.
(*) This commit already existed in another branch; no separate mail sent
6 years, 5 months
[megamario] Fix canyon file name (rfbz #4526)
by Leigh Scott
commit 8428adbeae8b5ff383510711cf04cfa2338c045e
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Nov 20 10:55:06 2017 +0000
Fix canyon file name (rfbz #4526)
megamario.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/megamario.spec b/megamario.spec
index 2a61219..c7630a5 100644
--- a/megamario.spec
+++ b/megamario.spec
@@ -1,6 +1,6 @@
Name: megamario
Version: 1.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Well known platform game clone
Group: Amusements/Games
License: LGPLv2
@@ -26,6 +26,7 @@ captured by the evil Bowser.
%setup -q -c
%patch0 -p1
sed -i 's/\r//' *.txt
+sed -i -e 's@Canyon.jpg@canyon.jpg(a)g' data/levels/grasslevels/grassland
%build
@@ -77,6 +78,9 @@ fi
%changelog
+* Mon Nov 20 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.7-2
+- Fix canyon file name (rfbz #4526)
+
* Sun Oct 22 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.7-1
- New upstream release 1.7 (rfbz #4526)
- Clean up spec file
6 years, 5 months
[VirtualBox-kmod] Add more fixes for kernel 4.14
by Sérgio M. Basto
commit 97ebf86510af8fdb1a802614ac6946cb31fc3299
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Nov 19 23:02:19 2017 +0000
Add more fixes for kernel 4.14
VirtualBox-kmod.spec | 5 ++-
fixes_for_4.14.patch | 108 +++++++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 108 insertions(+), 5 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index c0fa2f0..0832488 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -29,7 +29,7 @@
Name: VirtualBox-kmod
Version: 5.1.30
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -109,6 +109,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Sun Nov 19 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.30-3
+- Add more fixes for kernel 4.14
+
* Sun Nov 19 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.30-2
- Readd fixes for kernel 4.14
diff --git a/fixes_for_4.14.patch b/fixes_for_4.14.patch
index 7adf260..887411f 100644
--- a/fixes_for_4.14.patch
+++ b/fixes_for_4.14.patch
@@ -1,4 +1,19 @@
-Index: VirtualBox-5.1.28/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
+Patch VirtualBox source for changes in the kernel API for 4.14.x
+
+The following issues are addressed:
+ vfs_write() is replaced by kernel_write()
+ symbol SKB_GSO_UDP is removed
+ removal of gamma_set and gamma_get from struct drm_fb_helper_funcs
+ removal of set_busid from struct drm_driver
+ replacement of drm_pci_init() with pci_register_driver()
+ replacement of drm_pci_exit() with pci_unregister_driver()
+ removal of load_lut from struct drm_crtc_helper_func
+
+This patch is licensed under the MIT license.
+
+Signed-off-by: Larry Finger <Larry.Finger(a)lwfinger.net>
+
+Index: VirtualBox-5.1.30/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
===================================================================
--- ./VirtualBox-kmod-5.1.30/vboxpci/linux/VBoxPci-linux.c.orig
+++ ./VirtualBox-kmod-5.1.30/vboxpci/linux/VBoxPci-linux.c
@@ -20,9 +35,9 @@ Index: VirtualBox-5.1.28/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
if (ret < 0)
printk(KERN_DEBUG "vboxPciFileWrite: error %d\n", ret);
-Index: VirtualBox-5.1.28/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+Index: VirtualBox-5.1.30/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
===================================================================
---- ./VirtualBox-kmod-5.1.30/vboxnetflt/linux/VBoxNetFlt-linux.c
+--- ./VirtualBox-kmod-5.1.30/vboxnetflt/linux/VBoxNetFlt-linux.c.orig
+++ ./VirtualBox-kmod-5.1.30/vboxnetflt/linux/VBoxNetFlt-linux.c
@@ -124,6 +124,10 @@ typedef struct VBOXNETFLTNOTIFIER *PVBOX
# define bstats stats
@@ -47,4 +62,89 @@ Index: VirtualBox-5.1.28/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.
case PDMNETWORKGSOTYPE_IPV6_TCP:
fGsoType = SKB_GSO_TCPV6;
break;
-
+Index: VirtualBox-5.1.30/src/VBox/Additions/linux/drm/vbox_fb.c
+===================================================================
+--- ./VirtualBox-kmod-5.1.30/vboxvideo/vbox_fb.c.orig
++++ ./VirtualBox-kmod-5.1.30/vboxvideo/vbox_fb.c
+@@ -381,6 +381,7 @@ out:
+ return ret;
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+ static void vbox_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
+ u16 blue, int regno)
+ {
+@@ -394,10 +395,13 @@ static void vbox_fb_gamma_get(struct drm
+ *green = regno;
+ *blue = regno;
+ }
++#endif
+
+ static struct drm_fb_helper_funcs vbox_fb_helper_funcs = {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+ .gamma_set = vbox_fb_gamma_set,
+ .gamma_get = vbox_fb_gamma_get,
++#endif
+ .fb_probe = vboxfb_create,
+ };
+
+Index: VirtualBox-5.1.30/src/VBox/Additions/linux/drm/vbox_drv.c
+===================================================================
+--- ./VirtualBox-kmod-5.1.30/vboxvideo/vbox_drv.c.orig
++++ ./VirtualBox-kmod-5.1.30/vboxvideo/vbox_drv.c
+@@ -281,7 +281,7 @@ static struct drm_driver driver =
+ .lastclose = vbox_driver_lastclose,
+ .master_set = vbox_master_set,
+ .master_drop = vbox_master_drop,
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_73)
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_73)) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+ .set_busid = drm_pci_set_busid,
+ #endif
+
+@@ -326,11 +326,19 @@ static int __init vbox_init(void)
+ if (vbox_modeset == 0)
+ return -EINVAL;
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+ return drm_pci_init(&driver, &vbox_pci_driver);
++#else
++ return pci_register_driver(&vbox_pci_driver);
++#endif
+ }
+ static void __exit vbox_exit(void)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+ drm_pci_exit(&driver, &vbox_pci_driver);
++#else
++ pci_unregister_driver(&vbox_pci_driver);
++#endif
+ }
+
+ module_init(vbox_init);
+Index: VirtualBox-5.1.30/src/VBox/Additions/linux/drm/vbox_mode.c
+===================================================================
+--- ./VirtualBox-kmod-5.1.30/vboxvideo/vbox_mode.c.orig
++++ ./VirtualBox-kmod-5.1.30/vboxvideo/vbox_mode.c
+@@ -152,10 +152,12 @@ static int vbox_set_view(struct drm_crtc
+ return 0;
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+ static void vbox_crtc_load_lut(struct drm_crtc *crtc)
+ {
+
+ }
++#endif
+
+ static void vbox_crtc_dpms(struct drm_crtc *crtc, int mode)
+ {
+@@ -301,7 +303,9 @@ static const struct drm_crtc_helper_func
+ .mode_set = vbox_crtc_mode_set,
+ /* .mode_set_base = vbox_crtc_mode_set_base, */
+ .disable = vbox_crtc_disable,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+ .load_lut = vbox_crtc_load_lut,
++#endif
+ .prepare = vbox_crtc_prepare,
+ .commit = vbox_crtc_commit,
+
6 years, 5 months
[VirtualBox-kmod] Readd fixes for kernel 4.14
by Sérgio M. Basto
commit a5b4f1242ba5042e2540b6248351f53187f561f0
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Nov 19 18:22:01 2017 +0000
Readd fixes for kernel 4.14
VirtualBox-kmod.spec | 7 ++++++-
fixes_for_4.14.patch | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 56 insertions(+), 1 deletion(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 2b84acd..c0fa2f0 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -29,7 +29,7 @@
Name: VirtualBox-kmod
Version: 5.1.30
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -37,6 +37,7 @@ License: GPLv2 or CDDL
URL: http://www.virtualbox.org/wiki/VirtualBox
# This filters out the XEN kernel, since we don't run on XEN
Source1: VirtualBox-kmod-excludekernel-filter.txt
+Patch1: fixes_for_4.14.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time
BuildRequires: %{AkmodsBuildRequires}
@@ -59,6 +60,7 @@ Kernel module for VirtualBox
%prep
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
+%patch1 -p1 -b .kernel_4.14
# error out if there was something wrong with kmodtool
%{?kmodtool_check}
@@ -107,6 +109,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Sun Nov 19 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.30-2
+- Readd fixes for kernel 4.14
+
* Tue Oct 31 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.30-1
- Update VBox to 5.1.30
diff --git a/fixes_for_4.14.patch b/fixes_for_4.14.patch
new file mode 100644
index 0000000..7adf260
--- /dev/null
+++ b/fixes_for_4.14.patch
@@ -0,0 +1,50 @@
+Index: VirtualBox-5.1.28/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
+===================================================================
+--- ./VirtualBox-kmod-5.1.30/vboxpci/linux/VBoxPci-linux.c.orig
++++ ./VirtualBox-kmod-5.1.30/vboxpci/linux/VBoxPci-linux.c
+@@ -353,12 +353,17 @@ static void vboxPciFileClose(struct fil
+ static int vboxPciFileWrite(struct file* file, unsigned long long offset, unsigned char* data, unsigned int size)
+ {
+ int ret;
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++
++ ret = kernel_write(file, data, size, &offset);
++#else
+ mm_segment_t fs_save;
+
+ fs_save = get_fs();
+ set_fs(get_ds());
+ ret = vfs_write(file, data, size, &offset);
+ set_fs(fs_save);
++#endif
+ if (ret < 0)
+ printk(KERN_DEBUG "vboxPciFileWrite: error %d\n", ret);
+
+Index: VirtualBox-5.1.28/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+===================================================================
+--- ./VirtualBox-kmod-5.1.30/vboxnetflt/linux/VBoxNetFlt-linux.c
++++ ./VirtualBox-kmod-5.1.30/vboxnetflt/linux/VBoxNetFlt-linux.c
+@@ -124,6 +124,10 @@ typedef struct VBOXNETFLTNOTIFIER *PVBOX
+ # define bstats stats
+ # define qstats stats
+ # endif
++#endif
++
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++#define SKB_GSO_UDP 0
+ #endif
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
+@@ -722,9 +726,11 @@ static struct sk_buff *vboxNetFltLinuxSk
+ case PDMNETWORKGSOTYPE_IPV4_TCP:
+ fGsoType = SKB_GSO_TCPV4;
+ break;
++# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+ case PDMNETWORKGSOTYPE_IPV4_UDP:
+ fGsoType = SKB_GSO_UDP;
+ break;
++#endif
+ case PDMNETWORKGSOTYPE_IPV6_TCP:
+ fGsoType = SKB_GSO_TCPV6;
+ break;
+
6 years, 5 months
[VirtualBox-kmod/f26] (5 commits) ...drop fixes_for_4.14.patch
by Sérgio M. Basto
Summary of changes:
ecac1f7... Tempory disable broken dep of buildsys-build-rpmfusion-kern (*)
f915f54... Reenable buildsys-build-rpmfusion-kerneldevpkgs-current (*)
c70cbdf... Add fixes for kernel 4.14 (*)
d5a04f5... Update VBox to 5.1.30 (*)
4d08626... drop fixes_for_4.14.patch (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 5 months