Browse Source

new upstream release

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

+ 14 - 4
nonfree/self-build-vlc/self-build-vlc-vl.spec

@@ -1,12 +1,14 @@
 %define pkgname vlc
 %define name    self-build-%{pkgname}
-%define version 2.0.5
+%define version 2.0.6
 %define release 1%{?_dist_release}
 
 %define with_mozilla	 		0
 
 #% define with_dc1394			1
 
+%define with_ncurses	 		0
+
 %define sourceurl0	http://download.videolan.org/pub/videolan/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.xz
 %define sourceurl10	http://2sen.dip.jp/cgi-bin/dtvup/source/up0617.zip
 
@@ -98,7 +100,9 @@ Requires(post):  libmusicbrainz-devel
 Requires(post):  lua-devel
 ##!! Requires(post):  minizip-devel
 ##!! Requires(post):	mpeg2dec-devel >= 0.3.2
+%if %with_ncurses
 Requires(post):	ncurses-devel
+%endif
 ##!! Requires(post):  opencv-devel
 Requires(post):	openslp-devel
 Requires(post):  pcre-devel
@@ -145,11 +149,11 @@ Requires(post):	self-build-libmpeg2
 Requires(post):	self-build-a52dec
 Requires(post):	self-build-faac
 Requires(post):	self-build-faad2
-Requires(post):	self-build-ffmpeg >= 0.4.9
+Requires(post):	self-build-ffmpeg >= 1.1.0
 Requires(post):	self-build-libdca
 Requires(post):	self-build-libdvbpsi
 Requires(post):	self-build-libmad
-Requires(post):	self-build-x264 >= 0.120
+Requires(post):	self-build-x264 >= 0.129
 Requires(post):	self-build-xvidcore
 
 BuildArch:	noarch
@@ -254,7 +258,7 @@ USE_UP0617_ZIP=
 ## NOTE: stopped 2sen.dip.jp/cgi-bin/dtvup
 # /usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec \
 #     %{sourceurl0} %{sourceurl10} 1556000
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec %{sourceurl0} 1556000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec %{sourceurl0} 794000
 
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
@@ -265,6 +269,12 @@ USE_UP0617_ZIP=
 
 
 %changelog
+* Tue Apr 30 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.6-1
+- new upstream release
+
+* Sun Jan 20 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.5-2
+- rebuilt with new x264 (ABI 0.129) and ffmpeg (1.1.x)
+
 * Mon Jan 14 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.5-1
 - new upstream release
 

+ 15 - 1
nonfree/self-build-vlc/vlc-vl.spec.in

@@ -12,9 +12,11 @@
 
 #% define with_dc1394			1
 
+%define with_ncurses	 		0
+
 Summary:	Multi-platform MPEG, DVD, and DivX player
 Name:		vlc
-Version:	2.0.5
+Version:	2.0.6
 Release:	1%{?_dist_release}
 License:	GPLv2+
 Group:		Applications/Multimedia
@@ -114,7 +116,9 @@ BuildRequires:  libmusicbrainz-devel
 BuildRequires:  lua-devel
 ##!! BuildRequires:  minizip-devel
 ##!! BuildRequires:	mpeg2dec-devel >= 0.3.2
+%if %with_ncurses
 BuildRequires:	ncurses-devel
+%endif
 ##!! BuildRequires:  opencv-devel
 BuildRequires:	openslp-devel
 BuildRequires:  pcre-devel
@@ -280,7 +284,9 @@ patch -p1 < vlc_patch_0.02/vlc118.diff || exit 1
 	--enable-jack				\
     %{?_with_portaudio:--enable-portaudio} \
 	--enable-pulse				\
+%if %with_ncurses
 	--enable-ncurses			\
+%endif
 	--enable-xosd				\
 	--enable-fbosd				\
 	--enable-galaktos			\
@@ -366,7 +372,9 @@ fi || :
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/*
 %{_bindir}/cvlc
+%if %with_ncurses
 %{_bindir}/nvlc
+%endif
 %{_bindir}/qvlc
 %{_bindir}/rvlc
 %{_bindir}/svlc
@@ -394,6 +402,12 @@ fi || :
 
 
 %changelog
+* Tue Apr 30 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.6-1
+- new upstream release
+
+* Sun Jan 20 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.5-2
+- rebuilt with new x264 (ABI 0.129) and ffmpeg (1.1.x)
+
 * Mon Jan 14 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2.0.5-1
 - new upstream release