[vdr-xineliboutput] Update to recent git version
by Martin Gansser
commit 0d3453d36d3741d952c869e465aeb0e01100fd98
Author: Martin Gansser <mgansser(a)alice.de>
Date: Sat Jan 28 12:46:35 2017 +0100
Update to recent git version
.gitignore | 1 +
clog | 2 --
sources | 2 +-
vdr-xineliboutput.spec | 9 ++++++---
4 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0b890a8..7b7e916 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
vdr-xineliboutput-1.1.0-20150422.tgz
/vdr-xineliboutput-1.1.0-9027ea1.tar.gz
+/vdr-xineliboutput-1.1.0-29f7afd.tar.gz
diff --git a/sources b/sources
index 2cc5f86..e36ead8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f8e4b2a9845e6382b1281614bdde6b75 vdr-xineliboutput-1.1.0-9027ea1.tar.gz
+54de16cdb78c05db2b3a5287ad74ad30 vdr-xineliboutput-1.1.0-29f7afd.tar.gz
diff --git a/vdr-xineliboutput.spec b/vdr-xineliboutput.spec
index c35e376..6601cd7 100644
--- a/vdr-xineliboutput.spec
+++ b/vdr-xineliboutput.spec
@@ -3,14 +3,14 @@
%global xinepluginver 2.0.0
%global pname xineliboutput
%global vdrver %(vdr-config --version 2>/dev/null || echo ERROR)
-%global gitrev 9027ea1
-%global gitdate 20160508
+%global gitrev 29f7afd
+%global gitdate 20160607
# build bluray support (disabled for now)
%global have_bluray 1
Name: vdr-%{pname}
Version: 1.1.0
-Release: 18.%{gitdate}git%{gitrev}%{?dist}
+Release: 19.%{gitdate}git%{gitrev}%{?dist}
Summary: Plugins for watching VDR over Xine
Group: Applications/Multimedia
@@ -150,6 +150,9 @@ find %{buildroot}%{xineplugindir} -name '*.so' -exec chmod +x '{}' ';'
%changelog
+* Sat Jan 28 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.0-19.20160607git29f7afd
+- Update to recent git version
+
* Sat Jul 30 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.1.0-18.20160508git9027ea1
- Rebuilt for ffmpeg-3.1.1
7 years, 9 months
[kodi/f25] Update to 17.0 RC4
by Michael Cronenworth
Summary of changes:
7a566ea... Update to 17.0 RC4 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 9 months
[kodi] Update to 17.0 RC4
by Michael Cronenworth
commit 7a566ea53bb194ed46ce3c8a4d6d69246255f0c0
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Fri Jan 27 11:40:38 2017 -0600
Update to 17.0 RC4
.gitignore | 4 +---
kodi-17.0rc3-AEDefines.patch | 21 ---------------------
kodi-generate-tarball-xz.sh | 2 +-
kodi.spec | 9 ++++-----
sources | 2 +-
5 files changed, 7 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4adc183..b7d3be2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/kodi-17.0rc1-patched.tar.xz
-/kodi-17.0rc2-patched.tar.xz
-/kodi-17.0rc3-patched.tar.xz
+/kodi-17.0rc4-patched.tar.xz
diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh
index 21527a6..cfc0696 100755
--- a/kodi-generate-tarball-xz.sh
+++ b/kodi-generate-tarball-xz.sh
@@ -1,7 +1,7 @@
#!/bin/sh
MAJORVERSION=17
-MINORVERSION=0rc3
+MINORVERSION=0rc4
#GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96
#GITSHORT=ge988513
CODENAME=Krypton
diff --git a/kodi.spec b/kodi.spec
index d52f2ae..43f94e6 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -1,4 +1,4 @@
-%global PRERELEASE rc3
+%global PRERELEASE rc4
#global DIRVERSION %{version}
#global GITCOMMIT Gotham_r2-ge988513
# use the line below for pre-releases
@@ -38,9 +38,6 @@ Patch1: kodi-16.0-versioning.patch
# Drop DVD library support
Patch2: kodi-17a2-libdvd.patch
-# Build issue, fixed upstream
-Patch3: kodi-17.0rc3-AEDefines.patch
-
# Optional deps (not in EPEL)
%if 0%{?fedora}
# (libbluray in EPEL 6 is too old.)
@@ -260,7 +257,6 @@ library.
%setup -q -n %{name}-%{DIRVERSION}
%patch1 -p1 -b.versioning
%patch2 -p1 -b.libdvd
-%patch3 -p1 -b.aedefines
%if 0%{?_with_dvd}
cp -p %{SOURCE2} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz
cp -p %{SOURCE3} tools/depends/target/libdvdread/libdvdread-master.tar.gz
@@ -420,6 +416,9 @@ fi
%changelog
+* Fri Jan 27 2017 Michael Cronenworth <mike(a)cchtml.com> - 17.0-0.12.rc4
+- Kodi 17 RC4
+
* Mon Jan 16 2017 Michael Cronenworth <mike(a)cchtml.com> - 17.0-0.12.rc3
- Kodi 17 RC3
- Check for new installs (RFBZ#4409)
diff --git a/sources b/sources
index 616525d..d56b99b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db0346baf7c745e7477782ae2443b8fc kodi-17.0rc3-patched.tar.xz
+4cc741ed919e358b575a18b285cd380a kodi-17.0rc4-patched.tar.xz
7 years, 9 months
[VirtualBox-kmod] Applied upstream patch for kernel-4.10.0-0.rc5
by Sérgio M. Basto
commit 52fe386f2faa239e46ac140d959c8a957073cc53
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Jan 27 14:15:35 2017 +0000
Applied upstream patch for kernel-4.10.0-0.rc5
VirtualBox-kmod.spec | 7 +++++--
kernel-4.10.0-0.rc5.lnkops.patch | 17 -----------------
kernel-4.10.0-0.rc5.lnkops.v2.patch | 24 ++++++++++++++++++++++++
3 files changed, 29 insertions(+), 19 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index e0998be..b18ad95 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -28,7 +28,7 @@
Name: VirtualBox-kmod
Version: 5.1.14
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -36,7 +36,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: kernel-4.10.0-0.rc5.lnkops.patch
+Patch1: kernel-4.10.0-0.rc5.lnkops.v2.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time
BuildRequires: %{AkmodsBuildRequires}
@@ -108,6 +108,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Fri Jan 27 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.14-3
+- Applied upstream patch for kernel-4.10.0-0.rc5
+
* Fri Jan 27 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.14-2
- Applied lnkops.patch for kernel-4.10.0-0.rc5
diff --git a/kernel-4.10.0-0.rc5.lnkops.v2.patch b/kernel-4.10.0-0.rc5.lnkops.v2.patch
new file mode 100644
index 0000000..22279ff
--- /dev/null
+++ b/kernel-4.10.0-0.rc5.lnkops.v2.patch
@@ -0,0 +1,24 @@
+From d9bd947b1fa1d7c47cd1cdb894dadfa07f51e446 Mon Sep 17 00:00:00 2001
+From: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
+Date: Tue, 24 Jan 2017 08:13:25 +0000
+Subject: [PATCH] Additions/linux/sharedfolders: Linux 4.10 fix
+
+git-svn-id: http://www.virtualbox.org/svn/vbox@65409 cfe28804-0f27-0410-a406-dd0f0b0b656f
+---
+ trunk/src/VBox/Additions/linux/sharedfolders/lnkops.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/trunk/src/VBox/Additions/linux/sharedfolders/lnkops.c b/trunk/src/VBox/Additions/linux/sharedfolders/lnkops.c
+index 66ddecd..e43b84c 100644
+--- ./VirtualBox-kmod-5.1.14/vboxsf/lnkops.c.orig
++++ ./VirtualBox-kmod-5.1.14/vboxsf/lnkops.c
+@@ -90,7 +90,9 @@ static const char *sf_get_link(struct dentry *dentry, struct inode *inode,
+
+ struct inode_operations sf_lnk_iops =
+ {
++# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+ .readlink = generic_readlink,
++# endif
+ # if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
+ .get_link = sf_get_link
+ # elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
7 years, 9 months
[mythweb/el7: 15/15] Merge remote-tracking branch 'origin/master' into el7
by Xavier Bachelot
commit 2647c265b0969b99b372e1950ff9fd9e00f7ad17
Merge: 1728bdd 98b43d1
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Fri Jan 27 00:35:54 2017 +0100
Merge remote-tracking branch 'origin/master' into el7
.gitignore | 3 +-
ChangeLog | 146 +++++++++++++++++-----
mythweb-0.27-fixes.patch | 260 --------------------------------------
mythweb-0.28-fixes.patch | 318 +++++++++++++++++++++++++++++++++++++++++++++++
mythweb.spec | 138 +++++++++-----------
sources | 2 +-
6 files changed, 496 insertions(+), 371 deletions(-)
---
7 years, 10 months
[mythweb/el7] (15 commits) ...Merge remote-tracking branch 'origin/master' into el7
by Xavier Bachelot
Summary of changes:
b335582... * Mon May 26 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.2 (*)
e7208db... * Sun Jul 27 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.2 (*)
50067e7... Upload package (*)
897a04f... * Thu Oct 23 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.2 (*)
78de456... * Wed May 27 2015 Richard Shaw <hobbes1069(a)gmail.com> - 0.2 (*)
e7e252f... * Wed Jul 29 2015 Richard Shaw <hobbes1069(a)gmail.com> - 0.2 (*)
05c4836... Update to latest upstream release. (*)
2a5dbd9... Merge branch 'master' of ssh://pkgs.kwizart.net/free/rpms/m (*)
df3f98c... Update to latest fixes. (*)
98e1c9b... Update to latest fixes. (*)
3e7e87c... v0.28-rc1 already support mysqli, https://code.mythtv.org/t (*)
646ee72... Update to latest fixes. (*)
fb38798... BR: perl-generators for proper dependency generation (*)
98b43d1... Remove obsolete scripts. Since data was moved to /var/lib d (*)
2647c26... Merge remote-tracking branch 'origin/master' into el7
(*) This commit already existed in another branch; no separate mail sent
7 years, 10 months
[VirtualBox-kmod] Applied lnkops.patch for kernel-4.10.0-0.rc5
by Sérgio M. Basto
commit 760a61d9e8802c4f6d716931fbd0a66d9ba288ea
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Jan 27 01:18:38 2017 +0000
Applied lnkops.patch for kernel-4.10.0-0.rc5
VirtualBox-kmod.spec | 7 ++++++-
kernel-4.10.0-0.rc5.lnkops.patch | 17 +++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index c7bd092..e0998be 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -28,7 +28,7 @@
Name: VirtualBox-kmod
Version: 5.1.14
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -36,6 +36,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: kernel-4.10.0-0.rc5.lnkops.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time
BuildRequires: %{AkmodsBuildRequires}
@@ -58,6 +59,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 .lnkops
# error out if there was something wrong with kmodtool
%{?kmodtool_check}
@@ -106,6 +108,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Fri Jan 27 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.14-2
+- Applied lnkops.patch for kernel-4.10.0-0.rc5
+
* Wed Jan 18 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.14-1
- Update VBox to 5.1.14
diff --git a/kernel-4.10.0-0.rc5.lnkops.patch b/kernel-4.10.0-0.rc5.lnkops.patch
new file mode 100644
index 0000000..1b2562f
--- /dev/null
+++ b/kernel-4.10.0-0.rc5.lnkops.patch
@@ -0,0 +1,17 @@
+Fix kernel-4.10.0-0.rc5
+
+based on https://patchwork.kernel.org/patch/9327855/
+--- ./VirtualBox-kmod-5.1.14/vboxsf/lnkops.c.orig 2017-01-27 00:42:02.874808843 +0000
++++ ./VirtualBox-kmod-5.1.14/vboxsf/lnkops.c 2017-01-27 00:43:37.814861397 +0000
+@@ -90,7 +90,11 @@ static const char *sf_get_link(struct de
+
+ struct inode_operations sf_lnk_iops =
+ {
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
++ .readlink = vfs_readlink,
++# else
+ .readlink = generic_readlink,
++# endif
+ # if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
+ .get_link = sf_get_link
+ # elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
7 years, 10 months