Browse Source

self-build-x264/ffmpeg: rebuild

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11850 ec354946-7b23-47d6-9f5a-488ba84defc7
ara_t 3 years ago
parent
commit
8056b081aa

+ 47 - 44
nonfree/self-build-ffmpeg/self-build-ffmpeg-vl.spec

@@ -12,13 +12,13 @@
 
 
 %global pkgname ffmpeg
-%global name	self-build-%{pkgname}
+%global name  self-build-%{pkgname}
 %global major_version 2.8
-%global version %{major_version}.6
-#% define svndate	20110326
-%global release	2%{?svndate:.%svndate}%{?_dist_release}
+%global version %{major_version}.7
+#% define svndate 20110326
+%global release 2%{?svndate:.%svndate}%{?_dist_release}
 
-%global sourceurl0	http://ffmpeg.org/releases/%{pkgname}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
+%global sourceurl0  http://ffmpeg.org/releases/%{pkgname}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
 
 %global with_faac 1
 %global with_vaapi 1
@@ -26,22 +26,22 @@
 
 #% define enable_avconv 1
 
-Summary:	Package to automatically build %{pkgname} rpm package
-Summary(ja): 	%{pkgname} の rpm パッケージを自動作成するパッケージ
-Name:		%{name}
-Version:	%{version}
-Release: 	%{release}
-Source0:	%{pkgname}-vl.spec
-#Source1:	%{pkgname}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
+Summary:  Package to automatically build %{pkgname} rpm package
+Summary(ja):  %{pkgname} の rpm パッケージを自動作成するパッケージ
+Name:   %{name}
+Version:  %{version}
+Release:  %{release}
+Source0:  %{pkgname}-vl.spec
+#Source1: %{pkgname}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
 
-License:	GPLv2+
-Group:		Restricted Software
+License:  GPLv2+
+Group:    Restricted Software
 
 Obsoletes:      ffmpeg < %{major_version}, ffmpeg-libs < %{major_version}, ffmpeg-devel < %{major_version}
 Obsoletes:      self-build-ffmpeg < %{version}
 
-Requires(post):		self-build-setup >= 0.9.9
-#Requires(post):		subversion
+Requires(post):   self-build-setup >= 0.9.9
+#Requires(post):    subversion
 
 # (build)requies of target package.
 Requires(post):  bzip2-devel
@@ -49,21 +49,21 @@ Requires(post):  celt-devel
 ##Requires(post):  dirac-devel
 Requires(post):  freetype2-devel
 Requires(post):  gnutls-devel
-Requires(post):	gsm-devel
-Requires(post):	imlib2-devel
-Requires(post):	libdc1394-devel
-Requires(post):	libogg-devel
+Requires(post): gsm-devel
+Requires(post): imlib2-devel
+Requires(post): libdc1394-devel
+Requires(post): libogg-devel
 Requires(post):  libass-devel
 %{!?_without_cdio:Requires(post): libcdio-devel}
 %{!?_without_cdio:Requires: libcdio-paranoia-devel}
 #libcrystalhd is currently broken
-%{?_with_crystalhd:Requires(post):	libcrystalhd-devel}
-Requires(post):	libraw1394-devel
-Requires(post):	librtmp-devel >= 2.3
-Requires(post):	libtheora-devel
-%{?with_vaapi:Requires(post):	libva-devel >= 0.31.0}
+%{?_with_crystalhd:Requires(post):  libcrystalhd-devel}
+Requires(post): libraw1394-devel
+Requires(post): librtmp-devel >= 2.3
+Requires(post): libtheora-devel
+%{?with_vaapi:Requires(post): libva-devel >= 0.31.0}
 Requires(post):  libvdpau-devel
-Requires(post):	libvorbis-devel
+Requires(post): libvorbis-devel
 %{?with_libvpx:Requires(post):  libvpx-devel >= 0.9.7}
 Requires(post):  libXvMC-devel
 %{?_with_opencore_amr:Requires(post):  opencore-amr-devel vo-amrwbenc-devel}
@@ -71,25 +71,25 @@ Requires(post):  libXvMC-devel
 %{?_with_opencv:Requires(post):  opencv-devel}
 %{?_with_openjpeg:Requires(post):  openjpeg-devel}
 ##Requires(post):  schroedinger-devel
-Requires(post):	SDL-devel
+Requires(post): SDL-devel
 Requires(post):  speex-devel
-##Requires(post):	texi2html
-Requires(post):	zlib-devel 
-Requires(post):	libogg-devel
-Requires(post):		yasm
-Requires(post):		self-build-a52dec
-Requires(post):		self-build-faac
-Requires(post):		self-build-faad2
-Requires(post):		self-build-lame 
-Requires(post):		self-build-libdca
-Requires(post):		self-build-x264 >= 0.142
-Requires(post):		self-build-x265 >= 1.4
-Requires(post):		self-build-xvidcore
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-
-BuildArch:	noarch
-Packager:	munepi
+##Requires(post): texi2html
+Requires(post): zlib-devel 
+Requires(post): libogg-devel
+Requires(post):   yasm
+Requires(post):   self-build-a52dec
+Requires(post):   self-build-faac
+Requires(post):   self-build-faad2
+Requires(post):   self-build-lame 
+Requires(post):   self-build-libdca
+Requires(post):   self-build-x264 >= 0.142
+Requires(post):   self-build-x265 >= 1.4
+Requires(post):   self-build-xvidcore
+
+BuildRoot:  %{_tmppath}/%{name}-%{version}-root
+
+BuildArch:  noarch
+Packager: munepi
 
 %description
 FFMpeg is a complete and free Internet live audio and video
@@ -219,6 +219,9 @@ Rebuild_x264_$LOCALE
 %{_datadir}/%{name}
 
 %changelog
+* Mon Nov 05 2018 Toshiaki Ara <ara_t@384.jp> 2.8.6-2
+- rebuild
+
 * Sun Jul 03 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.8.6-2
 - rebuild with libcdio-0.93
 

+ 25 - 22
nonfree/self-build-x264/self-build-x264-vl.spec

@@ -1,38 +1,38 @@
-%global snapshot_date	20160122
-%global snapshot_time	2245
-%global branch		stable
+%global snapshot_date 20160122
+%global snapshot_time 2245
+%global branch    stable
 
-%global pkgname 	x264
-%global name		self-build-%{pkgname}
-%global version		0.148
-%global release		2.%{snapshot_date}%{?_dist_release}
+%global pkgname   x264
+%global name    self-build-%{pkgname}
+%global version   0.148
+%global release   3.%{snapshot_date}%{?_dist_release}
 
-#define sourceurl0	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/%{pkgname}-snapshot-%{date}-%{time}.tar.bz2
-%define sourceurl0	http://download.videolan.org/pub/x264/snapshots/%{pkgname}-snapshot-%{snapshot_date}-%{snapshot_time}%{?branch:-%{branch}}.tar.bz2
+#define sourceurl0  ftp://ftp.videolan.org/pub/videolan/x264/snapshots/%{pkgname}-snapshot-%{date}-%{time}.tar.bz2
+%define sourceurl0  http://download.videolan.org/pub/x264/snapshots/%{pkgname}-snapshot-%{snapshot_date}-%{snapshot_time}%{?branch:-%{branch}}.tar.bz2
 
-Summary:	Package to automatically build %{pkgname} rpm package
-Summary(ja): 	%{pkgname} の rpm パッケージを自動作成するパッケージ
-Name:		%{name}
-Version:	%{version}
-Release: 	%{release}
-Source0:	%{pkgname}-vl.spec
+Summary:  Package to automatically build %{pkgname} rpm package
+Summary(ja):  %{pkgname} の rpm パッケージを自動作成するパッケージ
+Name:   %{name}
+Version:  %{version}
+Release:  %{release}
+Source0:  %{pkgname}-vl.spec
 
-License:	GPLv2+
-Group:		Restricted Software
+License:  GPLv2+
+Group:    Restricted Software
 
 Obsoletes:      x264 < %{version}, x264-devel < %{version}
 Obsoletes:      self-build-x264 < %{version}
 
-Requires(post):		self-build-setup >= 0.9.9
+Requires(post):   self-build-setup >= 0.9.9
 
 # (build)requies of target package.
-Requires(post):	yasm
+Requires(post): yasm
 Requires(post): self-build-gpac >= 0.5.0
 
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildArch:  noarch
+BuildRoot:  %{_tmppath}/%{name}-%{version}-root
 
-Packager:	munepi
+Packager: munepi
 
 %description
 x264 is a free library for encoding H264/AVC video streams, written from
@@ -115,6 +115,9 @@ x264 はスクラッチから書かれた H264/AVC ビデオストリームを
 %{_datadir}/%{name}
 
 %changelog
+* Mon Nov 05 2018 Toshiaki Ara <ara_t@384.jp> 0.148-3.20160122
+- rebuild
+
 * Sun Jul 03 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.148-2.20160122
 - rebuild with libcdio-0.93