From 61a86d3c53a8c21b28439e02b2dfc1c568dff694 Mon Sep 17 00:00:00 2001 From: tigro Date: Sun, 29 Dec 2024 22:29:51 +0300 Subject: [PATCH] import libdv-1.0.0-43.el10 --- .gitignore | 3 +- .libdv.metadata | 1 + .../libdv-dso-linking.patch | 0 SOURCES/libdv-gcc14.patch | 32 ++++++++++++++++++ libdv-gtk2.patch => SOURCES/libdv-gtk2.patch | 0 .../libdv-no-exec-stack.patch | 0 libdv-pic.patch => SOURCES/libdv-pic.patch | 6 ++-- libdv.spec => SPECS/libdv.spec | 33 ++++++++++++++++--- sources | 1 - 9 files changed, 65 insertions(+), 11 deletions(-) create mode 100644 .libdv.metadata rename libdv-dso-linking.patch => SOURCES/libdv-dso-linking.patch (100%) create mode 100644 SOURCES/libdv-gcc14.patch rename libdv-gtk2.patch => SOURCES/libdv-gtk2.patch (100%) rename libdv-no-exec-stack.patch => SOURCES/libdv-no-exec-stack.patch (100%) rename libdv-pic.patch => SOURCES/libdv-pic.patch (99%) rename libdv.spec => SPECS/libdv.spec (70%) delete mode 100644 sources diff --git a/.gitignore b/.gitignore index 0ae121b..374114e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -libdv-0.104.tar.gz -libdv-1.0.0.tar.gz +SOURCES/libdv-1.0.0.tar.gz diff --git a/.libdv.metadata b/.libdv.metadata new file mode 100644 index 0000000..94f8953 --- /dev/null +++ b/.libdv.metadata @@ -0,0 +1 @@ +2e5ba0e95f665d60e72cbebcf1c4989e0d6c92c8 SOURCES/libdv-1.0.0.tar.gz diff --git a/libdv-dso-linking.patch b/SOURCES/libdv-dso-linking.patch similarity index 100% rename from libdv-dso-linking.patch rename to SOURCES/libdv-dso-linking.patch diff --git a/SOURCES/libdv-gcc14.patch b/SOURCES/libdv-gcc14.patch new file mode 100644 index 0000000..7b5a0a1 --- /dev/null +++ b/SOURCES/libdv-gcc14.patch @@ -0,0 +1,32 @@ +--- a/libdv/dv.orig.c 2024-03-17 21:51:33.216006756 +0100 ++++ b/libdv/dv.c 2024-03-17 21:53:50.975829509 +0100 +@@ -35,6 +35,13 @@ + * @{ + */ + ++#if defined __GNUC__ && __GNUC__ >= 14 ++#pragma GCC diagnostic warning "-Wimplicit-function-declaration" ++#pragma GCC diagnostic warning "-Wincompatible-pointer-types" ++#pragma GCC diagnostic warning "-Wint-conversion" ++#pragma GCC diagnostic warning "-Wreturn-mismatch" ++#endif ++ + #if HAVE_CONFIG_H + # include + #endif +--- a/libdv/quant.orig.c 2024-03-17 22:16:58.212228098 +0100 ++++ b/libdv/quant.c 2024-03-17 22:18:20.503660888 +0100 +@@ -37,6 +37,13 @@ + * @{ + */ + ++#if defined __GNUC__ && __GNUC__ >= 14 ++#pragma GCC diagnostic warning "-Wimplicit-function-declaration" ++#pragma GCC diagnostic warning "-Wincompatible-pointer-types" ++#pragma GCC diagnostic warning "-Wint-conversion" ++#pragma GCC diagnostic warning "-Wreturn-mismatch" ++#endif ++ + #if HAVE_CONFIG_H + # include + #endif diff --git a/libdv-gtk2.patch b/SOURCES/libdv-gtk2.patch similarity index 100% rename from libdv-gtk2.patch rename to SOURCES/libdv-gtk2.patch diff --git a/libdv-no-exec-stack.patch b/SOURCES/libdv-no-exec-stack.patch similarity index 100% rename from libdv-no-exec-stack.patch rename to SOURCES/libdv-no-exec-stack.patch diff --git a/libdv-pic.patch b/SOURCES/libdv-pic.patch similarity index 99% rename from libdv-pic.patch rename to SOURCES/libdv-pic.patch index 92973f4..45cf1d0 100644 --- a/libdv-pic.patch +++ b/SOURCES/libdv-pic.patch @@ -272,7 +272,7 @@ diff -Naur libdv-1.0.0.old/libdv/dv.c libdv-1.0.0/libdv/dv.c } else { #if ARCH_X86 - _dv_quant_88_inverse_x86(mb->b[i].coeffs,mb->qno,mb->b[i].class_no); -+ _dv_quant_88_inverse_x86(mb->b[i].coeffs,mb->qno,mb->b[i].class_no,dv_quant_offset,dv_quant_shifts); ++ _dv_quant_88_inverse_x86(mb->b[i].coeffs,mb->qno,mb->b[i].class_no,dv_quant_offset,dv_quant_shifts[0]); _dv_idct_88(mb->b[i].coeffs); #elif ARCH_X86_64 _dv_quant_88_inverse_x86_64(mb->b[i].coeffs,mb->qno,mb->b[i].class_no); @@ -281,7 +281,7 @@ diff -Naur libdv-1.0.0.old/libdv/dv.c libdv-1.0.0/libdv/dv.c } else { #if ARCH_X86 - _dv_quant_88_inverse_x86(bl->coeffs,mb->qno,bl->class_no); -+ _dv_quant_88_inverse_x86(bl->coeffs,mb->qno,bl->class_no,dv_quant_offset,dv_quant_shifts); ++ _dv_quant_88_inverse_x86(bl->coeffs,mb->qno,bl->class_no,dv_quant_offset,dv_quant_shifts[0]); _dv_weight_88_inverse(bl->coeffs); _dv_idct_88(bl->coeffs); #elif ARCH_X86_64 @@ -652,7 +652,7 @@ diff -Naur libdv-1.0.0.old/libdv/quant.h libdv-1.0.0/libdv/quant.h extern void (*_dv_quant_248_inverse) (dv_coeff_t *block,int qno,int klass, dv_248_coeff_t *co); -extern void _dv_quant_88_inverse_x86(dv_coeff_t *block,int qno,int klass); -+extern void _dv_quant_88_inverse_x86(dv_coeff_t *block,int qno,int klass, uint8_t *offset, uint8_t *shifts); ++extern void _dv_quant_88_inverse_x86(dv_coeff_t *block,int qno,int klass, uint8_t *offset, uint8_t (*shifts)[4]); extern void _dv_quant_88_inverse_x86_64(dv_coeff_t *block,int qno,int klass); extern void dv_quant_init (void); #ifdef __cplusplus diff --git a/libdv.spec b/SPECS/libdv.spec similarity index 70% rename from libdv.spec rename to SPECS/libdv.spec index 3ec1ba9..ca94c31 100644 --- a/libdv.spec +++ b/SPECS/libdv.spec @@ -1,16 +1,16 @@ Name: libdv Version: 1.0.0 -Release: 36%{?dist} +Release: 43%{?dist} Summary: Software decoder for DV format video -License: LGPLv2+ +License: LGPL-2.0-or-later URL: http://libdv.sourceforge.net/ - -Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch1: %{name}-no-exec-stack.patch Patch2: %{name}-pic.patch Patch3: %{name}-gtk2.patch Patch4: %{name}-dso-linking.patch +Patch5: %{name}-gcc14.patch BuildRequires: autoconf BuildRequires: automake @@ -42,7 +42,6 @@ support the IEEE 1394 (a.k.a. FireWire or i.Link) interface. %package devel Summary: Development package for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: pkgconfig %description devel This package contains development files for %{name}. @@ -84,6 +83,30 @@ find %{buildroot} -name "*.la" -delete %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Dec 29 2024 Arkady L. Shane - 1.0.0-43 +- Rebuilt for MSVSphere 10 + +* Thu Jul 18 2024 Fedora Release Engineering - 1.0.0-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sun Mar 17 2024 Antonio Trande - 1.0.0-42 +- Update libdv-pic patch for GCC-14 (rhbz#2261310) + +* Thu Jan 25 2024 Fedora Release Engineering - 1.0.0-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.0.0-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 1.0.0-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.0.0-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1.0.0-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Mar 24 2022 Simone Caronni - 1.0.0-36 - Clean up SPEC file. - Trim changelog. diff --git a/sources b/sources deleted file mode 100644 index ec5b544..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -f895162161cfa4bb4a94c070a7caa6c7 libdv-1.0.0.tar.gz