Browse Source

updated self-build-vlc

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1259 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 15 years ago
parent
commit
a439ad0592

+ 9 - 3
nonfree/self-build-vlc/self-build-vlc-vl.spec

@@ -1,7 +1,7 @@
 %define pkgname vlc
 %define name    self-build-%{pkgname}
 %define version 1.1.0
-%define release 1%{?_dist_release}
+%define release 2%{?_dist_release}
 
 %if %{?_dist_release} == "vl4"
 ## dummy echo
@@ -24,8 +24,8 @@ Name:		%{name}
 Version:	%{version}
 Release: 	%{release}
 
-Obsoletes:	vlc < 1.0.0
-Obsoletes:	vlc-devel < 1.0.0
+Obsoletes:	vlc < 1.1.0
+Obsoletes:	vlc-devel < 1.1.0
 
 Source0:	%{pkgname}-vl.spec
 
@@ -122,7 +122,9 @@ Requires(post):  libraw1394-devel
 Requires: TrueType-dejavu
 
 ## vine
+%if %{?_dist_release} == "vl6"
 Requires(post):	libva-devel
+%endif
 Requires(post):	libgcrypt-devel
 Requires(post):	wx-gtk2-devel
 Requires:	mesa-libGL
@@ -236,6 +238,10 @@ mp3, ogg など)だけでなく,DVD や VCD,様々なストリーミング
 
 
 %changelog
+* Sun Jun 27 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.0-2
+- for only vl6, supported libva
+- set Obsoletes: vlc < 1.1.0 vlc-devel < 1.1.0
+
 * Sat Jun 26 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.0-1
 - new upstream release
 - added Requires(post): libva-devel

+ 8 - 1
nonfree/self-build-vlc/vlc-vl.spec

@@ -15,7 +15,7 @@
 Summary:	Multi-platform MPEG, DVD, and DivX player
 Name:		vlc
 Version:	1.1.0
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.videolan.org/
@@ -169,7 +169,9 @@ 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
@@ -282,7 +284,9 @@ VLC plugins for libdc1394
 	--enable-dc1394				\
 	--enable-dv				\
 %endif
+%if %{?_dist_release} == "vl6"
 	--enable-libva				\
+%endif
 	--enable-dvdread --enable-dvdnav \
 	%{?_with_opencv:--enable-opencv} \
 	--enable-v4l				\
@@ -457,6 +461,9 @@ fi || :
 
 
 %changelog
+* Sun Jun 27 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.0-2
+- for only vl6, supported libva
+
 * Sat Jun 26 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.0-1
 - new upstream release
 - added BuildRequires: libva-devel