Author: rathann Update of /cvs/free/rpms/xvidcore/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv16314 Modified Files: .cvsignore sources xvidcore.spec Added Files: xvidcore-rpm.patch Removed Files: xvidcore-noexecstack.patch Log Message: * Wed Dec 03 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.2.0-1 - 1.2.0 - drop upstreamed noexec stack patch - BR recent nasm instead of yasm - licence seems to be just GPLv2+ - move TODO from main to -devel doc - update summary and description - small spec file fixes xvidcore-rpm.patch: --- NEW FILE xvidcore-rpm.patch --- diff -up xvidcore/src/xvid.c.r xvidcore/src/xvid.c --- xvidcore/src/xvid.c.r 2008-11-30 17:38:31.000000000 +0100 +++ xvidcore/src/xvid.c 2008-12-03 00:47:15.000000000 +0100 @@ -27,6 +27,9 @@ #include <stdlib.h> #include <string.h> #include <time.h> +#ifndef _WIN32 +#include <unistd.h> +#endif #include "xvid.h" #include "decoder.h" @@ -675,7 +678,6 @@ xvid_gbl_info(xvid_gbl_info_t * info) #else - #include <unistd.h> info->num_threads = sysconf(_SC_NPROCESSORS_CONF); #endif Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xvidcore/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Aug 2008 15:23:52 -0000 1.2 +++ .cvsignore 3 Dec 2008 00:04:05 -0000 1.3 @@ -1 +1 @@ -xvidcore-1.1.3.tar.bz2 +xvidcore-1.2.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/xvidcore/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Aug 2008 15:23:52 -0000 1.2 +++ sources 3 Dec 2008 00:04:05 -0000 1.3 @@ -1 +1 @@ -29c60d4d991ac18f687a8fd13cfe64b7 xvidcore-1.1.3.tar.bz2 +07c31ebf7d4e7aa6fcd17e8e4a0d1aca xvidcore-1.2.0.tar.bz2 Index: xvidcore.spec =================================================================== RCS file: /cvs/free/rpms/xvidcore/devel/xvidcore.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xvidcore.spec 3 Aug 2008 15:23:52 -0000 1.1 +++ xvidcore.spec 3 Dec 2008 00:04:05 -0000 1.2 @@ -1,38 +1,43 @@ Name: xvidcore -Version: 1.1.3 -Release: 4%{?dist} -Summary: Free reimplementation of the OpenDivX video codec +Version: 1.2.0 +Release: 1%{?dist} +Summary: MPEG-4 Simple and Advanced Simple Profile codec Group: System Environment/Libraries -License: XVID (GPL with specific restrictions) +License: GPLv2+ URL: http://www.xvid.org/ Source0: http://downloads.xvid.org/downloads/xvidcore-%{version}.tar.bz2 -Patch0: %{name}-noexecstack.patch +Patch0: %{name}-rpm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %ifarch %{ix86} x86_64 -BuildRequires: yasm +BuildRequires: nasm >= 2.0 %endif %description -Free reimplementation of the OpenDivX video codec. You can play OpenDivX -and DivX4 videos with it, as well as encode compatible files. +The Xvid video codec implements MPEG-4 Simple Profile and Advanced Simple +Profile standards. It permits compressing and decompressing digital video +in order to reduce the required bandwidth of video data for transmission +over computer networks or efficient storage on CDs or DVDs. Due to its +unrivalled quality Xvid has gained great popularity and is used in many +other GPLed applications, like e.g. Transcode, MEncoder, MPlayer, Xine and +many more. %package devel -Summary: Development files for the XviD video codec +Summary: Development files for the Xvid video codec Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel This package contains header files, static library and API -documentation for the XviD video codec. +documentation for the Xvid video codec. %prep -%setup -q -%patch0 -p1 -b .noexec +%setup -q -n %{name} +%patch0 -p1 -b .r chmod -x examples/*.pl -f=AUTHORS ; iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f +f=AUTHORS ; iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && touch -r $f $f.utf8 && mv $f.utf8 $f # Yes, we want to see the build output. %{__perl} -pi -e 's/^\t@(?!echo\b)/\t/' build/generic/Makefile @@ -48,7 +53,7 @@ %install rm -rf $RPM_BUILD_ROOT make -C build/generic install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/libxvidcore.a +rm $RPM_BUILD_ROOT%{_libdir}/libxvidcore.a cd $RPM_BUILD_ROOT%{_libdir} chmod 755 libxvidcore.so* /sbin/ldconfig -n . @@ -67,17 +72,26 @@ %files %defattr(-,root,root,-) -%doc LICENSE README AUTHORS ChangeLog TODO +%doc LICENSE README AUTHORS ChangeLog %{_libdir}/libxvidcore.so.* %files devel %defattr(-,root,root,-) -%doc CodingStyle examples/ +%doc CodingStyle TODO examples/ %{_includedir}/xvid.h %{_libdir}/libxvidcore.so %changelog +* Wed Dec 03 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.2.0-1 +- 1.2.0 +- drop upstreamed noexec stack patch +- BR recent nasm instead of yasm +- licence seems to be just GPLv2+ +- move TODO from main to -devel doc +- update summary and description +- small spec file fixes + * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.1.3-4 - rebuild --- xvidcore-noexecstack.patch DELETED ---