|
|
@@ -14,7 +14,7 @@
|
|
|
|
|
|
Summary: Multi-platform MPEG, DVD, and DivX player
|
|
|
Name: vlc
|
|
|
-Version: 1.1.6
|
|
|
+Version: 1.1.7
|
|
|
Release: 1%{?_dist_release}
|
|
|
License: GPLv2+
|
|
|
Group: Applications/Multimedia
|
|
|
@@ -23,10 +23,15 @@ Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}
|
|
|
# %if %with_internal_live555
|
|
|
# Source2: http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
|
|
|
# %endif
|
|
|
-Patch0: vlc-1.1.0-vlc-cache-gen_noerror.patch
|
|
|
-Patch1: 0001-Libnotify-depends-on-a-gtk.patch
|
|
|
-Patch3: vlc-1.1.4-hardode_font_patch.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
|
|
|
Patch4: vlc-1.1.4-tls_path.patch
|
|
|
+#Patch5: vlc-backport-lirc_fix.patch
|
|
|
+#Patch6: vlc-backport-signal_fix.patch
|
|
|
+
|
|
|
+## vine
|
|
|
+Patch50: vlc-1.1.7-revert-pulse-c.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
|
@@ -89,6 +94,9 @@ BuildRequires: libtheora-devel
|
|
|
BuildRequires: libtiff-devel
|
|
|
BuildRequires: libupnp-devel
|
|
|
BuildRequires: libv4l-devel
|
|
|
+%if %{?_dist_release} == "vl6"
|
|
|
+BuildRequires: libva-devel
|
|
|
+%endif
|
|
|
BuildRequires: libvorbis-devel
|
|
|
BuildRequires: libxml2-devel
|
|
|
#BuildRequires: lirc-devel
|
|
|
@@ -170,9 +178,6 @@ BuildRequires: libraw1394-devel
|
|
|
Requires: TrueType-dejavu
|
|
|
|
|
|
## vine
|
|
|
-%if %{?_dist_release} == "vl6"
|
|
|
-BuildRequires: libva-devel
|
|
|
-%endif
|
|
|
BuildRequires: libgcrypt-devel
|
|
|
BuildRequires: wx-gtk2-devel
|
|
|
Requires: mesa-libGL
|
|
|
@@ -251,7 +256,18 @@ VLC plugins for libdc1394
|
|
|
# %setup -q -D -T -a 2 -n %{name}-%{_version}
|
|
|
# %endif
|
|
|
%patch0 -p1 -b .noerror
|
|
|
-#%patch1 -p1 -b .0dlopen
|
|
|
+#%patch1 -p1 -b .gtk23
|
|
|
+%patch3 -p1 -b .hardode_path
|
|
|
+%patch4 -p1 -b .tls_path
|
|
|
+#%patch5 -p1 -b .lirc_fix
|
|
|
+#%patch6 -p1 -b .signal_fix
|
|
|
+
|
|
|
+## 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
|
|
|
@@ -274,6 +290,7 @@ VLC plugins for libdc1394
|
|
|
|
|
|
%configure \
|
|
|
--disable-dependency-tracking \
|
|
|
+ --with-pic \
|
|
|
--disable-rpath \
|
|
|
--enable-release \
|
|
|
--with-binary-version=%{version}-%{release} \
|
|
|
@@ -308,7 +325,7 @@ VLC plugins for libdc1394
|
|
|
--enable-tarkin \
|
|
|
--enable-theora \
|
|
|
%{?_with_dirac:--enable-dirac} \
|
|
|
- %{?_with_libass:--enable-libass} \
|
|
|
+ --enable-libass \
|
|
|
--enable-shout \
|
|
|
%{?_with_xcb:--enable-xcb} \
|
|
|
--enable-svg \
|
|
|
@@ -329,7 +346,7 @@ VLC plugins for libdc1394
|
|
|
--enable-xosd \
|
|
|
--enable-fbosd \
|
|
|
--enable-galaktos \
|
|
|
- %{?_with_lirc:--enable-lirc} \
|
|
|
+ --enable-lirc \
|
|
|
%ifarch %{ix86}
|
|
|
--enable-loader \
|
|
|
%else
|
|
|
@@ -349,7 +366,6 @@ VLC plugins for libdc1394
|
|
|
# sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
|
|
|
|
|
|
%__make %{?_smp_mflags}
|
|
|
-#% __make
|
|
|
|
|
|
|
|
|
%install
|
|
|
@@ -450,6 +466,15 @@ fi || :
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Feb 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.7-1
|
|
|
+- new upstream release
|
|
|
+- dropped upstreamed patches
|
|
|
+- applied a reverted patch to pulse.c for vl5
|
|
|
+
|
|
|
+* Fri Feb 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.6-2
|
|
|
+- backport lirc and signal fixes
|
|
|
+- revived BuildRequires: lirc
|
|
|
+
|
|
|
* Tue Feb 01 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.6-1
|
|
|
- new upstream release
|
|
|
- dropped temporarily BuildRequires: lirc
|
munepi