rpm/vlc
SHA256
1
0
Fork 0
forked from pool/vlc
Code Pull Requests Activity

Accepting request 791216 from multimedia:libs

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/791216
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vlc?expand=0&rev=104
This commit is contained in:
Dominique Leuenberger 2020-04-05 18:49:58 +00:00 committed by Git OBS Bridge
commit 5cf1297353
3 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
reproducible.patch Normal file
View File

@ -0,0 +1,35 @@
https://mailman.videolan.org/pipermail/vlc-devel/2019-October/128188.html
commit d5e7205f0a4c5dbd55b1b56487f3044a5b01be16
Author: Bernhard M. Wiedemann <bwiedemann@suse.de>
Date: Fri Oct 4 12:55:46 2019 +0200
Sort tar file list
if available (in GNU tar >= 1.28)
and use ustar format to not have pax headers add nondetermistic bits
to make skins2/default.vlt reproducible.
See https://reproducible-builds.org/ for why this is good.
This patch was done while working on reproducible builds for openSUSE.
Signed-off-by: Bernhard M. Wiedemann <bwiedemann@suse.de>
diff --git a/share/Makefile.am b/share/Makefile.am
index e5b801a5be..327d36a64d 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -92,8 +92,11 @@ 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 \
+ $(AM_V_GEN)tarsort= ; \
+ tar --help|grep -q sort=ORDER && tarsort=--sort=name ; \
+ GZIP=--no-name \
tar cvvzf skins2/default.vlt.tmp \
+ --format=ustar $$tarsort \
--owner=root --group=root --directory="$(srcdir)/skins2" \
default/
$(AM_V_at)mv -f -- skins2/default.vlt.tmp skins2/default.vlt

7
vlc.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Mar 31 08:58:04 UTC 2020 - Bernhard Wiedemann <bwiedemann@suse.com>
- Make package build reproducible:
* Add reproducible.patch to normalize created tarballs
* Create %ghost file with fixed size
-------------------------------------------------------------------
Fri Mar 27 09:23:26 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>

6
vlc.spec
View File

@ -59,6 +59,8 @@ Patch102: 0002-Add-Avahi-implementation-for-chromecast-renderer-dis.patch
Patch103: 0001-Port-OpenCV-facedetect-example-to-C-API.patch
# PATCH-FIX-UPSTREAM -- Fix building with Qt 5.15 by adding a missing include
Patch104: fix-missing-includes-with-qt-5.15.patch
# PATCH-FIX-UPSTREAM reproducible.patch -- make tar reproducible -- 87ea3c0dfb7367b434f688d657f931c074bb34f4
Patch105: reproducible.patch
BuildRequires: Mesa-devel
BuildRequires: aalib-devel
BuildRequires: alsa-devel >= 1.0.24
@ -407,6 +409,7 @@ OpenCV based video filters and a face detection example.
%patch102 -p1
%patch103 -p1
%patch104 -p1
%patch105 -p1
### And LUA 5.3.1 has some more API changes
if pkg-config --atleast-version 5.3.1 lua; then
@ -534,6 +537,9 @@ for lang in ach an cgg co ff tet ks_IN; do
done
%find_lang vlc
# ensure the ghost file has constant length for reproducibility
dd if=/dev/zero bs=1M count=1 of=%{buildroot}/%{_libdir}/vlc/plugins/plugins.dat
%post
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins