March 2022 - rpmfusion-commits

[mixxx] (3 commits) ...Disable -Werror in benchmark/googletest/googlemock builds

by Uwe Klotz

Summary of changes: 3d039ef... Do not abort the build on warnings (*) 2e50016... Revert "Do not abort the build on warnings" (*) 267eadc... Disable -Werror in benchmark/googletest/googlemock builds (*) (*) This commit already existed in another branch; no separate mail sent

2 years, 8 months

1
0
0 / 0

[mixxx/f36] Disable -Werror in benchmark/googletest/googlemock builds

by Uwe Klotz

commit 267eadca4db195ae4ee47605b798926f14e952d8 Author: Uwe Klotz <uklotz(a)mixxx.org> Date: Fri Mar 11 03:00:43 2022 +0100 Disable -Werror in benchmark/googletest/googlemock builds disable_werror_in_tests.patch | 39 +++++++++++++++++++++++++++++++++++++++ mixxx.spec | 1 + 2 files changed, 40 insertions(+) --- diff --git a/disable_werror_in_tests.patch b/disable_werror_in_tests.patch new file mode 100644 index 0000000..cb5d525 --- /dev/null +++ b/disable_werror_in_tests.patch @@ -0,0 +1,39 @@ +diff --git a/lib/benchmark/CMakeLists.txt b/lib/benchmark/CMakeLists.txt +index 49f2ae2a0f..7b494ee8db 100644 +--- a/lib/benchmark/CMakeLists.txt ++++ b/lib/benchmark/CMakeLists.txt +@@ -160,9 +160,9 @@ else() + add_cxx_compiler_flag(-Wall) + add_cxx_compiler_flag(-Wextra) + add_cxx_compiler_flag(-Wshadow) +- add_cxx_compiler_flag(-Werror RELEASE) +- add_cxx_compiler_flag(-Werror RELWITHDEBINFO) +- add_cxx_compiler_flag(-Werror MINSIZEREL) ++ #add_cxx_compiler_flag(-Werror RELEASE) ++ #add_cxx_compiler_flag(-Werror RELWITHDEBINFO) ++ #add_cxx_compiler_flag(-Werror MINSIZEREL) + if (NOT BENCHMARK_ENABLE_TESTING) + # Disable warning when compiling tests as gtest does not use 'override'. + add_cxx_compiler_flag(-Wsuggest-override) +diff --git a/lib/googletest/googletest/cmake/internal_utils.cmake b/lib/googletest/googletest/cmake/internal_utils.cmake +index 8d8d60a86c..58fc9bfbee 100644 +--- a/lib/googletest/googletest/cmake/internal_utils.cmake ++++ b/lib/googletest/googletest/cmake/internal_utils.cmake +@@ -84,13 +84,13 @@ macro(config_compiler_and_linker) + # Ensure MSVC treats source files as UTF-8 encoded. + set(cxx_base_flags "${cxx_base_flags} -utf-8") + elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +- set(cxx_base_flags "-Wall -Wshadow -Werror -Wconversion") ++ set(cxx_base_flags "-Wall -Wshadow -Wconversion") + set(cxx_exception_flags "-fexceptions") + set(cxx_no_exception_flags "-fno-exceptions") + set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls") + set(cxx_no_rtti_flags "-fno-rtti") + elseif (CMAKE_COMPILER_IS_GNUCXX) +- set(cxx_base_flags "-Wall -Wshadow -Werror") ++ set(cxx_base_flags "-Wall -Wshadow") + if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0) + set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else") + endif() +-- +2.35.1 diff --git a/mixxx.spec b/mixxx.spec index 5267b61..65f3c02 100644 --- a/mixxx.spec +++ b/mixxx.spec @@ -34,6 +34,7 @@ Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}/%{name}-%{ # as a fragment identifier to the URL to populate SOURCE1 correctly Source1: https://github.com/mixxxdj/libkeyfinder/archive/refs/tags/v%{libkeyfinder... Patch0: appstream_metainfo.patch +Patch1: disable_werror_in_tests.patch # Build Tools BuildRequires: desktop-file-utils

2 years, 8 months

1
0
0 / 0

[mixxx/f36] Revert "Do not abort the build on warnings"

by Uwe Klotz

commit 2e500162de9153189413638be30888633a3d52da Author: Uwe Klotz <uklotz(a)mixxx.org> Date: Fri Mar 11 02:04:13 2022 +0100 Revert "Do not abort the build on warnings" This reverts commit 3d039ef39863df178939038ed5dcc3c560a0e618. mixxx.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- diff --git a/mixxx.spec b/mixxx.spec index 093eaae..5267b61 100644 --- a/mixxx.spec +++ b/mixxx.spec @@ -114,15 +114,13 @@ echo "#pragma once" > src/build.h mkdir -p %{__cmake_builddir}/downloads cp %{SOURCE1} %{__cmake_builddir}/downloads -# TODO: Set -DWARNINGS_FATAL=ON -# Disabled to fix compile errors in googletest caused by -Wrestrict (implied by -Wall) %build %cmake \ -GNinja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DOPTIMIZE=portable \ -DINSTALL_USER_UDEV_RULES=ON \ - -DWARNINGS_FATAL=OFF \ + -DWARNINGS_FATAL=ON \ -DBATTERY=ON \ -DBROADCAST=ON \ -DBULK=ON \

2 years, 8 months

1
0
0 / 0

[xine-lib/el7: 2/2] Merge remote-tracking branch 'origin/master' into el7

by Xavier Bachelot

commit 2d6276690431d42d866fe5d506c2cc929485d477 Merge: 559556f 8f73ce3 Author: Xavier Bachelot <xavier(a)bachelot.org> Date: Thu Mar 10 14:39:57 2022 +0100 Merge remote-tracking branch 'origin/master' into el7 xine-lib-1.2.12-fix_older_libcaca.patch | 22 ++++++++++++++++++++++ xine-lib.spec | 17 ++++++++++++++--- 2 files changed, 36 insertions(+), 3 deletions(-) ---

2 years, 8 months

1
0
0 / 0

[xine-lib/el7] (2 commits) ...Merge remote-tracking branch 'origin/master' into el7

by Xavier Bachelot

Summary of changes: 8f73ce3... Fix build on EL7 and EL8 (*) 2d62766... Merge remote-tracking branch 'origin/master' into el7 (*) This commit already existed in another branch; no separate mail sent

2 years, 8 months

1
0
0 / 0

[xine-lib/el8: 2/2] Merge remote-tracking branch 'origin/master' into el8

by Xavier Bachelot

commit 9c09a89559cd0a435876e84bdd2bb5ee4cc0b457 Merge: 87ebe8b 8f73ce3 Author: Xavier Bachelot <xavier(a)bachelot.org> Date: Thu Mar 10 14:39:29 2022 +0100 Merge remote-tracking branch 'origin/master' into el8 xine-lib-1.2.12-fix_older_libcaca.patch | 22 ++++++++++++++++++++++ xine-lib.spec | 17 ++++++++++++++--- 2 files changed, 36 insertions(+), 3 deletions(-) ---

2 years, 8 months

1
0
0 / 0

[xine-lib/el8] (2 commits) ...Merge remote-tracking branch 'origin/master' into el8

by Xavier Bachelot

Summary of changes: 8f73ce3... Fix build on EL7 and EL8 (*) 9c09a89... Merge remote-tracking branch 'origin/master' into el8 (*) This commit already existed in another branch; no separate mail sent

2 years, 8 months

1
0
0 / 0

[xine-lib] Fix build on EL7 and EL8

by Xavier Bachelot

commit 8f73ce313320714a1553f257daf87c198a6d59b5 Author: Xavier Bachelot <xavier(a)bachelot.org> Date: Thu Mar 10 14:39:05 2022 +0100 Fix build on EL7 and EL8 xine-lib-1.2.12-fix_older_libcaca.patch | 22 ++++++++++++++++++++++ xine-lib.spec | 17 ++++++++++++++--- 2 files changed, 36 insertions(+), 3 deletions(-) --- diff --git a/xine-lib-1.2.12-fix_older_libcaca.patch b/xine-lib-1.2.12-fix_older_libcaca.patch new file mode 100644 index 0000000..85bb014 --- /dev/null +++ b/xine-lib-1.2.12-fix_older_libcaca.patch @@ -0,0 +1,22 @@ +# HG changeset patch +# User Xavier Bachelot <xavier(a)bachelot.org> +# Date 1646916446 -3600 +# Thu Mar 10 13:47:26 2022 +0100 +# Node ID 6488085f778dd8115562ca308e2a60b502954dfc +# Parent 41217d6440d1f52478180d7e477aa7e7df953507 +Fix build with older libcaca + +This was introduced in 3f383e + +diff -r 41217d6440d1 -r 6488085f778d src/video_out/video_out_caca.c +--- a/src/video_out/video_out_caca.c Wed Mar 09 15:12:14 2022 +0200 ++++ b/src/video_out/video_out_caca.c Thu Mar 10 13:47:26 2022 +0100 +@@ -44,7 +44,7 @@ + # define caca_get_canvas_height cucul_get_canvas_height + # define caca_free_canvas cucul_free_canvas + # define caca_dither_t cucul_dither_t +-# define caca_create_dither define cucul_create_dither ++# define caca_create_dither cucul_create_dither + # define caca_dither_bitmap cucul_dither_bitmap + # define caca_free_dither cucul_free_dither + #endif diff --git a/xine-lib.spec b/xine-lib.spec index e7d3536..483e4c8 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -4,9 +4,14 @@ %if 0%{?el7} %global _without_dav1d 1 + %global _without_gcrypt 1 %global _without_png 1 %endif +%if 0%{?el8} + %global _without_gcrypt 1 +%endif + %if 0%{?el9} # RHBZ 2031269 %global _without_caca 1 @@ -39,7 +44,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.2.12 -Release: 1%{?snapshot:.%{date}hg%{revision}}%{?dist} +Release: 2%{?snapshot:.%{date}hg%{revision}}%{?dist} License: GPLv2+ URL: https://www.xine-project.org/ %if ! 0%{?snapshot} @@ -50,6 +55,8 @@ Source0: xine-lib-%{version}-%{date}hg%{revision}.tar.xz # Script to make a snapshot Source1: make_xinelib_snapshot.sh +Patch1: xine-lib-1.2.12-fix_older_libcaca.patch + Provides: xine-lib(plugin-abi) = %{plugin_abi} %{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}} @@ -78,7 +85,7 @@ BuildRequires: libdca-devel %{!?_without_dvdnav:BuildRequires: libdvdnav-devel} BuildRequires: libdvdread-devel %{!?_without_fame:BuildRequires: libfame-devel} -BuildRequires: libgcrypt-devel +%{!?_without_gcrypt:BuildRequires: libgcrypt-devel} BuildRequires: libGLU-devel BuildRequires: libmad-devel BuildRequires: libmng-devel @@ -143,6 +150,7 @@ This package contains extra plugins for %{name}: %prep %if ! 0%{?snapshot} %setup -q +%patch1 -p1 %else %setup -q -n %{name}-%{version}-%{date}hg%{revision} %endif @@ -280,7 +288,7 @@ mkdir -p %{buildroot}%{codecdir} %{!?_without_va:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_hw_frame_vaapi.so} %{!?_without_bluray:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_bluray.so} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_cdda.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_crypto.so +%{!?_without_gcrypt:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_crypto.so} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_dvb.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_dvd.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_mms.so @@ -348,6 +356,9 @@ mkdir -p %{buildroot}%{codecdir} %changelog +* Thu Mar 10 2022 Xavier Bachelot <xavier(a)bachelot.org> - 1.2.12-2 +- Fix build on EL7 and EL8 + * Thu Mar 10 2022 Xavier Bachelot <xavier(a)bachelot.org> - 1.2.12-1 - Update to 1.2.12

2 years, 8 months

1
0
0 / 0

[xine-lib/el7: 20/20] Merge remote-tracking branch 'origin/master' into el7

by Xavier Bachelot

commit 559556fa6cd086ac97f8e731ac2b7dbd437f8dd3 Merge: 35f8751 6fa6e18 Author: Xavier Bachelot <xavier(a)bachelot.org> Date: Thu Mar 10 10:14:49 2022 +0100 Merge remote-tracking branch 'origin/master' into el7 .gitignore | 3 ++ sources | 2 +- xine-lib.spec | 95 +++++++++++++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 83 insertions(+), 17 deletions(-) ---

2 years, 8 months

1
0
0 / 0

[xine-lib/el7] (20 commits) ...Merge remote-tracking branch 'origin/master' into el7

by Xavier Bachelot

Summary of changes: 78925e6... Rebuild for dav1d SONAME bump (*) 387c6b0... Actually do the dav1d rebuild (*) 9b0d40f... Rebuilt for new ffmpeg snapshot (*) 30bc586... - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass (*) 45b6590... Rebuild for new aom (*) e4de52e... - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass (*) feeeaec... Rebuilt for new ffmpeg snapshot (*) 0e59340... Rebuilt for new ImageMagick (*) 9548943... Rebuilt for libjxl-0.6.1 (*) 07f9882... Rebuilt for new ImageMagick on F34 (*) ed745cc... rebuilt (*) 76f31a6... Fix build with libcaca > 0.99beta20 (*) 2ada228... Update to xine-lib snapshot. (*) 16ea584... Add unpacked files (*) 6146747... Specfile clean up (*) 8796b82... Update xine-lib snapshot (*) ca239d8... Add support for EL9 (*) 7fe47e0... Add Changelog entry and bump Release (*) 6fa6e18... Update to 1.2.12 (*) 559556f... Merge remote-tracking branch 'origin/master' into el7 (*) This commit already existed in another branch; no separate mail sent

2 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits March 2022