[smplayer] Update script
by Sérgio M. Basto
commit 3e4b3d0bedb983297370c8ef5af1dcca09bb9fdb
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Apr 9 20:41:37 2020 +0100
Update script
update_smplayer.sh | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/update_smplayer.sh b/update_smplayer.sh
index 4107869..60a3c18 100755
--- a/update_smplayer.sh
+++ b/update_smplayer.sh
@@ -2,6 +2,7 @@ version=20.4.0
#stube_ver=19.6.0
themes_ver=18.6.0
skins_ver=15.2.0
+REPOS="f32 f31 f30 el7"
if [ -z "$1" ]
then
@@ -39,12 +40,15 @@ fi
if test $stage -le 1
then
echo STAGE 1
-echo Press enter to continue; read dummy;
+echo Press enter to push and build in rawhide; read dummy;
rfpkg push && rfpkg build --nowait
echo Press enter to continue; read dummy;
-git checkout f31 && git merge master && git push && rfpkg build --nowait; git checkout master
-echo Press enter to continue; read dummy;
-git checkout f30 && git merge master && git push && rfpkg build --nowait; git checkout master
-echo Press enter to continue; read dummy;
-git checkout el7 && git merge master && git push && rfpkg build --nowait; git checkout master
+fi
+
+if test $stage -le 2
+then
+for repo in $REPOS ; do
+echo Press enter to build on branch $repo; read dummy;
+git checkout $repo && git merge master && git push && rfpkg build --nowait; git checkout master
+done
fi
4 years, 7 months
[smplayer] Update smplayer to 20.4.0
by Sérgio M. Basto
commit bd74acb4054c682214fadccdb8ef1ee3f69c8a33
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Apr 9 19:16:10 2020 +0100
Update smplayer to 20.4.0
.gitignore | 1 +
smplayer.spec | 7 +++++--
sources | 2 +-
update_smplayer.sh | 4 +++-
4 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 39fac40..e27d30a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@ smtube-16.3.0.tar.bz2
/smtube-19.6.0.tar.bz2
/smplayer-19.10.0.tar.bz2
/smplayer-19.10.2.tar.bz2
+/smplayer-20.4.0.tar.bz2
diff --git a/smplayer.spec b/smplayer.spec
index c484fd1..88677e0 100644
--- a/smplayer.spec
+++ b/smplayer.spec
@@ -1,8 +1,8 @@
Name: smplayer
-Version: 19.10.2
+Version: 20.4.0
%global smplayer_themes_ver 18.6.0
%global smplayer_skins_ver 15.2.0
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: A graphical frontend for mplayer and mpv
License: GPLv2+
@@ -171,6 +171,9 @@ fi
%{_datadir}/smplayer/themes/
%changelog
+* Thu Apr 09 2020 Sérgio Basto <sergio(a)serjux.com> - 20.4.0-1
+- Update smplayer to 20.4.0
+
* Sun Mar 01 2020 Sérgio Basto <sergio(a)serjux.com> - 19.10.2-3
- Add appdata file, copied from
https://github.com/sanjayankur31/rpmfusion-appdata
diff --git a/sources b/sources
index 2ad3f74..b5bf47d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (smplayer-19.10.2.tar.bz2) = 46327a1f988cfe8fe4e04f456057c2395f5ad011513988c1ffecf5c91cf2fdedbe8095cfba15f0f61c3e1cabc7f34b78d676bce430a79fcf542d74e14a33ec62
+SHA512 (smplayer-20.4.0.tar.bz2) = 2ab84d342dcdb2343d6b5705e59eaa89e0e7abe18f626777d22919b1604be66747112a007abd469385be69f3ba3b0387e267c56c0f2935d761ad8289b87770fe
SHA512 (smplayer-themes-18.6.0.tar.bz2) = e16f2dc50015b0034134a096ca99603167309c31bb50a44679c343b5f9c0ea786a17a0fb64eb1d71c61dacbd2a295adc0a82d23bd0837adf96664120f33adda6
SHA512 (smplayer-skins-15.2.0.tar.bz2) = 58d1dcc9caf5d93b7f0692ffa7ff4875eb8dd83db78293aee25a713a1f6007c83af556215cd1f7666dec98bc323b074c6b1fdb66eb9560176db842669c206a83
diff --git a/update_smplayer.sh b/update_smplayer.sh
index 0915108..4107869 100755
--- a/update_smplayer.sh
+++ b/update_smplayer.sh
@@ -1,4 +1,4 @@
-version=19.10.2
+version=20.4.0
#stube_ver=19.6.0
themes_ver=18.6.0
skins_ver=15.2.0
@@ -31,6 +31,8 @@ rpmdev-bumpspec -c "$MSG" smplayer.spec
fi
spectool -g smplayer.spec
+rfpkg scratch-build --srpm --nowait
+echo Press enter to upload sources and commit; read dummy;
rfpkg new-sources ./smplayer-$version.tar.bz2 ./smplayer-themes-$themes_ver.tar.bz2 ./smplayer-skins-$skins_ver.tar.bz2
rfpkg ci -c && git show
fi
4 years, 7 months
[wireguard-kmod/f30: 2/2] Merge branch 'f31' into f30
by Leigh Scott
commit 8a6030616058b7166d4e9c7bd46574e835c97670
Merge: 2334a62 95f5d08
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Apr 9 14:04:25 2020 +0100
Merge branch 'f31' into f30
kernel-5.5.15.patch | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++
wireguard-kmod.spec | 8 ++++++--
2 files changed, 60 insertions(+), 2 deletions(-)
---
4 years, 7 months
[wireguard-kmod/f31] Patch for kernel-5.5.15
by Leigh Scott
commit 95f5d08384f62ff74270e8c8f20f19e892f82dda
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Apr 9 14:03:52 2020 +0100
Patch for kernel-5.5.15
kernel-5.5.15.patch | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++
wireguard-kmod.spec | 8 ++++++--
2 files changed, 60 insertions(+), 2 deletions(-)
---
diff --git a/kernel-5.5.15.patch b/kernel-5.5.15.patch
new file mode 100644
index 0000000..613afa9
--- /dev/null
+++ b/kernel-5.5.15.patch
@@ -0,0 +1,54 @@
+From 2d4fa2a6e7903ec3340f1b075456cbd84ba6a744 Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason(a)zx2c4.com>
+Date: Sat, 28 Mar 2020 19:49:30 -0600
+Subject: queueing: backport skb_reset_redirect change from 5.6
+
+This backports upstream commit 2c64605b590edadb3fb46d1ec6badb49e940b479.
+It makes no difference for us, but it's nice to keep this code in sync
+with upstream as much as possible.
+
+Signed-off-by: Jason A. Donenfeld <Jason(a)zx2c4.com>
+---
+ src/compat/compat.h | 10 ++++++++++
+ src/queueing.h | 2 +-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git WireGuard-0.0.20191219/src/compat/compat.h WireGuard-0.0.20191219/src/compat/compat.h
+index 42f7bee..fe2d07e 100644
+--- WireGuard-0.0.20191219/src/compat/compat.h
++++ WireGuard-0.0.20191219/src/compat/compat.h
+@@ -865,6 +865,16 @@
+ #define ipv6_dst_lookup_flow(a, b, c, d) ipv6_dst_lookup(a, b, &dst, c) + (void *)0 ?: dst
+ #endif
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 29) || (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 14))
++#include <linux/skbuff.h>
++static inline void skb_reset_redirect(struct sk_buff *skb)
++{
++#ifdef CONFIG_NET_SCHED
++ skb_reset_tc(skb);
++#endif
++}
++#endif
++
+ #if defined(ISUBUNTU1604)
+ #include <linux/siphash.h>
+ #ifndef _WG_LINUX_SIPHASH_H
+
+diff --git WireGuard-0.0.20191219/src/queueing.h WireGuard-0.0.20191219/src/queueing.h
+index 256c6be..fe6e5c9 100644
+--- WireGuard-0.0.20191219/src/queueing.h
++++ WireGuard-0.0.20191219/src/queueing.h
+@@ -103,8 +103,8 @@ static inline void wg_reset_packet(struct sk_buff *skb)
+ skb->dev = NULL;
+ #ifdef CONFIG_NET_SCHED
+ skb->tc_index = 0;
+- skb_reset_tc(skb);
+ #endif
++ skb_reset_redirect(skb);
+ skb->hdr_len = skb_headroom(skb);
+ skb_reset_mac_header(skb);
+ skb_reset_network_header(skb);
+--
+cgit v1.2.3-4-ga26e
+
diff --git a/wireguard-kmod.spec b/wireguard-kmod.spec
index daa4798..340cb7d 100644
--- a/wireguard-kmod.spec
+++ b/wireguard-kmod.spec
@@ -6,11 +6,12 @@
Name: wireguard-kmod
Summary: Kernel module (kmod) for Wireguard
Version: 0.0.20191219
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
URL: https://www.wireguard.com/
Source0: https://git.zx2c4.com/WireGuard/snapshot/WireGuard-%{version}.tar.xz
+Patch0: kernel-5.5.15.patch
BuildRequires: kmodtool
%{!?kernels:BuildRequires: gcc, elfutils-libelf-devel, buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
@@ -36,7 +37,7 @@ This package contains the kmod module for WireGuard.
# print kmodtool output for debugging purposes:
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
-%autosetup -c -T -a 0 -p 1
+%autosetup -c -T -a 0 -p 0
for kernel_version in %{?kernel_versions} ; do
cp -a WireGuard-%{version} _kmod_build_${kernel_version%%___*}
@@ -59,6 +60,9 @@ done
%changelog
+* Thu Apr 09 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.0.20191219-2
+- Patch for kernel-5.5.15
+
* Fri Dec 20 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 0.0.20191219-1
- Release 0.0.20191219
4 years, 7 months
