update to 0.9.1
This commit is contained in:
Tom Callaway
parent
cc8d55575d
commit
e333565c2f
@ -1 +1 @@
|
||||
libvpx-0.9.0.tar.bz2
|
||||
libvpx-0.9.1.tar.bz2
|
||||
|
||||
@ -5,7 +5,7 @@ includedir=@INCLUDEDIR@
|
||||
|
||||
Name: libvpx
|
||||
Description: VP8 Video Codec SDK library
|
||||
Version: 0.9.0
|
||||
Version: 0.9.1
|
||||
URL: http://www.webmproject.org/tools/vp8-sdk/
|
||||
Requires:
|
||||
Conflicts:
|
||||
|
||||
51
libvpx.spec
51
libvpx.spec
@ -1,17 +1,12 @@
|
||||
Name: libvpx
|
||||
Summary: VP8 Video Codec SDK
|
||||
Version: 0.9.0
|
||||
Release: 6%{?dist}
|
||||
Version: 0.9.1
|
||||
Release: 1%{?dist}
|
||||
License: BSD
|
||||
Group: System Environment/Libraries
|
||||
Source0: http://webm.googlecode.com/files/%{name}-%{version}.tar.bz2
|
||||
Source1: libvpx.pc
|
||||
# Thanks to debian.
|
||||
Source2: libvpx.ver
|
||||
Patch0: libvpx-0.9.0-no-explicit-dep-on-static-lib.patch
|
||||
# Hackish fix for bz 599147
|
||||
# See: https://groups.google.com/a/webmproject.org/group/codec-devel/browse_frm/thread/ff90bd82d0369b96/79d4c40ea78db91b?tvc=1&q=timothy#79d4c40ea78db91b
|
||||
Patch1: 0001-Test-commit-for-a-version-of-the-SPLITMV-bounds-patc.patch
|
||||
URL: http://www.webmproject.org/tools/vp8-sdk/
|
||||
%ifarch %{ix86} x86_64
|
||||
BuildRequires: yasm
|
||||
@ -44,7 +39,6 @@ and decoder.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .no-static-lib
|
||||
%patch1 -p1 -b .bz599147
|
||||
|
||||
%build
|
||||
%ifarch %{ix86}
|
||||
@ -57,30 +51,21 @@ and decoder.
|
||||
%endif
|
||||
%endif
|
||||
|
||||
./configure --target=%{vpxtarget} --enable-pic --disable-install-srcs
|
||||
./configure --target=%{vpxtarget} --enable-pic --disable-install-srcs --enable-shared --prefix=%{_prefix} --libdir=%{_libdir}
|
||||
|
||||
# Hack our optflags in.
|
||||
sed -i "s|\"vpx_config.h\"|\"vpx_config.h\" %{optflags} -fPIC|g" libs-%{vpxtarget}.mk
|
||||
sed -i "s|\"vpx_config.h\"|\"vpx_config.h\" %{optflags} -fPIC|g" examples-%{vpxtarget}.mk
|
||||
sed -i "s|\"vpx_config.h\"|\"vpx_config.h\" %{optflags} -fPIC|g" docs-%{vpxtarget}.mk
|
||||
sed -i "s|-O3|%{optflags}|g" libs-%{vpxtarget}.mk
|
||||
sed -i "s|-O3|%{optflags}|g" examples-%{vpxtarget}.mk
|
||||
sed -i "s|-O3|%{optflags}|g" docs-%{vpxtarget}.mk
|
||||
|
||||
make %{?_smp_mflags} verbose=true target=libs
|
||||
|
||||
# Really? You couldn't make this a shared library? Ugh.
|
||||
# Oh well, I'll do it for you.
|
||||
mkdir tmp
|
||||
cd tmp
|
||||
ar x ../libvpx_g.a
|
||||
cd ..
|
||||
gcc -fPIC -shared -pthread -lm -Wl,--no-undefined -Wl,-soname,libvpx.so.0 -Wl,--version-script,%{SOURCE2} -Wl,-z,noexecstack -o libvpx.so.0.0.0 tmp/*.o
|
||||
rm -rf tmp
|
||||
|
||||
# Temporarily dance the static libs out of the way
|
||||
mv libvpx.a libNOTvpx.a
|
||||
mv libvpx_g.a libNOTvpx_g.a
|
||||
|
||||
# We need to do this so the examples can link against it.
|
||||
ln -sf libvpx.so.0.0.0 libvpx.so
|
||||
ln -sf libvpx.so.%{version} libvpx.so
|
||||
|
||||
make %{?_smp_mflags} verbose=true target=examples
|
||||
make %{?_smp_mflags} verbose=true target=docs
|
||||
@ -90,7 +75,7 @@ mv libNOTvpx.a libvpx.a
|
||||
mv libNOTvpx_g.a libvpx_g.a
|
||||
|
||||
%install
|
||||
make DIST_DIR=%{buildroot}%{_prefix} install
|
||||
make DIST_DIR=%{buildroot}%{_prefix} dist
|
||||
|
||||
# Install the pkg-config file
|
||||
mkdir -p %{buildroot}%{_libdir}/pkgconfig/
|
||||
@ -103,22 +88,14 @@ sed -i "s|@INCLUDEDIR@|%{_includedir}|g" %{buildroot}%{_libdir}/pkgconfig/libvpx
|
||||
# Simpler to label the dir as %doc.
|
||||
mv %{buildroot}/usr/docs doc/
|
||||
|
||||
mkdir -p %{buildroot}%{_includedir}/vpx/
|
||||
install -p libvpx.so.0.0.0 %{buildroot}%{_libdir}
|
||||
pushd %{buildroot}%{_libdir}
|
||||
ln -sf libvpx.so.0.0.0 libvpx.so
|
||||
ln -sf libvpx.so.0.0.0 libvpx.so.0
|
||||
ln -sf libvpx.so.0.0.0 libvpx.so.0.0
|
||||
popd
|
||||
pushd %{buildroot}
|
||||
# Stuff we don't need.
|
||||
rm -rf usr/build/ usr/md5sums.txt usr/lib*/*.a usr/CHANGELOG usr/README
|
||||
# Rename a few examples
|
||||
mv usr/bin/postproc usr/bin/vp8_postproc
|
||||
mv usr/bin/simple_decoder usr/bin/vp8_simple_decoder
|
||||
mv usr/bin/simple_encoder usr/bin/vp8_simple_encoder
|
||||
mv usr/bin/twopass_encoder usr/bin/vp8_twopass_encoder
|
||||
# Move the headers into the subdir
|
||||
mv usr/include/*.h usr/include/vpx/
|
||||
# Fix the binary permissions
|
||||
chmod 755 usr/bin/*
|
||||
popd
|
||||
@ -137,7 +114,7 @@ rm -rf %{buildroot}
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
# These are SDK docs, not really useful to an end-user.
|
||||
%doc doc/
|
||||
%doc docs/
|
||||
%{_includedir}/vpx/
|
||||
%{_libdir}/pkgconfig/libvpx.pc
|
||||
%{_libdir}/libvpx.so
|
||||
@ -147,6 +124,14 @@ rm -rf %{buildroot}
|
||||
%{_bindir}/*
|
||||
|
||||
%changelog
|
||||
* Thu Jun 24 2010 Tom "spot" Callaway <tcallawa@redhat.com> 0.9.1-1
|
||||
- update to 0.9.1
|
||||
|
||||
* Fri Jun 11 2010 Tom "spot" Callaway <tcallawa@redhat.com> 0.9.0-7
|
||||
- update to git revision 8389f1967c5f8b3819cca80705b1b4ba04132b93
|
||||
- upstream fix for bz 599147
|
||||
- proper shared library support
|
||||
|
||||
* Wed Jun 2 2010 Tom "spot" Callaway <tcallawa@redhat.com> 0.9.0-6
|
||||
- add hackish fix for bz 599147
|
||||
(upstream will hopefully fix properly in future release)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user