December 2010 - rpmfusion-commits

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/gpac/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv2624/F-13 Modified Files: gpac.spec Log Message: Fix include Index: gpac.spec =================================================================== RCS file: /cvs/free/rpms/gpac/F-13/gpac.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gpac.spec 11 Jul 2010 17:49:51 -0000 1.20 +++ gpac.spec 14 Dec 2010 21:52:07 -0000 1.21 @@ -17,7 +17,7 @@ Name: gpac Summary: MPEG-4 multimedia framework Version: 0.4.6 -Release: 0.9.cvs%{?cvs}%{?dist} +Release: 0.11.cvs%{?cvs}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://gpac.sourceforge.net/ @@ -274,8 +274,8 @@ #Fix doxygen timestamp touch -r Changelog doc/html/* -#Fix header installed by misstake -rm $RPM_BUILD_ROOT%{_includedir}/gpac/configuration.h +#config.h like but not only +touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/configuration.h %clean @@ -334,6 +334,9 @@ %changelog +* Tue Dec 14 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.11.cvs20100527 +- Fix include - rfbz#1551 + * Sun Jul 11 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.9.cvs20100527 - Fix header installed by misstake - rfbz#270c9

13 years, 11 months

1
0
0 / 0

rpms/xdtv/devel sources, 1.2, 1.3 xdtv-2.4.1cvs15-libv4l2.patch, 1.1, NONE xdtv-2.4.1cvs15-noldffmpeg.patch, 1.1, NONE xdtv.desktop, 1.1, NONE xdtv.spec, 1.2, NONE xdtv_v4l-conf.pam, 1.1, NONE xdtv_wizard.desktop, 1.1, NONE

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/xdtv/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv1673 Modified Files: sources Removed Files: xdtv-2.4.1cvs15-libv4l2.patch xdtv-2.4.1cvs15-noldffmpeg.patch xdtv.desktop xdtv.spec xdtv_v4l-conf.pam xdtv_wizard.desktop Log Message: Drop xdtv Index: sources =================================================================== RCS file: /cvs/free/rpms/xdtv/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 May 2009 11:14:39 -0000 1.2 +++ sources 14 Dec 2010 21:39:04 -0000 1.3 @@ -1 +1 @@ -890a6c98c904326be88d163cdf602018 xdtv-2.4.1cvs15.tar.gz +xdtv is unmaintained and target analogic TV which is deprecated in several country --- xdtv-2.4.1cvs15-libv4l2.patch DELETED --- --- xdtv-2.4.1cvs15-noldffmpeg.patch DELETED --- --- xdtv.desktop DELETED --- --- xdtv.spec DELETED --- --- xdtv_v4l-conf.pam DELETED --- --- xdtv_wizard.desktop DELETED ---

13 years, 11 months

1
0
0 / 0

rpms/minitube/F-13 .cvsignore, 1.3, 1.4 minitube-lang.patch, 1.2, 1.3 minitube.spec, 1.3, 1.4 sources, 1.3, 1.4

by Magnus Tuominen

Author: magnu5 Update of /cvs/free/rpms/minitube/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv10970 Modified Files: .cvsignore minitube-lang.patch minitube.spec sources Log Message: * Mon Dec 13 2010 Magnus Tuominen <magnus.tuominen(a)gmai.com> - 1.3-1 - version 1.3 - rename macedonian language code to mk_MK.ts Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/minitube/F-13/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Oct 2010 18:14:32 -0000 1.3 +++ .cvsignore 14 Dec 2010 15:35:34 -0000 1.4 @@ -1 +1 @@ -minitube-1.2.tar.gz +minitube-1.3.tar.gz minitube-lang.patch: locale.pri | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Index: minitube-lang.patch =================================================================== RCS file: /cvs/free/rpms/minitube/F-13/minitube-lang.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- minitube-lang.patch 22 Oct 2010 20:52:18 -0000 1.2 +++ minitube-lang.patch 14 Dec 2010 15:35:34 -0000 1.3 @@ -1,6 +1,6 @@ diff -up minitube/locale/locale.pri.orig minitube/locale/locale.pri ---- minitube/locale/locale.pri.orig 2010-09-26 10:51:58.346654903 +0300 -+++ minitube/locale/locale.pri 2010-09-26 11:25:00.978607272 +0300 +--- minitube/locale/locale.pri.orig 2010-12-13 19:17:35.038300402 +0200 ++++ minitube/locale/locale.pri 2010-12-13 19:40:24.519261834 +0200 @@ -14,7 +14,7 @@ TRANSLATIONS += \ cs_CZ.ts \ uk.ts \ @@ -10,7 +10,16 @@ hr_HR.ts \ es.ts \ gl.ts \ -@@ -37,8 +37,8 @@ isEmpty(QMAKE_LRELEASE) { +@@ -30,7 +30,7 @@ TRANSLATIONS += \ + fi_FI.ts \ + bg_BG.ts \ + zh_CN.ts \ +- mkd_MKD.ts ++ mk_MK.ts + + isEmpty(QMAKE_LRELEASE) { + win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe +@@ -38,8 +38,8 @@ isEmpty(QMAKE_LRELEASE) { } updateqm.input = TRANSLATIONS Index: minitube.spec =================================================================== RCS file: /cvs/free/rpms/minitube/F-13/minitube.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- minitube.spec 23 Oct 2010 17:31:12 -0000 1.3 +++ minitube.spec 14 Dec 2010 15:35:34 -0000 1.4 @@ -1,6 +1,6 @@ Name: minitube -Version: 1.2 -Release: 2%{?dist} +Version: 1.3 +Release: 1%{?dist} Summary: A YouTube desktop client Group: Applications/Multimedia @@ -71,7 +71,8 @@ # rename latvian language code mv locale/lat.ts locale/lv.ts - +# rename macedoninan language code +mv locale/mkd_MKD.ts locale/mk_MK.ts %patch0 -p 1 @@ -128,8 +129,9 @@ %dir %{_datadir}/%{name}/locale %changelog -* Sat Oct 23 2010 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.2-2 -- rebuild +* Mon Dec 13 2010 Magnus Tuominen <magnus.tuominen(a)gmai.com> - 1.3-1 +- version 1.3 +- rename macedonian language code to mk_MK.ts * Sun Oct 13 2010 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.2-1 - version 1.2 Index: sources =================================================================== RCS file: /cvs/free/rpms/minitube/F-13/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Oct 2010 18:14:32 -0000 1.3 +++ sources 14 Dec 2010 15:35:34 -0000 1.4 @@ -1 +1 @@ -c0e2bae37ce84fac505950ed1b2b1f36 minitube-1.2.tar.gz +961de6f4a1bb88dce48eaa0a864954c6 minitube-1.3.tar.gz

13 years, 11 months

1
0
0 / 0

rpms/minitube/F-14 .cvsignore, 1.3, 1.4 minitube-lang.patch, 1.2, 1.3 minitube.spec, 1.4, 1.5 sources, 1.3, 1.4

by Magnus Tuominen

Author: magnu5 Update of /cvs/free/rpms/minitube/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv10713 Modified Files: .cvsignore minitube-lang.patch minitube.spec sources Log Message: * Mon Dec 13 2010 Magnus Tuominen <magnus.tuominen(a)gmai.com> - 1.3-1 - version 1.3 - rename macedonian language code to mk_MK.ts Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/minitube/F-14/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Oct 2010 18:12:43 -0000 1.3 +++ .cvsignore 14 Dec 2010 15:34:00 -0000 1.4 @@ -1 +1 @@ -minitube-1.2.tar.gz +minitube-1.3.tar.gz minitube-lang.patch: locale.pri | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Index: minitube-lang.patch =================================================================== RCS file: /cvs/free/rpms/minitube/F-14/minitube-lang.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- minitube-lang.patch 23 Oct 2010 16:19:44 -0000 1.2 +++ minitube-lang.patch 14 Dec 2010 15:34:00 -0000 1.3 @@ -1,6 +1,6 @@ diff -up minitube/locale/locale.pri.orig minitube/locale/locale.pri ---- minitube/locale/locale.pri.orig 2010-09-26 10:51:58.346654903 +0300 -+++ minitube/locale/locale.pri 2010-09-26 11:25:00.978607272 +0300 +--- minitube/locale/locale.pri.orig 2010-12-13 19:17:35.038300402 +0200 ++++ minitube/locale/locale.pri 2010-12-13 19:40:24.519261834 +0200 @@ -14,7 +14,7 @@ TRANSLATIONS += \ cs_CZ.ts \ uk.ts \ @@ -10,7 +10,16 @@ hr_HR.ts \ es.ts \ gl.ts \ -@@ -37,8 +37,8 @@ isEmpty(QMAKE_LRELEASE) { +@@ -30,7 +30,7 @@ TRANSLATIONS += \ + fi_FI.ts \ + bg_BG.ts \ + zh_CN.ts \ +- mkd_MKD.ts ++ mk_MK.ts + + isEmpty(QMAKE_LRELEASE) { + win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe +@@ -38,8 +38,8 @@ isEmpty(QMAKE_LRELEASE) { } updateqm.input = TRANSLATIONS Index: minitube.spec =================================================================== RCS file: /cvs/free/rpms/minitube/F-14/minitube.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- minitube.spec 23 Oct 2010 16:55:35 -0000 1.4 +++ minitube.spec 14 Dec 2010 15:34:00 -0000 1.5 @@ -1,6 +1,6 @@ Name: minitube -Version: 1.2 -Release: 2%{?dist} +Version: 1.3 +Release: 1%{?dist} Summary: A YouTube desktop client Group: Applications/Multimedia @@ -71,7 +71,8 @@ # rename latvian language code mv locale/lat.ts locale/lv.ts - +# rename macedoninan language code +mv locale/mkd_MKD.ts locale/mk_MK.ts %patch0 -p 1 @@ -128,8 +129,9 @@ %dir %{_datadir}/%{name}/locale %changelog -* Sat Oct 23 2010 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.2-2 -- rebuild +* Mon Dec 13 2010 Magnus Tuominen <magnus.tuominen(a)gmai.com> - 1.3-1 +- version 1.3 +- rename macedonian language code to mk_MK.ts * Sun Oct 13 2010 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.2-1 - version 1.2 Index: sources =================================================================== RCS file: /cvs/free/rpms/minitube/F-14/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Oct 2010 18:12:43 -0000 1.3 +++ sources 14 Dec 2010 15:34:00 -0000 1.4 @@ -1 +1 @@ -c0e2bae37ce84fac505950ed1b2b1f36 minitube-1.2.tar.gz +961de6f4a1bb88dce48eaa0a864954c6 minitube-1.3.tar.gz

13 years, 11 months

1
0
0 / 0

rpms/minitube/devel .cvsignore, 1.3, 1.4 minitube-lang.patch, 1.2, 1.3 minitube.spec, 1.4, 1.5 sources, 1.3, 1.4

by Magnus Tuominen

Author: magnu5 Update of /cvs/free/rpms/minitube/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv10268 Modified Files: .cvsignore minitube-lang.patch minitube.spec sources Log Message: * Mon Dec 13 2010 Magnus Tuominen <magnus.tuominen(a)gmai.com> - 1.3-1 - version 1.3 - rename macedonian language code to mk_MK.ts Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/minitube/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Oct 2010 18:12:43 -0000 1.3 +++ .cvsignore 14 Dec 2010 15:32:33 -0000 1.4 @@ -1 +1 @@ -minitube-1.2.tar.gz +minitube-1.3.tar.gz minitube-lang.patch: locale.pri | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Index: minitube-lang.patch =================================================================== RCS file: /cvs/free/rpms/minitube/devel/minitube-lang.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- minitube-lang.patch 22 Oct 2010 19:56:58 -0000 1.2 +++ minitube-lang.patch 14 Dec 2010 15:32:33 -0000 1.3 @@ -1,6 +1,6 @@ diff -up minitube/locale/locale.pri.orig minitube/locale/locale.pri ---- minitube/locale/locale.pri.orig 2010-09-26 10:51:58.346654903 +0300 -+++ minitube/locale/locale.pri 2010-09-26 11:25:00.978607272 +0300 +--- minitube/locale/locale.pri.orig 2010-12-13 19:17:35.038300402 +0200 ++++ minitube/locale/locale.pri 2010-12-13 19:40:24.519261834 +0200 @@ -14,7 +14,7 @@ TRANSLATIONS += \ cs_CZ.ts \ uk.ts \ @@ -10,7 +10,16 @@ hr_HR.ts \ es.ts \ gl.ts \ -@@ -37,8 +37,8 @@ isEmpty(QMAKE_LRELEASE) { +@@ -30,7 +30,7 @@ TRANSLATIONS += \ + fi_FI.ts \ + bg_BG.ts \ + zh_CN.ts \ +- mkd_MKD.ts ++ mk_MK.ts + + isEmpty(QMAKE_LRELEASE) { + win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe +@@ -38,8 +38,8 @@ isEmpty(QMAKE_LRELEASE) { } updateqm.input = TRANSLATIONS Index: minitube.spec =================================================================== RCS file: /cvs/free/rpms/minitube/devel/minitube.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- minitube.spec 23 Oct 2010 18:13:38 -0000 1.4 +++ minitube.spec 14 Dec 2010 15:32:33 -0000 1.5 @@ -1,6 +1,6 @@ Name: minitube -Version: 1.2 -Release: 2%{?dist} +Version: 1.3 +Release: 1%{?dist} Summary: A YouTube desktop client Group: Applications/Multimedia @@ -71,7 +71,8 @@ # rename latvian language code mv locale/lat.ts locale/lv.ts - +# rename macedoninan language code +mv locale/mkd_MKD.ts locale/mk_MK.ts %patch0 -p 1 @@ -128,8 +129,9 @@ %dir %{_datadir}/%{name}/locale %changelog -* Sat Oct 23 2010 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.2-2 -- rebuild +* Mon Dec 13 2010 Magnus Tuominen <magnus.tuominen(a)gmai.com> - 1.3-1 +- version 1.3 +- rename macedonian language code to mk_MK.ts * Sun Oct 13 2010 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.2-1 - version 1.2 Index: sources =================================================================== RCS file: /cvs/free/rpms/minitube/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Oct 2010 18:12:43 -0000 1.3 +++ sources 14 Dec 2010 15:32:33 -0000 1.4 @@ -1 +1 @@ -c0e2bae37ce84fac505950ed1b2b1f36 minitube-1.2.tar.gz +961de6f4a1bb88dce48eaa0a864954c6 minitube-1.3.tar.gz

13 years, 11 months

1
0
0 / 0

rpms/xbmc/F-14 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xbmc-10-python2.7.patch, 1.1, 1.2 xbmc-generate-tarball-xz.sh, 1.6, 1.7 xbmc.spec, 1.21, 1.22

by Alex Lancaster

Author: alexlan Update of /cvs/free/rpms/xbmc/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv5365 Modified Files: .cvsignore sources xbmc-10-python2.7.patch xbmc-generate-tarball-xz.sh xbmc.spec Log Message: - Rebase to Dharma rc2 (SVN r35567) - Update Python 2.7 patch, to fix DLL search patch problems (#1532). Thanks to Richard Guest for patch. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xbmc/F-14/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 20 Nov 2010 01:29:11 -0000 1.7 +++ .cvsignore 12 Dec 2010 22:01:11 -0000 1.8 @@ -1 +1 @@ -xbmc-Dharma_rc1-patched.tar.xz +xbmc-Dharma_rc2-patched.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xbmc/F-14/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 20 Nov 2010 01:29:11 -0000 1.7 +++ sources 12 Dec 2010 22:01:11 -0000 1.8 @@ -1 +1 @@ -d0102d9f22dbbd9a6bb3b1386f00f971 xbmc-Dharma_rc1-patched.tar.xz +70c07e24b2924a57b7ab0075a2d0f245 xbmc-Dharma_rc2-patched.tar.xz xbmc-10-python2.7.patch: configure.in | 10 ++++++- xbmc/lib/libPython/XBPyThread.cpp | 5 +++ xbmc/lib/libPython/XBPyThread.h | 4 ++- xbmc/lib/libPython/XBPython.cpp | 24 ++++++++++++++----- xbmc/lib/libPython/XBPythonDll.cpp | 4 ++- xbmc/lib/libPython/XBPythonDllFuncs.S | 4 ++- xbmc/lib/libPython/linux/Makefile.in | 5 +++ xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h | 4 ++- xbmc/lib/libPython/xbmcmodule/PythonAddon.h | 4 ++- xbmc/lib/libPython/xbmcmodule/PythonPlayer.h | 4 ++- xbmc/lib/libPython/xbmcmodule/action.h | 4 ++- xbmc/lib/libPython/xbmcmodule/control.h | 4 ++- xbmc/lib/libPython/xbmcmodule/controlbutton.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlgroup.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlimage.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controllabel.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controllist.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlprogress.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlslider.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlspin.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controltextbox.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/dialog.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/dialog.h | 4 ++- xbmc/lib/libPython/xbmcmodule/infotagmusic.h | 4 ++- xbmc/lib/libPython/xbmcmodule/infotagvideo.h | 4 ++- xbmc/lib/libPython/xbmcmodule/keyboard.h | 4 ++- xbmc/lib/libPython/xbmcmodule/listitem.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/listitem.h | 4 ++- xbmc/lib/libPython/xbmcmodule/player.h | 4 ++- xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/pyplaylist.h | 4 ++- xbmc/lib/libPython/xbmcmodule/pyutil.h | 4 ++- xbmc/lib/libPython/xbmcmodule/window.h | 4 ++- xbmc/lib/libPython/xbmcmodule/winxml.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/winxml.h | 4 ++- xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp | 5 +++ xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp | 4 ++- 42 files changed, 149 insertions(+), 48 deletions(-) Index: xbmc-10-python2.7.patch =================================================================== RCS file: /cvs/free/rpms/xbmc/F-14/xbmc-10-python2.7.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xbmc-10-python2.7.patch 2 Sep 2010 03:17:55 -0000 1.1 +++ xbmc-10-python2.7.patch 12 Dec 2010 22:01:11 -0000 1.2 @@ -616,6 +616,61 @@ #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> +@@ -63,7 +63,9 @@ + #define PYTHON_DLL "special://xbmcbin/system/python/python24-x86-osx.so" + #endif + #elif defined(__x86_64__) +-#if (defined HAVE_LIBPYTHON2_6) ++#if (defined HAVE_LIBPYTHON2_7) ++#define PYTHON_DLL "special://xbmcbin/system/python/python27-x86_64-linux.so" ++#elif (defined HAVE_LIBPYTHON2_6) + #define PYTHON_DLL "special://xbmcbin/system/python/python26-x86_64-linux.so" + #elif (defined HAVE_LIBPYTHON2_5) + #define PYTHON_DLL "special://xbmcbin/system/python/python25-x86_64-linux.so" +@@ -71,7 +73,9 @@ + #define PYTHON_DLL "special://xbmcbin/system/python/python24-x86_64-linux.so" + #endif + #elif defined(_POWERPC) +-#if (defined HAVE_LIBPYTHON2_6) ++#if (defined HAVE_LIBPYTHON2_7) ++#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc-linux.so" ++#elif (defined HAVE_LIBPYTHON2_6) + #define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc-linux.so" + #elif (defined HAVE_LIBPYTHON2_5) + #define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc-linux.so" +@@ -79,7 +83,9 @@ + #define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc-linux.so" + #endif + #elif defined(_POWERPC64) +-#if (defined HAVE_LIBPYTHON2_6) ++#if (defined HAVE_LIBPYTHON2_7) ++#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc64-linux.so" ++#elif (defined HAVE_LIBPYTHON2_6) + #define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc64-linux.so" + #elif (defined HAVE_LIBPYTHON2_5) + #define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc64-linux.so" +@@ -87,7 +93,9 @@ + #define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc64-linux.so" + #endif + #elif defined(_ARMEL) +-#if (defined HAVE_LIBPYTHON2_6) ++#if (defined HAVE_LIBPYTHON2_7) ++#define PYTHON_DLL "special://xbmc/system/python/python27-arm.so" ++#elif (defined HAVE_LIBPYTHON2_6) + #define PYTHON_DLL "special://xbmc/system/python/python26-arm.so" + #elif (defined HAVE_LIBPYTHON2_5) + #define PYTHON_DLL "special://xbmc/system/python/python25-arm.so" +@@ -95,7 +103,9 @@ + #define PYTHON_DLL "special://xbmc/system/python/python24-arm.so" + #endif + #else /* !__x86_64__ && !__powerpc__ */ +-#if (defined HAVE_LIBPYTHON2_6) ++#if (defined HAVE_LIBPYTHON2_7) ++#define PYTHON_DLL "special://xbmcbin/system/python/python27-i486-linux.so" ++#elif (defined HAVE_LIBPYTHON2_6) + #define PYTHON_DLL "special://xbmcbin/system/python/python26-i486-linux.so" + #elif (defined HAVE_LIBPYTHON2_5) + #define PYTHON_DLL "special://xbmcbin/system/python/python25-i486-linux.so" Index: configure.in =================================================================== --- configure.in (revision 32022) Index: xbmc-generate-tarball-xz.sh =================================================================== RCS file: /cvs/free/rpms/xbmc/F-14/xbmc-generate-tarball-xz.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xbmc-generate-tarball-xz.sh 20 Nov 2010 01:29:11 -0000 1.6 +++ xbmc-generate-tarball-xz.sh 12 Dec 2010 22:01:11 -0000 1.7 @@ -9,12 +9,12 @@ #SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk # use SVN version number passed from script, or otherwise use default -SVNVERSION=${1-35326} +SVNVERSION=${1-35567} # uncomment following if you want to always pull from tip of branch # SVNVERSION=$(svn info $SVNURL |grep "Revision:"|cut -d' ' -f2) #VERSION=$MAJORVERSION-$SVNVERSION -VERSION=Dharma_rc1 +VERSION=Dharma_rc2 # remove existing checkout rm -r xbmc-$VERSION Index: xbmc.spec =================================================================== RCS file: /cvs/free/rpms/xbmc/F-14/xbmc.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xbmc.spec 21 Nov 2010 21:15:56 -0000 1.21 +++ xbmc.spec 12 Dec 2010 22:01:11 -0000 1.22 @@ -1,12 +1,12 @@ -%global SVNVERSION 35326 -%global PRERELEASE Dharma_rc1 +%global SVNVERSION 35567 +%global PRERELEASE Dharma_rc2 # use below for SVN snapshot #global DIRVERSION %{version}-%{SVNVERSION} %global DIRVERSION %{PRERELEASE} Name: xbmc Version: 10.0 -Release: 0.22.%{PRERELEASE}%{?dist} +Release: 0.23.%{PRERELEASE}%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{DIRVERSION}-patched.tar.xz @@ -212,6 +212,11 @@ %{_datadir}/icons/hicolor/*/*/*.png %changelog +* Sun Dec 12 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.0-0.23.Dharma_rc2 +- Rebase to Dharma rc2 (SVN r35567) +- Update Python 2.7 patch, to fix DLL search patch problems (#1532). Thanks to + Richard Guest for patch. + * Sun Nov 21 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.0-0.22.Dharma_rc1 - Need explicit requires for librtmp and libbluray: loaded dynamically via XBMC's DLL mechanism which is missed by autodeps

13 years, 11 months

1
0
0 / 0

rpms/xbmc/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xbmc-10-python2.7.patch, 1.1, 1.2 xbmc-generate-tarball-xz.sh, 1.6, 1.7 xbmc.spec, 1.21, 1.22

by Alex Lancaster

Author: alexlan Update of /cvs/free/rpms/xbmc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv449 Modified Files: .cvsignore sources xbmc-10-python2.7.patch xbmc-generate-tarball-xz.sh xbmc.spec Log Message: - Rebase to Dharma rc2 (SVN r35567) - Update Python 2.7 patch, to fix DLL search patch problems (#1532). Thanks to Richard Guest for patch. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 20 Nov 2010 00:38:43 -0000 1.7 +++ .cvsignore 12 Dec 2010 20:48:28 -0000 1.8 @@ -1 +1 @@ -xbmc-Dharma_rc1-patched.tar.xz +xbmc-Dharma_rc2-patched.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 20 Nov 2010 00:38:43 -0000 1.7 +++ sources 12 Dec 2010 20:48:28 -0000 1.8 @@ -1 +1 @@ -d0102d9f22dbbd9a6bb3b1386f00f971 xbmc-Dharma_rc1-patched.tar.xz +70c07e24b2924a57b7ab0075a2d0f245 xbmc-Dharma_rc2-patched.tar.xz xbmc-10-python2.7.patch: configure.in | 10 ++++++- xbmc/lib/libPython/XBPyThread.cpp | 5 +++ xbmc/lib/libPython/XBPyThread.h | 4 ++- xbmc/lib/libPython/XBPython.cpp | 24 ++++++++++++++----- xbmc/lib/libPython/XBPythonDll.cpp | 4 ++- xbmc/lib/libPython/XBPythonDllFuncs.S | 4 ++- xbmc/lib/libPython/linux/Makefile.in | 5 +++ xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h | 4 ++- xbmc/lib/libPython/xbmcmodule/PythonAddon.h | 4 ++- xbmc/lib/libPython/xbmcmodule/PythonPlayer.h | 4 ++- xbmc/lib/libPython/xbmcmodule/action.h | 4 ++- xbmc/lib/libPython/xbmcmodule/control.h | 4 ++- xbmc/lib/libPython/xbmcmodule/controlbutton.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlgroup.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlimage.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controllabel.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controllist.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlprogress.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlslider.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlspin.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controltextbox.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/dialog.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/dialog.h | 4 ++- xbmc/lib/libPython/xbmcmodule/infotagmusic.h | 4 ++- xbmc/lib/libPython/xbmcmodule/infotagvideo.h | 4 ++- xbmc/lib/libPython/xbmcmodule/keyboard.h | 4 ++- xbmc/lib/libPython/xbmcmodule/listitem.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/listitem.h | 4 ++- xbmc/lib/libPython/xbmcmodule/player.h | 4 ++- xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/pyplaylist.h | 4 ++- xbmc/lib/libPython/xbmcmodule/pyutil.h | 4 ++- xbmc/lib/libPython/xbmcmodule/window.h | 4 ++- xbmc/lib/libPython/xbmcmodule/winxml.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/winxml.h | 4 ++- xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp | 5 +++ xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp | 4 ++- 42 files changed, 149 insertions(+), 48 deletions(-) Index: xbmc-10-python2.7.patch =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc-10-python2.7.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xbmc-10-python2.7.patch 2 Sep 2010 03:17:55 -0000 1.1 +++ xbmc-10-python2.7.patch 12 Dec 2010 20:48:28 -0000 1.2 @@ -616,6 +616,61 @@ #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> +@@ -63,7 +63,9 @@ + #define PYTHON_DLL "special://xbmcbin/system/python/python24-x86-osx.so" + #endif + #elif defined(__x86_64__) +-#if (defined HAVE_LIBPYTHON2_6) ++#if (defined HAVE_LIBPYTHON2_7) ++#define PYTHON_DLL "special://xbmcbin/system/python/python27-x86_64-linux.so" ++#elif (defined HAVE_LIBPYTHON2_6) + #define PYTHON_DLL "special://xbmcbin/system/python/python26-x86_64-linux.so" + #elif (defined HAVE_LIBPYTHON2_5) + #define PYTHON_DLL "special://xbmcbin/system/python/python25-x86_64-linux.so" +@@ -71,7 +73,9 @@ + #define PYTHON_DLL "special://xbmcbin/system/python/python24-x86_64-linux.so" + #endif + #elif defined(_POWERPC) +-#if (defined HAVE_LIBPYTHON2_6) ++#if (defined HAVE_LIBPYTHON2_7) ++#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc-linux.so" ++#elif (defined HAVE_LIBPYTHON2_6) + #define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc-linux.so" + #elif (defined HAVE_LIBPYTHON2_5) + #define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc-linux.so" +@@ -79,7 +83,9 @@ + #define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc-linux.so" + #endif + #elif defined(_POWERPC64) +-#if (defined HAVE_LIBPYTHON2_6) ++#if (defined HAVE_LIBPYTHON2_7) ++#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc64-linux.so" ++#elif (defined HAVE_LIBPYTHON2_6) + #define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc64-linux.so" + #elif (defined HAVE_LIBPYTHON2_5) + #define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc64-linux.so" +@@ -87,7 +93,9 @@ + #define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc64-linux.so" + #endif + #elif defined(_ARMEL) +-#if (defined HAVE_LIBPYTHON2_6) ++#if (defined HAVE_LIBPYTHON2_7) ++#define PYTHON_DLL "special://xbmc/system/python/python27-arm.so" ++#elif (defined HAVE_LIBPYTHON2_6) + #define PYTHON_DLL "special://xbmc/system/python/python26-arm.so" + #elif (defined HAVE_LIBPYTHON2_5) + #define PYTHON_DLL "special://xbmc/system/python/python25-arm.so" +@@ -95,7 +103,9 @@ + #define PYTHON_DLL "special://xbmc/system/python/python24-arm.so" + #endif + #else /* !__x86_64__ && !__powerpc__ */ +-#if (defined HAVE_LIBPYTHON2_6) ++#if (defined HAVE_LIBPYTHON2_7) ++#define PYTHON_DLL "special://xbmcbin/system/python/python27-i486-linux.so" ++#elif (defined HAVE_LIBPYTHON2_6) + #define PYTHON_DLL "special://xbmcbin/system/python/python26-i486-linux.so" + #elif (defined HAVE_LIBPYTHON2_5) + #define PYTHON_DLL "special://xbmcbin/system/python/python25-i486-linux.so" Index: configure.in =================================================================== --- configure.in (revision 32022) Index: xbmc-generate-tarball-xz.sh =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc-generate-tarball-xz.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xbmc-generate-tarball-xz.sh 20 Nov 2010 00:38:43 -0000 1.6 +++ xbmc-generate-tarball-xz.sh 12 Dec 2010 20:48:28 -0000 1.7 @@ -9,12 +9,12 @@ #SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk # use SVN version number passed from script, or otherwise use default -SVNVERSION=${1-35326} +SVNVERSION=${1-35567} # uncomment following if you want to always pull from tip of branch # SVNVERSION=$(svn info $SVNURL |grep "Revision:"|cut -d' ' -f2) #VERSION=$MAJORVERSION-$SVNVERSION -VERSION=Dharma_rc1 +VERSION=Dharma_rc2 # remove existing checkout rm -r xbmc-$VERSION Index: xbmc.spec =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xbmc.spec 21 Nov 2010 21:12:41 -0000 1.21 +++ xbmc.spec 12 Dec 2010 20:48:28 -0000 1.22 @@ -1,12 +1,12 @@ -%global SVNVERSION 35326 -%global PRERELEASE Dharma_rc1 +%global SVNVERSION 35567 +%global PRERELEASE Dharma_rc2 # use below for SVN snapshot #global DIRVERSION %{version}-%{SVNVERSION} %global DIRVERSION %{PRERELEASE} Name: xbmc Version: 10.0 -Release: 0.22.%{PRERELEASE}%{?dist} +Release: 0.23.%{PRERELEASE}%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{DIRVERSION}-patched.tar.xz @@ -212,6 +212,11 @@ %{_datadir}/icons/hicolor/*/*/*.png %changelog +* Sun Dec 12 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.0-0.23.Dharma_rc2 +- Rebase to Dharma rc2 (SVN r35567) +- Update Python 2.7 patch, to fix DLL search patch problems (#1532). Thanks to + Richard Guest for patch. + * Sun Nov 21 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.0-0.22.Dharma_rc1 - Need explicit requires for librtmp and libbluray: loaded dynamically via XBMC's DLL mechanism which is missed by autodeps

13 years, 11 months

1
0
0 / 0

rpms/xvidcore/devel xvidcore-noexec-stack.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xvidcore.spec, 1.5, 1.6 xvidcore-1.2.1-noexec-stack.patch, 1.1, NONE

by Dominik Mierzejewski

Author: rathann Update of /cvs/free/rpms/xvidcore/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv23813 Modified Files: .cvsignore sources xvidcore.spec Added Files: xvidcore-noexec-stack.patch Removed Files: xvidcore-1.2.1-noexec-stack.patch Log Message: * Sat Dec 11 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.2.2-1 - 1.2.2 - rebase noexec-stack patch xvidcore-noexec-stack.patch: bitstream/x86_asm/cbp_mmx.asm | 6 +----- bitstream/x86_asm/cbp_sse2.asm | 6 +----- dct/x86_asm/fdct_mmx_ffmpeg.asm | 5 +---- dct/x86_asm/fdct_mmx_skal.asm | 5 +---- dct/x86_asm/fdct_sse2_skal.asm | 5 +---- dct/x86_asm/idct_3dne.asm | 6 +----- dct/x86_asm/idct_mmx.asm | 6 +----- dct/x86_asm/idct_sse2_dmitry.asm | 6 +----- image/x86_asm/colorspace_rgb_mmx.asm | 6 +----- image/x86_asm/colorspace_yuv_mmx.asm | 5 +---- image/x86_asm/colorspace_yuyv_mmx.asm | 5 +---- image/x86_asm/deintl_sse.asm | 5 +---- image/x86_asm/gmc_mmx.asm | 5 +---- image/x86_asm/interpolate8x8_3dn.asm | 6 +----- image/x86_asm/interpolate8x8_3dne.asm | 6 +----- image/x86_asm/interpolate8x8_mmx.asm | 6 +----- image/x86_asm/interpolate8x8_xmm.asm | 6 +----- image/x86_asm/postprocessing_mmx.asm | 5 +---- image/x86_asm/postprocessing_sse2.asm | 5 +---- image/x86_asm/qpel_mmx.asm | 5 +---- image/x86_asm/reduced_mmx.asm | 6 +----- motion/x86_asm/sad_3dn.asm | 6 +----- motion/x86_asm/sad_3dne.asm | 6 +----- motion/x86_asm/sad_mmx.asm | 6 +----- motion/x86_asm/sad_sse2.asm | 6 +----- motion/x86_asm/sad_xmm.asm | 6 +----- nasm.inc | 9 +++++++++ plugins/x86_asm/plugin_ssim-a.asm | 4 +--- quant/x86_asm/quantize_h263_3dne.asm | 5 +---- quant/x86_asm/quantize_h263_mmx.asm | 6 +----- quant/x86_asm/quantize_mpeg_mmx.asm | 6 +----- quant/x86_asm/quantize_mpeg_xmm.asm | 6 +----- utils/x86_asm/cpuid.asm | 5 +---- utils/x86_asm/interlacing_mmx.asm | 6 +----- utils/x86_asm/mem_transfer_3dne.asm | 6 +----- utils/x86_asm/mem_transfer_mmx.asm | 6 +----- 36 files changed, 44 insertions(+), 161 deletions(-) --- NEW FILE xvidcore-noexec-stack.patch --- diff -up xvidcore/src/bitstream/x86_asm/cbp_mmx.asm.noexec-stack xvidcore/src/bitstream/x86_asm/cbp_mmx.asm --- xvidcore/src/bitstream/x86_asm/cbp_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/bitstream/x86_asm/cbp_mmx.asm 2010-12-12 03:21:50.000000000 +0100 @@ -126,8 +126,4 @@ calc_cbp_mmx: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/bitstream/x86_asm/cbp_sse2.asm.noexec-stack xvidcore/src/bitstream/x86_asm/cbp_sse2.asm --- xvidcore/src/bitstream/x86_asm/cbp_sse2.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/bitstream/x86_asm/cbp_sse2.asm 2010-12-12 03:21:50.000000000 +0100 @@ -116,8 +116,4 @@ calc_cbp_sse2: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm --- xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm 2010-12-12 03:21:50.000000000 +0100 @@ -401,7 +401,4 @@ MAKE_FDCT_FUNC fdct_mmx_ffmpeg, FDCT_ROW MAKE_FDCT_FUNC fdct_xmm_ffmpeg, FDCT_ROW_XMM -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm --- xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm 2010-12-12 03:21:50.000000000 +0100 @@ -500,7 +500,4 @@ MAKE_FDCT_FUNC fdct_mmx_skal, fMTX_MULT_ MAKE_FDCT_FUNC fdct_xmm_skal, fMTX_MULT_XMM -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm --- xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm 2010-12-12 03:23:11.000000000 +0100 @@ -608,7 +608,4 @@ ENDFUNC ALIGN SECTION_ALIGN times 8 dw 0 -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/dct/x86_asm/idct_3dne.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_3dne.asm --- xvidcore/src/dct/x86_asm/idct_3dne.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/dct/x86_asm/idct_3dne.asm 2010-12-12 03:21:50.000000000 +0100 @@ -698,8 +698,4 @@ idct_3dne: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/dct/x86_asm/idct_mmx.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_mmx.asm --- xvidcore/src/dct/x86_asm/idct_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/dct/x86_asm/idct_mmx.asm 2010-12-12 03:21:50.000000000 +0100 @@ -608,8 +608,4 @@ idct_xmm: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm --- xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm 2010-12-12 03:21:50.000000000 +0100 @@ -325,8 +325,4 @@ idct_sse2_dmitry: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm --- xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm 2010-12-12 03:21:51.000000000 +0100 @@ -529,8 +529,4 @@ MAKE_COLORSPACE rgba_to_yv12_mmx,0, 4 MAKE_COLORSPACE yv12_to_bgr_mmx,48, 3,8,2, YV12_TO_BGR, 3, -1 MAKE_COLORSPACE yv12_to_bgra_mmx,48, 4,8,2, YV12_TO_BGR, 4, -1 - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm --- xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm.noexec-stack 2009-05-28 17:04:35.000000000 +0200 +++ xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm 2010-12-12 03:21:51.000000000 +0100 @@ -474,7 +474,4 @@ MAKE_YV12_TO_YV12 yv12_to_yv12_mmx, 0 MAKE_YV12_TO_YV12 yv12_to_yv12_xmm, 1 -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm --- xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm 2010-12-12 03:21:51.000000000 +0100 @@ -341,7 +341,4 @@ MAKE_COLORSPACE yv12_to_uyvy_mmx,0, MAKE_COLORSPACE yv12_to_yuyvi_mmx,0, 2,8,4, YV12_TO_YUYVI, 0, -1 MAKE_COLORSPACE yv12_to_uyvyi_mmx,0, 2,8,4, YV12_TO_YUYVI, 1, -1 -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/deintl_sse.asm.noexec-stack xvidcore/src/image/x86_asm/deintl_sse.asm --- xvidcore/src/image/x86_asm/deintl_sse.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/deintl_sse.asm 2010-12-12 03:21:51.000000000 +0100 @@ -131,7 +131,4 @@ xvid_deinterlace_sse: ENDFUNC ;////////////////////////////////////////////////////////////////////// - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/gmc_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/gmc_mmx.asm --- xvidcore/src/image/x86_asm/gmc_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/gmc_mmx.asm 2010-12-12 03:21:51.000000000 +0100 @@ -220,7 +220,4 @@ xvid_GMC_Core_Lin_8_sse41: ENDFUNC ;////////////////////////////////////////////////////////////////////// - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm --- xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm 2010-12-12 03:21:51.000000000 +0100 @@ -463,8 +463,4 @@ interpolate8x4_halfpel_hv_3dn: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm --- xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm.noexec-stack 2009-05-28 17:04:35.000000000 +0200 +++ xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm 2010-12-12 03:21:51.000000000 +0100 @@ -563,8 +563,4 @@ ALIGN SECTION_ALIGN ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm --- xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm 2010-12-12 03:21:51.000000000 +0100 @@ -1328,8 +1328,4 @@ interpolate8x8_halfpel_hv_add_mmx: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm --- xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm 2010-12-12 03:21:51.000000000 +0100 @@ -819,8 +819,4 @@ interpolate8x8_halfpel_hv_add_xmm: EPILOG ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/postprocessing_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/postprocessing_mmx.asm --- xvidcore/src/image/x86_asm/postprocessing_mmx.asm.noexec-stack 2009-05-28 17:04:35.000000000 +0200 +++ xvidcore/src/image/x86_asm/postprocessing_mmx.asm 2010-12-12 03:21:51.000000000 +0100 @@ -114,7 +114,4 @@ image_brightness_mmx: ENDFUNC ;////////////////////////////////////////////////////////////////////// -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/postprocessing_sse2.asm.noexec-stack xvidcore/src/image/x86_asm/postprocessing_sse2.asm --- xvidcore/src/image/x86_asm/postprocessing_sse2.asm.noexec-stack 2009-05-28 17:04:35.000000000 +0200 +++ xvidcore/src/image/x86_asm/postprocessing_sse2.asm 2010-12-12 03:21:52.000000000 +0100 @@ -130,7 +130,4 @@ image_brightness_sse2: ENDFUNC ;////////////////////////////////////////////////////////////////////// -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/qpel_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/qpel_mmx.asm --- xvidcore/src/image/x86_asm/qpel_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/qpel_mmx.asm 2010-12-12 03:21:52.000000000 +0100 @@ -1149,7 +1149,4 @@ ENDFUNC %undef SRC_PTR %undef DST_PTR -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/reduced_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/reduced_mmx.asm --- xvidcore/src/image/x86_asm/reduced_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/reduced_mmx.asm 2010-12-12 03:21:52.000000000 +0100 @@ -985,8 +985,4 @@ ENDFUNC ; pfeewwww... Never Do That On Stage Again. :) - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/motion/x86_asm/sad_3dn.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_3dn.asm --- xvidcore/src/motion/x86_asm/sad_3dn.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/motion/x86_asm/sad_3dn.asm 2010-12-12 03:21:52.000000000 +0100 @@ -216,8 +216,4 @@ sad8bi_3dn: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/motion/x86_asm/sad_3dne.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_3dne.asm --- xvidcore/src/motion/x86_asm/sad_3dne.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/motion/x86_asm/sad_3dne.asm 2010-12-12 03:21:52.000000000 +0100 @@ -490,8 +490,4 @@ ALIGN SECTION_ALIGN ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/motion/x86_asm/sad_mmx.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_mmx.asm --- xvidcore/src/motion/x86_asm/sad_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/motion/x86_asm/sad_mmx.asm 2010-12-12 03:21:52.000000000 +0100 @@ -731,8 +731,4 @@ sse8_8bit_mmx: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/motion/x86_asm/sad_sse2.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_sse2.asm --- xvidcore/src/motion/x86_asm/sad_sse2.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/motion/x86_asm/sad_sse2.asm 2010-12-12 03:21:52.000000000 +0100 @@ -176,8 +176,4 @@ dev16_sse3: MEAN16_SSE2_SSE3 lddqu ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/motion/x86_asm/sad_xmm.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_xmm.asm --- xvidcore/src/motion/x86_asm/sad_xmm.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/motion/x86_asm/sad_xmm.asm 2010-12-12 03:21:52.000000000 +0100 @@ -436,8 +436,4 @@ sad16v_xmm: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/nasm.inc.noexec-stack xvidcore/src/nasm.inc --- xvidcore/src/nasm.inc.noexec-stack 2009-05-28 17:04:35.000000000 +0200 +++ xvidcore/src/nasm.inc 2010-12-12 03:21:52.000000000 +0100 @@ -203,3 +203,12 @@ BITS 32 %endif %endif %endmacro + +%macro NON_EXEC_STACK 0 +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif +%ifidn __OUTPUT_FORMAT__,elf64 +section .note.GNU-stack noalloc noexec nowrite progbits +%endif +%endmacro diff -up xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm.noexec-stack xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm --- xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm 2010-12-12 03:21:53.000000000 +0100 @@ -273,6 +273,4 @@ consim_mmx: ret ENDFUNC -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif +NON_EXEC_STACK diff -up xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm --- xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm.noexec-stack 2009-05-28 17:04:35.000000000 +0200 +++ xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm 2010-12-12 03:21:53.000000000 +0100 @@ -931,7 +931,4 @@ ALIGN SECTION_ALIGN ret ENDFUNC -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm --- xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm 2010-12-12 03:21:53.000000000 +0100 @@ -1070,8 +1070,4 @@ dequant_h263_inter_sse2: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm --- xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm 2010-12-12 03:21:53.000000000 +0100 @@ -657,8 +657,4 @@ ALIGN SECTION_ALIGN ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm --- xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm.noexec-stack 2009-05-28 17:04:35.000000000 +0200 +++ xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm 2010-12-12 03:21:53.000000000 +0100 @@ -618,8 +618,4 @@ ALIGN SECTION_ALIGN ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/utils/x86_asm/cpuid.asm.noexec-stack xvidcore/src/utils/x86_asm/cpuid.asm --- xvidcore/src/utils/x86_asm/cpuid.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/utils/x86_asm/cpuid.asm 2010-12-12 03:21:53.000000000 +0100 @@ -240,7 +240,4 @@ ENDFUNC %endif -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/utils/x86_asm/interlacing_mmx.asm.noexec-stack xvidcore/src/utils/x86_asm/interlacing_mmx.asm --- xvidcore/src/utils/x86_asm/interlacing_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/utils/x86_asm/interlacing_mmx.asm 2010-12-12 03:21:53.000000000 +0100 @@ -198,8 +198,4 @@ MBFieldTest_mmx: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm.noexec-stack xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm --- xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm 2010-12-12 03:21:53.000000000 +0100 @@ -465,8 +465,4 @@ transfer8x4_copy_3dne: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm.noexec-stack xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm --- xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm 2010-12-12 03:21:53.000000000 +0100 @@ -588,8 +588,4 @@ transfer8x4_copy_mmx: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xvidcore/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Dec 2008 18:21:34 -0000 1.4 +++ .cvsignore 12 Dec 2010 02:36:07 -0000 1.5 @@ -1 +1 @@ -xvidcore-1.2.1.tar.bz2 +xvidcore-1.2.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/xvidcore/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Dec 2008 18:21:34 -0000 1.4 +++ sources 12 Dec 2010 02:36:07 -0000 1.5 @@ -1 +1 @@ -8c4470ae8e5a104abedb39f6c70e2a40 xvidcore-1.2.1.tar.bz2 +6a3473a12c8a1fa7bdc2b5cb829fab58 xvidcore-1.2.2.tar.bz2 Index: xvidcore.spec =================================================================== RCS file: /cvs/free/rpms/xvidcore/devel/xvidcore.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xvidcore.spec 21 Sep 2009 10:26:59 -0000 1.5 +++ xvidcore.spec 12 Dec 2010 02:36:07 -0000 1.6 @@ -1,13 +1,13 @@ Name: xvidcore -Version: 1.2.1 -Release: 3%{?dist} +Version: 1.2.2 +Release: 1%{?dist} Summary: MPEG-4 Simple and Advanced Simple Profile codec Group: System Environment/Libraries License: GPLv2+ URL: http://www.xvid.org/ Source0: http://downloads.xvid.org/downloads/xvidcore-%{version}.tar.bz2 -Patch0: xvidcore-1.2.1-noexec-stack.patch +Patch0: xvidcore-noexec-stack.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %ifarch %{ix86} x86_64 @@ -83,6 +83,10 @@ %changelog +* Sat Dec 11 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.2.2-1 +- 1.2.2 +- rebase noexec-stack patch + * Mon Sep 21 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 1.2.1-3 - Do not require an executable stack on x86_64 (rf743, rf733) --- xvidcore-1.2.1-noexec-stack.patch DELETED ---

13 years, 11 months

1
0
0 / 0

rpms/xvidcore/F-14 xvidcore-noexec-stack.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xvidcore.spec, 1.5, 1.6 xvidcore-1.2.1-noexec-stack.patch, 1.1, NONE

by Dominik Mierzejewski

Author: rathann Update of /cvs/free/rpms/xvidcore/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv23715 Modified Files: .cvsignore sources xvidcore.spec Added Files: xvidcore-noexec-stack.patch Removed Files: xvidcore-1.2.1-noexec-stack.patch Log Message: * Sat Dec 11 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.2.2-1 - 1.2.2 - rebase noexec-stack patch xvidcore-noexec-stack.patch: bitstream/x86_asm/cbp_mmx.asm | 6 +----- bitstream/x86_asm/cbp_sse2.asm | 6 +----- dct/x86_asm/fdct_mmx_ffmpeg.asm | 5 +---- dct/x86_asm/fdct_mmx_skal.asm | 5 +---- dct/x86_asm/fdct_sse2_skal.asm | 5 +---- dct/x86_asm/idct_3dne.asm | 6 +----- dct/x86_asm/idct_mmx.asm | 6 +----- dct/x86_asm/idct_sse2_dmitry.asm | 6 +----- image/x86_asm/colorspace_rgb_mmx.asm | 6 +----- image/x86_asm/colorspace_yuv_mmx.asm | 5 +---- image/x86_asm/colorspace_yuyv_mmx.asm | 5 +---- image/x86_asm/deintl_sse.asm | 5 +---- image/x86_asm/gmc_mmx.asm | 5 +---- image/x86_asm/interpolate8x8_3dn.asm | 6 +----- image/x86_asm/interpolate8x8_3dne.asm | 6 +----- image/x86_asm/interpolate8x8_mmx.asm | 6 +----- image/x86_asm/interpolate8x8_xmm.asm | 6 +----- image/x86_asm/postprocessing_mmx.asm | 5 +---- image/x86_asm/postprocessing_sse2.asm | 5 +---- image/x86_asm/qpel_mmx.asm | 5 +---- image/x86_asm/reduced_mmx.asm | 6 +----- motion/x86_asm/sad_3dn.asm | 6 +----- motion/x86_asm/sad_3dne.asm | 6 +----- motion/x86_asm/sad_mmx.asm | 6 +----- motion/x86_asm/sad_sse2.asm | 6 +----- motion/x86_asm/sad_xmm.asm | 6 +----- nasm.inc | 9 +++++++++ plugins/x86_asm/plugin_ssim-a.asm | 4 +--- quant/x86_asm/quantize_h263_3dne.asm | 5 +---- quant/x86_asm/quantize_h263_mmx.asm | 6 +----- quant/x86_asm/quantize_mpeg_mmx.asm | 6 +----- quant/x86_asm/quantize_mpeg_xmm.asm | 6 +----- utils/x86_asm/cpuid.asm | 5 +---- utils/x86_asm/interlacing_mmx.asm | 6 +----- utils/x86_asm/mem_transfer_3dne.asm | 6 +----- utils/x86_asm/mem_transfer_mmx.asm | 6 +----- 36 files changed, 44 insertions(+), 161 deletions(-) --- NEW FILE xvidcore-noexec-stack.patch --- diff -up xvidcore/src/bitstream/x86_asm/cbp_mmx.asm.noexec-stack xvidcore/src/bitstream/x86_asm/cbp_mmx.asm --- xvidcore/src/bitstream/x86_asm/cbp_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/bitstream/x86_asm/cbp_mmx.asm 2010-12-12 03:21:50.000000000 +0100 @@ -126,8 +126,4 @@ calc_cbp_mmx: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/bitstream/x86_asm/cbp_sse2.asm.noexec-stack xvidcore/src/bitstream/x86_asm/cbp_sse2.asm --- xvidcore/src/bitstream/x86_asm/cbp_sse2.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/bitstream/x86_asm/cbp_sse2.asm 2010-12-12 03:21:50.000000000 +0100 @@ -116,8 +116,4 @@ calc_cbp_sse2: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm --- xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm 2010-12-12 03:21:50.000000000 +0100 @@ -401,7 +401,4 @@ MAKE_FDCT_FUNC fdct_mmx_ffmpeg, FDCT_ROW MAKE_FDCT_FUNC fdct_xmm_ffmpeg, FDCT_ROW_XMM -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm --- xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm 2010-12-12 03:21:50.000000000 +0100 @@ -500,7 +500,4 @@ MAKE_FDCT_FUNC fdct_mmx_skal, fMTX_MULT_ MAKE_FDCT_FUNC fdct_xmm_skal, fMTX_MULT_XMM -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm --- xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm 2010-12-12 03:23:11.000000000 +0100 @@ -608,7 +608,4 @@ ENDFUNC ALIGN SECTION_ALIGN times 8 dw 0 -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/dct/x86_asm/idct_3dne.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_3dne.asm --- xvidcore/src/dct/x86_asm/idct_3dne.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/dct/x86_asm/idct_3dne.asm 2010-12-12 03:21:50.000000000 +0100 @@ -698,8 +698,4 @@ idct_3dne: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/dct/x86_asm/idct_mmx.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_mmx.asm --- xvidcore/src/dct/x86_asm/idct_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/dct/x86_asm/idct_mmx.asm 2010-12-12 03:21:50.000000000 +0100 @@ -608,8 +608,4 @@ idct_xmm: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm --- xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm 2010-12-12 03:21:50.000000000 +0100 @@ -325,8 +325,4 @@ idct_sse2_dmitry: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm --- xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm 2010-12-12 03:21:51.000000000 +0100 @@ -529,8 +529,4 @@ MAKE_COLORSPACE rgba_to_yv12_mmx,0, 4 MAKE_COLORSPACE yv12_to_bgr_mmx,48, 3,8,2, YV12_TO_BGR, 3, -1 MAKE_COLORSPACE yv12_to_bgra_mmx,48, 4,8,2, YV12_TO_BGR, 4, -1 - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm --- xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm.noexec-stack 2009-05-28 17:04:35.000000000 +0200 +++ xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm 2010-12-12 03:21:51.000000000 +0100 @@ -474,7 +474,4 @@ MAKE_YV12_TO_YV12 yv12_to_yv12_mmx, 0 MAKE_YV12_TO_YV12 yv12_to_yv12_xmm, 1 -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm --- xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm 2010-12-12 03:21:51.000000000 +0100 @@ -341,7 +341,4 @@ MAKE_COLORSPACE yv12_to_uyvy_mmx,0, MAKE_COLORSPACE yv12_to_yuyvi_mmx,0, 2,8,4, YV12_TO_YUYVI, 0, -1 MAKE_COLORSPACE yv12_to_uyvyi_mmx,0, 2,8,4, YV12_TO_YUYVI, 1, -1 -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/deintl_sse.asm.noexec-stack xvidcore/src/image/x86_asm/deintl_sse.asm --- xvidcore/src/image/x86_asm/deintl_sse.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/deintl_sse.asm 2010-12-12 03:21:51.000000000 +0100 @@ -131,7 +131,4 @@ xvid_deinterlace_sse: ENDFUNC ;////////////////////////////////////////////////////////////////////// - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/gmc_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/gmc_mmx.asm --- xvidcore/src/image/x86_asm/gmc_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/gmc_mmx.asm 2010-12-12 03:21:51.000000000 +0100 @@ -220,7 +220,4 @@ xvid_GMC_Core_Lin_8_sse41: ENDFUNC ;////////////////////////////////////////////////////////////////////// - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm --- xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm 2010-12-12 03:21:51.000000000 +0100 @@ -463,8 +463,4 @@ interpolate8x4_halfpel_hv_3dn: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm --- xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm.noexec-stack 2009-05-28 17:04:35.000000000 +0200 +++ xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm 2010-12-12 03:21:51.000000000 +0100 @@ -563,8 +563,4 @@ ALIGN SECTION_ALIGN ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm --- xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm 2010-12-12 03:21:51.000000000 +0100 @@ -1328,8 +1328,4 @@ interpolate8x8_halfpel_hv_add_mmx: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm --- xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm 2010-12-12 03:21:51.000000000 +0100 @@ -819,8 +819,4 @@ interpolate8x8_halfpel_hv_add_xmm: EPILOG ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/postprocessing_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/postprocessing_mmx.asm --- xvidcore/src/image/x86_asm/postprocessing_mmx.asm.noexec-stack 2009-05-28 17:04:35.000000000 +0200 +++ xvidcore/src/image/x86_asm/postprocessing_mmx.asm 2010-12-12 03:21:51.000000000 +0100 @@ -114,7 +114,4 @@ image_brightness_mmx: ENDFUNC ;////////////////////////////////////////////////////////////////////// -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/postprocessing_sse2.asm.noexec-stack xvidcore/src/image/x86_asm/postprocessing_sse2.asm --- xvidcore/src/image/x86_asm/postprocessing_sse2.asm.noexec-stack 2009-05-28 17:04:35.000000000 +0200 +++ xvidcore/src/image/x86_asm/postprocessing_sse2.asm 2010-12-12 03:21:52.000000000 +0100 @@ -130,7 +130,4 @@ image_brightness_sse2: ENDFUNC ;////////////////////////////////////////////////////////////////////// -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/qpel_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/qpel_mmx.asm --- xvidcore/src/image/x86_asm/qpel_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/qpel_mmx.asm 2010-12-12 03:21:52.000000000 +0100 @@ -1149,7 +1149,4 @@ ENDFUNC %undef SRC_PTR %undef DST_PTR -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/reduced_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/reduced_mmx.asm --- xvidcore/src/image/x86_asm/reduced_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/reduced_mmx.asm 2010-12-12 03:21:52.000000000 +0100 @@ -985,8 +985,4 @@ ENDFUNC ; pfeewwww... Never Do That On Stage Again. :) - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/motion/x86_asm/sad_3dn.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_3dn.asm --- xvidcore/src/motion/x86_asm/sad_3dn.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/motion/x86_asm/sad_3dn.asm 2010-12-12 03:21:52.000000000 +0100 @@ -216,8 +216,4 @@ sad8bi_3dn: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/motion/x86_asm/sad_3dne.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_3dne.asm --- xvidcore/src/motion/x86_asm/sad_3dne.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/motion/x86_asm/sad_3dne.asm 2010-12-12 03:21:52.000000000 +0100 @@ -490,8 +490,4 @@ ALIGN SECTION_ALIGN ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/motion/x86_asm/sad_mmx.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_mmx.asm --- xvidcore/src/motion/x86_asm/sad_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/motion/x86_asm/sad_mmx.asm 2010-12-12 03:21:52.000000000 +0100 @@ -731,8 +731,4 @@ sse8_8bit_mmx: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/motion/x86_asm/sad_sse2.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_sse2.asm --- xvidcore/src/motion/x86_asm/sad_sse2.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/motion/x86_asm/sad_sse2.asm 2010-12-12 03:21:52.000000000 +0100 @@ -176,8 +176,4 @@ dev16_sse3: MEAN16_SSE2_SSE3 lddqu ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/motion/x86_asm/sad_xmm.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_xmm.asm --- xvidcore/src/motion/x86_asm/sad_xmm.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/motion/x86_asm/sad_xmm.asm 2010-12-12 03:21:52.000000000 +0100 @@ -436,8 +436,4 @@ sad16v_xmm: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/nasm.inc.noexec-stack xvidcore/src/nasm.inc --- xvidcore/src/nasm.inc.noexec-stack 2009-05-28 17:04:35.000000000 +0200 +++ xvidcore/src/nasm.inc 2010-12-12 03:21:52.000000000 +0100 @@ -203,3 +203,12 @@ BITS 32 %endif %endif %endmacro + +%macro NON_EXEC_STACK 0 +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif +%ifidn __OUTPUT_FORMAT__,elf64 +section .note.GNU-stack noalloc noexec nowrite progbits +%endif +%endmacro diff -up xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm.noexec-stack xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm --- xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm 2010-12-12 03:21:53.000000000 +0100 @@ -273,6 +273,4 @@ consim_mmx: ret ENDFUNC -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif +NON_EXEC_STACK diff -up xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm --- xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm.noexec-stack 2009-05-28 17:04:35.000000000 +0200 +++ xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm 2010-12-12 03:21:53.000000000 +0100 @@ -931,7 +931,4 @@ ALIGN SECTION_ALIGN ret ENDFUNC -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm --- xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm 2010-12-12 03:21:53.000000000 +0100 @@ -1070,8 +1070,4 @@ dequant_h263_inter_sse2: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm --- xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm 2010-12-12 03:21:53.000000000 +0100 @@ -657,8 +657,4 @@ ALIGN SECTION_ALIGN ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm --- xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm.noexec-stack 2009-05-28 17:04:35.000000000 +0200 +++ xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm 2010-12-12 03:21:53.000000000 +0100 @@ -618,8 +618,4 @@ ALIGN SECTION_ALIGN ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/utils/x86_asm/cpuid.asm.noexec-stack xvidcore/src/utils/x86_asm/cpuid.asm --- xvidcore/src/utils/x86_asm/cpuid.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/utils/x86_asm/cpuid.asm 2010-12-12 03:21:53.000000000 +0100 @@ -240,7 +240,4 @@ ENDFUNC %endif -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/utils/x86_asm/interlacing_mmx.asm.noexec-stack xvidcore/src/utils/x86_asm/interlacing_mmx.asm --- xvidcore/src/utils/x86_asm/interlacing_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/utils/x86_asm/interlacing_mmx.asm 2010-12-12 03:21:53.000000000 +0100 @@ -198,8 +198,4 @@ MBFieldTest_mmx: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm.noexec-stack xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm --- xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm 2010-12-12 03:21:53.000000000 +0100 @@ -465,8 +465,4 @@ transfer8x4_copy_3dne: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm.noexec-stack xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm --- xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm 2010-12-12 03:21:53.000000000 +0100 @@ -588,8 +588,4 @@ transfer8x4_copy_mmx: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xvidcore/F-14/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Dec 2008 18:21:34 -0000 1.4 +++ .cvsignore 12 Dec 2010 02:35:23 -0000 1.5 @@ -1 +1 @@ -xvidcore-1.2.1.tar.bz2 +xvidcore-1.2.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/xvidcore/F-14/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Dec 2008 18:21:34 -0000 1.4 +++ sources 12 Dec 2010 02:35:23 -0000 1.5 @@ -1 +1 @@ -8c4470ae8e5a104abedb39f6c70e2a40 xvidcore-1.2.1.tar.bz2 +6a3473a12c8a1fa7bdc2b5cb829fab58 xvidcore-1.2.2.tar.bz2 Index: xvidcore.spec =================================================================== RCS file: /cvs/free/rpms/xvidcore/F-14/xvidcore.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xvidcore.spec 21 Sep 2009 10:26:59 -0000 1.5 +++ xvidcore.spec 12 Dec 2010 02:35:23 -0000 1.6 @@ -1,13 +1,13 @@ Name: xvidcore -Version: 1.2.1 -Release: 3%{?dist} +Version: 1.2.2 +Release: 1%{?dist} Summary: MPEG-4 Simple and Advanced Simple Profile codec Group: System Environment/Libraries License: GPLv2+ URL: http://www.xvid.org/ Source0: http://downloads.xvid.org/downloads/xvidcore-%{version}.tar.bz2 -Patch0: xvidcore-1.2.1-noexec-stack.patch +Patch0: xvidcore-noexec-stack.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %ifarch %{ix86} x86_64 @@ -83,6 +83,10 @@ %changelog +* Sat Dec 11 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.2.2-1 +- 1.2.2 +- rebase noexec-stack patch + * Mon Sep 21 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 1.2.1-3 - Do not require an executable stack on x86_64 (rf743, rf733) --- xvidcore-1.2.1-noexec-stack.patch DELETED ---

13 years, 11 months

1
0
0 / 0

rpms/xvidcore/F-13 xvidcore-noexec-stack.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xvidcore.spec, 1.5, 1.6 xvidcore-1.2.1-noexec-stack.patch, 1.1, NONE

by Dominik Mierzejewski

Author: rathann Update of /cvs/free/rpms/xvidcore/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv23235 Modified Files: .cvsignore sources xvidcore.spec Added Files: xvidcore-noexec-stack.patch Removed Files: xvidcore-1.2.1-noexec-stack.patch Log Message: * Sat Dec 11 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.2.2-1 - 1.2.2 - rebase noexec-stack patch xvidcore-noexec-stack.patch: bitstream/x86_asm/cbp_mmx.asm | 6 +----- bitstream/x86_asm/cbp_sse2.asm | 6 +----- dct/x86_asm/fdct_mmx_ffmpeg.asm | 5 +---- dct/x86_asm/fdct_mmx_skal.asm | 5 +---- dct/x86_asm/fdct_sse2_skal.asm | 5 +---- dct/x86_asm/idct_3dne.asm | 6 +----- dct/x86_asm/idct_mmx.asm | 6 +----- dct/x86_asm/idct_sse2_dmitry.asm | 6 +----- image/x86_asm/colorspace_rgb_mmx.asm | 6 +----- image/x86_asm/colorspace_yuv_mmx.asm | 5 +---- image/x86_asm/colorspace_yuyv_mmx.asm | 5 +---- image/x86_asm/deintl_sse.asm | 5 +---- image/x86_asm/gmc_mmx.asm | 5 +---- image/x86_asm/interpolate8x8_3dn.asm | 6 +----- image/x86_asm/interpolate8x8_3dne.asm | 6 +----- image/x86_asm/interpolate8x8_mmx.asm | 6 +----- image/x86_asm/interpolate8x8_xmm.asm | 6 +----- image/x86_asm/postprocessing_mmx.asm | 5 +---- image/x86_asm/postprocessing_sse2.asm | 5 +---- image/x86_asm/qpel_mmx.asm | 5 +---- image/x86_asm/reduced_mmx.asm | 6 +----- motion/x86_asm/sad_3dn.asm | 6 +----- motion/x86_asm/sad_3dne.asm | 6 +----- motion/x86_asm/sad_mmx.asm | 6 +----- motion/x86_asm/sad_sse2.asm | 6 +----- motion/x86_asm/sad_xmm.asm | 6 +----- nasm.inc | 9 +++++++++ plugins/x86_asm/plugin_ssim-a.asm | 4 +--- quant/x86_asm/quantize_h263_3dne.asm | 5 +---- quant/x86_asm/quantize_h263_mmx.asm | 6 +----- quant/x86_asm/quantize_mpeg_mmx.asm | 6 +----- quant/x86_asm/quantize_mpeg_xmm.asm | 6 +----- utils/x86_asm/cpuid.asm | 5 +---- utils/x86_asm/interlacing_mmx.asm | 6 +----- utils/x86_asm/mem_transfer_3dne.asm | 6 +----- utils/x86_asm/mem_transfer_mmx.asm | 6 +----- 36 files changed, 44 insertions(+), 161 deletions(-) --- NEW FILE xvidcore-noexec-stack.patch --- diff -up xvidcore/src/bitstream/x86_asm/cbp_mmx.asm.noexec-stack xvidcore/src/bitstream/x86_asm/cbp_mmx.asm --- xvidcore/src/bitstream/x86_asm/cbp_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/bitstream/x86_asm/cbp_mmx.asm 2010-12-12 03:21:50.000000000 +0100 @@ -126,8 +126,4 @@ calc_cbp_mmx: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/bitstream/x86_asm/cbp_sse2.asm.noexec-stack xvidcore/src/bitstream/x86_asm/cbp_sse2.asm --- xvidcore/src/bitstream/x86_asm/cbp_sse2.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/bitstream/x86_asm/cbp_sse2.asm 2010-12-12 03:21:50.000000000 +0100 @@ -116,8 +116,4 @@ calc_cbp_sse2: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm --- xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm 2010-12-12 03:21:50.000000000 +0100 @@ -401,7 +401,4 @@ MAKE_FDCT_FUNC fdct_mmx_ffmpeg, FDCT_ROW MAKE_FDCT_FUNC fdct_xmm_ffmpeg, FDCT_ROW_XMM -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm --- xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm 2010-12-12 03:21:50.000000000 +0100 @@ -500,7 +500,4 @@ MAKE_FDCT_FUNC fdct_mmx_skal, fMTX_MULT_ MAKE_FDCT_FUNC fdct_xmm_skal, fMTX_MULT_XMM -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm --- xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm 2010-12-12 03:23:11.000000000 +0100 @@ -608,7 +608,4 @@ ENDFUNC ALIGN SECTION_ALIGN times 8 dw 0 -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/dct/x86_asm/idct_3dne.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_3dne.asm --- xvidcore/src/dct/x86_asm/idct_3dne.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/dct/x86_asm/idct_3dne.asm 2010-12-12 03:21:50.000000000 +0100 @@ -698,8 +698,4 @@ idct_3dne: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/dct/x86_asm/idct_mmx.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_mmx.asm --- xvidcore/src/dct/x86_asm/idct_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/dct/x86_asm/idct_mmx.asm 2010-12-12 03:21:50.000000000 +0100 @@ -608,8 +608,4 @@ idct_xmm: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm --- xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm 2010-12-12 03:21:50.000000000 +0100 @@ -325,8 +325,4 @@ idct_sse2_dmitry: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm --- xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm 2010-12-12 03:21:51.000000000 +0100 @@ -529,8 +529,4 @@ MAKE_COLORSPACE rgba_to_yv12_mmx,0, 4 MAKE_COLORSPACE yv12_to_bgr_mmx,48, 3,8,2, YV12_TO_BGR, 3, -1 MAKE_COLORSPACE yv12_to_bgra_mmx,48, 4,8,2, YV12_TO_BGR, 4, -1 - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm --- xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm.noexec-stack 2009-05-28 17:04:35.000000000 +0200 +++ xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm 2010-12-12 03:21:51.000000000 +0100 @@ -474,7 +474,4 @@ MAKE_YV12_TO_YV12 yv12_to_yv12_mmx, 0 MAKE_YV12_TO_YV12 yv12_to_yv12_xmm, 1 -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm --- xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm 2010-12-12 03:21:51.000000000 +0100 @@ -341,7 +341,4 @@ MAKE_COLORSPACE yv12_to_uyvy_mmx,0, MAKE_COLORSPACE yv12_to_yuyvi_mmx,0, 2,8,4, YV12_TO_YUYVI, 0, -1 MAKE_COLORSPACE yv12_to_uyvyi_mmx,0, 2,8,4, YV12_TO_YUYVI, 1, -1 -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/deintl_sse.asm.noexec-stack xvidcore/src/image/x86_asm/deintl_sse.asm --- xvidcore/src/image/x86_asm/deintl_sse.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/deintl_sse.asm 2010-12-12 03:21:51.000000000 +0100 @@ -131,7 +131,4 @@ xvid_deinterlace_sse: ENDFUNC ;////////////////////////////////////////////////////////////////////// - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/gmc_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/gmc_mmx.asm --- xvidcore/src/image/x86_asm/gmc_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/gmc_mmx.asm 2010-12-12 03:21:51.000000000 +0100 @@ -220,7 +220,4 @@ xvid_GMC_Core_Lin_8_sse41: ENDFUNC ;////////////////////////////////////////////////////////////////////// - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm --- xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm 2010-12-12 03:21:51.000000000 +0100 @@ -463,8 +463,4 @@ interpolate8x4_halfpel_hv_3dn: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm --- xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm.noexec-stack 2009-05-28 17:04:35.000000000 +0200 +++ xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm 2010-12-12 03:21:51.000000000 +0100 @@ -563,8 +563,4 @@ ALIGN SECTION_ALIGN ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm --- xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm 2010-12-12 03:21:51.000000000 +0100 @@ -1328,8 +1328,4 @@ interpolate8x8_halfpel_hv_add_mmx: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm --- xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm 2010-12-12 03:21:51.000000000 +0100 @@ -819,8 +819,4 @@ interpolate8x8_halfpel_hv_add_xmm: EPILOG ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/postprocessing_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/postprocessing_mmx.asm --- xvidcore/src/image/x86_asm/postprocessing_mmx.asm.noexec-stack 2009-05-28 17:04:35.000000000 +0200 +++ xvidcore/src/image/x86_asm/postprocessing_mmx.asm 2010-12-12 03:21:51.000000000 +0100 @@ -114,7 +114,4 @@ image_brightness_mmx: ENDFUNC ;////////////////////////////////////////////////////////////////////// -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/postprocessing_sse2.asm.noexec-stack xvidcore/src/image/x86_asm/postprocessing_sse2.asm --- xvidcore/src/image/x86_asm/postprocessing_sse2.asm.noexec-stack 2009-05-28 17:04:35.000000000 +0200 +++ xvidcore/src/image/x86_asm/postprocessing_sse2.asm 2010-12-12 03:21:52.000000000 +0100 @@ -130,7 +130,4 @@ image_brightness_sse2: ENDFUNC ;////////////////////////////////////////////////////////////////////// -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/qpel_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/qpel_mmx.asm --- xvidcore/src/image/x86_asm/qpel_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/qpel_mmx.asm 2010-12-12 03:21:52.000000000 +0100 @@ -1149,7 +1149,4 @@ ENDFUNC %undef SRC_PTR %undef DST_PTR -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/image/x86_asm/reduced_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/reduced_mmx.asm --- xvidcore/src/image/x86_asm/reduced_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/image/x86_asm/reduced_mmx.asm 2010-12-12 03:21:52.000000000 +0100 @@ -985,8 +985,4 @@ ENDFUNC ; pfeewwww... Never Do That On Stage Again. :) - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/motion/x86_asm/sad_3dn.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_3dn.asm --- xvidcore/src/motion/x86_asm/sad_3dn.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/motion/x86_asm/sad_3dn.asm 2010-12-12 03:21:52.000000000 +0100 @@ -216,8 +216,4 @@ sad8bi_3dn: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/motion/x86_asm/sad_3dne.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_3dne.asm --- xvidcore/src/motion/x86_asm/sad_3dne.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/motion/x86_asm/sad_3dne.asm 2010-12-12 03:21:52.000000000 +0100 @@ -490,8 +490,4 @@ ALIGN SECTION_ALIGN ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/motion/x86_asm/sad_mmx.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_mmx.asm --- xvidcore/src/motion/x86_asm/sad_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/motion/x86_asm/sad_mmx.asm 2010-12-12 03:21:52.000000000 +0100 @@ -731,8 +731,4 @@ sse8_8bit_mmx: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/motion/x86_asm/sad_sse2.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_sse2.asm --- xvidcore/src/motion/x86_asm/sad_sse2.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/motion/x86_asm/sad_sse2.asm 2010-12-12 03:21:52.000000000 +0100 @@ -176,8 +176,4 @@ dev16_sse3: MEAN16_SSE2_SSE3 lddqu ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/motion/x86_asm/sad_xmm.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_xmm.asm --- xvidcore/src/motion/x86_asm/sad_xmm.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/motion/x86_asm/sad_xmm.asm 2010-12-12 03:21:52.000000000 +0100 @@ -436,8 +436,4 @@ sad16v_xmm: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/nasm.inc.noexec-stack xvidcore/src/nasm.inc --- xvidcore/src/nasm.inc.noexec-stack 2009-05-28 17:04:35.000000000 +0200 +++ xvidcore/src/nasm.inc 2010-12-12 03:21:52.000000000 +0100 @@ -203,3 +203,12 @@ BITS 32 %endif %endif %endmacro + +%macro NON_EXEC_STACK 0 +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif +%ifidn __OUTPUT_FORMAT__,elf64 +section .note.GNU-stack noalloc noexec nowrite progbits +%endif +%endmacro diff -up xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm.noexec-stack xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm --- xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm 2010-12-12 03:21:53.000000000 +0100 @@ -273,6 +273,4 @@ consim_mmx: ret ENDFUNC -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif +NON_EXEC_STACK diff -up xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm --- xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm.noexec-stack 2009-05-28 17:04:35.000000000 +0200 +++ xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm 2010-12-12 03:21:53.000000000 +0100 @@ -931,7 +931,4 @@ ALIGN SECTION_ALIGN ret ENDFUNC -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm --- xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm 2010-12-12 03:21:53.000000000 +0100 @@ -1070,8 +1070,4 @@ dequant_h263_inter_sse2: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm --- xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm 2010-12-12 03:21:53.000000000 +0100 @@ -657,8 +657,4 @@ ALIGN SECTION_ALIGN ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm --- xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm.noexec-stack 2009-05-28 17:04:35.000000000 +0200 +++ xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm 2010-12-12 03:21:53.000000000 +0100 @@ -618,8 +618,4 @@ ALIGN SECTION_ALIGN ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/utils/x86_asm/cpuid.asm.noexec-stack xvidcore/src/utils/x86_asm/cpuid.asm --- xvidcore/src/utils/x86_asm/cpuid.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/utils/x86_asm/cpuid.asm 2010-12-12 03:21:53.000000000 +0100 @@ -240,7 +240,4 @@ ENDFUNC %endif -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/utils/x86_asm/interlacing_mmx.asm.noexec-stack xvidcore/src/utils/x86_asm/interlacing_mmx.asm --- xvidcore/src/utils/x86_asm/interlacing_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/utils/x86_asm/interlacing_mmx.asm 2010-12-12 03:21:53.000000000 +0100 @@ -198,8 +198,4 @@ MBFieldTest_mmx: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm.noexec-stack xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm --- xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm 2010-12-12 03:21:53.000000000 +0100 @@ -465,8 +465,4 @@ transfer8x4_copy_3dne: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK diff -up xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm.noexec-stack xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm --- xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm 2010-12-12 03:21:53.000000000 +0100 @@ -588,8 +588,4 @@ transfer8x4_copy_mmx: ret ENDFUNC - -%ifidn __OUTPUT_FORMAT__,elf -section ".note.GNU-stack" noalloc noexec nowrite progbits -%endif - +NON_EXEC_STACK Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xvidcore/F-13/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Dec 2008 18:21:34 -0000 1.4 +++ .cvsignore 12 Dec 2010 02:34:36 -0000 1.5 @@ -1 +1 @@ -xvidcore-1.2.1.tar.bz2 +xvidcore-1.2.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/xvidcore/F-13/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Dec 2008 18:21:34 -0000 1.4 +++ sources 12 Dec 2010 02:34:36 -0000 1.5 @@ -1 +1 @@ -8c4470ae8e5a104abedb39f6c70e2a40 xvidcore-1.2.1.tar.bz2 +6a3473a12c8a1fa7bdc2b5cb829fab58 xvidcore-1.2.2.tar.bz2 Index: xvidcore.spec =================================================================== RCS file: /cvs/free/rpms/xvidcore/F-13/xvidcore.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xvidcore.spec 21 Sep 2009 10:26:59 -0000 1.5 +++ xvidcore.spec 12 Dec 2010 02:34:36 -0000 1.6 @@ -1,13 +1,13 @@ Name: xvidcore -Version: 1.2.1 -Release: 3%{?dist} +Version: 1.2.2 +Release: 1%{?dist} Summary: MPEG-4 Simple and Advanced Simple Profile codec Group: System Environment/Libraries License: GPLv2+ URL: http://www.xvid.org/ Source0: http://downloads.xvid.org/downloads/xvidcore-%{version}.tar.bz2 -Patch0: xvidcore-1.2.1-noexec-stack.patch +Patch0: xvidcore-noexec-stack.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %ifarch %{ix86} x86_64 @@ -83,6 +83,10 @@ %changelog +* Sat Dec 11 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.2.2-1 +- 1.2.2 +- rebase noexec-stack patch + * Mon Sep 21 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 1.2.1-3 - Do not require an executable stack on x86_64 (rf743, rf733) --- xvidcore-1.2.1-noexec-stack.patch DELETED ---

13 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits December 2010