- updated to 0.9.7

- removed obsolete 0.9.0-no-explicit-dep-on-static-lib patch and unused external libvpx.ver
- package vpx.pc (adjusting wrt. proper prefix and libdir)

Changed files:
    libvpx-0.9.0-no-explicit-dep-on-static-lib.patch -> 1.2
    libvpx.spec -> 1.19
    libvpx.ver -> 1.2

diff --git a/libvpx-0.9.0-no-explicit-dep-on-static-lib.patch b/libvpx-0.9.0-no-explicit-dep-on-static-lib.patch
deleted file mode 100644 (file)
index d909d7e..0000000
--- a/libvpx-0.9.0-no-explicit-dep-on-static-lib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up libvpx-0.9.0/examples.mk.BAD libvpx-0.9.0/examples.mk
---- libvpx-0.9.0/examples.mk.BAD       2010-05-19 17:58:42.611058552 -0400
-+++ libvpx-0.9.0/examples.mk   2010-05-19 17:59:11.934181029 -0400
-@@ -129,7 +129,6 @@ BINS-$(NOT_MSVS)           += $(addprefi
- # Instantiate linker template for all examples.
- CODEC_LIB=$(if $(CONFIG_DEBUG_LIBS),vpx_g,vpx)
- $(foreach bin,$(BINS-yes),\
--    $(if $(BUILD_OBJS),$(eval $(bin): $(LIB_PATH)/lib$(CODEC_LIB).a))\
-     $(if $(BUILD_OBJS),$(eval $(call linker_template,$(bin),\
-         $(call objs,$($(notdir $(bin)).SRCS)) \
-         -l$(CODEC_LIB) $(addprefix -l,$(CODEC_EXTRA_LIBS))\

diff --git a/libvpx.spec b/libvpx.spec
index 0b5dccd85c7dccff919edcac339aec4148eff6e6..5584576d055dd9bb006fcc99d77024f3e1184ac2 100644 (file)
--- a/libvpx.spec
+++ b/libvpx.spec
@@ -1,24 +1,23 @@
 #
 # Conditional build:
 %bcond_without asm     # x86 assembler
-
+#
 Summary:       VP8, a high-quality video codec
 Summary(pl.UTF-8):     VP8 - kodek obrazu wysokiej jakości
 Name:          libvpx
-Version:       0.9.6
+Version:       0.9.7
 Release:       1
 License:       BSD
 Group:         Libraries
-#Source0-Download: http://code.google.com/p/webm/downloads/list
+#Source0Download: http://code.google.com/p/webm/downloads/list
 Source0:       http://webm.googlecode.com/files/%{name}-v%{version}.tar.bz2
-# Source0-md5: 383f3f07a76099682abb43f79b692b72
-Source1:       %{name}.ver
-Patch0:                %{name}-0.9.0-no-explicit-dep-on-static-lib.patch
+# Source0-md5: 893d07d1bdedaac1ad2ab63d32de7d83
 URL:           http://www.webmproject.org/
 BuildRequires: /usr/bin/php
 BuildRequires: doxygen
 BuildRequires: php-common >= 4:5.0.0
 BuildRequires: php-pcre
+BuildRequires: sed >= 4.0
 %ifarch %{ix86} %{x8664}
 %{?with_asm:BuildRequires:     yasm}
 %endif
@@ -56,7 +55,6 @@ Statyczna biblioteka libvpx.
 
 %prep
 %setup -q -n %{name}-v%{version}
-%patch0 -p1
 
 %build
 install -d obj
@@ -99,7 +97,10 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir}/vpx,%{_libdir}}
        LIBSUBDIR=%{_lib} \
        DIST_DIR=$RPM_BUILD_ROOT%{_prefix}
 
-rm $RPM_BUILD_ROOT%{_libdir}/libvpx.so.0.?
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvpx.so.0.?
+
+# adjust prefix and libdir
+sed -i -e 's,^prefix=.*,prefix=%{_prefix},;s,^libdir=.*,libdir=%{_libdir},' $RPM_BUILD_ROOT%{_pkgconfigdir}/vpx.pc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -119,6 +120,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libvpx.so
 %{_includedir}/vpx
+%{_pkgconfigdir}/vpx.pc
 
 %files static
 %defattr(644,root,root,755)

diff --git a/libvpx.ver b/libvpx.ver
deleted file mode 100644 (file)
index d4b6ec2..0000000
--- a/libvpx.ver
+++ /dev/null
@@ -1,56 +0,0 @@
-{ global:
-vpx_codec_build_config;
-vpx_codec_control_;
-vpx_codec_dec_init_ver;
-vpx_codec_decode;
-vpx_codec_destroy;
-vpx_codec_enc_config_default;
-vpx_codec_enc_config_set;
-vpx_codec_enc_init_ver;
-vpx_codec_encode;
-vpx_codec_error;
-vpx_codec_error_detail;
-vpx_codec_err_to_string;
-vpx_codec_get_caps;
-vpx_codec_get_cx_data;
-vpx_codec_get_frame;
-vpx_codec_get_global_headers;
-vpx_codec_get_mem_map;
-vpx_codec_get_preview_frame;
-vpx_codec_get_stream_info;
-vpx_codec_iface_name;
-vpx_codec_peek_stream_info;
-vpx_codec_register_put_frame_cb;
-vpx_codec_register_put_slice_cb;
-vpx_codec_set_cx_data_buf;
-vpx_codec_set_mem_map;
-vpx_codec_version;
-vpx_codec_version_extra_str;
-vpx_codec_version_str;
-vpx_codec_vp8_algo;
-vpx_codec_vp8_cx_algo;
-vpx_codec_vp8_dx_algo;
-vpx_dec_control;
-vpx_dec_decode;
-vpx_dec_destroy;
-vpx_dec_error;
-vpx_dec_error_detail;
-vpx_dec_err_to_string;
-vpx_dec_get_caps;
-vpx_dec_get_frame;
-vpx_dec_get_mem_map;
-vpx_dec_get_stream_info;
-vpx_dec_iface_name;
-vpx_dec_init_ver;
-vpx_dec_peek_stream_info;
-vpx_dec_register_put_frame_cb;
-vpx_dec_register_put_slice_cb;
-vpx_dec_set_mem_map;
-vpx_dec_xma_init_ver;
-vpx_enc_vp8_algo;
-vpx_img_alloc;
-vpx_img_flip;
-vpx_img_free;
-vpx_img_set_rect;
-vpx_img_wrap;
-local: *; };