diff --git a/vlc-2.1.5-fix-skins2-default-skin-creation.patch b/vlc-2.1.5-fix-skins2-default-skin-creation.patch new file mode 100644 index 0000000..cd88f32 --- /dev/null +++ b/vlc-2.1.5-fix-skins2-default-skin-creation.patch @@ -0,0 +1,33 @@ +Author: Stefan Seyfried + +New tar defaults create PAX archives which have two problems: +* VLC cannot read them +* they contain atime and thus the build time +Avoid this by passign "--format=ustar" to tar when creating skins2/default.vlt + +Index: b/share/Makefile.am +=================================================================== +--- a/share/Makefile.am ++++ b/share/Makefile.am +@@ -79,7 +79,7 @@ skins2/default.vlt: $(skins2_default_vlt + mkdir -p skins2 + (cd "$(srcdir)/skins2"; find default -print0 | \ + LC_ALL=C sort -z | \ +- tar cvv --exclude .svn --no-recursion --null -T -) | \ ++ tar cvv --format=ustar --exclude .svn --no-recursion --null -T -) | \ + gzip -n > skins2/default.vlt + + # +Index: b/share/Makefile.in +=================================================================== +--- a/share/Makefile.in ++++ b/share/Makefile.in +@@ -1757,7 +1757,7 @@ skins2/default.vlt: $(skins2_default_vlt + mkdir -p skins2 + (cd "$(srcdir)/skins2"; find default -print0 | \ + LC_ALL=C sort -z | \ +- tar cvv --exclude .svn --no-recursion --null -T -) | \ ++ tar cvv --format=ustar --exclude .svn --no-recursion --null -T -) | \ + gzip -n > skins2/default.vlt + + .lua.luac: diff --git a/vlc.changes b/vlc.changes index 7de75ae..69a7fbd 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Nov 9 16:06:10 UTC 2014 - seife+obs@b1-systems.com + +- fix skins2 defaut.vlt generation with newer tar defaults (and + remove the embedded build date from it on the way) + vlc-2.1.5-fix-skins2-default-skin-creation.patch +- remove buildhost hostname from the binary to avoid republishing + ------------------------------------------------------------------- Thu Oct 30 06:08:06 UTC 2014 - olaf@aepfle.de diff --git a/vlc.spec b/vlc.spec index 6445f88..497c099 100644 --- a/vlc.spec +++ b/vlc.spec @@ -41,6 +41,8 @@ Version: 2.1.5 Release: 0 Url: http://www.videolan.org/ Source: http://download.videolan.org/%{name}/%{version}/%{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE vlc-2.1.5-fix-skins2-default-skin-creation.patch -- see description in patch header +Patch1: vlc-2.1.5-fix-skins2-default-skin-creation.patch Patch3: 0001-no-return-in-non-void.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Mesa-devel @@ -297,6 +299,7 @@ for gnome-vfs2. %prep %setup -q +%patch1 -p1 %patch3 -p1 rm -rf contrib # fix builddate info @@ -407,6 +410,8 @@ export CXXFLAGS="%{optflags} -L%{_libdir}/live -Wno-return-type $smbclient" --enable-xvideo \ --with-default-font=/usr/share/fonts/truetype/FreeSerifBold.ttf \ --with-default-monospace-font=/usr/share/fonts/truetype/FreeMono.ttf +# we don't need no VLC_COMPILE_HOST `hostname -f` in the binary... +sed -i -e 's/^#define VLC_COMPILE_HOST.*/#define VLC_COMPILE_HOST "obs-build"/' config.h make %{?_smp_mflags} V=1 %install