From 0bdbb67551227f662a9e327af26454d83e6c93ff6cd91a63fb491df63429f72c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 1 Mar 2015 17:33:44 +0000 Subject: [PATCH 01/18] Accepting request 288342 from home:dimstar:branches:multimedia:libs Update to version 2.2.0 - getting it to the users ASAP; we can add more features as we go along OBS-URL: https://build.opensuse.org/request/show/288342 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=96 --- vlc-2.1.5.tar.xz | 3 - vlc-2.2.0.tar.xz | 3 + vlc-CVE-2014-9625.patch | 253 ---------------------------------------- vlc.changes | 8 ++ vlc.spec | 93 ++++++++------- 5 files changed, 57 insertions(+), 303 deletions(-) delete mode 100644 vlc-2.1.5.tar.xz create mode 100644 vlc-2.2.0.tar.xz delete mode 100644 vlc-CVE-2014-9625.patch diff --git a/vlc-2.1.5.tar.xz b/vlc-2.1.5.tar.xz deleted file mode 100644 index d836993..0000000 --- a/vlc-2.1.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f6566ab6cd90d381395b7f0e401060b044cd3843e50ceb252b558a88e5d1f72 -size 19574208 diff --git a/vlc-2.2.0.tar.xz b/vlc-2.2.0.tar.xz new file mode 100644 index 0000000..0a61414 --- /dev/null +++ b/vlc-2.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e0a27e248c47da723a696420aca3a4dd15cc3ed8cc81618d3f1dc8661b25517 +size 20861760 diff --git a/vlc-CVE-2014-9625.patch b/vlc-CVE-2014-9625.patch deleted file mode 100644 index 6d993c5..0000000 --- a/vlc-CVE-2014-9625.patch +++ /dev/null @@ -1,253 +0,0 @@ -From b915dc931fe886add566f208650e0ab225acbe3a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= -Date: Wed, 30 Jul 2014 19:05:43 +0300 -Subject: [PATCH 18/39] avformat: initialize probe data (fixes #11851) - -(cherry picked from commit 49bd1c657d960ba107d9db8752f716139a938eee) ---- - modules/demux/avformat/demux.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c -index 3bb1266..902ef01 100644 ---- a/modules/demux/avformat/demux.c -+++ b/modules/demux/avformat/demux.c -@@ -106,7 +106,7 @@ int OpenDemux( vlc_object_t *p_this ) - { - demux_t *p_demux = (demux_t*)p_this; - demux_sys_t *p_sys; -- AVProbeData pd; -+ AVProbeData pd = { }; - AVInputFormat *fmt = NULL; - unsigned int i; - int64_t i_start_time = -1; --- -2.2.1 - -From 74996ceefd63adf07e28ea80198200d74a164c9d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= -Date: Sat, 30 Aug 2014 16:41:53 +0300 -Subject: [PATCH 27/39] decomp: fix heap overflow (fixes #12052) - ---- - modules/stream_filter/decomp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/stream_filter/decomp.c b/modules/stream_filter/decomp.c -index 5a12e87..16a4901 100644 ---- a/modules/stream_filter/decomp.c -+++ b/modules/stream_filter/decomp.c -@@ -207,7 +207,7 @@ static int Read (stream_t *stream, void *buf, unsigned int buflen) - p_sys->offset += length; - - if (buflen > 0) -- length += Read (stream, ((char *)buf) + length, buflen - length); -+ length += Read (stream, buf, buflen); - return length; - } - assert ((buf != NULL) || (buflen == 0)); --- -2.2.1 - -From 9ddfcbb6e5222871de9b2047c939cf1da1fdbe7b Mon Sep 17 00:00:00 2001 -From: Fabian Yamaguchi -Date: Sat, 6 Dec 2014 13:12:38 +0100 -Subject: [PATCH 34/39] misc: update: fix buffer overflow in updater - -On 32 bit builds, parsing of update status files with a size of -4294967295 or more lead to an integer truncation in a call to malloc -and a subsequent buffer overflow. This happened prior to checking the -files' signature. The commit fixes this by disallowing overly large -status files (above 65k in practice) - -Signed-off-by: Jean-Baptiste Kempf -(cherry picked from commit fbe2837bc80f155c001781041a54c58b5524fc14) -Signed-off-by: Jean-Baptiste Kempf ---- - src/misc/update.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/misc/update.c b/src/misc/update.c -index 600e900..32e8701 100644 ---- a/src/misc/update.c -+++ b/src/misc/update.c -@@ -193,6 +193,13 @@ static bool GetUpdateFile( update_t *p_update ) - } - - const int64_t i_read = stream_Size( p_stream ); -+ -+ if( i_read < 0 || i_read >= UINT16_MAX) -+ { -+ msg_Err(p_update->p_libvlc, "Status file too large"); -+ goto error; -+ } -+ - psz_update_data = malloc( i_read + 1 ); /* terminating '\0' */ - if( !psz_update_data ) - goto error; --- -2.2.1 - -From a99d9cc2fede1a18140b43ffb59cde37cef7478d Mon Sep 17 00:00:00 2001 -From: Fabian Yamaguchi -Date: Fri, 5 Dec 2014 15:18:22 +0100 -Subject: [PATCH 35/39] codec: schroedinger: fix potential buffer overflow. - -The variable len is a raw 32 bit value read using GetDWBE. If this -value is larger than UINT32_MAX - sizeof(eos), this will cause an -integer overflow in the subsequent call to malloc, and finally a -buffer overflow when calling memcpy. We fix this by checking len -accordingly. - -Signed-off-by: Jean-Baptiste Kempf -(cherry picked from commit 9bb0353a5c63a7f8c6fc853faa3df4b4df1f5eb5) -Signed-off-by: Jean-Baptiste Kempf ---- - modules/codec/schroedinger.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/modules/codec/schroedinger.c b/modules/codec/schroedinger.c -index 0c5a7e7..93b72e1 100644 ---- a/modules/codec/schroedinger.c -+++ b/modules/codec/schroedinger.c -@@ -1548,6 +1548,10 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pic ) - * is appended to the sequence header to allow guard - * against poor streaming servers */ - /* XXX, should this be done using the packetizer ? */ -+ -+ if( len > UINT32_MAX - sizeof( eos ) ) -+ return NULL; -+ - p_enc->fmt_out.p_extra = malloc( len + sizeof( eos ) ); - if( !p_enc->fmt_out.p_extra ) - return NULL; --- -2.2.1 - -From 4e6137bbcd3d74630aa6f0e8b8b5b8aa0c19647d Mon Sep 17 00:00:00 2001 -From: Fabian Yamaguchi -Date: Fri, 5 Dec 2014 15:37:05 +0100 -Subject: [PATCH 36/39] codec: dmo: avoid null-pointer dereference. - -Check the return value of malloc to avoid a null-pointer dereference. - -Signed-off-by: Jean-Baptiste Kempf -(cherry picked from commit 229c385a79d48e41687fae8b4dfeaeef9c8c3eb7) -Signed-off-by: Jean-Baptiste Kempf ---- - modules/codec/dmo/dmo.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/modules/codec/dmo/dmo.c b/modules/codec/dmo/dmo.c -index 6595f70..dd1fbbc 100644 ---- a/modules/codec/dmo/dmo.c -+++ b/modules/codec/dmo/dmo.c -@@ -1310,6 +1310,9 @@ static int EncoderSetAudioType( encoder_t *p_enc, IMediaObject *p_dmo ) - msg_Dbg( p_enc, "found cbSize: %i", p_wf->cbSize ); - p_enc->fmt_out.i_extra = p_wf->cbSize; - p_enc->fmt_out.p_extra = malloc( p_enc->fmt_out.i_extra ); -+ if( p_enc->fmt_out.p_extra == NULL) -+ return VLC_EGENERIC; -+ - memcpy( p_enc->fmt_out.p_extra, &p_wf[1], p_enc->fmt_out.i_extra ); - } - --- -2.2.1 - -From 8eab5c92136ffc60873c41c06e7a6a9266e8af7c Mon Sep 17 00:00:00 2001 -From: Fabian Yamaguchi -Date: Fri, 5 Dec 2014 13:52:42 +0100 -Subject: [PATCH 37/39] demux: mp4: fix buffer overflow in parsing of string - boxes. - -We ensure that pbox->i_size is never smaller than 8 to avoid an -integer underflow in the third argument of the subsequent call to -memcpy. We also make sure no truncation occurs when passing values -derived from the 64 bit integer p_box->i_size to arguments of malloc -and memcpy that may be 32 bit integers on 32 bit platforms. - -Signed-off-by: Jean-Baptiste Kempf -(cherry picked from commit 2e7c7091a61aa5d07e7997b393d821e91f593c39) -Signed-off-by: Jean-Baptiste Kempf - -Conflicts: - modules/demux/mp4/libmp4.c ---- - modules/demux/mp4/libmp4.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c -index 3abb940..ba6dcb9 100644 ---- a/modules/demux/mp4/libmp4.c -+++ b/modules/demux/mp4/libmp4.c -@@ -2596,6 +2596,9 @@ static int MP4_ReadBox_name( stream_t *p_stream, MP4_Box_t *p_box ) - { - MP4_READBOX_ENTER( MP4_Box_data_name_t ); - -+ if( p_box->i_size < 8 || p_box->i_size > SIZE_MAX ) -+ MP4_READBOX_EXIT( 0 ); -+ - p_box->data.p_name->psz_text = malloc( p_box->i_size + 1 - 8 ); /* +\0, -name, -size */ - if( p_box->data.p_name->psz_text == NULL ) - MP4_READBOX_EXIT( 0 ); --- -2.2.1 - -From 41c52fbf434d6fc59e1a5e90118b8c924ea6f50d Mon Sep 17 00:00:00 2001 -From: Fabian Yamaguchi -Date: Fri, 5 Dec 2014 13:58:24 +0100 -Subject: [PATCH 38/39] stream_out: rtp: don't use VLA for user controlled data - -It should fix a possible invalid memory access - -When streaming ogg-files via rtp, an ogg-file can trigger an invalid -write access using an overly long 'configuration' string. - -The original code attemps to allocate space to hold the string on the stack -and hence, cannot verify if allocation succeeds. Instead, we now allocate the -buffer on the heap and return if allocation fails. - -In detail, rtp_packetize_xiph_config allocates a buffer on the stack at (1) where -the size depends on the local variable 'len'. The variable 'len' is -calculated at (0) to be the length of a string contained in a specially -crafted Ogg Vorbis file, and therefore, it is attacker-controlled. - -Signed-off-by: Jean-Baptiste Kempf -(cherry picked from commit 204291467724867b79735c0ee3aeb0dbc2200f97) -Signed-off-by: Jean-Baptiste Kempf - -Conflicts: - modules/stream_out/rtpfmt.c ---- - modules/stream_out/rtpfmt.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/modules/stream_out/rtpfmt.c b/modules/stream_out/rtpfmt.c -index 7b71588..f19f41b 100644 ---- a/modules/stream_out/rtpfmt.c -+++ b/modules/stream_out/rtpfmt.c -@@ -540,7 +540,11 @@ int rtp_packetize_xiph_config( sout_stream_id_t *id, const char *fmtp, - char *end = strchr(start, ';'); - assert(end != NULL); - size_t len = end - start; -- char b64[len + 1]; -+ -+ char *b64 = malloc(len + 1); -+ if(!b64) -+ return VLC_EGENERIC; -+ - memcpy(b64, start, len); - b64[len] = '\0'; - -@@ -550,6 +554,7 @@ int rtp_packetize_xiph_config( sout_stream_id_t *id, const char *fmtp, - int i_data; - - i_data = vlc_b64_decode_binary(&p_orig, b64); -+ free(b64); - if (i_data == 0) - return VLC_EGENERIC; - assert(i_data > 9); --- -2.2.1 - diff --git a/vlc.changes b/vlc.changes index 0f0e60e..81bfc38 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Feb 27 18:28:17 UTC 2015 - dimstar@opensuse.org + +- Update to version 2.2.0: + + Long awaited update with a huge changelog. Please see the + content of /usr/share/doc/packages/vlc/NEWS. +- Drop vlc-CVE-2014-9625.patch: fixed upstream. + ------------------------------------------------------------------- Wed Feb 4 10:11:09 UTC 2015 - dimstar@opensuse.org diff --git a/vlc.spec b/vlc.spec index 4b8765c..6516225 100644 --- a/vlc.spec +++ b/vlc.spec @@ -18,7 +18,7 @@ %define libvlc 5 -%define libvlccore 7 +%define libvlccore 8 %define conflicts vlc-beta # Currently no ncurses support. Will have to find the right trick for integrating curses (which is a curse) @@ -37,7 +37,7 @@ Summary: Video Lan Client multimedia player License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Multimedia/Video/Players Name: vlc -Version: 2.1.5 +Version: 2.2.0 Release: 0 Url: http://www.videolan.org/ Source: http://download.videolan.org/%{name}/%{version}/%{name}-%{version}.tar.xz @@ -45,8 +45,6 @@ Source: http://download.videolan.org/%{name}/%{version}/%{name}-%{versio Source1: %{name}.changes # 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 -# PATCH-FIX-UPSTREAM vlc-CVE-2014-9625.patch boo#914268 CVE-2014-9625 dimstar@opensuse.org -- Fix various buffer overflows and null ptr deref -Patch2: vlc-CVE-2014-9625.patch Patch3: 0001-no-return-in-non-void.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Mesa-devel @@ -304,7 +302,6 @@ for gnome-vfs2. %prep %setup -q %patch1 -p1 -%patch2 -p1 %patch3 -p1 # We do not rely on contrib but make use of system libraries rm -rf contrib @@ -479,7 +476,7 @@ done %{_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_splitter/libpanoramix_plugin.so %{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so %endif %if %{with opengles} @@ -487,8 +484,10 @@ done %{_libdir}/vlc/plugins/video_output/libgles2_plugin.so %endif %{_libdir}/vlc/plugins/video_output/libaa_plugin.so +%{_libdir}/vlc/plugins/video_output/libegl_x11_plugin.so %if 0%{?suse_version} >= 1220 %{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so +%{_libdir}/vlc/plugins/visualization/libglspectrum_plugin.so %endif %files noX-lang -f vlc.lang @@ -539,22 +538,17 @@ done %dir %{_libdir}/vlc/plugins/lua %dir %{_libdir}/vlc/plugins/meta_engine %dir %{_libdir}/vlc/plugins/misc -%ifarch %{ix86} x86_64 -%dir %{_libdir}/vlc/plugins/mmx -%endif %dir %{_libdir}/vlc/plugins/mux %dir %{_libdir}/vlc/plugins/notify %dir %{_libdir}/vlc/plugins/packetizer %dir %{_libdir}/vlc/plugins/services_discovery -%ifarch %{ix86} x86_64 -%dir %{_libdir}/vlc/plugins/sse2 -%endif %dir %{_libdir}/vlc/plugins/stream_filter %dir %{_libdir}/vlc/plugins/stream_out %dir %{_libdir}/vlc/plugins/text_renderer %dir %{_libdir}/vlc/plugins/video_chroma %dir %{_libdir}/vlc/plugins/video_filter %dir %{_libdir}/vlc/plugins/video_output +%dir %{_libdir}/vlc/plugins/video_splitter %dir %{_libdir}/vlc/plugins/visualization # Files explicitly listed... so we are in full control of what goes to -noX, -codec or the X-depending pkg. %{_libdir}/vlc/vlc-cache-gen @@ -564,7 +558,6 @@ done %{_libdir}/vlc/lua/intf/dumpmeta.luac %{_libdir}/vlc/lua/intf/http.luac %{_libdir}/vlc/lua/intf/luac.luac -%{_libdir}/vlc/lua/intf/modules/common.luac %{_libdir}/vlc/lua/intf/modules/host.luac %{_libdir}/vlc/lua/intf/modules/httprequests.luac %{_libdir}/vlc/lua/intf/telnet.luac @@ -574,6 +567,7 @@ done %{_libdir}/vlc/lua/meta/art/03_lastfm.luac %{_libdir}/vlc/lua/meta/fetcher/tvrage.luac %{_libdir}/vlc/lua/meta/reader/filename.luac +%{_libdir}/vlc/lua/modules/common.luac %{_libdir}/vlc/lua/modules/dkjson.luac %{_libdir}/vlc/lua/modules/sandbox.luac %{_libdir}/vlc/lua/modules/simplexml.luac @@ -606,6 +600,7 @@ done %{_libdir}/vlc/lua/playlist/youtube_homepage.luac %{_libdir}/vlc/lua/playlist/zapiks.luac %{_libdir}/vlc/lua/sd/fmc.luac +%{_libdir}/vlc/lua/sd/icast.luac %{_libdir}/vlc/lua/sd/icecast.luac %{_libdir}/vlc/lua/sd/jamendo.luac %{_libdir}/vlc/lua/sd/metachannels.luac @@ -613,23 +608,23 @@ done %{_libdir}/vlc/plugins/altivec/libi420_yuy2_altivec_plugin.so %endif %{_libdir}/vlc/plugins/access/libaccess_alsa_plugin.so -%{_libdir}/vlc/plugins/access/libaccess_attachment_plugin.so +%{_libdir}/vlc/plugins/access/libattachment_plugin.so %{_libdir}/vlc/plugins/access/libaccess_bd_plugin.so -%{_libdir}/vlc/plugins/access/libaccess_ftp_plugin.so -%{_libdir}/vlc/plugins/access/libaccess_http_plugin.so -%{_libdir}/vlc/plugins/access/libaccess_imem_plugin.so +%{_libdir}/vlc/plugins/access/libftp_plugin.so +%{_libdir}/vlc/plugins/access/libhttp_plugin.so +%{_libdir}/vlc/plugins/access/libimem_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/librar_plugin.so %{_libdir}/vlc/plugins/access/libaccess_realrtsp_plugin.so -%{_libdir}/vlc/plugins/access/libaccess_sftp_plugin.so -%{_libdir}/vlc/plugins/access/libaccess_smb_plugin.so -%{_libdir}/vlc/plugins/access/libaccess_tcp_plugin.so -%{_libdir}/vlc/plugins/access/libaccess_udp_plugin.so -%{_libdir}/vlc/plugins/access/libaccess_vdr_plugin.so +%{_libdir}/vlc/plugins/access/libsftp_plugin.so +%{_libdir}/vlc/plugins/access/libsmb_plugin.so +%{_libdir}/vlc/plugins/access/libtcp_plugin.so +%{_libdir}/vlc/plugins/access/libudp_plugin.so +%{_libdir}/vlc/plugins/access/libvdr_plugin.so %{_libdir}/vlc/plugins/access/libcdda_plugin.so %if 0%{?suse_version} >= 1140 %{_libdir}/vlc/plugins/access/libdc1394_plugin.so @@ -652,7 +647,6 @@ done %{_libdir}/vlc/plugins/access/librtp_plugin.so %{_libdir}/vlc/plugins/access/libsdp_plugin.so %{_libdir}/vlc/plugins/access/libshm_plugin.so -%{_libdir}/vlc/plugins/access/libstream_filter_rar_plugin.so %{_libdir}/vlc/plugins/access/libtimecode_plugin.so %{_libdir}/vlc/plugins/access/libv4l2_plugin.so %{_libdir}/vlc/plugins/access/libvcd_plugin.so @@ -660,7 +654,7 @@ done %{_libdir}/vlc/plugins/access/libvcdx_plugin.so %endif %if 0%{?suse_version} >= 1310 -%{_libdir}/vlc/plugins/access/liblibvnc_plugin.so +%{_libdir}/vlc/plugins/access/libvnc_plugin.so %endif %if 0%{?suse_version} >= 1140 %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so @@ -711,7 +705,6 @@ done %{_libdir}/vlc/plugins/codec/libcdg_plugin.so %{_libdir}/vlc/plugins/codec/libcvdsub_plugin.so %{_libdir}/vlc/plugins/codec/libddummy_plugin.so -%{_libdir}/vlc/plugins/codec/libdirac_plugin.so %{_libdir}/vlc/plugins/codec/libdts_plugin.so %{_libdir}/vlc/plugins/codec/libdvbsub_plugin.so %{_libdir}/vlc/plugins/codec/libedummy_plugin.so @@ -720,6 +713,7 @@ done %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so %endif %{_libdir}/vlc/plugins/codec/libg711_plugin.so +%{_libdir}/vlc/plugins/codec/libjpeg_plugin.so %{_libdir}/vlc/plugins/codec/libkate_plugin.so %{_libdir}/vlc/plugins/codec/liblpcm_plugin.so %{_libdir}/vlc/plugins/codec/libmpeg_audio_plugin.so @@ -732,8 +726,12 @@ done %{_libdir}/vlc/plugins/codec/libstl_plugin.so %{_libdir}/vlc/plugins/codec/libscte27_plugin.so %{_libdir}/vlc/plugins/codec/libsubsdec_plugin.so +%{_libdir}/vlc/plugins/codec/libsubstx3g_plugin.so %{_libdir}/vlc/plugins/codec/libsubsusf_plugin.so %{_libdir}/vlc/plugins/codec/libsvcdsub_plugin.so +%if 0%{?suse_version} > 1320 +%{_libdir}/vlc/plugins/codec/libsvgdec_plugin.so +%endif %{_libdir}/vlc/plugins/codec/libt140_plugin.so %{_libdir}/vlc/plugins/codec/libtelx_plugin.so %{_libdir}/vlc/plugins/codec/libtheora_plugin.so @@ -747,22 +745,22 @@ done %{_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} >= 1140 -%{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so -%endif %{_libdir}/vlc/plugins/control/liblirc_plugin.so %{_libdir}/vlc/plugins/control/libmotion_plugin.so %{_libdir}/vlc/plugins/control/libnetsync_plugin.so %{_libdir}/vlc/plugins/control/liboldrc_plugin.so +%{_libdir}/vlc/plugins/control/libxcb_hotkeys_plugin.so %{_libdir}/vlc/plugins/demux/libaiff_plugin.so %{_libdir}/vlc/plugins/demux/libasf_plugin.so %{_libdir}/vlc/plugins/demux/libau_plugin.so %{_libdir}/vlc/plugins/demux/libavi_plugin.so +%{_libdir}/vlc/plugins/demux/libcaf_plugin.so %{_libdir}/vlc/plugins/demux/libdemux_cdg_plugin.so %{_libdir}/vlc/plugins/demux/libdemux_stl_plugin.so %{_libdir}/vlc/plugins/demux/libdemuxdump_plugin.so -%{_libdir}/vlc/plugins/demux/libdirac_plugin.so +%{_libdir}/vlc/plugins/demux/libdiracsys_plugin.so %{_libdir}/vlc/plugins/demux/libes_plugin.so +%{_libdir}/vlc/plugins/demux/libhevc_plugin.so %{_libdir}/vlc/plugins/demux/libflacsys_plugin.so %{_libdir}/vlc/plugins/demux/libgme_plugin.so %{_libdir}/vlc/plugins/demux/libh264_plugin.so @@ -797,6 +795,8 @@ done %{_libdir}/vlc/plugins/lua/liblua_plugin.so %{_libdir}/vlc/plugins/meta_engine/libfolder_plugin.so %{_libdir}/vlc/plugins/meta_engine/libtaglib_plugin.so +%{_libdir}/vlc/plugins/misc/libaddonsfsstorage_plugin.so +%{_libdir}/vlc/plugins/misc/libaddonsvorepository_plugin.so %{_libdir}/vlc/plugins/misc/libaudioscrobbler_plugin.so %{_libdir}/vlc/plugins/misc/libdbus_screensaver_plugin.so %{_libdir}/vlc/plugins/misc/libexport_plugin.so @@ -813,13 +813,6 @@ done %{_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 -%{_libdir}/vlc/plugins/mmx/libi420_yuy2_mmx_plugin.so -%{_libdir}/vlc/plugins/mmx/libi422_yuy2_mmx_plugin.so -#{_libdir}/vlc/plugins/mmx/libmemcpymmx_plugin.so -#{_libdir}/vlc/plugins/mmxext/libmemcpymmxext_plugin.so -%endif %{_libdir}/vlc/plugins/mux/libmux_asf_plugin.so %{_libdir}/vlc/plugins/mux/libmux_avi_plugin.so %{_libdir}/vlc/plugins/mux/libmux_dummy_plugin.so @@ -833,6 +826,7 @@ done %{_libdir}/vlc/plugins/packetizer/libpacketizer_dirac_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_flac_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_h264_plugin.so +%{_libdir}/vlc/plugins/packetizer/libpacketizer_hevc_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_mlp_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_mpeg4audio_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_mpeg4video_plugin.so @@ -851,11 +845,6 @@ done %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 -%{_libdir}/vlc/plugins/sse2/libi422_yuy2_sse2_plugin.so -%endif %{_libdir}/vlc/plugins/stream_filter/libdecomp_plugin.so %{_libdir}/vlc/plugins/stream_filter/libdash_plugin.so %{_libdir}/vlc/plugins/stream_filter/libhttplive_plugin.so @@ -881,14 +870,21 @@ done %{_libdir}/vlc/plugins/stream_out/libstream_out_setid_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_smem_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_standard_plugin.so +%{_libdir}/vlc/plugins/stream_out/libstream_out_stats_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_transcode_plugin.so %{_libdir}/vlc/plugins/text_renderer/libsvg_plugin.so %{_libdir}/vlc/plugins/text_renderer/libtdummy_plugin.so %{_libdir}/vlc/plugins/video_chroma/libgrey_yuv_plugin.so %{_libdir}/vlc/plugins/video_chroma/libi420_rgb_plugin.so +%{_libdir}/vlc/plugins/video_chroma/libi420_rgb_mmx_plugin.so +%{_libdir}/vlc/plugins/video_chroma/libi420_rgb_sse2_plugin.so %{_libdir}/vlc/plugins/video_chroma/libi420_yuy2_plugin.so +%{_libdir}/vlc/plugins/video_chroma/libi420_yuy2_mmx_plugin.so +%{_libdir}/vlc/plugins/video_chroma/libi420_yuy2_sse2_plugin.so %{_libdir}/vlc/plugins/video_chroma/libi422_i420_plugin.so %{_libdir}/vlc/plugins/video_chroma/libi422_yuy2_plugin.so +%{_libdir}/vlc/plugins/video_chroma/libi422_yuy2_mmx_plugin.so +%{_libdir}/vlc/plugins/video_chroma/libi422_yuy2_sse2_plugin.so %{_libdir}/vlc/plugins/video_chroma/librv32_plugin.so %{_libdir}/vlc/plugins/video_chroma/libyuy2_i420_plugin.so %{_libdir}/vlc/plugins/video_chroma/libyuy2_i422_plugin.so @@ -903,14 +899,15 @@ done %{_libdir}/vlc/plugins/video_filter/libblendbench_plugin.so %{_libdir}/vlc/plugins/video_filter/libbluescreen_plugin.so %{_libdir}/vlc/plugins/video_filter/libcanvas_plugin.so -%{_libdir}/vlc/plugins/video_filter/libchain_plugin.so -%{_libdir}/vlc/plugins/video_filter/libclone_plugin.so +%{_libdir}/vlc/plugins/video_chroma/libchain_plugin.so +%{_libdir}/vlc/plugins/video_splitter/libclone_plugin.so %{_libdir}/vlc/plugins/video_filter/libcolorthres_plugin.so %{_libdir}/vlc/plugins/video_filter/libcroppadd_plugin.so %{_libdir}/vlc/plugins/video_filter/libdeinterlace_plugin.so %{_libdir}/vlc/plugins/video_filter/libdynamicoverlay_plugin.so %{_libdir}/vlc/plugins/video_filter/liberase_plugin.so %{_libdir}/vlc/plugins/video_filter/libextract_plugin.so +%{_libdir}/vlc/plugins/video_filter/libfreeze_plugin.so %{_libdir}/vlc/plugins/video_filter/libgaussianblur_plugin.so %{_libdir}/vlc/plugins/video_filter/libgradfun_plugin.so %{_libdir}/vlc/plugins/video_filter/libgradient_plugin.so @@ -924,6 +921,7 @@ done %{_libdir}/vlc/plugins/video_filter/libmosaic_plugin.so %{_libdir}/vlc/plugins/video_filter/libmotionblur_plugin.so %{_libdir}/vlc/plugins/video_filter/libmotiondetect_plugin.so +%{_libdir}/vlc/plugins/video_filter/liboldmovie_plugin.so %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 @@ -939,11 +937,12 @@ done %{_libdir}/vlc/plugins/video_filter/libsepia_plugin.so %{_libdir}/vlc/plugins/video_filter/libsharpen_plugin.so %{_libdir}/vlc/plugins/video_filter/libsubsdelay_plugin.so +%{_libdir}/vlc/plugins/video_filter/libvhs_plugin.so %if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG} -%{_libdir}/vlc/plugins/video_filter/libswscale_plugin.so +%{_libdir}/vlc/plugins/video_chroma/libswscale_plugin.so %endif %{_libdir}/vlc/plugins/video_filter/libtransform_plugin.so -%{_libdir}/vlc/plugins/video_filter/libwall_plugin.so +%{_libdir}/vlc/plugins/video_splitter/libwall_plugin.so %{_libdir}/vlc/plugins/video_filter/libwave_plugin.so %{_libdir}/vlc/plugins/video_filter/libyuvp_plugin.so %{_libdir}/vlc/plugins/video_output/libcaca_plugin.so @@ -996,7 +995,7 @@ done %files gnome %defattr(-,root,root) -%{_libdir}/vlc/plugins/access/libaccess_gnomevfs_plugin.so +%{_libdir}/vlc/plugins/access/libgnomevfs_plugin.so %files devel %defattr(-,root,root) From ab7a7f0c990cf7a77c0af76b29e41306d593e82145fcd541b1559cb206365172 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 2 Mar 2015 12:24:36 +0000 Subject: [PATCH 02/18] fix OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=97 --- vlc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 6516225..5ebe2ab 100644 --- a/vlc.spec +++ b/vlc.spec @@ -89,7 +89,7 @@ BuildRequires: pkgconfig(libdc1394-2) >= 2.1.0 %endif BuildRequires: libgcrypt-devel BuildRequires: libmatroska-devel -BuildRequires: pkgconfig(dvdnav) +BuildRequires: pkgconfig(dvdnav) >= 4.9.0 BuildRequires: pkgconfig(dvdread) BuildRequires: pkgconfig(jack) >= 1.9.7 BuildRequires: pkgconfig(kate) >= 0.3.0 From 1170909d5bf3c8b3acabae2a158c58d3bf47bfddb35c696c10aa6ea841c6cf51 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 2 Mar 2015 14:29:22 +0000 Subject: [PATCH 03/18] Accepting request 288473 from home:alois:branches:multimedia:libs it should be ok now OBS-URL: https://build.opensuse.org/request/show/288473 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=98 --- vlc-rpmlintrc | 12 + vlc.changes | 12 + vlc.spec | 675 ++++++++++++++++++++++++++++---------------------- 3 files changed, 399 insertions(+), 300 deletions(-) create mode 100644 vlc-rpmlintrc diff --git a/vlc-rpmlintrc b/vlc-rpmlintrc new file mode 100644 index 0000000..a0b77ff --- /dev/null +++ b/vlc-rpmlintrc @@ -0,0 +1,12 @@ +# according to the developers this is a false positive +addFilter("libvlccore8.* shared-lib-calls-exit") + +# there's a good reason for packaging vlc and vlc.desktop separately +addFilter("desktopfile-without-binary") + +# plugins.dat is created on startup if necessary +addFilter("vlc-noX.* ghost-files-without-postin") + +# these are false positives +addFilter("(libvlccore8|vlc-qt).* file-contains-date-and-time") + diff --git a/vlc.changes b/vlc.changes index 81bfc38..076343c 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Mar 1 18:05:03 UTC 2015 - aloisio@gmx.com + +- enabled ncurses for Factory +- enabled fluidsynth unconditionally +- enabled libcdio +- enabled x265 for packman +- fixed SLE11/SLE12 build +- added vlc-rpmlintrc to suppress bogus warnings +- added manpages for the various versions of vlc + as link to the main one + ------------------------------------------------------------------- Fri Feb 27 18:28:17 UTC 2015 - dimstar@opensuse.org diff --git a/vlc.spec b/vlc.spec index 5ebe2ab..5d25158 100644 --- a/vlc.spec +++ b/vlc.spec @@ -21,200 +21,170 @@ %define libvlccore 8 %define conflicts vlc-beta -# Currently no ncurses support. Will have to find the right trick for integrating curses (which is a curse) -%define with_ncurses 0 - -# Fluidsynth plugin is known to cause strange crashes here and there - disable it for now (2014-10-07, DimStar) -%bcond_with fluidsynth - %ifarch %arm %bcond_without opengles %else %bcond_with opengles %endif -Summary: Video Lan Client multimedia player -License: GPL-2.0+ and LGPL-2.1+ -Group: Productivity/Multimedia/Video/Players Name: vlc Version: 2.2.0 Release: 0 -Url: http://www.videolan.org/ -Source: http://download.videolan.org/%{name}/%{version}/%{name}-%{version}.tar.xz +Summary: Video Lan Client multimedia player +License: GPL-2.0+ and LGPL-2.1+ +Group: Productivity/Multimedia/Video/Players +Url: http://www.videolan.org +Source: http://download.videolan.org/%{name}%%{version}/%{name}-%{version}.tar.xz # Add vlc.changes as source, so we can reproducibly extract the date from it during build Source1: %{name}.changes -# PATCH-FIX-OPENSUSE vlc-2.1.5-fix-skins2-default-skin-creation.patch -- see description in patch header +Source2: %{name}-rpmlintrc +# 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: SDL-devel >= 1.2.10 BuildRequires: aalib-devel +BuildRequires: alsa-devel >= 1.0.24 +BuildRequires: automake >= 1.11 +BuildRequires: avahi-devel >= 0.6 +BuildRequires: dirac-devel BuildRequires: fdupes -BuildRequires: pkgconfig(alsa) >= 1.0.24 -BuildRequires: pkgconfig(avahi-client) >= 0.6 -BuildRequires: pkgconfig(flac) -%if %{with fluidsynth} -BuildRequires: pkgconfig(fluidsynth) >= 1.1.2 -%endif -%if 0%{?suse_version} >= 1220 -BuildRequires: pkgconfig(freerdp) >= 1.0.1 -%endif -BuildRequires: gdk-pixbuf-devel +BuildRequires: findutils +BuildRequires: flac-devel +BuildRequires: freetype2 +BuildRequires: fribidi-devel BuildRequires: gettext-devel BuildRequires: git -BuildRequires: pkgconfig(freetype2) -BuildRequires: pkgconfig(fribidi) -BuildRequires: pkgconfig(gnome-vfs-2.0) -%if 0%{?suse_version} >= 1220 -BuildRequires: pkgconfig(gnutls) >= 3.0.20 -%endif -BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(sdl) >= 1.2.10 -%if 0%{?suse_version} >= 1140 -BuildRequires: pkgconfig(SDL_image) >= 1.2.10 -%endif -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 -%endif -%if 0%{?suse_version} >= 1230 && 0%{?suse_version} != 1315 -BuildRequires: pkgconfig(libchromaprint) >= 0.6.0 -%endif -%if 0%{?suse_version} >= 1140 -BuildRequires: pkgconfig(libdc1394-2) >= 2.1.0 -%endif +BuildRequires: gnome-vfs2-devel +BuildRequires: gtk2-devel +BuildRequires: libavc1394-devel >= 0.5.3 +BuildRequires: libcddb-devel >= 0.9.5 +BuildRequires: libcdio-devel >= 0.78.2 +BuildRequires: libdc1394-devel >= 2.1.0 BuildRequires: libgcrypt-devel -BuildRequires: libmatroska-devel -BuildRequires: pkgconfig(dvdnav) >= 4.9.0 -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: pkgconfig(libmtp) >= 1.0.0 -%endif -BuildRequires: libproxy-devel +BuildRequires: libidn-devel +BuildRequires: libjack-devel >= 1.9.7 +BuildRequires: libkate-devel >= 0.3.0 +BuildRequires: libmodplug-devel >= 0.8.4 +BuildRequires: libnotify-devel +BuildRequires: libogg-devel >= 1.0 +BuildRequires: libopus-devel >= 1.0.3 +BuildRequires: libqt4-devel >= 4.6.0 +BuildRequires: libraw1394 >= 2.0.1 +BuildRequires: librsvg-devel >= 2.9.0 +BuildRequires: libsamplerate-devel +BuildRequires: libshout-devel >= 2.1 +BuildRequires: libsmbclient-devel +BuildRequires: libssh2-devel +BuildRequires: libtheora-devel >= 1.0 BuildRequires: libtool -BuildRequires: libv4l-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: pkgconfig(libvncclient) >= 0.9.9 -%endif +BuildRequires: libudev-devel >= 142 +BuildRequires: libvorbis-devel >= 1.1 +BuildRequires: libxml2-devel >= 2.5 BuildRequires: lirc-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: live555-devel >= 2015.01.27 +BuildRequires: lua-devel >= 5.1 BuildRequires: pcre-devel -%if 0%{?suse_version} >= 1220 -BuildRequires: pkgconfig(libprojectM) >= 2.0.0 -%endif -BuildRequires: pulseaudio-devel +BuildRequires: schroedinger-devel >= 1.0.10 BuildRequires: slang-devel +BuildRequires: speex-devel >= 1.0.5 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 -BuildRequires: pkgconfig(libcdio) >= 0.78.2 -BuildRequires: pkgconfig(libiso9660) >= 0.72 -BuildRequires: pkgconfig(libvcdinfo) >= 0.7.22 +BuildRequires: xosd-devel +BuildRequires: xz +Requires: %{name}-noX = %{version}-%{release} +Requires: %{name}-qt = %{version}-%{release} +Conflicts: %{conflicts} +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%if 0%{?suse_version} > 1110 +BuildRequires: gdk-pixbuf-devel +BuildRequires: libv4l-devel +BuildRequires: pkgconfig(caca) >= 0.99.beta14 +BuildRequires: pkgconfig(speexdsp) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(zvbi-0.2) >= 0.2.28 %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: 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} +%if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 || 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 -BuildRequires: xz -# ncurses are not ready so far -%if %{?with_ncurses} -BuildRequires: ncurses-devel +%if 0%{?suse_version} > 1110 +%if 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} +BuildRequires: pkgconfig(SDL_image) >= 1.2.10 +BuildRequires: pkgconfig(libprojectM) >= 2.0.0 +BuildRequires: pkgconfig(libupnp) +BuildRequires: pkgconfig(opencv) > 2.0 +%endif +%endif +%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} +BuildRequires: libmatroska-devel +BuildRequires: pkgconfig(dvdnav) > 4.9.0 +BuildRequires: pkgconfig(dvdread) > 4.9.0 +BuildRequires: pkgconfig(libass) >= 0.9.8 +BuildRequires: pkgconfig(libgme) +BuildRequires: pkgconfig(libmtp) >= 1.0.0 +BuildRequires: pkgconfig(libva) +BuildRequires: pkgconfig(libva-x11) +BuildRequires: pkgconfig(taglib) >= 1.9 +%endif +%if 0%{?suse_version} > 1140 +BuildRequires: libdvbpsi-devel >= 1.0.0 +BuildRequires: pkgconfig(dbus-1) >= 1.6.0 +BuildRequires: pkgconfig(fluidsynth) >= 1.1.2 +BuildRequires: pkgconfig(freerdp) >= 1.0.1 +BuildRequires: pkgconfig(gnutls) >= 3.2.0 +BuildRequires: pkgconfig(libbluray) >= 0.3.0 +BuildRequires: pkgconfig(libchromaprint) >= 0.6.0 +BuildRequires: pkgconfig(libpulse) >= 1.0 +BuildRequires: pkgconfig(libvncclient) >= 0.9.9 +BuildRequires: pkgconfig(xcb-keysyms) >= 0.3.4 +BuildRequires: pkgconfig(xinerama) +BuildRequires: pkgconfig(xpm) +%endif +%if 0%{?suse_version} != 1315 +BuildRequires: libkde4-devel +%endif +%if 0%{?suse_version} >= 1320 +BuildRequires: pkgconfig(ncursesw) %endif # Those are dependencies which are NOT provided in openSUSE, mostly for legal reasons. %if 0%{?BUILD_ORIG} BuildRequires: faad2-devel -BuildRequires: liba52-devel BuildRequires: libfaac-devel -BuildRequires: libmad-devel BuildRequires: libxvidcore-devel -BuildRequires: pkgconfig(libavcodec) >= 53.34.0 +BuildRequires: pkgconfig(liba52) +BuildRequires: pkgconfig(libavcodec) >= 55.26.0 BuildRequires: pkgconfig(libavformat) >= 53.21.0 -BuildRequires: pkgconfig(libavutil) >= 51.22.0 +BuildRequires: pkgconfig(libavutil) >= 52.4.0 BuildRequires: pkgconfig(libdca) >= 0.0.5 BuildRequires: pkgconfig(libmpeg2) > 0.3.2 BuildRequires: pkgconfig(libpostproc) +BuildRequires: pkgconfig(mad) BuildRequires: pkgconfig(twolame) -BuildRequires: pkgconfig(vdpau) -BuildRequires: pkgconfig(x264) >= 0.86 +BuildRequires: pkgconfig(x264) >= 0.8.6 +BuildRequires: pkgconfig(x265) +%if 0%{?suse_version} > 1140 +BuildRequires: pkgconfig(vdpau) >= 0.6 +%endif %endif -Requires: %{name}-noX = %{version}-%{release} -Requires: %{name}-qt = %{version}-%{release} -Conflicts: %{conflicts} - %description -VLC media player is a highly portable multimedia player for various -audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, ...) -as well as DVDs, VCDs, and various streaming protocols. -It can also be used as a server to stream in unicast or multicast +VLC media player is a highly portable multimedia player for various +audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, ...) +as well as DVDs, VCDs, and various streaming protocols. +It can also be used as a server to stream in unicast or multicast in IPv4 or IPv6 on a high-bandwidth network. %package devel -Summary: VLC Development system -License: GPL-2.0+ and LGPL-2.1+ +Summary: Video Lan Client Development system Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -223,7 +193,6 @@ Those development headers are required if you plan on coding against VLC %package -n libvlc%{libvlc} Summary: Shared library libvlc -License: LGPL-2.1+ Group: System/Libraries %description -n libvlc%{libvlc} @@ -231,7 +200,6 @@ Shared library libvlc. To be installed by system dependencies %package -n libvlccore%{libvlccore} Summary: Shared library libvlc -License: LGPL-2.1+ Group: System/Libraries %description -n libvlccore%{libvlccore} @@ -239,18 +207,13 @@ Shared library libvlc. To be installed by system dependencies %package noX Summary: VLC: VideoLAN Client - without X dependencies -License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Multimedia/Video/Players Requires: libvlc%{libvlc} = %{version}-%{release} Requires: libvlccore%{libvlccore} = %{version}-%{release} -Conflicts: %{conflicts}-noX -Recommends: libdvdcss -# pulseaudio subpackage merge -Supplements: packageand(%{name}-noX:pulseaudio) -Provides: vlc-aout-pulse = %{version} -Obsoletes: vlc-aout-pulse < %{version} # lang subpackage -Recommends: vlc-noX-lang +Recommends: %{name}-noX-lang +Recommends: libdvdcss +Conflicts: %{conflicts}-noX %description noX This Package of VLC contains the bare requirements you need to install. @@ -260,15 +223,14 @@ suitable for server installations (Streaming Server for example) Should you decide to install the GUI modules, %{name}-noX will stay installed as a dependency. -%lang_package -n vlc-noX +%lang_package -n %{name}-noX %if 0%{?BUILD_ORIG} %package codecs Summary: VLC: VideoLAN Client - Codec extension -License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Multimedia/Video/Players -Requires: vlc-noX = %{version} -Supplements: vlc-noX +Requires: %{name}-noX = %{version} +Supplements: %{name}-noX %description codecs This Package enhances the functionality of the VLC VideoLAN Client with @@ -277,11 +239,9 @@ Codecs that are not available in a stock openSUSE distribution. %package qt Summary: VLC: VideoLAN Client - Qt interface -License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Multimedia/Video/Players -Supplements: packageand(%{name}-noX:libqt4) Requires: %{name}-noX = %{version}-%{release} -Recommends: %{name} +Supplements: packageand(%{name}-noX:libqt4) Conflicts: %{conflicts}-qt %description qt @@ -289,10 +249,9 @@ The all new Qt interface for the VLC VideoLAN Client. %package gnome Summary: VLC: VideoLAN Client - Gnome Access Modules -License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Multimedia/Video/Players -Supplements: packageand(%{name}-noX:gnome-vfs2) Requires: %{name}-noX = %{version}-%{release} +Supplements: packageand(%{name}-noX:gnome-vfs2) Conflicts: %{conflicts}-gnome %description gnome @@ -300,6 +259,8 @@ In order to integrate flawless into GNOME, there are some access modules for gnome-vfs2. %prep +echo '********* ENTERED PREP PHASE ********' +date %setup -q %patch1 -p1 %patch3 -p1 @@ -307,52 +268,85 @@ for gnome-vfs2. 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 %{S:1} '+%%H:%%M') -FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{S:1} '+%%b %%e %%Y') +FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{SOURCE1} '+%%H:%%M') +FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{SOURCE1} '+%%b %%e %%Y') sed -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" -i modules/gui/qt4/dialogs/help.cpp src/config/help.c 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) -%ifarch %{ix86} -export CFLAGS="%{optflags} -L%{_libdir}/live -msse -Wno-return-type $smbclient" -export CXXFLAGS="%{optflags} -L%{_libdir}/live -msse -Wno-return-type $smbclient" -%else -%ifarch x86_64 -export CFLAGS="%{optflags} -L%{_libdir}/live -msse2 -Wno-return-type $smbclient" -export CXXFLAGS="%{optflags} -L%{_libdir}/live -msse2 -Wno-return-type $smbclient" -%else -export CFLAGS="%{optflags} -L%{_libdir}/live -Wno-return-type $smbclient" -export CXXFLAGS="%{optflags} -L%{_libdir}/live -Wno-return-type $smbclient" -%endif +%if ! 0%{?BUILD_ORIG} +# don't build hevc-related modules even if probably overkill for legal purposes +sed -e "/hevc/d" -i modules/demux/Makefile.am modules/packetizer/Modules.am %endif +# no --disable-dvb switch unfortunately +%if 0%{?suse_version} <= 1140 +sed -e '/HAVE_LINUX_DVB/cAM_CONDITIONAL([HAVE_LINUX_DVB], [false])' -i configure.ac +%endif + +# disable module that won't build +%if 0%{?suse_version} == 1110 +sed -e '/deinterlace/d' -i modules/video_filter/Modules.am +%endif + +echo '********* ENDED PREP PHASE *********' +date + +%build +echo '********* BOOTSTRAPPING *********' +date +export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags}" +./bootstrap %configure \ - --disable-static \ --disable-dependency-tracking \ --enable-aa \ --enable-alsa \ +%if ! 0%{?BUILD_ORIG} + --disable-avcodec \ +%endif + --enable-dca \ +%if 0%{?suse_version} > 1140 --enable-dvbpsi \ +%else + --disable-dvbpsi \ +%endif +%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} --enable-dvdnav \ --enable-dvdread \ +%endif --enable-fast-install \ --enable-flac \ +%if 0%{?suse_version} > 1140 + --enable-freerdp \ +%endif --enable-freetype \ --enable-fribidi \ - --enable-glx \ - --enable-gme \ --enable-gnomevfs \ -%if 0%{?suse_version} >= 1220 +%if 0%{?suse_version} > 1140 --enable-gnutls \ %endif --enable-httpd \ --enable-jack \ +%if 0%{?suse_version} <= 1140 + --disable-jpeg \ +%endif --enable-kate \ +%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} --enable-libass \ +%endif --enable-libcddb \ - --enable-lirc \ - --enable-live555 \ -%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG} +%if 0%{?suse_version} > 1110 +%if 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} + --enable-opencv \ +%endif +%endif +%if 0%{?suse_version} <= 1140 + --disable-mmx \ + --disable-sse \ +%endif + --enable-sftp \ + --disable-svgdec \ +%if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} --enable-swscale \ %else --disable-swscale \ @@ -374,120 +368,110 @@ export CXXFLAGS="%{optflags} -L%{_libdir}/live -Wno-return-type $smbclient" --disable-a52 \ --disable-dca \ %endif + --enable-lirc \ + --enable-live555 \ --enable-lua \ --enable-mkv \ --enable-mod \ -%if %{?with_ncurses} - --enable-ncurses \ -%else - --disable-ncurses \ -%endif --enable-ogg \ --enable-optimizations \ - --enable-opus \ --disable-oss \ - --enable-png \ +%if 0%{?suse_version} > 1140 --enable-pulse \ +%endif --enable-realrtsp \ - --enable-smbclient \ --enable-sout \ --enable-speex \ +%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} --enable-taglib \ +%endif --enable-theora \ --enable-v4l2 \ -%if 0%{?suse_version} != 1315 --enable-vcd \ --enable-vcdx \ -%endif --enable-vorbis \ - --enable-waveout \ -%if 0%{?suse_version} >= 1140 +%if 0%{?suse_version} > 1110 --enable-xcb \ %else --disable-xcb \ %endif %if %{with opengles} --enable-gles2 \ - --enable-egl \ %endif - --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 +%if 0%{?suse_version} > 1140 && 0%{?BUILD_ORIG} + --enable-vdpau \ +%else + --disable-vdpau \ +%endif + --enable-xvideo \ + --with-default-font=%{_datadir}/fonts/truetype/FreeSerifBold.ttf \ + --with-default-monospace-font=%{_datadir}/fonts/truetype/FreeMono.ttf +echo '********* FINISHED CONFIGURE *********' +date +make %{?_smp_mflags} %install -%make_install +echo '********* ENTERED INSTALL PHASE *********' +date +make DESTDIR=%{buildroot} install %{?_smp_mflags} 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} +find %{buildroot} -type f -name "*.la" -delete -print +%suse_update_desktop_file vlc AudioVideo Audio Video Player +%fdupes %{buildroot}%{_datadir}/vlc +# remove duplicate file +rm %{buildroot}/%{_datadir}/vlc/lua/http/requests/README.txt +# add missing manfiles +for i in ?vlc; do + pushd %{buildroot}/%{_mandir}/man1 + ln -s vlc.1 $i.1 + popd +done # clean up some lang issues... -for lang in ach an cgg co ff kmr tet; do +for lang in ach an cgg co ff 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 - -%post -n libvlccore%{libvlccore} -p /sbin/ldconfig -%postun -n libvlccore%{libvlccore} -p /sbin/ldconfig - -%files +%files %defattr(-,root,root) %{_bindir}/svlc +%{_datadir}/applications/vlc.desktop +%{_datadir}/pixmaps/vlc.png %{_datadir}/icons/hicolor/*/apps/vlc* %dir %{_datadir}/kde4 %dir %{_datadir}/kde4/apps %{_datadir}/kde4/apps/solid +%exclude %{_libdir}/vlc/libcompat.a +%{_mandir}/man1/svlc* +%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/codec/liblibass_plugin.so -%if 0%{?suse_version} >= 1140 +%endif +%if 0%{?suse_version} > 1110 +%if 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/codec/libsdl_image_plugin.so %endif -%{_libdir}/vlc/plugins//notify/libnotify_plugin.so -%{_libdir}/vlc/plugins//video_filter/libremoteosd_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 +%if 0%{?suse_version} > 1110 %{_libdir}/vlc/plugins/video_splitter/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 %endif -%{_libdir}/vlc/plugins/video_output/libaa_plugin.so +%if 0%{?suse_version} > 1110 %{_libdir}/vlc/plugins/video_output/libegl_x11_plugin.so -%if 0%{?suse_version} >= 1220 -%{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so +%endif %{_libdir}/vlc/plugins/visualization/libglspectrum_plugin.so +%{_libdir}/vlc/plugins/video_output/libaa_plugin.so +%if 0%{?suse_version} > 1110 +%if 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} +%{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so +%endif %endif %files noX-lang -f vlc.lang @@ -496,18 +480,19 @@ done %files noX %defattr(-,root,root) %doc %{_datadir}/doc/vlc/ -%doc NEWS AUTHORS COPYING THANKS README +%doc NEWS AUTHORS COPYING THANKS README %{_bindir}/cvlc -%if %{?with_ncurses} +%if 0%{?suse_version} >= 1320 %{_bindir}/nvlc +%{_mandir}/man1/nvlc* %endif %{_bindir}/rvlc %{_bindir}/vlc %{_bindir}/vlc-wrapper -%{_datadir}/applications/vlc.desktop -%{_datadir}/pixmaps/vlc.png %{_datadir}/vlc/ -%{_mandir}/*/vlc* +%{_mandir}/man1/cvlc* +%{_mandir}/man1/rvlc* +%{_mandir}/man1/vlc* # Own the file.. but it's an auto-generated file, so ghost it. %ghost %{_libdir}/vlc/plugins/plugins.dat %dir %{_libdir}/vlc @@ -523,9 +508,6 @@ done %dir %{_libdir}/vlc/lua/playlist %dir %{_libdir}/vlc/lua/sd %dir %{_libdir}/vlc/plugins -%ifarch ppc ppc64 ppc64le ppc64p7 -%dir %{_libdir}/vlc/plugins/altivec -%endif %dir %{_libdir}/vlc/plugins/access %dir %{_libdir}/vlc/plugins/access_output %dir %{_libdir}/vlc/plugins/audio_filter @@ -551,6 +533,12 @@ done %dir %{_libdir}/vlc/plugins/video_splitter %dir %{_libdir}/vlc/plugins/visualization # Files explicitly listed... so we are in full control of what goes to -noX, -codec or the X-depending pkg. +%if 0%{?BUILD_ORIG} +%if 0%{?suse_version} > 1140 +%{_libdir}/vlc/libvlc_vdpau.so.0 +%{_libdir}/vlc/libvlc_vdpau.so.0.0.0 +%endif +%endif %{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/lua/extensions/VLSub.luac %{_libdir}/vlc/lua/intf/cli.luac @@ -604,44 +592,52 @@ done %{_libdir}/vlc/lua/sd/icecast.luac %{_libdir}/vlc/lua/sd/jamendo.luac %{_libdir}/vlc/lua/sd/metachannels.luac -%ifarch ppc ppc64 ppc64le ppc64p7 -%{_libdir}/vlc/plugins/altivec/libi420_yuy2_altivec_plugin.so -%endif %{_libdir}/vlc/plugins/access/libaccess_alsa_plugin.so -%{_libdir}/vlc/plugins/access/libattachment_plugin.so %{_libdir}/vlc/plugins/access/libaccess_bd_plugin.so %{_libdir}/vlc/plugins/access/libftp_plugin.so %{_libdir}/vlc/plugins/access/libhttp_plugin.so %{_libdir}/vlc/plugins/access/libimem_plugin.so %{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so %{_libdir}/vlc/plugins/access/libaccess_mms_plugin.so -%if 0%{?suse_version} >= 1140 +%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/access/libaccess_mtp_plugin.so %endif -%{_libdir}/vlc/plugins/access/librar_plugin.so %{_libdir}/vlc/plugins/access/libaccess_realrtsp_plugin.so +%{_libdir}/vlc/plugins/access/libattachment_plugin.so +%{_libdir}/vlc/plugins/access/libcdda_plugin.so +%{_libdir}/vlc/plugins/access/librar_plugin.so %{_libdir}/vlc/plugins/access/libsftp_plugin.so %{_libdir}/vlc/plugins/access/libsmb_plugin.so %{_libdir}/vlc/plugins/access/libtcp_plugin.so %{_libdir}/vlc/plugins/access/libudp_plugin.so %{_libdir}/vlc/plugins/access/libvdr_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 + +%if 0%{?suse_version} > 1140 +%{_libdir}/vlc/plugins/access/libdtv_plugin.so %{_libdir}/vlc/plugins/access/libdvb_plugin.so +%endif + +%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/access/libdvdnav_plugin.so %{_libdir}/vlc/plugins/access/libdvdread_plugin.so +%endif + %{_libdir}/vlc/plugins/access/libfilesystem_plugin.so %{_libdir}/vlc/plugins/access/libidummy_plugin.so + +%if 0%{?suse_version} > 1140 %{_libdir}/vlc/plugins/access/liblibbluray_plugin.so +%endif %{_libdir}/vlc/plugins/access/liblive555_plugin.so %{_libdir}/vlc/plugins/access/liblinsys_hdsdi_plugin.so +%if 0%{?suse_version} > 1110 %{_libdir}/vlc/plugins/access/liblinsys_sdi_plugin.so +%endif + +%if 0%{?suse_version} > 1140 %{_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 @@ -650,13 +646,12 @@ done %{_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 + +%if 0%{?suse_version} > 1140 %{_libdir}/vlc/plugins/access/libvnc_plugin.so %endif -%if 0%{?suse_version} >= 1140 +%if 0%{?suse_version} > 1110 %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so %endif %{_libdir}/vlc/plugins/access/libzip_plugin.so @@ -696,7 +691,10 @@ done %{_libdir}/vlc/plugins/audio_output/libamem_plugin.so %{_libdir}/vlc/plugins/audio_output/libafile_plugin.so %{_libdir}/vlc/plugins/audio_output/libjack_plugin.so + +%if 0%{?suse_version} > 1140 %{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so +%endif %{_libdir}/vlc/plugins/codec/liba52_plugin.so %{_libdir}/vlc/plugins/codec/libadpcm_plugin.so %{_libdir}/vlc/plugins/codec/libaes3_plugin.so @@ -705,15 +703,20 @@ done %{_libdir}/vlc/plugins/codec/libcdg_plugin.so %{_libdir}/vlc/plugins/codec/libcvdsub_plugin.so %{_libdir}/vlc/plugins/codec/libddummy_plugin.so +%{_libdir}/vlc/plugins/demux/libdiracsys_plugin.so %{_libdir}/vlc/plugins/codec/libdts_plugin.so %{_libdir}/vlc/plugins/codec/libdvbsub_plugin.so %{_libdir}/vlc/plugins/codec/libedummy_plugin.so %{_libdir}/vlc/plugins/codec/libflac_plugin.so -%if %{with fluidsynth} + +%if 0%{?suse_version} > 1140 %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so +%if 0%{?BUILD_ORIG} +%{_libdir}/vlc/plugins/codec/libhwdummy_plugin.so +%endif +%{_libdir}/vlc/plugins/codec/libjpeg_plugin.so %endif %{_libdir}/vlc/plugins/codec/libg711_plugin.so -%{_libdir}/vlc/plugins/codec/libjpeg_plugin.so %{_libdir}/vlc/plugins/codec/libkate_plugin.so %{_libdir}/vlc/plugins/codec/liblpcm_plugin.so %{_libdir}/vlc/plugins/codec/libmpeg_audio_plugin.so @@ -729,27 +732,29 @@ done %{_libdir}/vlc/plugins/codec/libsubstx3g_plugin.so %{_libdir}/vlc/plugins/codec/libsubsusf_plugin.so %{_libdir}/vlc/plugins/codec/libsvcdsub_plugin.so -%if 0%{?suse_version} > 1320 -%{_libdir}/vlc/plugins/codec/libsvgdec_plugin.so -%endif %{_libdir}/vlc/plugins/codec/libt140_plugin.so %{_libdir}/vlc/plugins/codec/libtelx_plugin.so %{_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 +%if 0%{?suse_version} > 1110 %{_libdir}/vlc/plugins/codec/libxwd_plugin.so -%endif %{_libdir}/vlc/plugins/codec/libzvbi_plugin.so +%endif + +%if 0%{?suse_version} > 1140 %{_libdir}/vlc/plugins/control/libdbus_plugin.so +%endif %{_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} > 1110 +%{_libdir}/vlc/plugins/control/libxcb_hotkeys_plugin.so +%endif %{_libdir}/vlc/plugins/control/liblirc_plugin.so %{_libdir}/vlc/plugins/control/libmotion_plugin.so %{_libdir}/vlc/plugins/control/libnetsync_plugin.so %{_libdir}/vlc/plugins/control/liboldrc_plugin.so -%{_libdir}/vlc/plugins/control/libxcb_hotkeys_plugin.so %{_libdir}/vlc/plugins/demux/libaiff_plugin.so %{_libdir}/vlc/plugins/demux/libasf_plugin.so %{_libdir}/vlc/plugins/demux/libau_plugin.so @@ -758,15 +763,17 @@ done %{_libdir}/vlc/plugins/demux/libdemux_cdg_plugin.so %{_libdir}/vlc/plugins/demux/libdemux_stl_plugin.so %{_libdir}/vlc/plugins/demux/libdemuxdump_plugin.so -%{_libdir}/vlc/plugins/demux/libdiracsys_plugin.so %{_libdir}/vlc/plugins/demux/libes_plugin.so -%{_libdir}/vlc/plugins/demux/libhevc_plugin.so %{_libdir}/vlc/plugins/demux/libflacsys_plugin.so +%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/demux/libgme_plugin.so +%endif %{_libdir}/vlc/plugins/demux/libh264_plugin.so %{_libdir}/vlc/plugins/demux/libimage_plugin.so %{_libdir}/vlc/plugins/demux/libmjpeg_plugin.so +%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/demux/libmkv_plugin.so +%endif %{_libdir}/vlc/plugins/demux/libmod_plugin.so %{_libdir}/vlc/plugins/demux/libmp4_plugin.so %{_libdir}/vlc/plugins/demux/libmpgv_plugin.so @@ -783,7 +790,10 @@ done %{_libdir}/vlc/plugins/demux/libreal_plugin.so %{_libdir}/vlc/plugins/demux/libsmf_plugin.so %{_libdir}/vlc/plugins/demux/libsubtitle_plugin.so + +%if 0%{?suse_version} > 1140 %{_libdir}/vlc/plugins/demux/libts_plugin.so +%endif %{_libdir}/vlc/plugins/demux/libtta_plugin.so %{_libdir}/vlc/plugins/demux/libty_plugin.so %{_libdir}/vlc/plugins/demux/libvc1_plugin.so @@ -793,23 +803,31 @@ done %{_libdir}/vlc/plugins/demux/libxa_plugin.so %{_libdir}/vlc/plugins/gui/libskins2_plugin.so %{_libdir}/vlc/plugins/lua/liblua_plugin.so + +%if 0%{?suse_version} >= 1320 +%{_libdir}/vlc/plugins/gui/libncurses_plugin.so +%endif %{_libdir}/vlc/plugins/meta_engine/libfolder_plugin.so +%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/meta_engine/libtaglib_plugin.so +%endif %{_libdir}/vlc/plugins/misc/libaddonsfsstorage_plugin.so %{_libdir}/vlc/plugins/misc/libaddonsvorepository_plugin.so %{_libdir}/vlc/plugins/misc/libaudioscrobbler_plugin.so + +%if 0%{?suse_version} > 1140 %{_libdir}/vlc/plugins/misc/libdbus_screensaver_plugin.so -%{_libdir}/vlc/plugins/misc/libexport_plugin.so -%if 0%{?suse_version} >= 1230 && 0%{?suse_version} != 1315 -%{_libdir}/vlc/plugins/misc/libfingerprinter_plugin.so %endif -%if 0%{?suse_version} >= 1220 +%{_libdir}/vlc/plugins/misc/libexport_plugin.so +%{_libdir}/vlc/plugins/misc/libfingerprinter_plugin.so + +%if 0%{?suse_version} > 1140 %{_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 +%if 0%{?suse_version} > 1110 %{_libdir}/vlc/plugins/misc/libxdg_screensaver_plugin.so %endif %{_libdir}/vlc/plugins/misc/libxml_plugin.so @@ -820,13 +838,18 @@ done %{_libdir}/vlc/plugins/mux/libmux_mpjpeg_plugin.so %{_libdir}/vlc/plugins/mux/libmux_ogg_plugin.so %{_libdir}/vlc/plugins/mux/libmux_ps_plugin.so + +%if 0%{?suse_version} > 1140 %{_libdir}/vlc/plugins/mux/libmux_ts_plugin.so +%endif %{_libdir}/vlc/plugins/mux/libmux_wav_plugin.so +%if 0%{?BUILD_ORIG} +%{_libdir}/vlc/plugins/packetizer/libpacketizer_avparser_plugin.so +%endif %{_libdir}/vlc/plugins/packetizer/libpacketizer_copy_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_dirac_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_flac_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_h264_plugin.so -%{_libdir}/vlc/plugins/packetizer/libpacketizer_hevc_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_mlp_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_mpeg4audio_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_mpeg4video_plugin.so @@ -834,15 +857,22 @@ done %{_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 +%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/services_discovery/libmtp_plugin.so %endif %{_libdir}/vlc/plugins/services_discovery/libpodcast_plugin.so + +%if 0%{?suse_version} > 1140 %{_libdir}/vlc/plugins/services_discovery/libpulselist_plugin.so +%endif %{_libdir}/vlc/plugins/services_discovery/libsap_plugin.so %{_libdir}/vlc/plugins/services_discovery/libudev_plugin.so +%if 0%{?suse_version} > 1110 +%if 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/services_discovery/libupnp_plugin.so -%if 0%{?suse_version} >= 1140 +%endif +%endif +%if 0%{?suse_version} > 1110 %{_libdir}/vlc/plugins/services_discovery/libxcb_apps_plugin.so %endif %{_libdir}/vlc/plugins/stream_filter/libdecomp_plugin.so @@ -852,7 +882,8 @@ done %{_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 && 0%{?suse_version} != 1315 + +%if 0%{?suse_version} > 1140 %{_libdir}/vlc/plugins/stream_out/libstream_out_chromaprint_plugin.so %endif %{_libdir}/vlc/plugins/stream_out/libstream_out_delay_plugin.so @@ -876,15 +907,20 @@ done %{_libdir}/vlc/plugins/text_renderer/libtdummy_plugin.so %{_libdir}/vlc/plugins/video_chroma/libgrey_yuv_plugin.so %{_libdir}/vlc/plugins/video_chroma/libi420_rgb_plugin.so -%{_libdir}/vlc/plugins/video_chroma/libi420_rgb_mmx_plugin.so -%{_libdir}/vlc/plugins/video_chroma/libi420_rgb_sse2_plugin.so %{_libdir}/vlc/plugins/video_chroma/libi420_yuy2_plugin.so -%{_libdir}/vlc/plugins/video_chroma/libi420_yuy2_mmx_plugin.so -%{_libdir}/vlc/plugins/video_chroma/libi420_yuy2_sse2_plugin.so %{_libdir}/vlc/plugins/video_chroma/libi422_i420_plugin.so %{_libdir}/vlc/plugins/video_chroma/libi422_yuy2_plugin.so + +%ifarch %ix86 x86_64 +%if 0%{?suse_version} > 1140 +%{_libdir}/vlc/plugins/video_chroma/libi420_rgb_mmx_plugin.so +%{_libdir}/vlc/plugins/video_chroma/libi420_rgb_sse2_plugin.so +%{_libdir}/vlc/plugins/video_chroma/libi420_yuy2_mmx_plugin.so +%{_libdir}/vlc/plugins/video_chroma/libi420_yuy2_sse2_plugin.so %{_libdir}/vlc/plugins/video_chroma/libi422_yuy2_mmx_plugin.so %{_libdir}/vlc/plugins/video_chroma/libi422_yuy2_sse2_plugin.so +%endif +%endif %{_libdir}/vlc/plugins/video_chroma/librv32_plugin.so %{_libdir}/vlc/plugins/video_chroma/libyuy2_i420_plugin.so %{_libdir}/vlc/plugins/video_chroma/libyuy2_i422_plugin.so @@ -903,7 +939,9 @@ done %{_libdir}/vlc/plugins/video_splitter/libclone_plugin.so %{_libdir}/vlc/plugins/video_filter/libcolorthres_plugin.so %{_libdir}/vlc/plugins/video_filter/libcroppadd_plugin.so +%if 0%{?suse_version} > 1110 %{_libdir}/vlc/plugins/video_filter/libdeinterlace_plugin.so +%endif %{_libdir}/vlc/plugins/video_filter/libdynamicoverlay_plugin.so %{_libdir}/vlc/plugins/video_filter/liberase_plugin.so %{_libdir}/vlc/plugins/video_filter/libextract_plugin.so @@ -915,17 +953,19 @@ done %{_libdir}/vlc/plugins/video_filter/libhqdn3d_plugin.so %{_libdir}/vlc/plugins/video_filter/libinvert_plugin.so %{_libdir}/vlc/plugins/video_filter/liblogo_plugin.so +%{_libdir}/vlc/plugins/video_filter/liboldmovie_plugin.so %{_libdir}/vlc/plugins/video_filter/libmagnify_plugin.so %{_libdir}/vlc/plugins/video_filter/libmarq_plugin.so %{_libdir}/vlc/plugins/video_filter/libmirror_plugin.so %{_libdir}/vlc/plugins/video_filter/libmosaic_plugin.so %{_libdir}/vlc/plugins/video_filter/libmotionblur_plugin.so %{_libdir}/vlc/plugins/video_filter/libmotiondetect_plugin.so -%{_libdir}/vlc/plugins/video_filter/liboldmovie_plugin.so -%if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 +%if 0%{?suse_version} > 1110 +%if 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so %endif +%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 @@ -937,24 +977,26 @@ done %{_libdir}/vlc/plugins/video_filter/libsepia_plugin.so %{_libdir}/vlc/plugins/video_filter/libsharpen_plugin.so %{_libdir}/vlc/plugins/video_filter/libsubsdelay_plugin.so -%{_libdir}/vlc/plugins/video_filter/libvhs_plugin.so -%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG} +%if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/video_chroma/libswscale_plugin.so %endif %{_libdir}/vlc/plugins/video_filter/libtransform_plugin.so +%{_libdir}/vlc/plugins/video_filter/libvhs_plugin.so %{_libdir}/vlc/plugins/video_splitter/libwall_plugin.so %{_libdir}/vlc/plugins/video_filter/libwave_plugin.so %{_libdir}/vlc/plugins/video_filter/libyuvp_plugin.so +%if 0%{?suse_version} > 1110 %{_libdir}/vlc/plugins/video_output/libcaca_plugin.so +%endif %{_libdir}/vlc/plugins/video_output/libfb_plugin.so -%if 0%{?suse_version} >= 1140 %{_libdir}/vlc/plugins/video_output/libgl_plugin.so +%if 0%{?suse_version} > 1110 %{_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 +%if 0%{?suse_version} > 1110 %{_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 @@ -965,7 +1007,7 @@ done %if 0%{?BUILD_ORIG} %files codecs %defattr(-,root,root) -%{_libdir}/vlc/plugins/access/libaccess_avio_plugin.so +%{_libdir}/vlc/plugins/access/libavio_plugin.so %{_libdir}/vlc/plugins/audio_filter/liba52tofloat32_plugin.so %{_libdir}/vlc/plugins/audio_filter/libdtstofloat32_plugin.so %{_libdir}/vlc/plugins/audio_filter/libmpgatofixed32_plugin.so @@ -974,9 +1016,23 @@ done %{_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/libvdpau_plugin.so -%{_libdir}/vlc/plugins/codec/libvaapi_plugin.so +%{_libdir}/vlc/plugins/codec/libx265_plugin.so +%if 0%{?suse_version} > 1140 +%{_libdir}/vlc/plugins/codec/libvaapi_drm_plugin.so +%endif +%{_libdir}/vlc/plugins/codec/libvaapi_x11_plugin.so %{_libdir}/vlc/plugins/demux/libavformat_plugin.so +%{_libdir}/vlc/plugins/demux/libhevc_plugin.so +%{_libdir}/vlc/plugins/packetizer/libpacketizer_hevc_plugin.so +%if 0%{?suse_version} > 1140 +%dir %{_libdir}/vlc/plugins/vdpau +%{_libdir}/vlc/plugins/vdpau/libvdpau_adjust_plugin.so +%{_libdir}/vlc/plugins/vdpau/libvdpau_avcodec_plugin.so +%{_libdir}/vlc/plugins/vdpau/libvdpau_chroma_plugin.so +%{_libdir}/vlc/plugins/vdpau/libvdpau_deinterlace_plugin.so +%{_libdir}/vlc/plugins/vdpau/libvdpau_display_plugin.so +%{_libdir}/vlc/plugins/vdpau/libvdpau_sharpen_plugin.so +%endif %{_libdir}/vlc/plugins/video_filter/libpostproc_plugin.so %endif @@ -991,6 +1047,7 @@ done %files qt %defattr(-,root,root) %{_bindir}/qvlc +%{_mandir}/man1/qvlc* %{_libdir}/vlc/plugins/gui/libqt4_plugin.so %files gnome @@ -1004,5 +1061,23 @@ done %{_libdir}/libvlc.so %{_libdir}/pkgconfig/libvlc.pc %{_libdir}/pkgconfig/vlc-plugin.pc +%{_libdir}/vlc/libcompat.a +%if 0%{?BUILD_ORIG} +%if 0%{?suse_version} > 1140 +%{_libdir}/vlc/libvlc_vdpau.so +%endif +%endif + +%post -n %{name}-noX -p /sbin/ldconfig + +%postun -n %{name}-noX -p /sbin/ldconfig + +%post -n libvlc%{libvlc} -p /sbin/ldconfig + +%postun -n libvlc%{libvlc} -p /sbin/ldconfig + +%post -n libvlccore%{libvlccore} -p /sbin/ldconfig + +%postun -n libvlccore%{libvlccore} -p /sbin/ldconfig %changelog From fca987f5fb78b8b00804797089f662d0624d3972d96f59bac4c2b410591f4251 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 2 Mar 2015 14:32:33 +0000 Subject: [PATCH 04/18] tweaks OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=99 --- vlc-rpmlintrc | 5 +---- vlc.spec | 21 +++++++++------------ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/vlc-rpmlintrc b/vlc-rpmlintrc index a0b77ff..2fc0db0 100644 --- a/vlc-rpmlintrc +++ b/vlc-rpmlintrc @@ -1,5 +1,5 @@ # according to the developers this is a false positive -addFilter("libvlccore8.* shared-lib-calls-exit") +addFilter("libvlccore.* shared-lib-calls-exit") # there's a good reason for packaging vlc and vlc.desktop separately addFilter("desktopfile-without-binary") @@ -7,6 +7,3 @@ addFilter("desktopfile-without-binary") # plugins.dat is created on startup if necessary addFilter("vlc-noX.* ghost-files-without-postin") -# these are false positives -addFilter("(libvlccore8|vlc-qt).* file-contains-date-and-time") - diff --git a/vlc.spec b/vlc.spec index 5d25158..50bb5d4 100644 --- a/vlc.spec +++ b/vlc.spec @@ -434,6 +434,15 @@ for lang in ach an cgg co ff tet; do done %find_lang vlc +%post -n %{name}-noX -p /sbin/ldconfig +%postun -n %{name}-noX -p /sbin/ldconfig + +%post -n libvlc%{libvlc} -p /sbin/ldconfig +%postun -n libvlc%{libvlc} -p /sbin/ldconfig + +%post -n libvlccore%{libvlccore} -p /sbin/ldconfig +%postun -n libvlccore%{libvlccore} -p /sbin/ldconfig + %files %defattr(-,root,root) %{_bindir}/svlc @@ -1068,16 +1077,4 @@ done %endif %endif -%post -n %{name}-noX -p /sbin/ldconfig - -%postun -n %{name}-noX -p /sbin/ldconfig - -%post -n libvlc%{libvlc} -p /sbin/ldconfig - -%postun -n libvlc%{libvlc} -p /sbin/ldconfig - -%post -n libvlccore%{libvlccore} -p /sbin/ldconfig - -%postun -n libvlccore%{libvlccore} -p /sbin/ldconfig - %changelog From 1d3688d1881f3f578833e9ea9401373b7942c95e88be5721371d0f060f601ce4 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 2 Mar 2015 14:34:41 +0000 Subject: [PATCH 05/18] fixup OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=100 --- vlc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 50bb5d4..2004204 100644 --- a/vlc.spec +++ b/vlc.spec @@ -34,7 +34,7 @@ Summary: Video Lan Client multimedia player License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Multimedia/Video/Players Url: http://www.videolan.org -Source: http://download.videolan.org/%{name}%%{version}/%{name}-%{version}.tar.xz +Source: http://download.videolan.org/%{name}/%{version}/%{name}-%{version}.tar.xz # Add vlc.changes as source, so we can reproducibly extract the date from it during build Source1: %{name}.changes Source2: %{name}-rpmlintrc From 8b6fb96a5faa6b6164f55b20d7e1f5ad919871bf2d25809b64c26b1950eb8869 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 2 Mar 2015 14:37:41 +0000 Subject: [PATCH 06/18] fix OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=101 --- vlc.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vlc.spec b/vlc.spec index 2004204..495d499 100644 --- a/vlc.spec +++ b/vlc.spec @@ -160,17 +160,20 @@ BuildRequires: pkgconfig(ncursesw) BuildRequires: faad2-devel BuildRequires: libfaac-devel BuildRequires: libxvidcore-devel -BuildRequires: pkgconfig(liba52) +# Disabled for now - VideoLAN repo needs to catch up +#BuildRequires: pkgconfig(liba52) BuildRequires: pkgconfig(libavcodec) >= 55.26.0 BuildRequires: pkgconfig(libavformat) >= 53.21.0 BuildRequires: pkgconfig(libavutil) >= 52.4.0 BuildRequires: pkgconfig(libdca) >= 0.0.5 BuildRequires: pkgconfig(libmpeg2) > 0.3.2 BuildRequires: pkgconfig(libpostproc) -BuildRequires: pkgconfig(mad) +# Disabled for now - VideoLAN repo needs to catch up +#BuildRequires: pkgconfig(mad) BuildRequires: pkgconfig(twolame) BuildRequires: pkgconfig(x264) >= 0.8.6 -BuildRequires: pkgconfig(x265) +# Disabled for now - VideoLAN repo needs to catch up +#BuildRequires: pkgconfig(x265) %if 0%{?suse_version} > 1140 BuildRequires: pkgconfig(vdpau) >= 0.6 %endif From 717665b4e8e8b271a1b3be8b5cacf86adea98c23fa748a5873364ab5cfe7a0d2 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 2 Mar 2015 14:48:07 +0000 Subject: [PATCH 07/18] one more OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=102 --- vlc.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/vlc.spec b/vlc.spec index 495d499..681d8ce 100644 --- a/vlc.spec +++ b/vlc.spec @@ -117,7 +117,7 @@ BuildRequires: pkgconfig(xproto) BuildRequires: pkgconfig(libswscale) %endif %if 0%{?suse_version} > 1110 -%if 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} +%if 0%{?suse_version} != 1315 BuildRequires: pkgconfig(SDL_image) >= 1.2.10 BuildRequires: pkgconfig(libprojectM) >= 2.0.0 BuildRequires: pkgconfig(libupnp) @@ -138,16 +138,18 @@ BuildRequires: pkgconfig(taglib) >= 1.9 %if 0%{?suse_version} > 1140 BuildRequires: libdvbpsi-devel >= 1.0.0 BuildRequires: pkgconfig(dbus-1) >= 1.6.0 -BuildRequires: pkgconfig(fluidsynth) >= 1.1.2 BuildRequires: pkgconfig(freerdp) >= 1.0.1 BuildRequires: pkgconfig(gnutls) >= 3.2.0 BuildRequires: pkgconfig(libbluray) >= 0.3.0 -BuildRequires: pkgconfig(libchromaprint) >= 0.6.0 BuildRequires: pkgconfig(libpulse) >= 1.0 BuildRequires: pkgconfig(libvncclient) >= 0.9.9 BuildRequires: pkgconfig(xcb-keysyms) >= 0.3.4 BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xpm) +%if 0%{?suse_version} != 1315 +BuildRequires: pkgconfig(fluidsynth) >= 1.1.2 +BuildRequires: pkgconfig(libchromaprint) >= 0.6.0 +%endif %endif %if 0%{?suse_version} != 1315 BuildRequires: libkde4-devel From 1ac0b7b6efff35688ec787f04a84ab3a3360b41931aab1e5c569cf369717e715 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 2 Mar 2015 15:07:30 +0000 Subject: [PATCH 08/18] fix OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=103 --- vlc.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 681d8ce..069682d 100644 --- a/vlc.spec +++ b/vlc.spec @@ -724,7 +724,9 @@ done %{_libdir}/vlc/plugins/codec/libflac_plugin.so %if 0%{?suse_version} > 1140 +%if 0%{?suse_version} != 1315 %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so +%endif %if 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/codec/libhwdummy_plugin.so %endif @@ -897,7 +899,7 @@ done %{_libdir}/vlc/plugins/stream_out/libstream_out_autodel_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_bridge_plugin.so -%if 0%{?suse_version} > 1140 +%if 0%{?suse_version} > 1140 && 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 From 1170c372964599d2b7d8954547e74abbfd7988ccf1a9667aae061b9b34112a7d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 2 Mar 2015 15:53:43 +0000 Subject: [PATCH 09/18] mad does not come with a .pc file OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=104 --- vlc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 069682d..55a0d1b 100644 --- a/vlc.spec +++ b/vlc.spec @@ -171,7 +171,7 @@ BuildRequires: pkgconfig(libdca) >= 0.0.5 BuildRequires: pkgconfig(libmpeg2) > 0.3.2 BuildRequires: pkgconfig(libpostproc) # Disabled for now - VideoLAN repo needs to catch up -#BuildRequires: pkgconfig(mad) +BuildRequires: libmad-devel BuildRequires: pkgconfig(twolame) BuildRequires: pkgconfig(x264) >= 0.8.6 # Disabled for now - VideoLAN repo needs to catch up From 1a783040d65e9ad33440df790da8e7abbbd6660aa990ec11939f9c909387af1e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 2 Mar 2015 16:41:26 +0000 Subject: [PATCH 10/18] a52 does also not have a .pc file OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=105 --- vlc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 55a0d1b..712d48a 100644 --- a/vlc.spec +++ b/vlc.spec @@ -163,7 +163,7 @@ BuildRequires: faad2-devel BuildRequires: libfaac-devel BuildRequires: libxvidcore-devel # Disabled for now - VideoLAN repo needs to catch up -#BuildRequires: pkgconfig(liba52) +BuildRequires: liba52-devel BuildRequires: pkgconfig(libavcodec) >= 55.26.0 BuildRequires: pkgconfig(libavformat) >= 53.21.0 BuildRequires: pkgconfig(libavutil) >= 52.4.0 From 53b86ce4e0c2f09b335944238ff119c8132e334de3302b12eb7878a339099d83 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 2 Mar 2015 19:21:40 +0000 Subject: [PATCH 11/18] x265 to be added in the future - deps needed OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=106 --- vlc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 712d48a..b8185db 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1032,7 +1032,7 @@ done %{_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/libx265_plugin.so +#{_libdir}/vlc/plugins/codec/libx265_plugin.so %if 0%{?suse_version} > 1140 %{_libdir}/vlc/plugins/codec/libvaapi_drm_plugin.so %endif From 9ac5fcb19ba7eadf4ebd9e12edcc336810346ad730b16fa3c53b71ce7422bfd6 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 2 Mar 2015 19:27:32 +0000 Subject: [PATCH 12/18] fixup OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=107 --- vlc-2.1.5-fix-skins2-default-skin-creation.patch | 13 ------------- vlc.spec | 1 - 2 files changed, 14 deletions(-) diff --git a/vlc-2.1.5-fix-skins2-default-skin-creation.patch b/vlc-2.1.5-fix-skins2-default-skin-creation.patch index cd88f32..dd20b28 100644 --- a/vlc-2.1.5-fix-skins2-default-skin-creation.patch +++ b/vlc-2.1.5-fix-skins2-default-skin-creation.patch @@ -5,19 +5,6 @@ New tar defaults create PAX archives which have two problems: * 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 diff --git a/vlc.spec b/vlc.spec index b8185db..1f249f6 100644 --- a/vlc.spec +++ b/vlc.spec @@ -45,7 +45,6 @@ BuildRequires: Mesa-devel BuildRequires: SDL-devel >= 1.2.10 BuildRequires: aalib-devel BuildRequires: alsa-devel >= 1.0.24 -BuildRequires: automake >= 1.11 BuildRequires: avahi-devel >= 0.6 BuildRequires: dirac-devel BuildRequires: fdupes From e456a22a0d2b8db71755ff36f6dd9b3ab4436efe1b94b5bffc079f6bd5691ef7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 2 Mar 2015 19:40:21 +0000 Subject: [PATCH 13/18] fix OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=108 --- vlc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index 1f249f6..dc6faf1 100644 --- a/vlc.spec +++ b/vlc.spec @@ -300,7 +300,7 @@ echo '********* BOOTSTRAPPING *********' date export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" -./bootstrap +#/bootstrap %configure \ --disable-dependency-tracking \ --enable-aa \ From 5f45184652f76356e91edf7240e79ce501450bd2d0e2b43c564fd0c5490c03b9 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 2 Mar 2015 20:07:23 +0000 Subject: [PATCH 14/18] Will have to address SLE11 in a better way OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=109 --- vlc.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index dc6faf1..b8185db 100644 --- a/vlc.spec +++ b/vlc.spec @@ -45,6 +45,7 @@ BuildRequires: Mesa-devel BuildRequires: SDL-devel >= 1.2.10 BuildRequires: aalib-devel BuildRequires: alsa-devel >= 1.0.24 +BuildRequires: automake >= 1.11 BuildRequires: avahi-devel >= 0.6 BuildRequires: dirac-devel BuildRequires: fdupes @@ -300,7 +301,7 @@ echo '********* BOOTSTRAPPING *********' date export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" -#/bootstrap +./bootstrap %configure \ --disable-dependency-tracking \ --enable-aa \ From 4df09026ce0007caf67e38a5c68d43765fa5a7ea5abdfed6fac2bc777b752f0a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 4 Mar 2015 10:23:47 +0000 Subject: [PATCH 15/18] Accepting request 288829 from home:alois:branches:multimedia:libs Fixes SLE11 in a more acceptable way. Fixes packman build. I hope it doesn't mess up videolan because I have no way of testing it:/ OBS-URL: https://build.opensuse.org/request/show/288829 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=110 --- vlc-2.2.0-fix_deinterlace_mmx.patch | 119 ++++++++++++++++++++++++++++ vlc.changes | 10 +++ vlc.spec | 79 +++++++++++------- 3 files changed, 181 insertions(+), 27 deletions(-) create mode 100644 vlc-2.2.0-fix_deinterlace_mmx.patch diff --git a/vlc-2.2.0-fix_deinterlace_mmx.patch b/vlc-2.2.0-fix_deinterlace_mmx.patch new file mode 100644 index 0000000..587a549 --- /dev/null +++ b/vlc-2.2.0-fix_deinterlace_mmx.patch @@ -0,0 +1,119 @@ +--- modules/video_filter/deinterlace/merge.c.orig 2015-03-04 07:55:02.021482260 +0100 ++++ modules/video_filter/deinterlace/merge.c 2015-03-04 07:56:33.975885612 +0100 +@@ -68,116 +68,6 @@ + *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1; + } + +-#if defined(CAN_COMPILE_MMXEXT) +-VLC_MMX +-void MergeMMXEXT( void *_p_dest, const void *_p_s1, const void *_p_s2, +- size_t i_bytes ) +-{ +- uint8_t *p_dest = _p_dest; +- const uint8_t *p_s1 = _p_s1; +- const uint8_t *p_s2 = _p_s2; +- +- for( ; i_bytes >= 8; i_bytes -= 8 ) +- { +- __asm__ __volatile__( "movq %2,%%mm1;" +- "pavgb %1, %%mm1;" +- "movq %%mm1, %0" :"=m" (*p_dest): +- "m" (*p_s1), +- "m" (*p_s2) : "mm1" ); +- p_dest += 8; +- p_s1 += 8; +- p_s2 += 8; +- } +- +- for( ; i_bytes > 0; i_bytes-- ) +- *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1; +-} +-#endif +- +-#if defined(CAN_COMPILE_3DNOW) +-VLC_MMX +-void Merge3DNow( void *_p_dest, const void *_p_s1, const void *_p_s2, +- size_t i_bytes ) +-{ +- uint8_t *p_dest = _p_dest; +- const uint8_t *p_s1 = _p_s1; +- const uint8_t *p_s2 = _p_s2; +- +- for( ; i_bytes >= 8; i_bytes -= 8 ) +- { +- __asm__ __volatile__( "movq %2,%%mm1;" +- "pavgusb %1, %%mm1;" +- "movq %%mm1, %0" :"=m" (*p_dest): +- "m" (*p_s1), +- "m" (*p_s2) : "mm1" ); +- p_dest += 8; +- p_s1 += 8; +- p_s2 += 8; +- } +- +- for( ; i_bytes > 0; i_bytes-- ) +- *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1; +-} +-#endif +- +-#if defined(CAN_COMPILE_SSE) +-VLC_SSE +-void Merge8BitSSE2( void *_p_dest, const void *_p_s1, const void *_p_s2, +- size_t i_bytes ) +-{ +- uint8_t *p_dest = _p_dest; +- const uint8_t *p_s1 = _p_s1; +- const uint8_t *p_s2 = _p_s2; +- +- for( ; i_bytes > 0 && ((uintptr_t)p_s1 & 15); i_bytes-- ) +- *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1; +- +- for( ; i_bytes >= 16; i_bytes -= 16 ) +- { +- __asm__ __volatile__( "movdqu %2,%%xmm1;" +- "pavgb %1, %%xmm1;" +- "movdqu %%xmm1, %0" :"=m" (*p_dest): +- "m" (*p_s1), +- "m" (*p_s2) : "xmm1" ); +- p_dest += 16; +- p_s1 += 16; +- p_s2 += 16; +- } +- +- for( ; i_bytes > 0; i_bytes-- ) +- *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1; +-} +- +-VLC_SSE +-void Merge16BitSSE2( void *_p_dest, const void *_p_s1, const void *_p_s2, +- size_t i_bytes ) +-{ +- uint16_t *p_dest = _p_dest; +- const uint16_t *p_s1 = _p_s1; +- const uint16_t *p_s2 = _p_s2; +- +- size_t i_words = i_bytes / 2; +- for( ; i_words > 0 && ((uintptr_t)p_s1 & 15); i_words-- ) +- *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1; +- +- for( ; i_words >= 8; i_words -= 8 ) +- { +- __asm__ __volatile__( "movdqu %2,%%xmm1;" +- "pavgw %1, %%xmm1;" +- "movdqu %%xmm1, %0" :"=m" (*p_dest): +- "m" (*p_s1), +- "m" (*p_s2) : "xmm1" ); +- p_dest += 8; +- p_s1 += 8; +- p_s2 += 8; +- } +- +- for( ; i_words > 0; i_words-- ) +- *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1; +-} +- +-#endif +- + #ifdef CAN_COMPILE_C_ALTIVEC + void MergeAltivec( void *_p_dest, const void *_p_s1, + const void *_p_s2, size_t i_bytes ) diff --git a/vlc.changes b/vlc.changes index 076343c..b8f5478 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Mar 3 15:00:18 UTC 2015 - aloisio@gmx.com + +- made fludsynth optional again out of caution +- added vlc-2.2.0-fix_deinterlace_mmx.patch to make + SLE11/i586 build without a recent enough gcc +- fixed SLE11 to build without automake >= 1.11 +- fixed a SLE12 build problem on packman +- removed hevc plugins in a cleaner way + ------------------------------------------------------------------- Sun Mar 1 18:05:03 UTC 2015 - aloisio@gmx.com diff --git a/vlc.spec b/vlc.spec index b8185db..ba911da 100644 --- a/vlc.spec +++ b/vlc.spec @@ -21,6 +21,9 @@ %define libvlccore 8 %define conflicts vlc-beta +# Fluidsynth plugin is known to cause strange crashes here and there - disable it for now (2014-10-07, DimStar) +%bcond_with fluidsynth + %ifarch %arm %bcond_without opengles %else @@ -41,16 +44,18 @@ Source2: %{name}-rpmlintrc # 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 +Patch4: vlc-2.2.0-fix_deinterlace_mmx.patch BuildRequires: Mesa-devel BuildRequires: SDL-devel >= 1.2.10 BuildRequires: aalib-devel BuildRequires: alsa-devel >= 1.0.24 -BuildRequires: automake >= 1.11 BuildRequires: avahi-devel >= 0.6 BuildRequires: dirac-devel BuildRequires: fdupes BuildRequires: findutils +%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} BuildRequires: flac-devel +%endif BuildRequires: freetype2 BuildRequires: fribidi-devel BuildRequires: gettext-devel @@ -102,17 +107,16 @@ BuildRequires: gdk-pixbuf-devel BuildRequires: libv4l-devel BuildRequires: pkgconfig(caca) >= 0.99.beta14 BuildRequires: pkgconfig(speexdsp) -BuildRequires: pkgconfig(xext) -BuildRequires: pkgconfig(zvbi-0.2) >= 0.2.28 -%endif -%if 0%{?suse_version} >= 1140 BuildRequires: pkgconfig(xcb) >= 1.6 BuildRequires: pkgconfig(xcb-composite) BuildRequires: pkgconfig(xcb-randr) >= 1.3 BuildRequires: pkgconfig(xcb-shm) BuildRequires: pkgconfig(xcb-xv) >= 1.1.90.1 +BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xproto) +BuildRequires: pkgconfig(zvbi-0.2) >= 0.2.28 %endif + %if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} BuildRequires: pkgconfig(libswscale) %endif @@ -146,8 +150,10 @@ BuildRequires: pkgconfig(libvncclient) >= 0.9.9 BuildRequires: pkgconfig(xcb-keysyms) >= 0.3.4 BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xpm) -%if 0%{?suse_version} != 1315 +%if %{with fluidsynth} BuildRequires: pkgconfig(fluidsynth) >= 1.1.2 +%endif +%if 0%{?suse_version} != 1315 BuildRequires: pkgconfig(libchromaprint) >= 0.6.0 %endif %endif @@ -217,6 +223,7 @@ Requires: libvlc%{libvlc} = %{version}-%{release} Requires: libvlccore%{libvlccore} = %{version}-%{release} # lang subpackage Recommends: %{name}-noX-lang +Recommends: %{name}-codecs Recommends: libdvdcss Conflicts: %{conflicts}-noX @@ -267,8 +274,16 @@ for gnome-vfs2. echo '********* ENTERED PREP PHASE ********' date %setup -q +%if 0%{?suse_version} >=1140 %patch1 -p1 +%endif %patch3 -p1 +%if 0%{?suse_version} == 1110 +%ifarch %ix86 +%patch4 +%endif +%endif + # We do not rely on contrib but make use of system libraries rm -rf contrib # fix builddate info @@ -278,19 +293,9 @@ FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{SOURCE1} '+%%b %%e %%Y') sed -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" -i modules/gui/qt4/dialogs/help.cpp src/config/help.c sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt4/dialogs/help.cpp src/config/help.c -%if ! 0%{?BUILD_ORIG} -# don't build hevc-related modules even if probably overkill for legal purposes -sed -e "/hevc/d" -i modules/demux/Makefile.am modules/packetizer/Modules.am -%endif - # no --disable-dvb switch unfortunately %if 0%{?suse_version} <= 1140 -sed -e '/HAVE_LINUX_DVB/cAM_CONDITIONAL([HAVE_LINUX_DVB], [false])' -i configure.ac -%endif - -# disable module that won't build -%if 0%{?suse_version} == 1110 -sed -e '/deinterlace/d' -i modules/video_filter/Modules.am +sed -e '/^#include.*dvb/d' -i configure %endif echo '********* ENDED PREP PHASE *********' @@ -301,7 +306,9 @@ echo '********* BOOTSTRAPPING *********' date export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" +%if 0%{?suse_version} > 1140 ./bootstrap +%endif %configure \ --disable-dependency-tracking \ --enable-aa \ @@ -318,9 +325,9 @@ export CXXFLAGS="%{optflags}" %if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} --enable-dvdnav \ --enable-dvdread \ + --enable-flac \ %endif --enable-fast-install \ - --enable-flac \ %if 0%{?suse_version} > 1140 --enable-freerdp \ %endif @@ -341,7 +348,7 @@ export CXXFLAGS="%{optflags}" %endif --enable-libcddb \ %if 0%{?suse_version} > 1110 -%if 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} +%if 0%{?suse_version} != 1315 --enable-opencv \ %endif %endif @@ -395,6 +402,7 @@ export CXXFLAGS="%{optflags}" --enable-vcd \ --enable-vcdx \ --enable-vorbis \ + --disable-x265 \ %if 0%{?suse_version} > 1110 --enable-xcb \ %else @@ -413,6 +421,14 @@ export CXXFLAGS="%{optflags}" --with-default-monospace-font=%{_datadir}/fonts/truetype/FreeMono.ttf echo '********* FINISHED CONFIGURE *********' date + +# post config patches, not very nice but we don't have automake + +%if 0%{?suse_version} == 1110 +# replaces ustar patch +sed -e 's/tar cvv/tar cvv --format=ustar/' -i share/Makefile +%endif + make %{?_smp_mflags} %install @@ -433,6 +449,12 @@ for i in ?vlc; do popd done +# don't ship hevc-related modules even if probably overkill for legal purposes +%if ! 0%{?BUILD_ORIG} +rm %{buildroot}/%{_libdir}/vlc/plugins/demux/libhevc_plugin.so +rm %{buildroot}/%{_libdir}/vlc/plugins/packetizer/libpacketizer_hevc_plugin.so +%endif + # clean up some lang issues... for lang in ach an cgg co ff tet; do rm -rf %{buildroot}%{_datadir}/locale/$lang @@ -463,7 +485,7 @@ done %{_libdir}/vlc/plugins/codec/liblibass_plugin.so %endif %if 0%{?suse_version} > 1110 -%if 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} +%if 0%{?suse_version} != 1315 %{_libdir}/vlc/plugins/codec/libsdl_image_plugin.so %endif %endif @@ -483,7 +505,7 @@ done %{_libdir}/vlc/plugins/visualization/libglspectrum_plugin.so %{_libdir}/vlc/plugins/video_output/libaa_plugin.so %if 0%{?suse_version} > 1110 -%if 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} +%if 0%{?suse_version} != 1315 %{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so %endif %endif @@ -721,12 +743,15 @@ done %{_libdir}/vlc/plugins/codec/libdts_plugin.so %{_libdir}/vlc/plugins/codec/libdvbsub_plugin.so %{_libdir}/vlc/plugins/codec/libedummy_plugin.so +%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/codec/libflac_plugin.so +%endif -%if 0%{?suse_version} > 1140 -%if 0%{?suse_version} != 1315 +%if %{with fluidsynth} %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so %endif + +%if 0%{?suse_version} > 1140 %if 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/codec/libhwdummy_plugin.so %endif @@ -884,7 +909,7 @@ done %{_libdir}/vlc/plugins/services_discovery/libsap_plugin.so %{_libdir}/vlc/plugins/services_discovery/libudev_plugin.so %if 0%{?suse_version} > 1110 -%if 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} +%if 0%{?suse_version} != 1315 %{_libdir}/vlc/plugins/services_discovery/libupnp_plugin.so %endif %endif @@ -955,9 +980,7 @@ done %{_libdir}/vlc/plugins/video_splitter/libclone_plugin.so %{_libdir}/vlc/plugins/video_filter/libcolorthres_plugin.so %{_libdir}/vlc/plugins/video_filter/libcroppadd_plugin.so -%if 0%{?suse_version} > 1110 %{_libdir}/vlc/plugins/video_filter/libdeinterlace_plugin.so -%endif %{_libdir}/vlc/plugins/video_filter/libdynamicoverlay_plugin.so %{_libdir}/vlc/plugins/video_filter/liberase_plugin.so %{_libdir}/vlc/plugins/video_filter/libextract_plugin.so @@ -977,7 +1000,7 @@ done %{_libdir}/vlc/plugins/video_filter/libmotionblur_plugin.so %{_libdir}/vlc/plugins/video_filter/libmotiondetect_plugin.so %if 0%{?suse_version} > 1110 -%if 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} +%if 0%{?suse_version} != 1315 %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so %endif @@ -1038,8 +1061,10 @@ done %endif %{_libdir}/vlc/plugins/codec/libvaapi_x11_plugin.so %{_libdir}/vlc/plugins/demux/libavformat_plugin.so +%if 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/demux/libhevc_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_hevc_plugin.so +%endif %if 0%{?suse_version} > 1140 %dir %{_libdir}/vlc/plugins/vdpau %{_libdir}/vlc/plugins/vdpau/libvdpau_adjust_plugin.so From 49c438d2066f34fc4a183e0a40eb2a4f4850b82aadfdb93e042d09a3da8be4ed Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 4 Mar 2015 11:53:51 +0000 Subject: [PATCH 16/18] fixup OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=111 --- vlc.changes | 7 ++++++- vlc.spec | 13 ++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/vlc.changes b/vlc.changes index b8f5478..3ccd693 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,7 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 4 11:09:14 UTC 2015 - dimstar@opensuse.org + +- Reintroduce calling {_libdir}/vlc/vlc-cache-gen during post. + ------------------------------------------------------------------- Tue Mar 3 15:00:18 UTC 2015 - aloisio@gmx.com -- made fludsynth optional again out of caution +- made fludsynth optional again out of caution - added vlc-2.2.0-fix_deinterlace_mmx.patch to make SLE11/i586 build without a recent enough gcc - fixed SLE11 to build without automake >= 1.11 diff --git a/vlc.spec b/vlc.spec index ba911da..c4f88de 100644 --- a/vlc.spec +++ b/vlc.spec @@ -461,10 +461,16 @@ for lang in ach an cgg co ff tet; do done %find_lang vlc -%post -n %{name}-noX -p /sbin/ldconfig +%post -n %{name}-noX +/sbin/ldconfig +%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins + %postun -n %{name}-noX -p /sbin/ldconfig -%post -n libvlc%{libvlc} -p /sbin/ldconfig +%post -n libvlc%{libvlc} +/sbin/ldconfig +%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins + %postun -n libvlc%{libvlc} -p /sbin/ldconfig %post -n libvlccore%{libvlccore} -p /sbin/ldconfig @@ -473,7 +479,6 @@ done %files %defattr(-,root,root) %{_bindir}/svlc -%{_datadir}/applications/vlc.desktop %{_datadir}/pixmaps/vlc.png %{_datadir}/icons/hicolor/*/apps/vlc* %dir %{_datadir}/kde4 @@ -517,6 +522,8 @@ done %defattr(-,root,root) %doc %{_datadir}/doc/vlc/ %doc NEWS AUTHORS COPYING THANKS README +# The .desktop file does not imply a dependeny on X; so let's keep it here +%{_datadir}/applications/vlc.desktop %{_bindir}/cvlc %if 0%{?suse_version} >= 1320 %{_bindir}/nvlc From 12d309b7b51d7137bce35fe2d1b474e38ed218f2fa41614f7e6fdd1e0d141a7e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 4 Mar 2015 23:09:28 +0000 Subject: [PATCH 17/18] fixup OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=112 --- vlc.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vlc.spec b/vlc.spec index c4f88de..412fd46 100644 --- a/vlc.spec +++ b/vlc.spec @@ -98,6 +98,8 @@ BuildRequires: vcdimager-devel BuildRequires: xosd-devel BuildRequires: xz Requires: %{name}-noX = %{version}-%{release} +# We need the noX package first, as it contains vlc-cache-gen +PreReq: %{name}-noX Requires: %{name}-qt = %{version}-%{release} Conflicts: %{conflicts} BuildRoot: %{_tmppath}/%{name}-%{version}-build From f2fd9c2bc302fc8bf24572dedac7adf7592b818ce052330893b711e24437351f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 5 Mar 2015 01:34:53 +0000 Subject: [PATCH 18/18] SLE11 fix OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=113 --- vlc.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vlc.spec b/vlc.spec index 412fd46..21f0ee2 100644 --- a/vlc.spec +++ b/vlc.spec @@ -463,16 +463,16 @@ for lang in ach an cgg co ff tet; do done %find_lang vlc +%post +%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins + %post -n %{name}-noX /sbin/ldconfig %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins %postun -n %{name}-noX -p /sbin/ldconfig -%post -n libvlc%{libvlc} -/sbin/ldconfig -%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins - +%post -n libvlc%{libvlc} -p /sbin/ldconfig %postun -n libvlc%{libvlc} -p /sbin/ldconfig %post -n libvlccore%{libvlccore} -p /sbin/ldconfig