From d54f168a1ade2bea11c8fa9649a37f6ea931319dc3274991c6f371015e2ead8c Mon Sep 17 00:00:00 2001 From: Callum Farmer Date: Thu, 27 Oct 2022 15:09:39 +0000 Subject: [PATCH] Accepting request 1031571 from home:gmbr3:Active - Update to version 20220920+f9fda6e: * Fix shift amount for SSSE3 assembly for I012 format conversions * 10/12 bit YUV replicate upper bits to low bits before converting to RGB * Fix immediate offsets for row_neon build on gcc - Update to version 20220920+248172e: * I422ToRGB24, I422ToRAW, I422ToRGB24MatrixFilter conversion functions added. * Remove include resource.h for Fuchsia build * I420ToRGB24MatrixFilter function added * SSE2 MM21->YUY2 conversion * MM21ToYUY2 and ABGRToJ420 conversion * AB64ToARGB fix for inplace conversion * Bump up version to 1838 * Add I422ToRGB565Matrix * RAWToJ400 require multiple of 16 pixels for NEON * row_neon*: Explicitly initialize pad in RgbConstants * Fix MSVC warnings by adding casts * Define _CRT_SECURE_NO_WARNINGS if MSVC CRT is used * Reduce cmake verbosity and update min version * Set IMPORT_PREFIX to "lib" on Windows * Android.bp: Remove reference to LICENSE_THIRD_PARTY * Fix SSE2 version of ScalePlaneUp2_16_Bilinear * Disable bilinear 16 bit scale up for SSE2 * Add .vpython3 to libyuv. * Switch from python to python3. OBS-URL: https://build.opensuse.org/request/show/1031571 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libyuv?expand=0&rev=9 --- Disable-static-library.patch | 4 ++-- Don-t-install-conversion-tool.patch | 2 +- Use-a-proper-so-version.patch | 10 ++++----- _service | 2 +- _servicedata | 2 +- libyuv-20220713+d248929c.obscpio | 3 --- libyuv-20220920+f9fda6e.obscpio | 3 +++ libyuv.changes | 32 +++++++++++++++++++++++++++++ libyuv.obsinfo | 6 +++--- libyuv.spec | 15 +++++++------- 10 files changed, 56 insertions(+), 23 deletions(-) delete mode 100644 libyuv-20220713+d248929c.obscpio create mode 100644 libyuv-20220920+f9fda6e.obscpio diff --git a/Disable-static-library.patch b/Disable-static-library.patch index 10bd4be..132af78 100644 --- a/Disable-static-library.patch +++ b/Disable-static-library.patch @@ -17,8 +17,8 @@ index bff03e88..1832ad42 100644 FILE ( GLOB_RECURSE ly_source_files ${ly_src_dir}/*.cc ) @@ -22,9 +21,6 @@ LIST ( SORT ly_unittest_sources ) - - INCLUDE_DIRECTORIES( BEFORE ${ly_inc_dir} ) + ADD_DEFINITIONS ( -D_CRT_SECURE_NO_WARNINGS ) + endif() -# this creates the static library (.a) -ADD_LIBRARY ( ${ly_lib_static} STATIC ${ly_source_files} ) diff --git a/Don-t-install-conversion-tool.patch b/Don-t-install-conversion-tool.patch index 30f15a4..b32c02c 100644 --- a/Don-t-install-conversion-tool.patch +++ b/Don-t-install-conversion-tool.patch @@ -9,7 +9,7 @@ index 1832ad42..854aea7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,15 +28,9 @@ SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES PREFIX "lib" ) - INCLUDE ( CM_linux_packages.cmake ) + INCLUDE ( CM_linux_packages.cmake ) SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES VERSION ${YUV_VERSION} SOVERSION ${YUV_VER_MAJOR} ) -# this creates the conversion tool diff --git a/Use-a-proper-so-version.patch b/Use-a-proper-so-version.patch index 5167010..c407c53 100644 --- a/Use-a-proper-so-version.patch +++ b/Use-a-proper-so-version.patch @@ -8,11 +8,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index ed4948f0..e1f87062 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -30,6 +30,9 @@ ADD_LIBRARY ( ${ly_lib_shared} SHARED ${ly_source_files} ) - SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES OUTPUT_NAME "${ly_lib_name}" ) - SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES PREFIX "lib" ) - -+INCLUDE ( CM_linux_packages.cmake ) +@@ -37,6 +37,9 @@ + SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES IMPORT_PREFIX "lib" ) + endif() + ++INCLUDE ( CM_linux_packages.cmake ) +SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES VERSION ${YUV_VERSION} SOVERSION ${YUV_VER_MAJOR} ) + # this creates the conversion tool diff --git a/_service b/_service index dae4472..e69a5fa 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git https://chromium.googlesource.com/libyuv/libyuv.git - d248929c059ff7629a85333699717d7a677d8d96 + f9fda6e7d819c07a684ba6bc97cbf0e257bbcb37 %cd+%h enable diff --git a/_servicedata b/_servicedata index f6bcad0..856d8d7 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://chromium.googlesource.com/libyuv/libyuv.git - d248929c059ff7629a85333699717d7a677d8d96 \ No newline at end of file + f9fda6e7d819c07a684ba6bc97cbf0e257bbcb37 \ No newline at end of file diff --git a/libyuv-20220713+d248929c.obscpio b/libyuv-20220713+d248929c.obscpio deleted file mode 100644 index 87f9bd7..0000000 --- a/libyuv-20220713+d248929c.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2a59b42a5415a3a6c3cecf6b3bb1f62b66c9c71515067e5850088168d23513f -size 5293069 diff --git a/libyuv-20220920+f9fda6e.obscpio b/libyuv-20220920+f9fda6e.obscpio new file mode 100644 index 0000000..52c0622 --- /dev/null +++ b/libyuv-20220920+f9fda6e.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad6c8c237cc55401724e44de2464fcee7bf2c69bf04a1e76a22ad095c4f0c670 +size 5390861 diff --git a/libyuv.changes b/libyuv.changes index fb2f57a..beb49f6 100644 --- a/libyuv.changes +++ b/libyuv.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Thu Oct 27 14:35:19 UTC 2022 - gmbr3@opensuse.org + +- Update to version 20220920+f9fda6e: + * Fix shift amount for SSSE3 assembly for I012 format conversions + * 10/12 bit YUV replicate upper bits to low bits before converting to RGB + * Fix immediate offsets for row_neon build on gcc + +------------------------------------------------------------------- +Thu Oct 20 11:29:30 UTC 2022 - gmbr3@opensuse.org + +- Update to version 20220920+248172e: + * I422ToRGB24, I422ToRAW, I422ToRGB24MatrixFilter conversion functions added. + * Remove include resource.h for Fuchsia build + * I420ToRGB24MatrixFilter function added + * SSE2 MM21->YUY2 conversion + * MM21ToYUY2 and ABGRToJ420 conversion + * AB64ToARGB fix for inplace conversion + * Bump up version to 1838 + * Add I422ToRGB565Matrix + * RAWToJ400 require multiple of 16 pixels for NEON + * row_neon*: Explicitly initialize pad in RgbConstants + * Fix MSVC warnings by adding casts + * Define _CRT_SECURE_NO_WARNINGS if MSVC CRT is used + * Reduce cmake verbosity and update min version + * Set IMPORT_PREFIX to "lib" on Windows + * Android.bp: Remove reference to LICENSE_THIRD_PARTY + * Fix SSE2 version of ScalePlaneUp2_16_Bilinear + * Disable bilinear 16 bit scale up for SSE2 + * Add .vpython3 to libyuv. + * Switch from python to python3. + ------------------------------------------------------------------- Sat Oct 1 13:03:58 UTC 2022 - Callum Farmer diff --git a/libyuv.obsinfo b/libyuv.obsinfo index e19f972..859a6b7 100644 --- a/libyuv.obsinfo +++ b/libyuv.obsinfo @@ -1,4 +1,4 @@ name: libyuv -version: 20220713+d248929c -mtime: 1657710509 -commit: d248929c059ff7629a85333699717d7a677d8d96 +version: 20220920+f9fda6e +mtime: 1663715273 +commit: f9fda6e7d819c07a684ba6bc97cbf0e257bbcb37 diff --git a/libyuv.spec b/libyuv.spec index 260fe24..dd7015f 100644 --- a/libyuv.spec +++ b/libyuv.spec @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: libyuv -Version: 20220713+d248929c +Version: 20220920+f9fda6e Release: 0 Summary: YUV scaling and conversion library License: BSD-3-Clause @@ -31,8 +32,8 @@ Patch2: Disable-static-library.patch Patch3: Don-t-install-conversion-tool.patch Patch4: Use-library-suffix-during-installation.patch Patch5: Link-main-library-against-libjpeg.patch -BuildRequires: gcc-c++ BuildRequires: cmake +BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: pkgconfig(libjpeg) @@ -72,11 +73,11 @@ prefix=%{_prefix} exec_prefix=\${prefix} includedir=%{_includedir} libdir=%{_libdir} - -Name: %{name} -Description: %{summary} -Version: ${rversion} -Libs: -lyuv + +Name: %{name} +Description: %{summary} +Version: ${rversion} +Libs: -lyuv EOF %cmake