|
@@ -8,13 +8,12 @@
|
|
#% define with_mozilla 1
|
|
#% define with_mozilla 1
|
|
%define with_mozilla 0
|
|
%define with_mozilla 0
|
|
%define with_dc1394 0
|
|
%define with_dc1394 0
|
|
-%define with_directfb 1
|
|
|
|
|
|
|
|
%define with_samba 0
|
|
%define with_samba 0
|
|
|
|
|
|
Summary: Multi-platform MPEG, DVD, and DivX player
|
|
Summary: Multi-platform MPEG, DVD, and DivX player
|
|
Name: vlc
|
|
Name: vlc
|
|
-Version: 1.1.7
|
|
+Version: 1.1.8
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
License: GPLv2+
|
|
License: GPLv2+
|
|
Group: Applications/Multimedia
|
|
Group: Applications/Multimedia
|
|
@@ -24,11 +23,8 @@ Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}
|
|
# Source2: http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
|
|
# Source2: http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
|
|
# %endif
|
|
# %endif
|
|
Patch0: vlc-1.1.0-vlc-cache-gen_noerror.patch
|
|
Patch0: vlc-1.1.0-vlc-cache-gen_noerror.patch
|
|
-#Patch1: 0001-Libnotify-depends-on-a-gtk.patch
|
|
|
|
Patch3: vlc-1.1.6-hardode_font_patch.patch
|
|
Patch3: vlc-1.1.6-hardode_font_patch.patch
|
|
Patch4: vlc-1.1.4-tls_path.patch
|
|
Patch4: vlc-1.1.4-tls_path.patch
|
|
-#Patch5: vlc-backport-lirc_fix.patch
|
|
|
|
-#Patch6: vlc-backport-signal_fix.patch
|
|
|
|
|
|
|
|
## vine
|
|
## vine
|
|
Patch50: vlc-1.1.7-revert-pulse-c.patch
|
|
Patch50: vlc-1.1.7-revert-pulse-c.patch
|
|
@@ -49,10 +45,8 @@ BuildRequires: avahi-devel
|
|
BuildRequires: cdparanoia-devel
|
|
BuildRequires: cdparanoia-devel
|
|
BuildRequires: dbus-devel
|
|
BuildRequires: dbus-devel
|
|
%{?_with_dirac: BuildRequires: dirac-devel >= 1.0.0}
|
|
%{?_with_dirac: BuildRequires: dirac-devel >= 1.0.0}
|
|
-%if %with_directfb
|
|
|
|
#BuildRequires: directfb-devel
|
|
#BuildRequires: directfb-devel
|
|
BuildRequires: libdirectfb-devel
|
|
BuildRequires: libdirectfb-devel
|
|
-%endif
|
|
|
|
#BuildRequires: faac-devel
|
|
#BuildRequires: faac-devel
|
|
#BuildRequires: faad2-devel
|
|
#BuildRequires: faad2-devel
|
|
#BuildRequires: ffmpeg-devel >= 0.4.9-0
|
|
#BuildRequires: ffmpeg-devel >= 0.4.9-0
|
|
@@ -67,8 +61,9 @@ BuildRequires: jack-audio-connection-kit-devel
|
|
BuildRequires: libavc1394-devel
|
|
BuildRequires: libavc1394-devel
|
|
BuildRequires: libass-devel >= 0.9.7
|
|
BuildRequires: libass-devel >= 0.9.7
|
|
##!! BuildRequires: libcaca-devel
|
|
##!! BuildRequires: libcaca-devel
|
|
-##!! BuildRequires: libcddb-devel
|
|
+BuildRequires: libcddb-devel
|
|
BuildRequires: libcdio-devel >= 0.77-3
|
|
BuildRequires: libcdio-devel >= 0.77-3
|
|
|
|
+BuildRequires: libdc1394-devel >= 2.1.0
|
|
#BuildRequires: libdca-devel
|
|
#BuildRequires: libdca-devel
|
|
BuildRequires: libdv-devel
|
|
BuildRequires: libdv-devel
|
|
#BuildRequires: libdvbpsi-devel
|
|
#BuildRequires: libdvbpsi-devel
|
|
@@ -79,22 +74,31 @@ BuildRequires: libid3tag-devel
|
|
%{?_with_kate: BuildRequires: libkate-devel}
|
|
%{?_with_kate: BuildRequires: libkate-devel}
|
|
#BuildRequires: libmad-devel
|
|
#BuildRequires: libmad-devel
|
|
BuildRequires: libmatroska-devel >= 0.7.6
|
|
BuildRequires: libmatroska-devel >= 0.7.6
|
|
-##!! BuildRequires: libmodplug-devel
|
|
+BuildRequires: libmodplug-devel
|
|
#BuildRequires: libmp4v2-devel
|
|
#BuildRequires: libmp4v2-devel
|
|
BuildRequires: libmpcdec-devel
|
|
BuildRequires: libmpcdec-devel
|
|
BuildRequires: libmtp-devel
|
|
BuildRequires: libmtp-devel
|
|
BuildRequires: libnotify-devel
|
|
BuildRequires: libnotify-devel
|
|
-#BuildRequires: libproxy-devel
|
|
+##!! BuildRequires: libprojectM-qt-devel
|
|
-BuildRequires: librsvg2-devel >= 2.5.0
|
|
+BuildRequires: libproxy-devel
|
|
|
|
+BuildRequires: librsvg2-devel >= 2.9.0
|
|
|
|
+BuildRequires: librtmp-devel
|
|
|
|
+%if %{?_dist_release} != "vl5"
|
|
|
|
+BuildRequires: libssh2-devel
|
|
|
|
+%endif
|
|
##!! BuildRequires: libsysfs-devel
|
|
##!! BuildRequires: libsysfs-devel
|
|
BuildRequires: libshout-devel
|
|
BuildRequires: libshout-devel
|
|
BuildRequires: libsmbclient-devel
|
|
BuildRequires: libsmbclient-devel
|
|
##!! BuildRequires: libtar-devel
|
|
##!! BuildRequires: libtar-devel
|
|
BuildRequires: libtheora-devel
|
|
BuildRequires: libtheora-devel
|
|
|
|
+##!! BuildRequires: libtiger-devel
|
|
BuildRequires: libtiff-devel
|
|
BuildRequires: libtiff-devel
|
|
|
|
+%if %{?_dist_release} != "vl5"
|
|
|
|
+BuildRequires: libudev-devel >= 142
|
|
|
|
+%endif
|
|
BuildRequires: libupnp-devel
|
|
BuildRequires: libupnp-devel
|
|
BuildRequires: libv4l-devel
|
|
BuildRequires: libv4l-devel
|
|
-%if %{?_dist_release} == "vl6"
|
|
+%if %{?_dist_release} != "vl5"
|
|
BuildRequires: libva-devel
|
|
BuildRequires: libva-devel
|
|
%endif
|
|
%endif
|
|
BuildRequires: libvorbis-devel
|
|
BuildRequires: libvorbis-devel
|
|
@@ -117,10 +121,10 @@ BuildRequires: lua-devel
|
|
BuildRequires: ncurses-devel
|
|
BuildRequires: ncurses-devel
|
|
##!! BuildRequires: opencv-devel
|
|
##!! BuildRequires: opencv-devel
|
|
BuildRequires: openslp-devel
|
|
BuildRequires: openslp-devel
|
|
-##!! BuildRequires: pcre-devel
|
|
+BuildRequires: pcre-devel
|
|
-##!! BuildRequires: pulseaudio-libs-devel >= 0.9.8
|
|
+BuildRequires: pulseaudio-libs-devel >= 0.9.8
|
|
##!! BuildRequires: portaudio-devel
|
|
##!! BuildRequires: portaudio-devel
|
|
-BuildRequires: qt4-devel
|
|
+BuildRequires: qt4-devel >= 4.5.2
|
|
##!! BuildRequires: schroedinger-devel
|
|
##!! BuildRequires: schroedinger-devel
|
|
BuildRequires: SDL_image-devel
|
|
BuildRequires: SDL_image-devel
|
|
BuildRequires: speex-devel >= 1.1.5
|
|
BuildRequires: speex-devel >= 1.1.5
|
|
@@ -129,7 +133,9 @@ BuildRequires: svgalib-devel
|
|
%endif
|
|
%endif
|
|
BuildRequires: taglib-devel
|
|
BuildRequires: taglib-devel
|
|
BuildRequires: twolame-devel
|
|
BuildRequires: twolame-devel
|
|
-##!! BuildRequires: vcdimager-devel >= 0.7.21
|
|
+%if %{?_dist_release} != "vl5"
|
|
|
|
+BuildRequires: vcdimager-devel >= 0.7.21
|
|
|
|
+%endif
|
|
#BuildRequires: x264-devel >= 0-0.8.20061028
|
|
#BuildRequires: x264-devel >= 0-0.8.20061028
|
|
#BuildRequires: x264-devel >= 0.0.0-2.20080225
|
|
#BuildRequires: x264-devel >= 0.0.0-2.20080225
|
|
BuildRequires: xosd-devel
|
|
BuildRequires: xosd-devel
|
|
@@ -144,15 +150,12 @@ BuildRequires: libXxf86vm-devel
|
|
BuildRequires: libX11-devel
|
|
BuildRequires: libX11-devel
|
|
BuildRequires: libXext-devel
|
|
BuildRequires: libXext-devel
|
|
BuildRequires: libXpm-devel
|
|
BuildRequires: libXpm-devel
|
|
-%ifarch %{ix86} x86_64
|
|
|
|
BuildRequires: libXvMC-devel
|
|
BuildRequires: libXvMC-devel
|
|
|
|
+%if %{?_dist_release} != "vl5"
|
|
|
|
+BuildRequires: xcb-util-devel
|
|
%endif
|
|
%endif
|
|
-##!! BuildRequires: xcb-util-devel
|
|
|
|
BuildRequires: xorg-x11-proto-devel
|
|
BuildRequires: xorg-x11-proto-devel
|
|
|
|
|
|
-BuildRequires: pulseaudio-libs-devel >= 0.9.8
|
|
|
|
-##!! BuildRequires: portaudio-devel
|
|
|
|
-
|
|
|
|
%if %with_mozilla
|
|
%if %with_mozilla
|
|
BuildRequires: gecko-devel
|
|
BuildRequires: gecko-devel
|
|
BuildRequires: nspr-devel
|
|
BuildRequires: nspr-devel
|
|
@@ -195,7 +198,7 @@ BuildRequires: mesa-libGL-devel
|
|
##BuildRequires: self-build-libdvdnav
|
|
##BuildRequires: self-build-libdvdnav
|
|
##BuildRequires: self-build-libmad
|
|
##BuildRequires: self-build-libmad
|
|
##BuildRequires: self-build-libmp4v2
|
|
##BuildRequires: self-build-libmp4v2
|
|
-##BuildRequires: self-build-x264 >= 0.0.0-2.20080225
|
|
+##BuildRequires: self-build-x264 >= 0.0.0-15.20110322
|
|
##BuildRequires: self-build-xvidcore
|
|
##BuildRequires: self-build-xvidcore
|
|
|
|
|
|
|
|
|
|
@@ -256,11 +259,9 @@ VLC plugins for libdc1394
|
|
# %setup -q -D -T -a 2 -n %{name}-%{_version}
|
|
# %setup -q -D -T -a 2 -n %{name}-%{_version}
|
|
# %endif
|
|
# %endif
|
|
%patch0 -p1 -b .noerror
|
|
%patch0 -p1 -b .noerror
|
|
-#%patch1 -p1 -b .gtk23
|
|
|
|
%patch3 -p1 -b .hardode_path
|
|
%patch3 -p1 -b .hardode_path
|
|
%patch4 -p1 -b .tls_path
|
|
%patch4 -p1 -b .tls_path
|
|
-#%patch5 -p1 -b .lirc_fix
|
|
+#%patch5 -p1 -b .opencv22
|
|
-#%patch6 -p1 -b .signal_fix
|
|
|
|
|
|
|
|
## vine
|
|
## vine
|
|
%if %{?_dist_release} == "vl5"
|
|
%if %{?_dist_release} == "vl5"
|
|
@@ -302,43 +303,44 @@ VLC plugins for libdc1394
|
|
--enable-dc1394 \
|
|
--enable-dc1394 \
|
|
--enable-dv \
|
|
--enable-dv \
|
|
%endif
|
|
%endif
|
|
-%if %{?_dist_release} == "vl6"
|
|
+%if %{?_dist_release} != "vl5"
|
|
--enable-libva \
|
|
--enable-libva \
|
|
%endif
|
|
%endif
|
|
- --enable-dvdread --enable-dvdnav \
|
|
+ --enable-dvdread --enable-dvdnav \
|
|
%{?_with_opencv:--enable-opencv} \
|
|
%{?_with_opencv:--enable-opencv} \
|
|
--enable-sftp \
|
|
--enable-sftp \
|
|
- --enable-v4l \
|
|
|
|
--enable-pvr \
|
|
--enable-pvr \
|
|
--enable-gnomevfs \
|
|
--enable-gnomevfs \
|
|
- %{?_with_vcdimager--enable-vcdx} \
|
|
+%if %{?_dist_release} != "vl5"
|
|
|
|
+ --enable-vcdx \
|
|
|
|
+%endif
|
|
--enable-cddax \
|
|
--enable-cddax \
|
|
--enable-wma-fixed \
|
|
--enable-wma-fixed \
|
|
--enable-shine \
|
|
--enable-shine \
|
|
|
|
+ --enable-omxil \
|
|
--enable-faad \
|
|
--enable-faad \
|
|
--enable-twolame \
|
|
--enable-twolame \
|
|
- --enable-real \
|
|
+ --enable-real --enable-realrtsp \
|
|
- --enable-realrtsp \
|
|
|
|
--enable-flac \
|
|
--enable-flac \
|
|
--enable-tremor \
|
|
--enable-tremor \
|
|
--enable-speex \
|
|
--enable-speex \
|
|
--enable-tarkin \
|
|
--enable-tarkin \
|
|
--enable-theora \
|
|
--enable-theora \
|
|
%{?_with_dirac:--enable-dirac} \
|
|
%{?_with_dirac:--enable-dirac} \
|
|
- --enable-libass \
|
|
+ --enable-libass \
|
|
--enable-shout \
|
|
--enable-shout \
|
|
- %{?_with_xcb:--enable-xcb} \
|
|
+%if %{?_dist_release} != "vl5"
|
|
|
|
+ --enable-xcb \
|
|
|
|
+%endif
|
|
--enable-svg \
|
|
--enable-svg \
|
|
--enable-snapshot \
|
|
--enable-snapshot \
|
|
%ifarch %{ix86} x86_64
|
|
%ifarch %{ix86} x86_64
|
|
--enable-svgalib \
|
|
--enable-svgalib \
|
|
--enable-xvmc \
|
|
--enable-xvmc \
|
|
%endif
|
|
%endif
|
|
-%if %with_directfb
|
|
|
|
--enable-directfb \
|
|
--enable-directfb \
|
|
-%endif
|
|
|
|
--enable-aa \
|
|
--enable-aa \
|
|
- %?_with_caca:--enable-caca} \
|
|
+ %{?_with_caca:--enable-caca} \
|
|
--enable-jack \
|
|
--enable-jack \
|
|
%{?_with_portaudio:--enable-portaudio} \
|
|
%{?_with_portaudio:--enable-portaudio} \
|
|
--enable-pulse \
|
|
--enable-pulse \
|
|
@@ -466,6 +468,20 @@ fi || :
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.8-1
|
|
|
|
+- new upstream release
|
|
|
|
+- added BuildRequires:
|
|
|
|
+ - libcddb-devel
|
|
|
|
+ - libdc1394-devel >= 2.1.0
|
|
|
|
+ - libmodplug-devel
|
|
|
|
+ - libproxy-devel
|
|
|
|
+ - librtmp-devel
|
|
|
|
+ - libssh2-devel
|
|
|
|
+ - libudev-devel >= 142
|
|
|
|
+ - pcre-devel
|
|
|
|
+ - vcdimager-devel >= 0.7.21
|
|
|
|
+ - xcb-util-devel
|
|
|
|
+
|
|
* Sat Feb 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.7-1
|
|
* Sat Feb 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.7-1
|
|
- new upstream release
|
|
- new upstream release
|
|
- dropped upstreamed patches
|
|
- dropped upstreamed patches
|