From ba58a1f7e6ea30b4f9a01d29d36fe8b265564ef4 Mon Sep 17 00:00:00 2001 From: Rune Morling Date: Tue, 1 Oct 2024 15:11:10 +0200 Subject: [PATCH] libvpx1: Make it build again and add homepage The workaround is to set CC=gcc in the environment when running the configure script. This bypasses a wonky internal configure function that makes the configure script fail otherwise. Also add homepage. Fixes getsolus/packages#3853 Closes getsolus/packages#3554 (the last does not build package in the list). Part of getsolus/packages#411 Signed-off-by: Rune Morling --- packages/l/libvpx1/abi_libs32 | 1 + packages/l/libvpx1/abi_symbols32 | 2 ++ packages/l/libvpx1/abi_used_libs | 1 - packages/l/libvpx1/abi_used_libs32 | 1 - packages/l/libvpx1/abi_used_symbols | 15 ++++++------ packages/l/libvpx1/abi_used_symbols32 | 35 +++++++++++++++++++++++++++ packages/l/libvpx1/package.yml | 7 +++++- packages/l/libvpx1/pspec_x86_64.xml | 25 +++++++++++-------- 8 files changed, 66 insertions(+), 21 deletions(-) create mode 100644 packages/l/libvpx1/abi_libs32 create mode 100644 packages/l/libvpx1/abi_used_symbols32 diff --git a/packages/l/libvpx1/abi_libs32 b/packages/l/libvpx1/abi_libs32 new file mode 100644 index 00000000000..cd580572b56 --- /dev/null +++ b/packages/l/libvpx1/abi_libs32 @@ -0,0 +1 @@ +libvpx.so.1 diff --git a/packages/l/libvpx1/abi_symbols32 b/packages/l/libvpx1/abi_symbols32 index d9added4610..42125160d51 100644 --- a/packages/l/libvpx1/abi_symbols32 +++ b/packages/l/libvpx1/abi_symbols32 @@ -27,7 +27,9 @@ libvpx.so.1:vpx_codec_version libvpx.so.1:vpx_codec_version_extra_str libvpx.so.1:vpx_codec_version_str libvpx.so.1:vpx_codec_vp8_cx +libvpx.so.1:vpx_codec_vp8_cx_algo libvpx.so.1:vpx_codec_vp8_dx +libvpx.so.1:vpx_codec_vp8_dx_algo libvpx.so.1:vpx_img_alloc libvpx.so.1:vpx_img_flip libvpx.so.1:vpx_img_free diff --git a/packages/l/libvpx1/abi_used_libs b/packages/l/libvpx1/abi_used_libs index 20ce53203f1..0b7acb55143 100644 --- a/packages/l/libvpx1/abi_used_libs +++ b/packages/l/libvpx1/abi_used_libs @@ -1,3 +1,2 @@ libc.so.6 libm.so.6 -libpthread.so.0 diff --git a/packages/l/libvpx1/abi_used_libs32 b/packages/l/libvpx1/abi_used_libs32 index 20ce53203f1..0b7acb55143 100644 --- a/packages/l/libvpx1/abi_used_libs32 +++ b/packages/l/libvpx1/abi_used_libs32 @@ -1,3 +1,2 @@ libc.so.6 libm.so.6 -libpthread.so.0 diff --git a/packages/l/libvpx1/abi_used_symbols b/packages/l/libvpx1/abi_used_symbols index 8de2494d2da..ec2ca2b8a6b 100644 --- a/packages/l/libvpx1/abi_used_symbols +++ b/packages/l/libvpx1/abi_used_symbols @@ -15,9 +15,16 @@ libc.so.6:malloc libc.so.6:memcpy libc.so.6:memmove libc.so.6:memset +libc.so.6:pthread_create +libc.so.6:pthread_join +libc.so.6:pthread_once libc.so.6:rand libc.so.6:realloc libc.so.6:sched_yield +libc.so.6:sem_destroy +libc.so.6:sem_init +libc.so.6:sem_post +libc.so.6:sem_wait libc.so.6:strncmp libc.so.6:strtol libc.so.6:sysconf @@ -26,11 +33,3 @@ libm.so.6:exp libm.so.6:log libm.so.6:log10 libm.so.6:pow -libm.so.6:sqrt -libpthread.so.0:pthread_create -libpthread.so.0:pthread_join -libpthread.so.0:pthread_once -libpthread.so.0:sem_destroy -libpthread.so.0:sem_init -libpthread.so.0:sem_post -libpthread.so.0:sem_wait diff --git a/packages/l/libvpx1/abi_used_symbols32 b/packages/l/libvpx1/abi_used_symbols32 new file mode 100644 index 00000000000..ec2ca2b8a6b --- /dev/null +++ b/packages/l/libvpx1/abi_used_symbols32 @@ -0,0 +1,35 @@ +libc.so.6:__assert_fail +libc.so.6:__stack_chk_fail +libc.so.6:_setjmp +libc.so.6:calloc +libc.so.6:fclose +libc.so.6:fopen64 +libc.so.6:fprintf +libc.so.6:fputc +libc.so.6:free +libc.so.6:fwrite +libc.so.6:getenv +libc.so.6:gettimeofday +libc.so.6:longjmp +libc.so.6:malloc +libc.so.6:memcpy +libc.so.6:memmove +libc.so.6:memset +libc.so.6:pthread_create +libc.so.6:pthread_join +libc.so.6:pthread_once +libc.so.6:rand +libc.so.6:realloc +libc.so.6:sched_yield +libc.so.6:sem_destroy +libc.so.6:sem_init +libc.so.6:sem_post +libc.so.6:sem_wait +libc.so.6:strncmp +libc.so.6:strtol +libc.so.6:sysconf +libc.so.6:vsnprintf +libm.so.6:exp +libm.so.6:log +libm.so.6:log10 +libm.so.6:pow diff --git a/packages/l/libvpx1/package.yml b/packages/l/libvpx1/package.yml index 2bc3719ca5b..34edcbfd15d 100644 --- a/packages/l/libvpx1/package.yml +++ b/packages/l/libvpx1/package.yml @@ -1,8 +1,9 @@ name : libvpx1 version : 1.3.0 -release : 2 +release : 3 source : - https://github.com/webmproject/libvpx/archive/v1.3.0.tar.gz : db72881e1c34e4ae92666847844f35dd2dd431bcf6284500b1b396464f882f64 +homepage : https://github.com/webmproject/libvpx license : BSD-3-Clause component : binary.compat emul32 : yes @@ -11,6 +12,10 @@ description: | This package provides binary compatibility only. It is forbidden to build against it. builddeps : - yasm +environment: | + # the ./configure script checks if CC is set and when it isn't, it errors out + # on an internal configure script function call that makes little sense + export CC=gcc setup : | %patch -p1 -i $pkgfiles/gcc-5.patch %patch -p1 -i $pkgfiles/security/cve-2017-13194.patch diff --git a/packages/l/libvpx1/pspec_x86_64.xml b/packages/l/libvpx1/pspec_x86_64.xml index 60856d291e4..5f0b7517fc9 100644 --- a/packages/l/libvpx1/pspec_x86_64.xml +++ b/packages/l/libvpx1/pspec_x86_64.xml @@ -1,16 +1,17 @@ libvpx1 + https://github.com/webmproject/libvpx - Peter O'Connor - peter@solus-project.com + Muhammad Alfi Syahrin + malfisya.dev@hotmail.com BSD-3-Clause binary.compat libvpx1 (Binary Compatibility Library) This package provides binary compatibility only. It is forbidden to build against it. - https://solus-project.com/sources/README.Solus + https://sources.getsol.us/README.Solus libvpx1 @@ -19,7 +20,9 @@ binary.compat - /usr/lib64/lib*.so.* + /usr/lib64/libvpx.so.1 + /usr/lib64/libvpx.so.1.3 + /usr/lib64/libvpx.so.1.3.0 @@ -29,19 +32,21 @@ emul32 - libvpx1 + libvpx1 - /usr/lib32/lib*.so.* + /usr/lib32/libvpx.so.1 + /usr/lib32/libvpx.so.1.3 + /usr/lib32/libvpx.so.1.3.0 - - 2018-03-25 + + 2024-10-01 1.3.0 Packaging update - Peter O'Connor - peter@solus-project.com + Muhammad Alfi Syahrin + malfisya.dev@hotmail.com \ No newline at end of file