Hello community, here is the log from the commit of package vlc for openSUSE:Factory checked in at 2014-10-06 12:06: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-07-21 21:39:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vlc.new/vlc.changes 2014-10-06 12:06:02.000000000 +0200 @@ -1,0 +2,22 @@ +Sun Oct 5 12:54:44 UTC 2014 - o...@aepfle.de + +- Enable build for SLE_11 + +------------------------------------------------------------------- +Tue Sep 23 19:12:35 UTC 2014 - vinde...@outlook.it + +- Fix rpmlint warning about duplicates with fdupes +- Add missing BuildRequires: + + fluidsynth-devel: SMF files playback + + freerdp-devel: RDP support + + libkde4-devel: KDE integration + + libchromaprint-devel: Chromaprint stream output + + libmlt6-modules: television broadcasting + + LibVNCServer-devel: VNC support + + opencv-devel: real-time computer vision support + + xcb-util-keysyms-devel: better X integration +- Remome gcc-c++ and libqt4-devel because automatically installed +- Add 'suse_version' conditionals to the new BuildRequires +- Remove 'suse_version' conditionals from live555-devel & lua-devel + +------------------------------------------------------------------- @@ -25 +47 @@ -Thu May 15 11:47:43 CEST 2014 - oher...@suse.de +Thu May 15 11:47:43 CEST 2014 - o...@aepfle.de @@ -30 +52 @@ -Thu May 15 11:30:28 CEST 2014 - oher...@suse.de +Thu May 15 11:30:28 CEST 2014 - o...@aepfle.de @@ -35 +57 @@ -Fri May 2 08:29:17 CEST 2014 - oher...@suse.de +Fri May 2 08:29:17 CEST 2014 - o...@aepfle.de @@ -40 +62 @@ -Thu Apr 24 20:00:17 CEST 2014 - oher...@suse.de +Thu Apr 24 20:00:17 CEST 2014 - o...@aepfle.de @@ -47 +69 @@ -Tue Apr 15 20:14:20 CEST 2014 - oher...@suse.de +Tue Apr 15 20:14:20 CEST 2014 - o...@aepfle.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vlc.spec ++++++ --- /var/tmp/diff_new_pack.ebkHAF/_old 2014-10-06 12:06:03.000000000 +0200 +++ /var/tmp/diff_new_pack.ebkHAF/_new 2014-10-06 12:06:03.000000000 +0200 @@ -37,18 +37,21 @@ Version: 2.1.5 Release: 0 Url: http://www.videolan.org/ -Source: http://download.videolan.org/vlc/%{version}/vlc-%{version}.tar.xz +Source: http://download.videolan.org/%{name}/%{version}/%{name}-%{version}.tar.xz Patch3: 0001-no-return-in-non-void.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Mesa-devel BuildRequires: aalib-devel -BuildRequires: alsa-devel +BuildRequires: alsa-devel >= 1.0.24 BuildRequires: avahi-devel BuildRequires: fdupes BuildRequires: flac-devel +BuildRequires: fluidsynth-devel +%if 0%{?suse_version} >= 1220 +BuildRequires: freerdp-devel +%endif BuildRequires: freetype2-devel BuildRequires: fribidi-devel -BuildRequires: gcc-c++ BuildRequires: gdk-pixbuf-devel BuildRequires: gettext-devel BuildRequires: git @@ -58,14 +61,22 @@ %endif BuildRequires: gtk2-devel BuildRequires: libSDL-devel +%if 0%{?suse_version} >= 1140 BuildRequires: libSDL_image-devel +%endif BuildRequires: libass-devel BuildRequires: libavc1394-devel BuildRequires: libbluray-devel BuildRequires: libcaca-devel BuildRequires: libcddb-devel BuildRequires: libcdio-devel -BuildRequires: libdc1394-devel +BuildRequires: libkde4-devel +%if 0%{?suse_version} >= 1230 +BuildRequires: libchromaprint-devel +%endif +%if 0%{?suse_version} >= 1140 +BuildRequires: libdc1394-devel >= 2.1.0 +%endif BuildRequires: libdvbpsi-devel < 1.0 BuildRequires: libdvdnav-devel BuildRequires: libdvdread-devel @@ -75,12 +86,16 @@ BuildRequires: libkate-devel BuildRequires: libmatroska-devel BuildRequires: libmodplug-devel -BuildRequires: libmtp-devel +%if 0%{?suse_version} > 1230 +BuildRequires: libmlt6-modules +%endif +%if 0%{?suse_version} >= 1140 +BuildRequires: libmtp-devel >= 1.0.0 +%endif BuildRequires: libnotify-devel BuildRequires: libogg-devel BuildRequires: libopus-devel BuildRequires: libproxy-devel -BuildRequires: libqt4-devel BuildRequires: libraw1394-devel BuildRequires: librsvg-devel BuildRequires: libsamplerate-devel @@ -94,16 +109,16 @@ BuildRequires: libupnp-devel BuildRequires: libv4l-devel BuildRequires: libva-devel +%if 0%{?suse_version} >= 1310 +BuildRequires: LibVNCServer-devel +%endif BuildRequires: libvorbis-devel BuildRequires: libxml2-devel BuildRequires: lirc-devel -%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG} BuildRequires: live555-devel -%endif -%if 0%{?suse_version} >= 1220 -BuildRequires: lua51-devel -%else -BuildRequires: lua-devel >= 5.1.0 +BuildRequires: lua-devel +%if 0%{?suse_version} >= 1140 +BuildRequires: opencv-devel %endif BuildRequires: pcre-devel %if 0%{?suse_version} >= 1220 @@ -115,6 +130,9 @@ BuildRequires: speex-devel BuildRequires: update-desktop-files BuildRequires: vcdimager-devel +%if 0%{?suse_version} >= 1220 +BuildRequires: xcb-util-keysyms-devel +%endif BuildRequires: xosd-devel BuildRequires: zvbi-devel BuildRequires: pkgconfig(dirac) >= 0.10.0 @@ -124,7 +142,6 @@ %if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG} BuildRequires: pkgconfig(libswscale) %endif - # BuildRequires that are not actively used for VLC, but for the build itself to work smoothly BuildRequires: findutils BuildRequires: update-desktop-files @@ -250,7 +267,6 @@ %setup -q %patch3 -p1 rm -rf contrib - # fix builddate info # Remove build time references so build-compare can do its work FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M') @@ -259,8 +275,7 @@ sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt4/dialogs/help.cpp src/config/help.c %build -pkg-config --exists smbclient && - smbclient=$(pkg-config --cflags smbclient) +pkg-config --exists smbclient && smbclient=$(pkg-config --cflags smbclient) %ifarch %{ix86} x86_64 export CFLAGS="%{optflags} -L%{_libdir}/live -msse -Wno-return-type $smbclient" export CXXFLAGS="%{optflags} -L%{_libdir}/live -msse -Wno-return-type $smbclient" @@ -293,12 +308,11 @@ --enable-libass \ --enable-libcddb \ --enable-lirc \ + --enable-live555 \ %if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG} --enable-swscale \ - --enable-live555 \ %else --disable-swscale \ - --disable-live555 \ %endif %if 0%{?BUILD_ORIG} --enable-libmpeg2 \ @@ -342,7 +356,11 @@ --enable-vcdx \ --enable-vorbis \ --enable-waveout \ +%if 0%{?suse_version} >= 1140 --enable-xcb \ +%else + --disable-xcb \ +%endif %if %{with opengles} --enable-gles2 \ --enable-egl \ @@ -353,28 +371,42 @@ make %{?_smp_mflags} V=1 %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install mkdir -p %{buildroot}/%{_datadir}/pixmaps ln -s %{_datadir}/icons/hicolor/48x48/apps/vlc.png %{buildroot}/%{_datadir}/pixmaps/vlc.png find %{buildroot} -name *.la -delete rm %{buildroot}%{_libdir}/vlc/libcompat.a %suse_update_desktop_file vlc AudioPlayer VideoPlayer Player -%fdupes %{buildroot}%{_datadir}/vlc +%fdupes %{buildroot}%{_datadir} # clean up some lang issues... -for lang in ach cgg ff kmr; do +for lang in ach an cgg co ff kmr tet; do rm -rf %{buildroot}%{_datadir}/locale/$lang done %find_lang vlc +%post +%if 0%{?suse_version} >= 1140 +%icon_theme_cache_post +%endif + +%postun +%if 0%{?suse_version} >= 1140 +%icon_theme_cache_postun +%endif + %post noX /sbin/ldconfig %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins +%if 0%{?suse_version} >= 1140 %desktop_database_post +%endif %postun noX /sbin/ldconfig +%if 0%{?suse_version} >= 1140 %desktop_database_postun +%endif %post -n libvlc%{libvlc} -p /sbin/ldconfig %postun -n libvlc%{libvlc} -p /sbin/ldconfig @@ -390,12 +422,16 @@ %dir %{_datadir}/kde4/apps %{_datadir}/kde4/apps/solid %{_libdir}/vlc/plugins/codec/liblibass_plugin.so +%if 0%{?suse_version} >= 1140 %{_libdir}/vlc/plugins/codec/libsdl_image_plugin.so +%endif %{_libdir}/vlc/plugins//notify/libnotify_plugin.so %{_libdir}/vlc/plugins//video_filter/libremoteosd_plugin.so %{_libdir}/vlc/plugins/text_renderer/libfreetype_plugin.so +%if 0%{?suse_version} >= 1140 %{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so %{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so +%endif %if %{with opengles} %{_libdir}/vlc/plugins/video_output/libegl_plugin.so %{_libdir}/vlc/plugins/video_output/libgles2_plugin.so @@ -412,8 +448,6 @@ %defattr(-,root,root) %doc %{_datadir}/doc/vlc/ %doc NEWS AUTHORS COPYING THANKS README -%{_datadir}/applications/vlc.desktop -%{_datadir}/pixmaps/vlc.png %{_bindir}/cvlc %if %{?with_ncurses} %{_bindir}/nvlc @@ -421,6 +455,8 @@ %{_bindir}/rvlc %{_bindir}/vlc %{_bindir}/vlc-wrapper +%{_datadir}/applications/vlc.desktop +%{_datadir}/pixmaps/vlc.png %{_datadir}/vlc/ %{_mandir}/*/vlc* # Own the file.. but it's an auto-generated file, so ghost it. @@ -534,7 +570,9 @@ %{_libdir}/vlc/plugins/access/libaccess_imem_plugin.so %{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so %{_libdir}/vlc/plugins/access/libaccess_mms_plugin.so +%if 0%{?suse_version} >= 1140 %{_libdir}/vlc/plugins/access/libaccess_mtp_plugin.so +%endif %{_libdir}/vlc/plugins/access/libaccess_rar_plugin.so %{_libdir}/vlc/plugins/access/libaccess_realrtsp_plugin.so %{_libdir}/vlc/plugins/access/libaccess_sftp_plugin.so @@ -543,7 +581,9 @@ %{_libdir}/vlc/plugins/access/libaccess_udp_plugin.so %{_libdir}/vlc/plugins/access/libaccess_vdr_plugin.so %{_libdir}/vlc/plugins/access/libcdda_plugin.so +%if 0%{?suse_version} >= 1140 %{_libdir}/vlc/plugins/access/libdc1394_plugin.so +%endif %{_libdir}/vlc/plugins/access/libdtv_plugin.so %{_libdir}/vlc/plugins/access/libdv1394_plugin.so %{_libdir}/vlc/plugins/access/libdvb_plugin.so @@ -552,12 +592,13 @@ %{_libdir}/vlc/plugins/access/libfilesystem_plugin.so %{_libdir}/vlc/plugins/access/libidummy_plugin.so %{_libdir}/vlc/plugins/access/liblibbluray_plugin.so -%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/access/liblive555_plugin.so -%endif %{_libdir}/vlc/plugins/access/liblinsys_hdsdi_plugin.so %{_libdir}/vlc/plugins/access/liblinsys_sdi_plugin.so %{_libdir}/vlc/plugins/access/libpulsesrc_plugin.so +%if 0%{?suse_version} >= 1220 +%{_libdir}/vlc/plugins/access/librdp_plugin.so +%endif %{_libdir}/vlc/plugins/access/librtp_plugin.so %{_libdir}/vlc/plugins/access/libsdp_plugin.so %{_libdir}/vlc/plugins/access/libshm_plugin.so @@ -566,7 +607,12 @@ %{_libdir}/vlc/plugins/access/libv4l2_plugin.so %{_libdir}/vlc/plugins/access/libvcd_plugin.so %{_libdir}/vlc/plugins/access/libvcdx_plugin.so +%if 0%{?suse_version} >= 1310 +%{_libdir}/vlc/plugins/access/liblibvnc_plugin.so +%endif +%if 0%{?suse_version} >= 1140 %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so +%endif %{_libdir}/vlc/plugins/access/libzip_plugin.so %{_libdir}/vlc/plugins/access_output/libaccess_output_dummy_plugin.so %{_libdir}/vlc/plugins/access_output/libaccess_output_file_plugin.so @@ -618,6 +664,7 @@ %{_libdir}/vlc/plugins/codec/libdvbsub_plugin.so %{_libdir}/vlc/plugins/codec/libedummy_plugin.so %{_libdir}/vlc/plugins/codec/libflac_plugin.so +%{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so %{_libdir}/vlc/plugins/codec/libg711_plugin.so %{_libdir}/vlc/plugins/codec/libkate_plugin.so %{_libdir}/vlc/plugins/codec/liblpcm_plugin.so @@ -638,13 +685,15 @@ %{_libdir}/vlc/plugins/codec/libtheora_plugin.so %{_libdir}/vlc/plugins/codec/libuleaddvaudio_plugin.so %{_libdir}/vlc/plugins/codec/libvorbis_plugin.so +%if 0%{?suse_version} >= 1140 %{_libdir}/vlc/plugins/codec/libxwd_plugin.so +%endif %{_libdir}/vlc/plugins/codec/libzvbi_plugin.so %{_libdir}/vlc/plugins/control/libdbus_plugin.so %{_libdir}/vlc/plugins/control/libdummy_plugin.so %{_libdir}/vlc/plugins/control/libgestures_plugin.so %{_libdir}/vlc/plugins/control/libhotkeys_plugin.so -%if 0%{?suse_version} < 1220 +%if 0%{?suse_version} >= 1140 %{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so %endif %{_libdir}/vlc/plugins/control/liblirc_plugin.so @@ -697,13 +746,18 @@ %{_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 +%{_libdir}/vlc/plugins/misc/libfingerprinter_plugin.so +%endif %if 0%{?suse_version} >= 1220 %{_libdir}/vlc/plugins/misc/libgnutls_plugin.so %endif %{_libdir}/vlc/plugins/misc/liblogger_plugin.so %{_libdir}/vlc/plugins/misc/libstats_plugin.so %{_libdir}/vlc/plugins/misc/libvod_rtsp_plugin.so +%if 0%{?suse_version} >= 1140 %{_libdir}/vlc/plugins/misc/libxdg_screensaver_plugin.so +%endif %{_libdir}/vlc/plugins/misc/libxml_plugin.so %ifarch %{ix86} x86_64 %{_libdir}/vlc/plugins/mmx/libi420_rgb_mmx_plugin.so @@ -732,13 +786,17 @@ %{_libdir}/vlc/plugins/packetizer/libpacketizer_vc1_plugin.so %{_libdir}/vlc/plugins/services_discovery/libbonjour_plugin.so %{_libdir}/vlc/plugins/services_discovery/libmediadirs_plugin.so +%if 0%{?suse_version} >= 1140 %{_libdir}/vlc/plugins/services_discovery/libmtp_plugin.so +%endif %{_libdir}/vlc/plugins/services_discovery/libpodcast_plugin.so %{_libdir}/vlc/plugins/services_discovery/libpulselist_plugin.so %{_libdir}/vlc/plugins/services_discovery/libsap_plugin.so %{_libdir}/vlc/plugins/services_discovery/libudev_plugin.so %{_libdir}/vlc/plugins/services_discovery/libupnp_plugin.so +%if 0%{?suse_version} >= 1140 %{_libdir}/vlc/plugins/services_discovery/libxcb_apps_plugin.so +%endif %ifarch %{ix86} x86_64 %{_libdir}/vlc/plugins/sse2/libi420_rgb_sse2_plugin.so %{_libdir}/vlc/plugins/sse2/libi420_yuy2_sse2_plugin.so @@ -751,6 +809,9 @@ %{_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 +%{_libdir}/vlc/plugins/stream_out/libstream_out_chromaprint_plugin.so +%endif %{_libdir}/vlc/plugins/stream_out/libstream_out_delay_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_description_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_display_plugin.so @@ -809,6 +870,10 @@ %{_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 +%{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so +%{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so +%endif %{_libdir}/vlc/plugins/video_filter/libposterize_plugin.so %{_libdir}/vlc/plugins/video_filter/libpsychedelic_plugin.so %{_libdir}/vlc/plugins/video_filter/libpuzzle_plugin.so @@ -829,14 +894,18 @@ %{_libdir}/vlc/plugins/video_filter/libyuvp_plugin.so %{_libdir}/vlc/plugins/video_output/libcaca_plugin.so %{_libdir}/vlc/plugins/video_output/libfb_plugin.so +%if 0%{?suse_version} >= 1140 %{_libdir}/vlc/plugins/video_output/libgl_plugin.so %{_libdir}/vlc/plugins/video_output/libglx_plugin.so +%endif %{_libdir}/vlc/plugins/video_output/libvdummy_plugin.so %{_libdir}/vlc/plugins/video_output/libvmem_plugin.so %{_libdir}/vlc/plugins/video_output/libvout_sdl_plugin.so +%if 0%{?suse_version} >= 1140 %{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so %{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so %{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so +%endif %{_libdir}/vlc/plugins/video_output/libyuv_plugin.so %{_libdir}/vlc/plugins/visualization/libvisual_plugin.so -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
