[SCM] vlc/master: Apply upstream patches to fix #841525
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Mon Oct 31 18:36:03 UTC 2016
The following commit has been merged in the master branch:
commit 5af8fe60734573aef735916bfb46b8ce800b13ff
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Mon Oct 31 19:35:31 2016 +0100
Apply upstream patches to fix #841525
diff --git a/debian/patches/Revert-Build-default.vlt-in-a-reproducible-fashion-f.patch b/debian/patches/Revert-Build-default.vlt-in-a-reproducible-fashion-f.patch
new file mode 100644
index 0000000..bbf8fd5
--- /dev/null
+++ b/debian/patches/Revert-Build-default.vlt-in-a-reproducible-fashion-f.patch
@@ -0,0 +1,34 @@
+From d0339fa10a29e78155a9d32a9c0ecf6cfda10a4d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi at remlab.net>
+Date: Fri, 21 Oct 2016 15:56:51 +0300
+Subject: [PATCH 1/5] Revert "Build default.vlt in a reproducible fashion
+ (fixes #4562)"
+
+This broke error propagation.
+
+This reverts commit ceacef3bbb0c34d67aa84e6ca91b360cbe2419e5.
+
+(cherry picked from commit 9f2f2165b7f7afa912fdf7ffbe8b3f0db51f687a)
+---
+ share/Makefile.am | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/share/Makefile.am b/share/Makefile.am
+index 9894ebb..7f56458 100644
+--- a/share/Makefile.am
++++ b/share/Makefile.am
+@@ -77,10 +77,7 @@ skins2_default_vlt_FILES = \
+
+ skins2/default.vlt: $(skins2_default_vlt_FILES)
+ mkdir -p skins2
+- (cd "$(srcdir)/skins2"; find default -print0 | \
+- LC_ALL=C sort -z | \
+- tar cvv --exclude .svn --no-recursion --null -T -) | \
+- gzip -n > skins2/default.vlt
++ tar cvvzf skins2/default.vlt -C $(srcdir)/skins2 default/
+
+ #
+ # LUA
+--
+2.10.2
+
diff --git a/debian/patches/series b/debian/patches/series
index d08ca3f..9b43cdd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,8 @@ vlc_atomic-atomic_compare_exchange_weak_explicit-tak.patch
vlc_atomic-atomic_compare_exchange_strong_explicit-t.patch
Fix-build-using-old-GCC-intrinsics.patch
video_splliter-Add-XCB-flags-for-panoramix.patch
+Revert-Build-default.vlt-in-a-reproducible-fashion-f.patch
+skins2-do-not-save-user-and-group-names-in-the-defau.patch
+skins-remove-timestamp-from-default.vlt-fixes-4562.patch
+skins-implement-silent-mode-make.patch
+skins2-do-not-generate-broken-default.vlt-on-error.patch
diff --git a/debian/patches/skins-implement-silent-mode-make.patch b/debian/patches/skins-implement-silent-mode-make.patch
new file mode 100644
index 0000000..abe6d11
--- /dev/null
+++ b/debian/patches/skins-implement-silent-mode-make.patch
@@ -0,0 +1,28 @@
+From 43f830f9e81e2534c42496005391104005cab6d6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi at remlab.net>
+Date: Fri, 21 Oct 2016 16:05:02 +0300
+Subject: [PATCH 4/5] skins: implement silent mode make
+
+(cherry picked from commit 0bdddcb8dcebe18cecfeed5805ceaaf50432a658)
+---
+ share/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/share/Makefile.am b/share/Makefile.am
+index 06bfa1c..a24d729 100644
+--- a/share/Makefile.am
++++ b/share/Makefile.am
+@@ -76,8 +76,8 @@ skins2_default_vlt_FILES = \
+ skins2/default/subX/vol_slider.png
+
+ skins2/default.vlt: $(skins2_default_vlt_FILES)
+- mkdir -p skins2
+- GZIP=--no-name \
++ $(AM_V_at)mkdir -p skins2
++ $(AM_V_GEN)GZIP=--no-name \
+ tar cvvzf skins2/default.vlt \
+ --owner=root --group=root --directory="$(srcdir)/skins2" \
+ default/
+--
+2.10.2
+
diff --git a/debian/patches/skins-remove-timestamp-from-default.vlt-fixes-4562.patch b/debian/patches/skins-remove-timestamp-from-default.vlt-fixes-4562.patch
new file mode 100644
index 0000000..4558883
--- /dev/null
+++ b/debian/patches/skins-remove-timestamp-from-default.vlt-fixes-4562.patch
@@ -0,0 +1,25 @@
+From 75b4a84c0b7061807f13a734331287d24dd46ffe Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi at remlab.net>
+Date: Fri, 21 Oct 2016 16:04:21 +0300
+Subject: [PATCH 3/5] skins: remove timestamp from default.vlt (fixes #4562)
+
+(cherry picked from commit 7b4bcf17d1f493c2d49f74ff573591e662a03924)
+---
+ share/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/share/Makefile.am b/share/Makefile.am
+index ef78505..06bfa1c 100644
+--- a/share/Makefile.am
++++ b/share/Makefile.am
+@@ -77,6 +77,7 @@ skins2_default_vlt_FILES = \
+
+ skins2/default.vlt: $(skins2_default_vlt_FILES)
+ mkdir -p skins2
++ GZIP=--no-name \
+ tar cvvzf skins2/default.vlt \
+ --owner=root --group=root --directory="$(srcdir)/skins2" \
+ default/
+--
+2.10.2
+
diff --git a/debian/patches/skins2-do-not-generate-broken-default.vlt-on-error.patch b/debian/patches/skins2-do-not-generate-broken-default.vlt-on-error.patch
new file mode 100644
index 0000000..68767bb
--- /dev/null
+++ b/debian/patches/skins2-do-not-generate-broken-default.vlt-on-error.patch
@@ -0,0 +1,31 @@
+From 953263bf5839054b162fe114db6b132521747bf7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi at remlab.net>
+Date: Fri, 21 Oct 2016 16:08:25 +0300
+Subject: [PATCH 5/5] skins2: do not generate (broken) default.vlt on error
+
+(cherry picked from commit 096c3544b55a88ca07ece9a5624671484e362945)
+---
+ share/Makefile.am | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/share/Makefile.am b/share/Makefile.am
+index a24d729..b08b3e8 100644
+--- a/share/Makefile.am
++++ b/share/Makefile.am
+@@ -77,10 +77,12 @@ skins2_default_vlt_FILES = \
+
+ skins2/default.vlt: $(skins2_default_vlt_FILES)
+ $(AM_V_at)mkdir -p skins2
++ $(AM_V_at)rm -f -- skins2/default.vlt.tmp
+ $(AM_V_GEN)GZIP=--no-name \
+- tar cvvzf skins2/default.vlt \
++ tar cvvzf skins2/default.vlt.tmp \
+ --owner=root --group=root --directory="$(srcdir)/skins2" \
+ default/
++ $(AM_V_at)mv -f -- skins2/default.vlt.tmp skins2/default.vlt
+
+ #
+ # LUA
+--
+2.10.2
+
diff --git a/debian/patches/skins2-do-not-save-user-and-group-names-in-the-defau.patch b/debian/patches/skins2-do-not-save-user-and-group-names-in-the-defau.patch
new file mode 100644
index 0000000..f4da33e
--- /dev/null
+++ b/debian/patches/skins2-do-not-save-user-and-group-names-in-the-defau.patch
@@ -0,0 +1,29 @@
+From cac50d90bae28f7125a46422cc6d497f316c9ad6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi at remlab.net>
+Date: Fri, 21 Oct 2016 15:35:18 +0300
+Subject: [PATCH 2/5] skins2: do not save user and group names in the default
+ skin
+
+(cherry picked from commit 79bed730df73ff241545e4ffe85ed293bf52adc1)
+---
+ share/Makefile.am | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/share/Makefile.am b/share/Makefile.am
+index 7f56458..ef78505 100644
+--- a/share/Makefile.am
++++ b/share/Makefile.am
+@@ -77,7 +77,9 @@ skins2_default_vlt_FILES = \
+
+ skins2/default.vlt: $(skins2_default_vlt_FILES)
+ mkdir -p skins2
+- tar cvvzf skins2/default.vlt -C $(srcdir)/skins2 default/
++ tar cvvzf skins2/default.vlt \
++ --owner=root --group=root --directory="$(srcdir)/skins2" \
++ default/
+
+ #
+ # LUA
+--
+2.10.2
+
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list