Changes - j0ke.net Open Build Service

Changes of Revision 23

[-] [+]	Changed	vlc.spec
@@ -1,58 +1,86 @@ -# norootforbuild - %define libvlc 5 %define libvlccore 4 -Name: vlc -Version: 1.1.12 -Release: 20 - -Summary: VLC - Video Lan Client -URL: http://www.videolan.org/ -License: GNU General Public License (GPL) -Group: Productivity/Multimedia/Video/Players - -Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.bz2 - -Patch0: vlc-fix_font_path.patch -Patch1: vlc-no_return_in_non_void.patch -Patch2: vlc-buildcompare.patch -Patch3: vlc-opencv22.patch -Patch4: vlc-errno_h.patch -Patch5: vlc-asserts_h.patch - -Requires: vlc-noX = %{version}-%{release} -Requires: vlc-qt = %{version}-%{release} -Recommends: freefont +Name: vlc +Version: 1.1.12 +Release: 7.3 + +License: GNU General Public License (GPL) +Summary: VLC - Video Lan Client +Url: http://www.videolan.org/ +Group: Productivity/Multimedia/Video/Players + +Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.bz2 + +Patch0: vlc-fix_font_path.patch +Patch1: vlc-no_return_in_non_void.patch +Patch2: vlc-buildcompare.patch +Patch3: vlc-opencv22.patch +Patch4: vlc-errno_h.patch +Patch5: vlc-asserts_h.patch + +Requires: vlc-noX = %{version} +Requires: vlc-qt = %{version} +Recommends: freefont -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build ### base ### -BuildRequires: fdupes fribidi-devel liba52-devel libffmpeg_oldabi-devel -BuildRequires: libgcrypt-devel libmad-devel libqt4-devel lua-devel -BuildRequires: update-desktop-files +BuildRequires: fdupes +BuildRequires: fribidi-devel +BuildRequires: liba52-devel +BuildRequires: libffmpeg-devel +BuildRequires: libgcrypt-devel +BuildRequires: libmad-devel +BuildRequires: libqt4-devel +BuildRequires: lua-devel +BuildRequires: update-desktop-files ### default enabled #### -BuildRequires: gnutls-devel flac-devel gnome-vfs2-devel -BuildRequires: libass-devel libavahi-devel libcaca-devel libcddb-devel -BuildRequires: libcdio-devel libdvbpsi-devel libdvdnav-devel libdvdread-devel -BuildRequires: libebml-devel libkate-devel -BuildRequires: libmatroska-devel libmodplug-devel libmpcdec-devel -BuildRequires: libmpeg2-devel libmtp-devel libnotify-devel libproxy-devel -BuildRequires: librsvg-devel libshout-devel libsmbclient-devel -BuildRequires: libtwolame-devel libudev-devel libupnp-devel libv4l-devel -BuildRequires: libxml2-devel live-devel portaudio-devel -BuildRequires: sqlite3-devel libtag-devel valgrind-devel zvbi-devel -BuildRequires: libprojectM-devel libfaad-devel +BuildRequires: flac-devel +BuildRequires: gnome-vfs2-devel +BuildRequires: gnutls-devel +BuildRequires: libass-devel +BuildRequires: libavahi-devel +BuildRequires: libcaca-devel +BuildRequires: libcddb-devel +BuildRequires: libcdio-devel +BuildRequires: libdvbpsi-devel +BuildRequires: libdvdnav-devel +BuildRequires: libdvdread-devel +BuildRequires: libebml-devel +BuildRequires: libfaad-devel +BuildRequires: libkate-devel +BuildRequires: libmatroska-devel +BuildRequires: libmodplug-devel +BuildRequires: libmpcdec-devel +BuildRequires: libmpeg2-devel +BuildRequires: libmtp-devel +BuildRequires: libprojectM-devel +BuildRequires: libproxy-devel +BuildRequires: librsvg-devel BuildRequires: schroedinger-devel -BuildRequires: SDL-devel SDL_image-devel +BuildRequires: libshout-devel +BuildRequires: libsmbclient-devel +BuildRequires: libtag-devel +BuildRequires: libtwolame-devel +BuildRequires: libudev-devel +BuildRequires: libupnp-devel +BuildRequires: libv4l-devel +BuildRequires: live-devel +BuildRequires: sqlite3-devel +BuildRequires: valgrind-devel +BuildRequires: zvbi-devel +BuildRequires: libnotify-devel +BuildRequires: libxml2-devel %ifnarch ppc BuildRequires: fluidsynth-devel %endif %if 0%{?suse_version} >= 1120 -BuildRequires: libva-devel libvdpau-devel +BuildRequires: libva-devel +BuildRequires: libvdpau-devel %endif %if 0%{?suse_version} <= 1120 @@ -60,23 +88,22 @@ %endif %if 0%{?suse_version} >= 1140 -BuildRequires: libpulse-devel -%endif - -%if 0%{?suse_version} > 1120 -BuildRequires: libSDL_image-devel -#libnotify1 +BuildRequires: libpulse-devel %endif %if 0%{?suse_version} > 1130 -BuildRequires: gtk2-devel +BuildRequires: pkgconfig(gtk+-2.0) %endif -### --enabled #### -BuildRequires: ncurses-devel +BuildRequires: DirectFB-devel BuildRequires: aalib-devel BuildRequires: libdca-devel -BuildRequires: DirectFB-devel libid3tag-devel +BuildRequires: libid3tag-devel +### --enabled #### +BuildRequires: ncurses-devel +%if 0%{?suse_version} > 1140 +BuildRequires: mozilla-xulrunner192-devel +%else %if 0%{?suse_version} <= 1130 %if 0%{?suse_version} >= 1120 \|\| 0%{?sles_version} >= 11 BuildRequires: mozilla-xulrunner192-devel @@ -84,55 +111,52 @@ %else BuildRequires: mozilla-xulrunner20-devel %endif -BuildRequires: opencv-devel -BuildRequires: pcre-devel vcdimager-devel xosd-devel - +%endif +BuildRequires: opencv-devel +BuildRequires: pcre-devel +BuildRequires: vcdimager-devel +BuildRequires: xosd-devel %if 0%{?suse_version} >= 1120 -BuildRequires: lirc-devel +BuildRequires: lirc-devel %else -BuildRequires: lirc +BuildRequires: lirc %endif - %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 -Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} +Summary: VLC Development system +Group: Development/Libraries/C and C++