Browse Source

new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9367 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 10 years ago
parent
commit
6d2383f5a0
2 changed files with 24 additions and 25 deletions
  1. 10 8
      nonfree/self-build-x265/self-build-x265-vl.spec
  2. 14 17
      nonfree/self-build-x265/x265-vl.spec

+ 10 - 8
nonfree/self-build-x265/self-build-x265-vl.spec

@@ -1,9 +1,9 @@
-%global commit 5e604833c5aa
+%global commit 9f0324125f53
 
 %global pkgname 	x265
 %global name		self-build-%{pkgname}
-%global version		1.4
-%global release		2%{?_dist_release}
+%global version		1.5
+%global release		1%{?_dist_release}
 
 %global sourceurl0	https://bitbucket.org/multicoreware/x265/get/%{version}.tar.bz2
 
@@ -14,8 +14,8 @@ Version:	%{version}
 Release: 	%{release}
 Source0:	%{pkgname}-vl.spec
 
-Source100: x265-pc-path.patch
-Source101: x265-test-shared.patch
+#Source100: x265-pc-path.patch
+Source101: x265-1.5-test-shared.patch
 Source102: x265-pic.patch
 
 License:	GPLv2+ and BSD
@@ -102,7 +102,7 @@ x265はH.265/HEVCをエンコードするためのライブラリです。
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__install} -d ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%{__install} -m 644 %{SOURCE100} %{SOURCE101} %{SOURCE102} \
+%{__install} -m 644 %{SOURCE101} %{SOURCE102} \
 	     ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 %clean
@@ -118,8 +118,10 @@ x265はH.265/HEVCをエンコードするためのライブラリです。
 %{_datadir}/%{name}
 
 %changelog
-* Sat Feb  7 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.4-2
-- added Group tag to Source0
+* Sat Feb 21 2015 Munehiro Yamamoto <munepi@vinelinux.org> 1.5-1
+- new upstream release
+- drop x265-pc-path.patch
+- add x265-1.5-test-shared.patch
 
 * Fri Jan  2 2015 Munehiro Yamamoto <munepi@vinelinux.org> 1.4-1
 - new upstream release

+ 14 - 17
nonfree/self-build-x265/x265-vl.spec

@@ -1,24 +1,21 @@
-%global commit 5e604833c5aa
+%global commit 9f0324125f53
 
 Summary: H.265/HEVC encoder library
-Summary(ja): H.265/HEVC エンコーダライブラリ
 Name: x265
-Version: 1.4
-Release: 2%{?_dist_release}
-Group: System Environment/Libraries
+Version: 1.5
+Release: 1%{?_dist_release}
 URL: http://x265.org/
 Source0: https://bitbucket.org/multicoreware/x265/get/%{version}.tar.bz2
 # fix pkgconfig file installation path
-Patch0: x265-pc-path.patch
+#Patch0: x265-pc-path.patch
 # link test binaries with shared library
-Patch1: x265-test-shared.patch
+Patch1: x265-1.5-test-shared.patch
 # build with -fPIC on arm and i686, too
 Patch2: x265-pic.patch
 # source/Lib/TLibCommon - BSD
 # source/Lib/TLibEncoder - BSD
 # everything else - GPLv2+
 License: GPLv2+ and BSD
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: cmake
 BuildRequires: yasm
 
@@ -31,9 +28,7 @@ This package contains the command line encoder and the shared library.
 
 %package devel
 Summary: H.265/HEVC encoder library development files
-Summary(ja): H.265/HEVC エンコーダライブラリの開発用ファイル
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 The primary objective of x265 is to become the best H.265/HEVC encoder
@@ -44,7 +39,7 @@ This package contains the shared library development files.
 
 %prep
 %setup -q -n multicoreware-%{name}-%{commit}
-%patch0 -p1 -b .p
+#%patch0 -p1 -b .p
 # tests are crashing on x86 if linked against shared libx265
 %ifnarch i686
 %patch1 -p1 -b .ts
@@ -69,7 +64,7 @@ This package contains the shared library development files.
 # %__install -Dpm644 COPYING %{buildroot}%{_pkgdocdir}/COPYING
 
 %check
-LD_LIBRARY_PATH=$(pwd) test/PoolTest
+#LD_LIBRARY_PATH=$(pwd) test/PoolTest
 LD_LIBRARY_PATH=$(pwd) test/TestBench
 
 exit 0
@@ -83,7 +78,7 @@ exit 0
 # %dir %{_pkgdocdir}
 # %{_pkgdocdir}/COPYING
 %doc COPYING
-%{_libdir}/libx265.so.35
+%{_libdir}/libx265.so.43
 
 %files devel
 %doc doc/*
@@ -93,11 +88,13 @@ exit 0
 %{_libdir}/pkgconfig/x265.pc
 
 %changelog
-* Sat Feb  7 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.4-2
-- added Group tag
+* Sat Feb 21 2015 Munehiro Yamamoto <munepi@vinelinux.org> 1.5-1
+- new upstream release (ABI 43)
+- drop x265-pc-path.patch
+- add x265-1.5-test-shared.patch
 
 * Fri Jan  2 2015 Munehiro Yamamoto <munepi@vinelinux.org> 1.4-1
-- new upstream release
+- new upstream release (ABI 35)
 - initial build based on RPM Fusion rawhide
 
 * Sun Aug 17 2014 Dominik Mierzejewski <rpm@greysector.net> 1.2-5