diff --git a/.gitignore b/.gitignore index 5c71735..063c100 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1 @@ -libXvMC-1.0.5.tar.bz2 -libXvMC-1.0.6.tar.bz2 -/libXvMC-1.0.7.tar.bz2 -/libXvMC-20130524.tar.bz2 -/libXvMC-1.0.8.tar.bz2 -/libXvMC-1.0.9.tar.bz2 -/libXvMC-1.0.10.tar.bz2 -/libXvMC-1.0.11.tar.bz2 -/libXvMC-1.0.12.tar.bz2 -/libXvMC-1.0.13.tar.xz +libXvMC-1.0.4.tar.bz2 diff --git a/commitid b/commitid deleted file mode 100644 index c3de932..0000000 --- a/commitid +++ /dev/null @@ -1 +0,0 @@ -8c164524d229adb6141fdac8336b3823e7fe1a5d diff --git a/libXvMC.spec b/libXvMC.spec index 13b5fd4..b61a760 100644 --- a/libXvMC.spec +++ b/libXvMC.spec @@ -1,53 +1,55 @@ -%global tarball libXvMC -#global gitdate 20130524 -%global gitversion e9415ddef - Summary: X.Org X11 libXvMC runtime library Name: libXvMC -Version: 1.0.13 -Release: 8%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} -License: MIT +Version: 1.0.4 +Release: 3%{?dist} +License: MIT/X11 +Group: System Environment/Libraries URL: http://www.x.org +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if 0%{?gitdate} -Source0: %{tarball}-%{gitdate}.tar.bz2 -Source1: make-git-snapshot.sh -Source2: commitid -%else -Source0: https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.xz -%endif +Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 -Requires: libX11 >= 1.5.99.902 +BuildRequires: pkgconfig +BuildRequires: xorg-x11-proto-devel +BuildRequires: libX11-devel +BuildRequires: libXext-devel +BuildRequires: libXv-devel -BuildRequires: make -BuildRequires: xorg-x11-util-macros -BuildRequires: autoconf automake libtool -BuildRequires: pkgconfig(videoproto) pkgconfig(xv) -BuildRequires: libX11-devel >= 1.5.99.902 +Obsoletes: XFree86-libs, xorg-x11-libs %description X.Org X11 libXvMC runtime library %package devel Summary: X.Org X11 libXvMC development package +Group: Development/Libraries +Requires(pre): xorg-x11-filesystem >= 0.99.2-3 Requires: %{name} = %{version}-%{release} +# needed by xvmc.pc +Requires: libXv-devel, xorg-x11-proto-devel + +Obsoletes: XFree86-devel, xorg-x11-devel %description devel X.Org X11 libXvMC development package %prep -%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} +%setup -q + +# Disable static library creation by default. +%define with_static 0 %build -autoreconf -v --install --force -%configure --disable-static -make %{?_smp_mflags} +%configure \ +%if ! %{with_static} + --disable-static +%endif +make %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +rm -rf $RPM_BUILD_ROOT -# do this ourself in %%doc so we get %%version -rm $RPM_BUILD_ROOT%{_docdir}/*/*.txt +make install DESTDIR=$RPM_BUILD_ROOT # Touch XvMCConfig for rpm to package the ghost file. (#192254) { @@ -55,13 +57,18 @@ rm $RPM_BUILD_ROOT%{_docdir}/*/*.txt touch $RPM_BUILD_ROOT%{_sysconfdir}/X11/XvMCConfig } -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +# We intentionally don't ship *.la files +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -%ldconfig_post -%ldconfig_postun +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files -%doc COPYING README.md +%defattr(-,root,root,-) +%doc AUTHORS COPYING README ChangeLog %{_libdir}/libXvMC.so.1 %{_libdir}/libXvMC.so.1.0.0 %{_libdir}/libXvMCW.so.1 @@ -69,169 +76,19 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %ghost %config(missingok,noreplace) %verify (not md5 size mtime) %{_sysconfdir}/X11/XvMCConfig %files devel -%doc XvMC_API.txt +%defattr(-,root,root,-) +%dir %{_includedir}/X11 +%dir %{_includedir}/X11/extensions %{_includedir}/X11/extensions/XvMClib.h -%{_includedir}/X11/extensions/vldXvMC.h +%if %{with_static} +%{_libdir}/libXvMC.a +%{_libdir}/libXvMCW.a +%endif %{_libdir}/libXvMC.so %{_libdir}/libXvMCW.so %{_libdir}/pkgconfig/xvmc.pc -%{_libdir}/pkgconfig/xvmc-wrapper.pc %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 1.0.13-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 1.0.13-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 18 2024 Fedora Release Engineering - 1.0.13-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 1.0.13-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.0.13-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 1.0.13-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 1.0.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Nov 04 2022 Benjamin Tissoires - 1.0.13-1 -- libXvMC 1.0.13-1 - -* Thu Jul 21 2022 Fedora Release Engineering - 1.0.12-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 1.0.12-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 1.0.12-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.0.12-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Nov 5 12:27:20 AEST 2020 Peter Hutterer - 1.0.12-4 -- Add BuildRequires for make - -* Tue Jul 28 2020 Fedora Release Engineering - 1.0.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 1.0.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Oct 09 2019 Adam Jackson - 1.0.12-1 -- libXvMC 1.0.12 - -* Thu Jul 25 2019 Fedora Release Engineering - 1.0.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Mar 20 2019 Adam Jackson - 1.0.11-1 -- libXvMC 1.0.11 - -* Fri Feb 01 2019 Fedora Release Engineering - 1.0.10-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1.0.10-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Jul 05 2018 Adam Jackson - 1.0.10-6 -- Drop useless %%defattr - -* Wed Feb 07 2018 Fedora Release Engineering - 1.0.10-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.0.10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.0.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.0.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Oct 05 2016 Benjamin Tissoires 1.0.10-1 -- libXvMC 1.0.10 -- fixes CVE-2016-7953 - -* Thu Feb 04 2016 Fedora Release Engineering - 1.0.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.0.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Mar 14 2015 Benjamin Tissoires 1.0.9-1 -- libXvMC 1.0.9 - -* Sun Aug 17 2014 Fedora Release Engineering - 1.0.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1.0.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 1.0.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Jul 08 2013 Peter Hutterer 1.0.8-1 -- libXvMC 1.0.8 - -* Mon May 27 2013 Peter Hutterer - 1.0.7-7.20130524gite9415ddef -- Require libX11 1.6RC2 for _XEatDataWords - -* Fri May 24 2013 Dave Airlie 1.0.7-5.20130524gite9415ddef -- Update to latest git to fix the following CVEs -- CVE-2013-1999 - -* Thu Mar 07 2013 Peter Hutterer - 1.0.7-4 -- autoreconf for aarch64 - -* Thu Feb 14 2013 Fedora Release Engineering - 1.0.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 1.0.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Mar 08 2012 Adam Jackson 1.0.7-1 -- libXvMC 1.0.7 - -* Fri Jan 13 2012 Fedora Release Engineering - 1.0.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 1.0.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Oct 18 2010 Parag Nemade 1.0.6-2 -- Merge-review cleanup (#226092) - -* Mon Aug 16 2010 Peter Hutterer 1.0.6-1 -- libXvMC 1.0.6 -- remove AUTHORS, not in tarball anymore - -* Wed Oct 07 2009 Adam Jackson 1.0.5-1 -- libXvMC 1.0.5 - -* Fri Jul 24 2009 Fedora Release Engineering - 1.0.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jul 23 2009 Adam Jackson 1.0.4-7 -- Un-require xorg-x11-filesystem -- Remove useless %%dir - -* Wed Feb 25 2009 Fedora Release Engineering - 1.0.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Jul 15 2008 Adam Jackson 1.0.4-5 -- Fix license tag. - -* Tue Feb 19 2008 Fedora Release Engineering - 1.0.4-4 -- Autorebuild for GCC 4.3 - * Tue Aug 21 2007 Adam Jackson - 1.0.4-3 - Rebuild for build id diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh deleted file mode 100755 index 2a86575..0000000 --- a/make-git-snapshot.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -DIRNAME=libXvMC-$( date +%Y%m%d ) - -rm -rf $DIRNAME -git clone git://git.freedesktop.org/git/xorg/lib/libXvMC $DIRNAME -cd $DIRNAME -if [ -z "$1" ]; then - git log | head -1 -else - git checkout $1 -fi -git log | head -1 | awk '{ print $2 }' > ../commitid -git repack -a -d -cd .. -tar jcf $DIRNAME.tar.bz2 $DIRNAME -rm -rf $DIRNAME diff --git a/sources b/sources index 7f8128e..d36d403 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libXvMC-1.0.13.tar.xz) = c9d0f73884a586efb9ea4f77fc8555f60d940077d7dff8eaa765b86345c8b4e3d80b860f68191d2830c272b9e464c08450fbb51bb64819753a6f4228c71861ac +b54600573daf9d1a29b952e8d35b389e libXvMC-1.0.4.tar.bz2