Hello community, here is the log from the commit of package vlc for openSUSE:Factory checked in at 2014-11-24 11:19:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vlc (Old) and /work/SRC/openSUSE:Factory/.vlc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vlc" Changes: -------- --- /work/SRC/openSUSE:Factory/vlc/vlc.changes 2014-10-11 22:41:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vlc.new/vlc.changes 2014-11-24 11:19:03.000000000 +0100 @@ -1,0 +2,18 @@ +Sun Nov 9 16:06:10 UTC 2014 - [email protected] + +- 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 - [email protected] + +- Convert BuildRequires from foo-devel to pkgconfig(foo) + +------------------------------------------------------------------- +Fri Oct 24 07:47:58 UTC 2014 - [email protected] + +- First attempts on enabling build for SLE-12. + +------------------------------------------------------------------- New: ---- vlc-2.1.5-fix-skins2-default-skin-creation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vlc.spec ++++++ --- /var/tmp/diff_new_pack.g3RKh1/_old 2014-11-24 11:19:05.000000000 +0100 +++ /var/tmp/diff_new_pack.g3RKh1/_new 2014-11-24 11:19:05.000000000 +0100 @@ -41,107 +41,133 @@ 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 BuildRequires: aalib-devel -BuildRequires: alsa-devel >= 1.0.24 -BuildRequires: avahi-devel BuildRequires: fdupes -BuildRequires: flac-devel +BuildRequires: pkgconfig(alsa) >= 1.0.24 +BuildRequires: pkgconfig(avahi-client) >= 0.6 +BuildRequires: pkgconfig(flac) %if %{with fluidsynth} -BuildRequires: fluidsynth-devel +BuildRequires: pkgconfig(fluidsynth) >= 1.1.2 %endif %if 0%{?suse_version} >= 1220 -BuildRequires: freerdp-devel +BuildRequires: pkgconfig(freerdp) >= 1.0.1 %endif -BuildRequires: freetype2-devel -BuildRequires: fribidi-devel BuildRequires: gdk-pixbuf-devel BuildRequires: gettext-devel BuildRequires: git -BuildRequires: gnome-vfs2-devel +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(fribidi) +BuildRequires: pkgconfig(gnome-vfs-2.0) %if 0%{?suse_version} >= 1220 -BuildRequires: gnutls-devel >= 3.0.20 +BuildRequires: pkgconfig(gnutls) >= 3.0.20 %endif -BuildRequires: gtk2-devel -BuildRequires: libSDL-devel +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(sdl) >= 1.2.10 %if 0%{?suse_version} >= 1140 -BuildRequires: libSDL_image-devel +BuildRequires: pkgconfig(SDL_image) >= 1.2.10 %endif -BuildRequires: libass-devel -BuildRequires: libavc1394-devel -BuildRequires: libbluray-devel -BuildRequires: libcaca-devel -BuildRequires: libcddb-devel -BuildRequires: libcdio-devel +BuildRequires: pkgconfig(caca) >= 0.99.beta14 +BuildRequires: pkgconfig(libass) >= 0.9.8 +BuildRequires: pkgconfig(libavc1394) >= 0.5.3 +BuildRequires: pkgconfig(libbluray) >= 0.2.1 +BuildRequires: pkgconfig(libcddb) >= 0.9.5 +%if 0%{?suse_version} != 1315 BuildRequires: libkde4-devel -%if 0%{?suse_version} >= 1230 -BuildRequires: libchromaprint-devel +%endif +%if 0%{?suse_version} >= 1230 && 0%{?suse_version} != 1315 +BuildRequires: pkgconfig(libchromaprint) >= 0.6.0 %endif %if 0%{?suse_version} >= 1140 -BuildRequires: libdc1394-devel >= 2.1.0 +BuildRequires: pkgconfig(libdc1394-2) >= 2.1.0 %endif -BuildRequires: libdvbpsi-devel < 1.0 -BuildRequires: libdvdnav-devel -BuildRequires: libdvdread-devel BuildRequires: libgcrypt-devel -BuildRequires: libidn-devel -BuildRequires: libjack-devel >= 1.9.7 -BuildRequires: libkate-devel BuildRequires: libmatroska-devel -BuildRequires: libmodplug-devel -%if 0%{?suse_version} > 1230 +BuildRequires: pkgconfig(dvdnav) +BuildRequires: pkgconfig(dvdread) +BuildRequires: pkgconfig(jack) >= 1.9.7 +BuildRequires: pkgconfig(kate) >= 0.3.0 +BuildRequires: pkgconfig(libdvbpsi) < 1.0 +BuildRequires: pkgconfig(libidn) +BuildRequires: pkgconfig(libmodplug) > 0.8.8 +%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 BuildRequires: libmlt6-modules %endif %if 0%{?suse_version} >= 1140 -BuildRequires: libmtp-devel >= 1.0.0 +BuildRequires: pkgconfig(libmtp) >= 1.0.0 %endif -BuildRequires: libnotify-devel -BuildRequires: libogg-devel -BuildRequires: libopus-devel BuildRequires: libproxy-devel -BuildRequires: libraw1394-devel -BuildRequires: librsvg-devel -BuildRequires: libsamplerate-devel -BuildRequires: libshout-devel -BuildRequires: libsmbclient-devel -BuildRequires: libssh2-devel -BuildRequires: libtag-devel -BuildRequires: libtheora-devel BuildRequires: libtool -BuildRequires: libudev-devel -BuildRequires: libupnp-devel BuildRequires: libv4l-devel -BuildRequires: libva-devel +BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(libraw1394) >= 2.0.1 +BuildRequires: pkgconfig(librsvg-2.0) >= 2.9.0 +BuildRequires: pkgconfig(libssh2) +BuildRequires: pkgconfig(libudev) >= 142 +BuildRequires: pkgconfig(libupnp) +BuildRequires: pkgconfig(libva) +BuildRequires: pkgconfig(libva-x11) +BuildRequires: pkgconfig(ogg) >= 1.0 +BuildRequires: pkgconfig(opus) +BuildRequires: pkgconfig(samplerate) +BuildRequires: pkgconfig(shout) >= 2.1 +BuildRequires: pkgconfig(smbclient) +BuildRequires: pkgconfig(taglib) >= 1.6.1 +BuildRequires: pkgconfig(theoradec) >= 1.0 +BuildRequires: pkgconfig(theoraenc) %if 0%{?suse_version} >= 1310 -BuildRequires: LibVNCServer-devel +BuildRequires: pkgconfig(libvncclient) >= 0.9.9 %endif -BuildRequires: libvorbis-devel -BuildRequires: libxml2-devel BuildRequires: lirc-devel -BuildRequires: live555-devel -BuildRequires: lua-devel -%if 0%{?suse_version} >= 1140 -BuildRequires: opencv-devel +BuildRequires: pkgconfig(libxml-2.0) >= 2.5 +BuildRequires: pkgconfig(live555) +BuildRequires: pkgconfig(lua) >= 5.1 +BuildRequires: pkgconfig(vorbis) >= 1.1 +BuildRequires: pkgconfig(vorbisenc) >= 1.1 +%if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 +BuildRequires: pkgconfig(opencv) > 2.0 %endif BuildRequires: pcre-devel %if 0%{?suse_version} >= 1220 -BuildRequires: projectM-devel +BuildRequires: pkgconfig(libprojectM) >= 2.0.0 %endif BuildRequires: pulseaudio-devel -BuildRequires: schroedinger-devel BuildRequires: slang-devel -BuildRequires: speex-devel BuildRequires: update-desktop-files +BuildRequires: pkgconfig(schroedinger-1.0) >= 1.0.10 +BuildRequires: pkgconfig(speex) >= 1.0.5 +BuildRequires: pkgconfig(speexdsp) +%if 0%{?suse_version} != 1315 BuildRequires: vcdimager-devel -%if 0%{?suse_version} >= 1220 -BuildRequires: xcb-util-keysyms-devel +BuildRequires: pkgconfig(libcdio) >= 0.78.2 +BuildRequires: pkgconfig(libiso9660) >= 0.72 +BuildRequires: pkgconfig(libvcdinfo) >= 0.7.22 +%endif +%if 0%{?suse_version} >= 1140 +BuildRequires: pkgconfig(xcb) >= 1.6 +BuildRequires: pkgconfig(xcb-composite) +BuildRequires: pkgconfig(xcb-keysyms) >= 0.3.4 +BuildRequires: pkgconfig(xcb-randr) >= 1.3 +BuildRequires: pkgconfig(xcb-shm) +BuildRequires: pkgconfig(xcb-xv) >= 1.1.90.1 +BuildRequires: pkgconfig(xproto) %endif BuildRequires: xosd-devel -BuildRequires: zvbi-devel +BuildRequires: pkgconfig(QtCore) +BuildRequires: pkgconfig(QtGui) >= 4.6.0 +BuildRequires: pkgconfig(dbus-1) >= 1.0.0 BuildRequires: pkgconfig(dirac) >= 0.10.0 +BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(libgme) +BuildRequires: pkgconfig(libpulse) >= 0.9.22 +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xinerama) +BuildRequires: pkgconfig(xpm) +BuildRequires: pkgconfig(zvbi-0.2) >= 0.2.28 # This is intentionally done the pkgconfig way: 3rd party repos might have alternative implementations # and can favor one over the other. %if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG} @@ -159,15 +185,18 @@ %if 0%{?BUILD_ORIG} BuildRequires: faad2-devel BuildRequires: liba52-devel -BuildRequires: libdca-devel BuildRequires: libfaac-devel -BuildRequires: libffmpeg-devel BuildRequires: libmad-devel -BuildRequires: libmpeg2-devel -BuildRequires: libtwolame-devel -BuildRequires: libvdpau-devel -BuildRequires: libx264-devel BuildRequires: libxvidcore-devel +BuildRequires: pkgconfig(libavcodec) >= 53.34.0 +BuildRequires: pkgconfig(libavformat) >= 53.21.0 +BuildRequires: pkgconfig(libavutil) >= 51.22.0 +BuildRequires: pkgconfig(libdca) >= 0.0.5 +BuildRequires: pkgconfig(libmpeg2) > 0.3.2 +BuildRequires: pkgconfig(libpostproc) +BuildRequires: pkgconfig(twolame) +BuildRequires: pkgconfig(vdpau) +BuildRequires: pkgconfig(x264) >= 0.86 %endif Requires: %{name}-noX = %{version}-%{release} @@ -270,6 +299,7 @@ %prep %setup -q +%patch1 -p1 %patch3 -p1 rm -rf contrib # fix builddate info @@ -362,8 +392,10 @@ --enable-taglib \ --enable-theora \ --enable-v4l2 \ +%if 0%{?suse_version} != 1315 --enable-vcd \ --enable-vcdx \ +%endif --enable-vorbis \ --enable-waveout \ %if 0%{?suse_version} >= 1140 @@ -378,6 +410,8 @@ --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 @@ -616,7 +650,9 @@ %{_libdir}/vlc/plugins/access/libtimecode_plugin.so %{_libdir}/vlc/plugins/access/libv4l2_plugin.so %{_libdir}/vlc/plugins/access/libvcd_plugin.so +%if 0%{?suse_version} != 1315 %{_libdir}/vlc/plugins/access/libvcdx_plugin.so +%endif %if 0%{?suse_version} >= 1310 %{_libdir}/vlc/plugins/access/liblibvnc_plugin.so %endif @@ -758,7 +794,7 @@ %{_libdir}/vlc/plugins/misc/libaudioscrobbler_plugin.so %{_libdir}/vlc/plugins/misc/libdbus_screensaver_plugin.so %{_libdir}/vlc/plugins/misc/libexport_plugin.so -%if 0%{?suse_version} >= 1230 +%if 0%{?suse_version} >= 1230 && 0%{?suse_version} != 1315 %{_libdir}/vlc/plugins/misc/libfingerprinter_plugin.so %endif %if 0%{?suse_version} >= 1220 @@ -821,7 +857,7 @@ %{_libdir}/vlc/plugins/stream_filter/libsmooth_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_autodel_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_bridge_plugin.so -%if 0%{?suse_version} >= 1230 +%if 0%{?suse_version} >= 1230 && 0%{?suse_version} != 1315 %{_libdir}/vlc/plugins/stream_out/libstream_out_chromaprint_plugin.so %endif %{_libdir}/vlc/plugins/stream_out/libstream_out_delay_plugin.so @@ -882,7 +918,7 @@ %{_libdir}/vlc/plugins/video_filter/libmosaic_plugin.so %{_libdir}/vlc/plugins/video_filter/libmotionblur_plugin.so %{_libdir}/vlc/plugins/video_filter/libmotiondetect_plugin.so -%if 0%{?suse_version} >= 1140 +%if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so %endif @@ -933,8 +969,8 @@ %{_libdir}/vlc/plugins/codec/liblibmpeg2_plugin.so %{_libdir}/vlc/plugins/codec/libtwolame_plugin.so %{_libdir}/vlc/plugins/codec/libx264_plugin.so -%{_libdir}/vlc/plugins/codec/libvaapi_plugin.so %{_libdir}/vlc/plugins/codec/libvdpau_plugin.so +%{_libdir}/vlc/plugins/codec/libvaapi_plugin.so %{_libdir}/vlc/plugins/demux/libavformat_plugin.so %{_libdir}/vlc/plugins/video_filter/libpostproc_plugin.so %endif ++++++ vlc-2.1.5-fix-skins2-default-skin-creation.patch ++++++ Author: Stefan Seyfried <[email protected]> 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: -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
