The package rpms/compat-libvpx4.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/compat-libvpx4.git/commit/?id=ead6ec....
Change: -%ifarch armv7hl
Thanks.
Full change: ============
commit ead6ec7694943cde708a3142eeeb73eb322ba96d Author: Pete Walter pwalter@fedoraproject.org Date: Mon Apr 30 20:50:10 2018 +0100
Retire old compat package in F29+
diff --git a/.gitignore b/.gitignore deleted file mode 100644 index c2e3f9a..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/v1.6.1.tar.gz diff --git a/0001-Fix-image-width-alignment.-Enable-ImageSizeSetting-t.patch b/0001-Fix-image-width-alignment.-Enable-ImageSizeSetting-t.patch deleted file mode 100644 index 7a9b469..0000000 --- a/0001-Fix-image-width-alignment.-Enable-ImageSizeSetting-t.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 5a40c8fde11bf82cccb5bd2f57c46ab5e6262cbf Mon Sep 17 00:00:00 2001 -From: Jerome Jiang jianj@google.com -Date: Wed, 27 Sep 2017 11:08:37 -0700 -Subject: [PATCH] Fix image width alignment. Enable ImageSizeSetting test. - -BUG=b/64710201 - -Change-Id: I5465f6c6481d3c9a5e00fcab024cf4ae562b6b01 - -diff --git a/vpx/src/vpx_image.c b/vpx/src/vpx_image.c -index dba439c10..ebd3d7f74 100644 ---- a/vpx/src/vpx_image.c -+++ b/vpx/src/vpx_image.c -@@ -88,11 +88,10 @@ static vpx_image_t *img_alloc_helper(vpx_image_t *img, vpx_img_fmt_t fmt, - default: ycs = 0; break; - } - -- /* Calculate storage sizes given the chroma subsampling */ -- align = (1 << xcs) - 1; -- w = (d_w + align) & ~align; -- align = (1 << ycs) - 1; -- h = (d_h + align) & ~align; -+ /* Calculate storage sizes. If the buffer was allocated externally, the width -+ * and height shouldn't be adjusted. */ -+ w = d_w; -+ h = d_h; - s = (fmt & VPX_IMG_FMT_PLANAR) ? w : bps * w / 8; - s = (s + stride_align - 1) & ~(stride_align - 1); - stride_in_bytes = (fmt & VPX_IMG_FMT_HIGHBITDEPTH) ? s * 2 : s; -@@ -111,9 +110,18 @@ static vpx_image_t *img_alloc_helper(vpx_image_t *img, vpx_img_fmt_t fmt, - img->img_data = img_data; - - if (!img_data) { -- const uint64_t alloc_size = (fmt & VPX_IMG_FMT_PLANAR) -- ? (uint64_t)h * s * bps / 8 -- : (uint64_t)h * s; -+ uint64_t alloc_size; -+ /* Calculate storage sizes given the chroma subsampling */ -+ align = xcs ? (1 << xcs) - 1 : 1; -+ w = (d_w + align - 1) & ~(align - 1); -+ align = ycs ? (1 << ycs) - 1 : 1; -+ h = (d_h + align - 1) & ~(align - 1); -+ -+ s = (fmt & VPX_IMG_FMT_PLANAR) ? w : bps * w / 8; -+ s = (s + stride_align - 1) & ~(stride_align - 1); -+ stride_in_bytes = (fmt & VPX_IMG_FMT_HIGHBITDEPTH) ? s * 2 : s; -+ alloc_size = (fmt & VPX_IMG_FMT_PLANAR) ? (uint64_t)h * s * bps / 8 -+ : (uint64_t)h * s; - - if (alloc_size != (size_t)alloc_size) goto fail; - --- -2.14.3 - diff --git a/compat-libvpx4.spec b/compat-libvpx4.spec deleted file mode 100644 index 607c9b6..0000000 --- a/compat-libvpx4.spec +++ /dev/null @@ -1,164 +0,0 @@ -%global somajor 4 -%global sominor 0 -%global sotiny 0 -%global soversion %{somajor}.%{sominor}.%{sotiny} - -Name: compat-libvpx4 -Summary: Compat package with libvpx libraries -Version: 1.6.1 -Release: 1%{?dist} -License: BSD -Group: System Environment/Libraries -#Source0: http://downloads.webmproject.org/releases/webm/%%7Bname%7D-%%7Bversion%7D.ta... -Source0: https://github.com/webmproject/libvpx/archive/v%%7Bversion%7D.tar.gz -# Thanks to debian. -Source2: libvpx.ver -URL: http://www.webmproject.org/code/ -%ifarch %{ix86} x86_64 -BuildRequires: yasm -%endif -BuildRequires: doxygen, php-cli, perl(Getopt::Long) - -#Fix CVE-2017-13194 -Patch001: 0001-Fix-image-width-alignment.-Enable-ImageSizeSetting-t.patch - -# Explicitly conflict with older libvpx packages that ship libraries -# with the same soname as this compat package -Conflicts: libvpx < 1.7.0 - -%description -Compatibility package with libvpx libraries ABI version 4. - -%prep -%setup -q -n libvpx-%{version} -%patch001 -p1 -b .001 - -%build -%ifarch %{ix86} -%global vpxtarget x86-linux-gcc -%else -%ifarch x86_64 -%global vpxtarget x86_64-linux-gcc -%else -%ifarch armv7hl -%global vpxtarget armv7-linux-gcc -%else -%global vpxtarget generic-gnu -%endif -%endif -%endif - -# History: The configure script used to reject the shared flag on the generic target. -# This meant that we needed to fall back to manual shared lib creation. -# However, the modern configure script permits the shared flag and assumes ELF. -# Additionally, the libvpx.ver would need to be updated to work properly. -# As a result, we disable this universally, but keep it around in case we ever need to support -# something "special". -%if "%{vpxtarget}" == "generic-gnu" -%global generic_target 0 -%else -%global generic_target 0 -%endif - -%ifarch armv7hl -CROSS=armv7hl-redhat-linux-gnueabi- CHOST=armv7hl-redhat-linux-gnueabi-hardfloat ./configure \ -%else -./configure --target=%{vpxtarget} \ -%endif -%ifarch %{arm} ---disable-neon --disable-neon_asm \ -%endif ---enable-pic --disable-install-srcs \ ---enable-vp9-decoder --enable-vp9-encoder \ ---enable-experimental --enable-spatial-svc \ ---enable-vp9-highbitdepth \ -%if ! %{generic_target} ---enable-shared \ -%endif ---prefix=%{_prefix} --libdir=%{_libdir} --size-limit=16384x16384 - -# Hack our optflags in. -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 - -%ifarch armv7hl -#hackety hack hack -sed -i "s|AR=armv7hl-redhat-linux-gnueabi-ar|AR=ar|g" libs-%{vpxtarget}.mk -sed -i "s|AR=armv7hl-redhat-linux-gnueabi-ar|AR=ar|g" examples-%{vpxtarget}.mk -sed -i "s|AR=armv7hl-redhat-linux-gnueabi-ar|AR=ar|g" docs-%{vpxtarget}.mk - -sed -i "s|AS=armv7hl-redhat-linux-gnueabi-as|AS=as|g" libs-%{vpxtarget}.mk -sed -i "s|AS=armv7hl-redhat-linux-gnueabi-as|AS=as|g" examples-%{vpxtarget}.mk -sed -i "s|AS=armv7hl-redhat-linux-gnueabi-as|AS=as|g" docs-%{vpxtarget}.mk - -sed -i "s|NM=armv7hl-redhat-linux-gnueabi-nm|NM=nm|g" libs-%{vpxtarget}.mk -sed -i "s|NM=armv7hl-redhat-linux-gnueabi-nm|NM=nm|g" examples-%{vpxtarget}.mk -sed -i "s|NM=armv7hl-redhat-linux-gnueabi-nm|NM=nm|g" docs-%{vpxtarget}.mk -%endif - -make %{?_smp_mflags} verbose=true - -# Manual shared library creation -# We should never need to do this anymore, and if we do, we need to fix the version-script. -%if %{generic_target} -mkdir tmp -cd tmp -ar x ../libvpx_g.a -cd .. -gcc -fPIC -shared -pthread -lm -Wl,--no-undefined -Wl,-soname,libvpx.so.%{somajor} -Wl,--version-script,%{SOURCE2} -Wl,-z,noexecstack -o libvpx.so.%{soversion} tmp/*.o -rm -rf tmp -%endif - -# 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.%{soversion} libvpx.so - -# make %{?_smp_mflags} verbose=true target=examples CONFIG_SHARED=1 -# make %{?_smp_mflags} verbose=true target=docs - -# Put them back so the install doesn't fail -# mv libNOTvpx.a libvpx.a -# mv libNOTvpx_g.a libvpx_g.a - -%install -make DIST_DIR=%{buildroot}%{_prefix} dist - -# Simpler to label the dir as %%doc. -if [ -d %{buildroot}/usr/docs ]; then - mv %{buildroot}/usr/docs doc/ -fi - -# Again, we should never need to do this anymore. -%if %{generic_target} -install -p libvpx.so.%{soversion} %{buildroot}%{_libdir} -pushd %{buildroot}%{_libdir} -ln -sf libvpx.so.%{soversion} libvpx.so -ln -sf libvpx.so.%{soversion} libvpx.so.%{somajor} -ln -sf libvpx.so.%{soversion} libvpx.so.%{somajor}.%{sominor} -popd -%endif - -pushd %{buildroot} -# Stuff we don't need. -rm -rf usr/build/ usr/md5sums.txt usr/lib*/*.a usr/CHANGELOG usr/README -# No, bad google. No treat. -mv usr/bin/examples/* usr/bin/ -rm -rf usr/bin/examples - -# Remove files that aren't needed for the compat package -rm -rf %{buildroot}%{_bindir} -rm -rf %{buildroot}%{_includedir} -rm -rf %{buildroot}%{_libdir}/*.so -rm -rf %{buildroot}%{_libdir}/pkgconfig/ - -%files -%license LICENSE -%{_libdir}/libvpx.so.* - -%changelog -* Wed Feb 07 2018 Pete Walter pwalter@fedoraproject.org - 1.6.1-1 -- Initial packaging diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..2a9b05a --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Retire old compat package in F29+ diff --git a/libvpx.ver b/libvpx.ver deleted file mode 100644 index aa147ab..0000000 --- a/libvpx.ver +++ /dev/null @@ -1,79 +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_frame_buffer_functions; -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; -vpx_codec_vp8_cx_algo; -vpx_codec_vp8_dx; -vpx_codec_vp8_dx_algo; -vpx_codec_vp9_cx; -vpx_codec_vp9_cx_algo; -vpx_codec_vp9_dx; -vpx_codec_vp9_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; -vpx_svc_dump_statistics; -vpx_svc_encode; -vpx_svc_get_buffer; -vpx_svc_get_encode_frame_count; -vpx_svc_get_frame_size; -vpx_svc_get_layer_resolution; -vpx_svc_get_message; -vpx_svc_get_rc_stats_buffer; -vpx_svc_get_rc_stats_buffer_size; -vpx_svc_init; -vpx_svc_is_keyframe; -vpx_svc_release; -vpx_svc_set_keyframe; -vpx_svc_set_options; -vpx_svc_set_quantizers; -vpx_svc_set_scale_factors; -local: *; }; diff --git a/sources b/sources deleted file mode 100644 index 588eb3f..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (v1.6.1.tar.gz) = 13b7eb515d026b302b8c484d6f06df067feb5aed4ceac953d85fe84fd684dab07e89ddbf80b4f395c6d9127709422156287e5754f49246050b2e18930adb3970
arch-excludes@lists.fedoraproject.org