Packman Build Service PMBS

libx264.changes Changed

libx264.spec Changed

@@ -17,19 +17,26 @@
 
 
 %define soname  148
-%define svn     20160905
+%define svn     20161219
 Name:           libx264
 Version:        0.%{soname}svn%{svn}
 Release:        0
 Summary:        A free h264/avc encoder - encoder binary
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-Url:            http://developers.videolan.org/x264.html
+Url:            http://www.videolan.org/developers/x264.html
 Source:         ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svn}-2245-stable.tar.bz2
+Source1:        baselibs.conf
 Patch0:         x264-use-shared-library.patch
+BuildRequires:  libffms2-devel
+BuildRequires:  libgpac-devel
 BuildRequires:  nasm
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  yasm >= 1.2.0
+BuildRequires:  pkgconfig(libavcodec)
+BuildRequires:  pkgconfig(libavformat)
+BuildRequires:  pkgconfig(libavutil)
+BuildRequires:  pkgconfig(libswscale)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -57,14 +64,9 @@
 - Custom quantization matrices
 - Parallel encoding of multiple slices (currently disabled)
 
-Be aware that the x264 library is still in early development stage. The
-command line tool x264 can handle only raw YUV 4:2:0 streams at the
-moment so please use mencoder or another tool that supports x264 library
-for all other file types.
-
 %package %{soname}
 Summary:        A free h264/avc encoder - encoder binary
-Group:          Productivity/Multimedia/Video/Editors and Convertors
+Group:          System/Libraries
 
 %description %{soname}
 x264 is a free library for encoding next-generation H264/AVC video
@@ -76,6 +78,20 @@
 development with libx264. This library is needed to build
 mplayer/mencoder with H264 encoding support.
 
+%package -n x264
+Summary:       Binaries for x264 streams conversions
+
+%description -n x264
+x264 is a free library for encoding next-generation H264/AVC video
+streams. The code is written from scratch by Laurent Aimar, Loren
+Merritt, Eric Petit (OS X), Min Chen (vfw/asm), Justin Clay (vfw), Mans
+Rullgard, Radek Czyz, Christian Heine (asm), Alex Izvorski (asm), and
+Alex Wright. It is released under the terms of the GPL license. This
+package contains a static library and a header needed for the
+development with libx264. This library is needed to build
+mplayer/mencoder with H264 encoding support.
+
+
 %package devel
 Summary:        Libraries and include file for the %{name} encoder
 Group:          Development/Libraries/C and C++
@@ -100,12 +116,7 @@
 sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" x264.c
 
 %build
-# add -fno-aggressive-loop-optimizations due to gcc-4.8-induces optimization problems
-# in 13.1 (see also https://bugs.launchpad.net/ubuntu/+source/x264/+bug/1241772
 %configure \
-%if %{?suse_version} >= 1310
-  --extra-cflags=-fno-aggressive-loop-optimizations \
-%endif
   --enable-shared \
   --enable-pic
 make %{?_smp_mflags}
@@ -117,10 +128,6 @@
 rm -f %{buildroot}%{_libdir}/%{name}.a
 ln -s %{name}.so.%{soname} %{buildroot}%{_libdir}/%{name}.so
 
-rm %{buildroot}%{_bindir}/*
-
-echo "%{name}-%{soname}" > %{_sourcedir}/baselibs.conf
-
 %post -n %{name}-%{soname} -p /sbin/ldconfig
 
 %postun -n %{name}-%{soname} -p /sbin/ldconfig
@@ -136,4 +143,9 @@
 %{_libdir}/pkgconfig/x264.pc
 %{_libdir}/%{name}.so
 
+%files -n x264
+%defattr(-,root,root)
+%doc doc/*.txt
+%attr(0755,root,root) %{_bindir}/x264
+
 %changelog

baselibs.conf Added

x264-snapshot-20160905-2245-stable.tar.bz2 Deleted

x264-snapshot-20161219-2245-stable.tar.bz2 Added

Changes of Revision 13