video codec updates

Signed-off-by: guibuilder_pel7ppc64lebuilder0 <guibuilder@powerel.org>

SPECS/opencore-amr.spec

@@ -1,7 +1,8 @@
 Name:           opencore-amr
 Version:        0.1.5
-Release:        6%{?dist}
+Release:        1%{?dist}
 Summary:        OpenCORE Adaptive Multi Rate Narrowband and Wideband speech lib
+Group:          System Environment/Libraries
 License:        ASL 2.0
 URL:            http://sourceforge.net/projects/opencore-amr/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -14,7 +15,8 @@ and Wideband speech codec.
 
 %package        devel
 Summary:        Development files for %{name}
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -33,11 +35,13 @@ mv opencore/README opencore/README.opencore
 
 
 %install
+rm -rf $RPM_BUILD_ROOT
 %make_install
 rm $RPM_BUILD_ROOT%{_libdir}/libopencore-amr??.la
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
@@ -52,21 +56,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/libopencore-amr??.la
 %{_libdir}/pkgconfig/opencore-amr??.pc
 
 %changelog
-* Tue Dec 11 2018 Nicolas Chauvet <kwizart@gmail.com> - 0.1.5-6
-- Spec file clean-up
-
-* Sun Aug 19 2018 Leigh Scott <leigh123linux@googlemail.com> - 0.1.5-5
-- Rebuilt for Fedora 29 Mass Rebuild binutils issue
-
-* Fri Jul 27 2018 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 0.1.5-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux@googlemail.com> - 0.1.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart@rpmfusion.org> - 0.1.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
 * Mon Mar 20 2017 Leigh Scott <leigh123linux@googlemail.com> - 0.1.5-1
 - Update to 0.1.5
 

SPECS/vid.stab.spec

@@ -1,3 +1,4 @@
+%undefine __cmake_in_source_build
 # https://github.com/georgmartius/vid.stab/commit/aeabc8daa7904f9edf7441a11f293965a5ef53b8
 %global commit aeabc8daa7904f9edf7441a11f293965a5ef53b8
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
@@ -5,7 +6,7 @@
 
 Name:           vid.stab
 Version:        1.1.0
-Release:        12.%{commitdate}git%{shortcommit}%{?dist}
+Release:        15.%{commitdate}git%{shortcommit}%{?dist}
 Summary:        Video stabilize library for fmpeg, mlt or transcode
 License:        GPLv2+
 URL:            http://public.hronopik.de/vid.stab
@@ -41,14 +42,9 @@ sed -i 's|-Wall -O0|-Wall -O|' tests/CMakeLists.txt
 sed -i 's|return units_failed==0;|return units_failed>0;|' tests/testframework.c
 
 %build
-%cmake .
+%cmake
 %make_build
 
-# build the tests program
-pushd tests
-%cmake .
-%make_build
-popd
 
 %install
 %make_install
@@ -70,6 +66,17 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} tests/tests || :
 %{_libdir}/pkgconfig/vidstab.pc
 
 %changelog
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-15.20190213gitaeabc8d
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+- Fix cmake build
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-14.20190213gitaeabc8d
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-13.20190213gitaeabc8d
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-12.20190213gitaeabc8d
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

SPECS/x264.spec

@@ -31,7 +31,7 @@
 Summary: H264/AVC video streams encoder
 Name: x264
 Version: 0.%{api}
-Release: 24%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 21%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
 License: GPLv2+
 URL: https://www.videolan.org/developers/x264.html
 Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -43,7 +43,7 @@ Patch0: x264-nover.patch
 Patch1: x264-10b.patch
 Patch10: x264-gpac.patch
 
-%{!?_without_gpac:BuildRequires: gpac-devel zlib-devel openssl-devel libpng-devel libjpeg-devel}
+%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel libjpeg-devel}
 %{!?_without_libavformat:BuildRequires: ffmpeg-devel}
 %{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel}
 # https://bugzilla.rpmfusion.org/show_bug.cgi?id=3975
@@ -53,7 +53,6 @@ BuildRequires: execstack
 %ifarch %{asmarch} %{simdarch}
 BuildRequires: yasm >= 1.0.0
 %endif
-BuildRequires: gcc
 # we need to enforce the exact EVR for an ISA - not only the same ABI
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -83,14 +82,14 @@ This package contains the development files.
 
 %global x_configure \
 %configure \\\
-    %{?_without_libavformat:--disable-lavf} \\\
-    %{?_without_libswscale:--disable-swscale} \\\
-    %{!?_with_ffmpegsource:--disable-ffms} \\\
-    --disable-opencl \\\
-    --disable-debug \\\
-    --enable-shared \\\
-    --system-libx264 \\\
-    --enable-pic
+	%{?_without_libavformat:--disable-lavf} \\\
+	%{?_without_libswscale:--disable-swscale} \\\
+	%{!?_with_ffmpegsource:--disable-ffms} \\\
+	--disable-opencl \\\
+	--enable-debug \\\
+	--enable-shared \\\
+	--system-libx264 \\\
+	--enable-pic
 
 %prep
 %setup -q -c -n %{name}-0.%{api}-%{snapshot}
@@ -113,35 +112,35 @@ done
 %build
 pushd generic
 %{x_configure}\
-    %{?_without_asm:--disable-asm}
+	%{?_without_asm:--disable-asm}
 
-%make_build
+%{__make} %{?_smp_mflags}
 popd
 
 pushd generic10
 %{x_configure}\
-    %{?_without_asm:--disable-asm}\
-    --disable-cli\
-    --bit-depth=10
+	%{?_without_asm:--disable-asm}\
+	--disable-cli\
+	--bit-depth=10
 
-%make_build
+%{__make} %{?_smp_mflags}
 popd
 
 %ifarch %{simdarch}
 pushd simd
 %{x_configure}\
-    --libdir=%{slibdir}
+	--libdir=%{slibdir}
 
-%make_build
+%{__make} %{?_smp_mflags}
 popd
 
 pushd simd10
 %{x_configure}\
-    --disable-cli\
-    --libdir=%{slibdir}\
-    --bit-depth=10
+	--disable-cli\
+	--libdir=%{slibdir}\
+	--bit-depth=10
 
-%make_build
+%{__make} %{?_smp_mflags}
 popd
 %endif
 
@@ -152,10 +151,10 @@ pushd ${variant}
 popd
 done
 %ifarch %{simdarch}
-for variant in simd10 simd ; do
+for variant in simd simd10 ; do
 pushd ${variant}
 %make_install
-rm -f %{buildroot}%{slibdir}/pkgconfig/x264.pc
+rm %{buildroot}%{slibdir}/pkgconfig/x264.pc
 popd
 done
 %endif
@@ -168,22 +167,20 @@ touch -r generic/version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_incl
 execstack -c %{buildroot}%{_libdir}/libx264{,10b}.so.%{api}
 %endif
 
-install -dm755 %{buildroot}%{_pkgdocdir}
-install -pm644 generic/AUTHORS %{buildroot}%{_pkgdocdir}/
-cp -a generic/doc %{buildroot}%{_pkgdocdir}/
-
+install -dm755 %{buildroot}%{_docdir}/%{name}
+install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_docdir}/%{name}/
 
 %post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
 
+%postun libs -p /sbin/ldconfig
 
 %files
 %{_bindir}/x264
 
 %files libs
-%{_pkgdocdir}/
-%exclude %{_pkgdocdir}/doc
-%license generic/COPYING
+%dir %{_docdir}/%{name}
+%{_docdir}/%{name}/AUTHORS
+%license %{_docdir}/%{name}/COPYING
 %{_libdir}/libx264.so.%{api}
 %{_libdir}/libx26410b.so.%{api}
 %ifarch %{simdarch}
@@ -192,7 +189,7 @@ cp -a generic/doc %{buildroot}%{_pkgdocdir}/
 %endif
 
 %files devel
-%{_pkgdocdir}/doc/
+%doc generic/doc/*
 %{_includedir}/x264.h
 %{_includedir}/x264_config.h
 %{_libdir}/libx264.so
@@ -204,19 +201,6 @@ cp -a generic/doc %{buildroot}%{_pkgdocdir}/
 %endif
 
 %changelog
-* Fri Oct 04 2019 Dominik Mierzejewski <rpm@greysector.net> - 0.148-24.20170521gitaaa9aa8
-- don't overwrite generic headers with 10bit on simdarch (rfbz#5071)
-
-* Thu Nov 22 2018 Antonio Trande <sagitter@fedoraproject.org> - 0.148-23.20170521gitaaa9aa8
-- Rebuild for ffmpeg-3.* on el7
-- Rebuild for x265-2.9 on el7
-- Set Make macros
-- Disable debug builds
-- Avoid mixed use of documentation macros
-
-* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart@rpmfusion.org> - 0.148-22.20170521gitaaa9aa8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
 * Mon Jun 26 2017 Sérgio Basto <sergio@serjux.com> - 0.148-21.20170521gitaaa9aa8
 - Update x264 to x264-0.148-20170521-aaa9aa8