|
@@ -7,32 +7,23 @@
|
|
|
#% define vlc_date 20080915
|
|
|
#% define with_mozilla 1
|
|
|
%define with_mozilla 0
|
|
|
-%define with_dc1394 0
|
|
|
|
|
|
-%define with_samba 0
|
|
|
+#% define with_dc1394 1
|
|
|
|
|
|
Summary: Multi-platform MPEG, DVD, and DivX player
|
|
|
Name: vlc
|
|
|
-Version: 1.1.13
|
|
|
+Version: 2.0.1
|
|
|
Release: 1%{?_dist_release}
|
|
|
License: GPLv2+
|
|
|
Group: Applications/Multimedia
|
|
|
URL: http://www.videolan.org/
|
|
|
-Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}.tar.bz2
|
|
|
-# %if %with_internal_live555
|
|
|
-# Source2: http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
|
|
|
-# %endif
|
|
|
+Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}.tar.xz
|
|
|
|
|
|
# vlc_patch_0.02/vlc118.diff
|
|
|
Source10: http://2sen.dip.jp/cgi-bin/dtvup/source/up0617.zip
|
|
|
|
|
|
-Patch0: vlc-1.1.0-vlc-cache-gen_noerror.patch
|
|
|
-Patch3: vlc-1.1.6-hardode_font_patch.patch
|
|
|
-Patch4: vlc-1.1.4-tls_path.patch
|
|
|
-#Patch5: vlc-1.1.8-bugfix.opencv22.patch
|
|
|
-
|
|
|
-## vine
|
|
|
-Patch50: vlc-1.1.7-revert-pulse-c.patch
|
|
|
+Patch0: vlc-2.0.1-fftype.patch
|
|
|
+#Patch5: vlc-1.1.8-bugfix.opencv22.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
@@ -40,6 +31,7 @@ BuildRequires: unzip
|
|
|
BuildRequires: desktop-file-utils
|
|
|
BuildRequires: gettext
|
|
|
#BuildRequires: prelink
|
|
|
+Buildrequires: xz
|
|
|
|
|
|
BuildRequires: gettext-devel
|
|
|
BuildRequires: libtool
|
|
@@ -62,16 +54,16 @@ BuildRequires: fribidi-devel
|
|
|
BuildRequires: gnome-vfs2-devel
|
|
|
BuildRequires: gnutls-devel >= 1.0.17
|
|
|
BuildRequires: gsm-devel
|
|
|
-BuildRequires: hal-devel
|
|
|
BuildRequires: jack-audio-connection-kit-devel
|
|
|
-BuildRequires: libavc1394-devel
|
|
|
+%{?with_dc1394:BuildRequires: libavc1394-devel >= 0.5.3}
|
|
|
+%{?with_dc1394:BuildRequires: libraw1394-devel >= 2.0.1}
|
|
|
BuildRequires: libass-devel >= 0.9.7
|
|
|
##!! BuildRequires: libcaca-devel
|
|
|
BuildRequires: libcddb-devel
|
|
|
BuildRequires: libcdio-devel >= 0.77-3
|
|
|
-BuildRequires: libdc1394-devel >= 2.1.0
|
|
|
+%{?with_dc1394:BuildRequires: libdc1394-devel >= 2.1.0}
|
|
|
#BuildRequires: libdca-devel
|
|
|
-BuildRequires: libdv-devel
|
|
|
+%{?with_dc1394:BuildRequires: libdv-devel}
|
|
|
#BuildRequires: libdvbpsi-devel
|
|
|
BuildRequires: libdvdnav-devel
|
|
|
BuildRequires: libdvdread-devel
|
|
@@ -89,9 +81,7 @@ BuildRequires: libnotify-devel
|
|
|
BuildRequires: libproxy-devel
|
|
|
BuildRequires: librsvg2-devel >= 2.9.0
|
|
|
BuildRequires: librtmp-devel
|
|
|
-%if %{?_dist_release} != "vl5"
|
|
|
BuildRequires: libssh2-devel
|
|
|
-%endif
|
|
|
##!! BuildRequires: libsysfs-devel
|
|
|
BuildRequires: libshout-devel
|
|
|
BuildRequires: libsmbclient-devel
|
|
@@ -99,14 +89,10 @@ BuildRequires: libsmbclient-devel
|
|
|
BuildRequires: libtheora-devel
|
|
|
##!! BuildRequires: libtiger-devel
|
|
|
BuildRequires: libtiff-devel
|
|
|
-%if %{?_dist_release} != "vl5"
|
|
|
BuildRequires: libudev-devel >= 142
|
|
|
-%endif
|
|
|
BuildRequires: libupnp-devel
|
|
|
BuildRequires: libv4l-devel
|
|
|
-%if %{?_dist_release} != "vl5"
|
|
|
BuildRequires: libva-devel
|
|
|
-%endif
|
|
|
BuildRequires: libvorbis-devel
|
|
|
BuildRequires: libxml2-devel
|
|
|
#BuildRequires: lirc-devel
|
|
@@ -136,9 +122,7 @@ BuildRequires: SDL_image-devel
|
|
|
BuildRequires: speex-devel >= 1.1.5
|
|
|
BuildRequires: taglib-devel
|
|
|
BuildRequires: twolame-devel
|
|
|
-%if %{?_dist_release} != "vl5"
|
|
|
BuildRequires: vcdimager-devel >= 0.7.21
|
|
|
-%endif
|
|
|
#BuildRequires: x264-devel >= 0-0.8.20061028
|
|
|
#BuildRequires: x264-devel >= 0.0.0-2.20080225
|
|
|
BuildRequires: xosd-devel
|
|
@@ -154,9 +138,7 @@ BuildRequires: libX11-devel
|
|
|
BuildRequires: libXext-devel
|
|
|
BuildRequires: libXpm-devel
|
|
|
BuildRequires: libXvMC-devel
|
|
|
-%if %{?_dist_release} != "vl5"
|
|
|
BuildRequires: xcb-util-devel
|
|
|
-%endif
|
|
|
BuildRequires: xorg-x11-proto-devel
|
|
|
|
|
|
%if %with_mozilla
|
|
@@ -164,22 +146,6 @@ BuildRequires: gecko-devel
|
|
|
BuildRequires: nspr-devel
|
|
|
%endif
|
|
|
|
|
|
-# # Now obsoleted as it will be built externally
|
|
|
-# Obsoletes: java-vlc < 0.9.0
|
|
|
-# Obsoletes: python-vlc < 0.9.0
|
|
|
-
|
|
|
-# %if 0
|
|
|
-# BuildRequires: libgoom2-devel
|
|
|
-# BuildRequires: libggi-devel
|
|
|
-# %endif
|
|
|
-
|
|
|
-# %if %with_dc1394
|
|
|
-# BuildRequires: compat-libdc1394-devel
|
|
|
-# BuildRequires: compat-libraw1394-devel
|
|
|
-# %else
|
|
|
-BuildRequires: libraw1394-devel
|
|
|
-# %endif
|
|
|
-
|
|
|
#Requires: dejavu-fonts
|
|
|
Requires: TrueType-dejavu
|
|
|
|
|
@@ -207,13 +173,6 @@ BuildRequires: mesa-libGL-devel
|
|
|
##BuildRequires: self-build-x264 >= 0.0.0-15.20110322
|
|
|
##BuildRequires: self-build-xvidcore
|
|
|
|
|
|
-
|
|
|
-%package devel
|
|
|
-Summary: Development package for %{name}
|
|
|
-Group: Development/Libraries
|
|
|
-Requires: %{name} = %{version}-%{release}
|
|
|
-
|
|
|
-
|
|
|
%description
|
|
|
VLC (initially VideoLAN Client) is a highly portable multimedia player
|
|
|
for various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX,
|
|
@@ -221,6 +180,11 @@ 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: Development package for %{name}
|
|
|
+Group: Development/Libraries
|
|
|
+Requires: %{name} = %{version}-%{release}
|
|
|
+
|
|
|
%description devel
|
|
|
This package contains development files for VLC Media Player.
|
|
|
|
|
@@ -248,55 +212,19 @@ It can also be used as a server to stream in unicast or multicast in
|
|
|
IPv4 or IPv6 on a high-bandwidth network.
|
|
|
%endif
|
|
|
|
|
|
-%if %with_dc1394
|
|
|
-%package plugins-dc1394
|
|
|
-Summary: VLC Media Player Plugins for dc1394
|
|
|
-Group: Applications/Multimedia
|
|
|
-Requires: %{name}-core = %{version}
|
|
|
-Requires: compat-libdc1394-tools
|
|
|
-
|
|
|
-%description plugins-dc1394
|
|
|
-VLC plugins for libdc1394
|
|
|
-%endif
|
|
|
-
|
|
|
%prep
|
|
|
%setup -q -n %{name}-%{version}
|
|
|
-# %if %with_internal_live555
|
|
|
-# %setup -q -D -T -a 2 -n %{name}-%{_version}
|
|
|
-# %endif
|
|
|
-%patch0 -p1 -b .noerror
|
|
|
-%patch3 -p1 -b .hardode_path
|
|
|
-%patch4 -p1 -b .tls_path
|
|
|
-#%patch5 -p1 -b .opencv22
|
|
|
-%__sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
|
|
|
+
|
|
|
+%patch0 -p1
|
|
|
|
|
|
unzip %{SOURCE10}
|
|
|
patch -p1 < vlc_patch_0.02/vlc118.diff || exit 1
|
|
|
|
|
|
-## vine
|
|
|
-%if %{?_dist_release} == "vl5"
|
|
|
-%patch50 -p1 -b .pulse
|
|
|
-%endif
|
|
|
-
|
|
|
-%__sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
|
|
|
-
|
|
|
-%__rm modules/access/videodev2.h
|
|
|
-%__ln_s -f %{_includedir}/linux/videodev2.h modules/access/videodev2.h
|
|
|
-
|
|
|
%__rm aclocal.m4 m4/lib*.m4 m4/lt*.m4
|
|
|
./bootstrap
|
|
|
|
|
|
|
|
|
%build
|
|
|
-# %if %with_internal_live555
|
|
|
-# # Then bundled live555 - not needed
|
|
|
-# pushd live
|
|
|
-# # Force the use of our CFLAGS
|
|
|
-# %{__perl} -pi -e 's|-O2|%{optflags} -fPIC -DPIC|g' config.linux
|
|
|
-# # Configure and build
|
|
|
-# ./genMakefiles linux && make
|
|
|
-# popd
|
|
|
-# %endif
|
|
|
|
|
|
|
|
|
%configure \
|
|
@@ -306,24 +234,18 @@ patch -p1 < vlc_patch_0.02/vlc118.diff || exit 1
|
|
|
--enable-release \
|
|
|
--with-binary-version=%{version}-%{release} \
|
|
|
--with-tuning=no \
|
|
|
- --enable-switcher \
|
|
|
+ --without-kde-solid \
|
|
|
+ %{?_with_ffmpeg:--enable-switcher} \
|
|
|
--enable-lua \
|
|
|
%{?_with_internal_live555:--enable-live555 --with-live555-tree=live} \
|
|
|
-%if %with_dc1394
|
|
|
- --enable-dc1394 \
|
|
|
- --enable-dv \
|
|
|
-%endif
|
|
|
-%if %{?_dist_release} != "vl5"
|
|
|
+ %{?with_dc1394:--enable-dv} \
|
|
|
--enable-libva \
|
|
|
-%endif
|
|
|
--enable-dvdread --enable-dvdnav \
|
|
|
%{?_with_opencv:--enable-opencv} \
|
|
|
--enable-sftp \
|
|
|
--enable-pvr \
|
|
|
--enable-gnomevfs \
|
|
|
-%if %{?_dist_release} != "vl5"
|
|
|
--enable-vcdx \
|
|
|
-%endif
|
|
|
--enable-cddax \
|
|
|
--enable-wma-fixed \
|
|
|
--enable-shine \
|
|
@@ -339,9 +261,7 @@ patch -p1 < vlc_patch_0.02/vlc118.diff || exit 1
|
|
|
%{?_with_dirac:--enable-dirac} \
|
|
|
--enable-libass \
|
|
|
--enable-shout \
|
|
|
-%if %{?_dist_release} != "vl5"
|
|
|
--enable-xcb \
|
|
|
-%endif
|
|
|
--enable-svg \
|
|
|
--enable-snapshot \
|
|
|
%ifarch %{ix86} x86_64
|
|
@@ -367,16 +287,8 @@ patch -p1 < vlc_patch_0.02/vlc118.diff || exit 1
|
|
|
%if %with_mozilla
|
|
|
--enable-mozilla \
|
|
|
%endif
|
|
|
- --without-kde-solid \
|
|
|
;
|
|
|
|
|
|
-# remove rpath from libtool
|
|
|
-%__sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
|
|
-%__sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
|
|
-
|
|
|
-# # clean unused-direct-shlib-dependencies
|
|
|
-# sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
|
|
|
-
|
|
|
%__make %{?_smp_mflags}
|
|
|
|
|
|
|
|
@@ -444,7 +356,7 @@ fi || :
|
|
|
|
|
|
%files -f %{name}.lang
|
|
|
%defattr(-,root,root,-)
|
|
|
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS
|
|
|
+%doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README THANKS
|
|
|
%{_datadir}/applications/*%{name}.desktop
|
|
|
%{_datadir}/icons/hicolor/*/apps/*
|
|
|
%{_bindir}/cvlc
|
|
@@ -462,10 +374,8 @@ fi || :
|
|
|
|
|
|
%files devel
|
|
|
%defattr(-,root,root,-)
|
|
|
-%doc HACKING
|
|
|
%dir %{_includedir}/vlc
|
|
|
%{_includedir}/vlc/*
|
|
|
-%{_mandir}/man1/vlc-config.1*
|
|
|
%{_libdir}/*.so
|
|
|
%{_libdir}/pkgconfig/vlc-plugin.pc
|
|
|
%{_libdir}/pkgconfig/libvlc.pc
|
|
@@ -478,6 +388,10 @@ fi || :
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sat May 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.1-1
|
|
|
+- new upstream release
|
|
|
+- dropped DC1394 and DV
|
|
|
+
|
|
|
* Tue Jan 3 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.13-1
|
|
|
- new upstream release
|
|
|
|