[libvpx] fixup pc file handling
Tom Callaway
spot at fedoraproject.org
Tue May 29 14:52:25 UTC 2012
commit 86640735b0a6f8a472b367dea1875a172ce9e63b
Author: Tom Callaway <spot at fedoraproject.org>
Date: Tue May 29 10:52:22 2012 -0400
fixup pc file handling
libvpx-v1.0.0-pcfix.patch | 13 +++++++++++--
libvpx.spec | 5 ++++-
2 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/libvpx-v1.0.0-pcfix.patch b/libvpx-v1.0.0-pcfix.patch
index d6de385..6691620 100644
--- a/libvpx-v1.0.0-pcfix.patch
+++ b/libvpx-v1.0.0-pcfix.patch
@@ -1,6 +1,6 @@
diff -up libvpx-v1.0.0/libs.mk.pcfix libvpx-v1.0.0/libs.mk
---- libvpx-v1.0.0/libs.mk.pcfix 2012-05-11 15:54:50.452637490 -0400
-+++ libvpx-v1.0.0/libs.mk 2012-05-11 15:55:06.694515039 -0400
+--- libvpx-v1.0.0/libs.mk.pcfix 2012-01-27 13:36:39.000000000 -0500
++++ libvpx-v1.0.0/libs.mk 2012-05-29 10:48:27.348425023 -0400
@@ -232,7 +232,7 @@ vpx.pc: config.mk libs.mk
$(qexec)echo '# pkg-config file from libvpx $(VERSION_STRING)' > $@
$(qexec)echo 'prefix=$(PREFIX)' >> $@
@@ -10,3 +10,12 @@ diff -up libvpx-v1.0.0/libs.mk.pcfix libvpx-v1.0.0/libs.mk
$(qexec)echo 'includedir=$${prefix}/include' >> $@
$(qexec)echo '' >> $@
$(qexec)echo 'Name: vpx' >> $@
+@@ -240,7 +240,7 @@ vpx.pc: config.mk libs.mk
+ $(qexec)echo 'Version: $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)' >> $@
+ $(qexec)echo 'Requires:' >> $@
+ $(qexec)echo 'Conflicts:' >> $@
+- $(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@
++ $(qexec)echo 'Libs: -L$${libdir} -lvpx -lm' >> $@
+ $(qexec)echo 'Cflags: -I$${includedir}' >> $@
+ INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
+ INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc
diff --git a/libvpx.spec b/libvpx.spec
index 8bee991..d803cb9 100644
--- a/libvpx.spec
+++ b/libvpx.spec
@@ -2,7 +2,7 @@ Name: libvpx
Summary: VP8 Video Codec SDK
Version: 1.0.0
%global soversion %{version}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: BSD
Group: System Environment/Libraries
Source0: http://webm.googlecode.com/files/%{name}-v%{version}.tar.bz2
@@ -143,6 +143,9 @@ popd
%{_bindir}/*
%changelog
+* Tue May 29 2012 Tom Callaway <spot at fedoraproject.org> - 1.0.0-3
+- fix vpx.pc file to include -lm (bz825754)
+
* Fri May 11 2012 Tom Callaway <spot at fedoraproject.org> - 1.0.0-2
- use included vpx.pc file (drop local libvpx.pc)
- apply upstream fix to vpx.pc file (bz 814177)
More information about the scm-commits
mailing list