August 2010 - rpmfusion-commits

rpms/livna-config-display/devel .cvsignore, 1.5, 1.6 livna-config-display.spec, 1.8, 1.9 sources, 1.5, 1.6

by Stewart Adam

Author: firewing Update of /cvs/nonfree/rpms/livna-config-display/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv2008/devel Modified Files: .cvsignore livna-config-display.spec sources Log Message: * Mon Aug 30 2010 Stewart Adam <s.adam at diffingo.com> - 0.0.24-1 - Update to 0.0.24 - Remove dependency on system-config-display Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/livna-config-display/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 May 2009 00:47:39 -0000 1.5 +++ .cvsignore 30 Aug 2010 15:34:41 -0000 1.6 @@ -1 +1 @@ -livna-config-display-0.0.23.tar.gz +livna-config-display-0.0.24.tar.gz Index: livna-config-display.spec =================================================================== RCS file: /cvs/nonfree/rpms/livna-config-display/devel/livna-config-display.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- livna-config-display.spec 21 Aug 2010 13:05:57 -0000 1.8 +++ livna-config-display.spec 30 Aug 2010 15:34:41 -0000 1.9 @@ -1,18 +1,17 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: livna-config-display -Version: 0.0.23 -Release: 3%{?dist} +Version: 0.0.24 +Release: 1%{?dist} Summary: Tools to manage graphic drivers from the Livna repository URL: http://rpm.livna.org License: GPLv2+ Group: System Environment/Base -Source0: http://www.diffingo.com/downloads/livna/livna-config-display/%{name}-%{ve... +Source0: http://downloads.diffingo.com/livna/livna-config-display/%{name}-%{versio... Requires: pygtk2, pygtk2-libglade Requires: usermode -Requires: system-config-display Requires: pyxf86config >= 0.3.16 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -65,6 +64,10 @@ %doc TODO CHANGELOG COPYING %changelog +* Mon Aug 30 2010 Stewart Adam <s.adam at diffingo.com> - 0.0.24-1 +- Update to 0.0.24 +- Remove dependency on system-config-display + * Sat Aug 21 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.23-3 - rebuilt Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/livna-config-display/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 May 2009 00:47:39 -0000 1.5 +++ sources 30 Aug 2010 15:34:41 -0000 1.6 @@ -1 +1 @@ -dc709aaccaf6fee8572a450cb2adcd8d livna-config-display-0.0.23.tar.gz +13a27a246edb1e11fabf33b8675554eb livna-config-display-0.0.24.tar.gz

13 years, 7 months

1
0
0 / 0

rpms/xbmc/F-13 xbmc-9.11-python2.7.patch, NONE, 1.1 xbmc.spec, 1.3, 1.4

by Alex Lancaster

Author: alexlan Update of /cvs/free/rpms/xbmc/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv1779 Modified Files: xbmc.spec Added Files: xbmc-9.11-python2.7.patch Log Message: Sync with rawhide branch: Add -D__STDC_CONSTANT_MACROS for building with ffmpeg > 0.6 as per: http://forum.xbmc.org/showthread.php?t=75800 Add patch for Python 2.7 xbmc-9.11-python2.7.patch: configure.in | 12 ++++++++---- xbmc/lib/libPython/XBPyThread.cpp | 5 ++++- xbmc/lib/libPython/XBPyThread.h | 4 +++- xbmc/lib/libPython/XBPython.cpp | 4 +++- xbmc/lib/libPython/linux/Makefile.in | 5 ++++- xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h | 4 +++- xbmc/lib/libPython/xbmcmodule/PythonPlayer.h | 4 +++- xbmc/lib/libPython/xbmcmodule/PythonSettings.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/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/language.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/xbmcguimodule.cpp | 5 ++++- xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp | 4 +++- 39 files changed, 125 insertions(+), 42 deletions(-) --- NEW FILE xbmc-9.11-python2.7.patch --- Index: xbmc/lib/libPython/linux/Makefile.in =================================================================== --- xbmc/lib/libPython/linux/Makefile.in.orig 2010-08-29 21:38:20.939294072 -0400 +++ xbmc/lib/libPython/linux/Makefile.in 2010-08-29 21:39:46.832294131 -0400 @@ -2,7 +2,10 @@ SHELL=/bin/bash SYSDIR=../../../../system/python -ifeq (@USE_PYTHON2_6@,1) +ifeq (@USE_PYTHON2_7@,1) + PYVERSION=python2.7 + SO=python27-$(ARCH).so +else ifeq (@USE_PYTHON2_6@,1) PYVERSION=python2.6 SO=python26-$(ARCH).so else ifeq (@USE_PYTHON2_5@,1) Index: xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp (working copy) @@ -24,7 +24,9 @@ #endif #include "winxml.h" #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/dialog.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/dialog.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/dialog.h (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp (working copy) @@ -23,7 +23,10 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #include <python2.7/structmember.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #include <python2.6/structmember.h> #elif (defined HAVE_LIBPYTHON2_5) Index: xbmc/lib/libPython/xbmcmodule/keyboard.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/keyboard.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/keyboard.h (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp (working copy) @@ -26,7 +26,9 @@ #include "Util.h" #include "pyplaylist.h" #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controllist.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controllist.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controllist.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/winxml.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/winxml.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/winxml.cpp (working copy) @@ -24,7 +24,9 @@ #endif #include "winxml.h" #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controllabel.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controllabel.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controllabel.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/action.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/action.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/action.h (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controlimage.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlimage.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlimage.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/infotagvideo.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/infotagvideo.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/infotagvideo.h (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/control.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/control.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/control.h (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controlgroup.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlgroup.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlgroup.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/infotagmusic.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/infotagmusic.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/infotagmusic.h (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controltextbox.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controltextbox.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controltextbox.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/listitem.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/listitem.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/listitem.h (working copy) @@ -25,7 +25,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/dialog.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/dialog.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/dialog.cpp (working copy) @@ -24,7 +24,9 @@ #endif #include "dialog.h" #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/player.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/player.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/player.h (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/PythonPlayer.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/PythonPlayer.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/PythonPlayer.h (working copy) @@ -25,7 +25,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controlprogress.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlprogress.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlprogress.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controlspin.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlspin.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlspin.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controlbutton.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlbutton.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlbutton.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/window.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/window.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/window.h (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/pyplaylist.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/pyplaylist.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/pyplaylist.h (working copy) @@ -25,7 +25,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h (working copy) @@ -26,7 +26,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/winxml.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/winxml.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/winxml.h (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/listitem.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/listitem.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/listitem.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/pyutil.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/pyutil.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/pyutil.h (working copy) @@ -25,7 +25,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/language.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/language.h.orig 2010-08-30 02:53:36.545418596 -0400 +++ xbmc/lib/libPython/xbmcmodule/language.h 2010-08-30 02:54:07.381668564 -0400 @@ -25,7 +25,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/PythonSettings.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/PythonSettings.h.orig 2010-08-30 03:02:55.131669137 -0400 +++ xbmc/lib/libPython/xbmcmodule/PythonSettings.h 2010-08-30 03:03:18.218294899 -0400 @@ -25,7 +25,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/XBPyThread.h =================================================================== --- xbmc/lib/libPython/XBPyThread.h (revision 32022) +++ xbmc/lib/libPython/XBPyThread.h (working copy) @@ -26,7 +26,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/XBPyThread.cpp =================================================================== --- xbmc/lib/libPython/XBPyThread.cpp (revision 32022) +++ xbmc/lib/libPython/XBPyThread.cpp (working copy) @@ -24,7 +24,10 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #include <python2.7/osdefs.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #include <python2.6/osdefs.h> #elif (defined HAVE_LIBPYTHON2_5) Index: xbmc/lib/libPython/XBPython.cpp =================================================================== --- xbmc/lib/libPython/XBPython.cpp (revision 32022) +++ xbmc/lib/libPython/XBPython.cpp (working copy) @@ -24,7 +24,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: configure.in =================================================================== --- configure.in (revision 32022) +++ configure.in (working copy) @@ -636,18 +636,21 @@ # External Python if test "$use_external_libraries" = "yes" || test "$use_external_python" = "yes"; then - AC_CHECK_LIB([python2.6], [main],, + AC_CHECK_LIB([python2.7], [main],, + [AC_CHECK_LIB([python2.6], [main],, [AC_CHECK_LIB([python2.5], [main],, [AC_CHECK_LIB([python2.4], [main],, - [AC_MSG_ERROR($missing_library)] )] )] ) + [AC_MSG_ERROR($missing_library)] )] )] )] ) # Test again, but this time just set some variables we need in Makefiles - AC_CHECK_LIB([python2.6], [main],[USE_PYTHON2_6=1], + AC_CHECK_LIB([python2.7], [main],[USE_PYTHON2_7=1], + [AC_CHECK_LIB([python2.6], [main],[USE_PYTHON2_6=1], [AC_CHECK_LIB([python2.5], [main],[USE_PYTHON2_5=1], [AC_CHECK_LIB([python2.4], [main],[USE_PYTHON2_4=1], - [AC_MSG_ERROR($missing_library)] )] )] ) + [AC_MSG_ERROR($missing_library)] )] )] )] ) AC_MSG_NOTICE($external_python_enabled) + test "$USE_PYTHON2_7" && AC_MSG_NOTICE([Using Python 2.7]) test "$USE_PYTHON2_6" && AC_MSG_NOTICE([Using Python 2.6]) test "$USE_PYTHON2_5" && AC_MSG_NOTICE([Using Python 2.5]) test "$USE_PYTHON2_4" && AC_MSG_NOTICE([Using Python 2.4]) @@ -1032,6 +1035,7 @@ AC_SUBST(USE_EXTERNAL_LIBOGG) AC_SUBST(USE_EXTERNAL_LIBWAVPACK) AC_SUBST(USE_EXTERNAL_PYTHON) +AC_SUBST(USE_PYTHON2_7) AC_SUBST(USE_PYTHON2_6) AC_SUBST(USE_PYTHON2_5) AC_SUBST(USE_PYTHON2_4) Index: xbmc.spec =================================================================== RCS file: /cvs/free/rpms/xbmc/F-13/xbmc.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xbmc.spec 25 Aug 2010 07:29:17 -0000 1.3 +++ xbmc.spec 30 Aug 2010 15:32:13 -0000 1.4 @@ -1,6 +1,6 @@ Name: xbmc Version: 9.11 -Release: 19%{?dist} +Release: 21%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{version}-patched.tar.xz @@ -69,6 +69,9 @@ # an attempt to force hdhomerun to be external Patch26: xbmc-9.11-hdhomerun.patch +# search for Python 2.7 as well +Patch27: xbmc-9.11-python2.7.patch + ExcludeArch: ppc64 Buildroot: %{_tmppath}/%{name}-%{version} Summary: Media center @@ -177,6 +180,7 @@ %patch24 -p1 %patch25 -p1 %patch26 -p1 -b .hdhomerun +%patch27 -p0 # Prevent rerunning the autotools. touch -r xbmc/screensavers/rsxs-0.9/aclocal.m4 \ @@ -197,8 +201,8 @@ --disable-webserver \ SVN_REV=26017 \ CPPFLAGS="-I/usr/include/ffmpeg" \ -CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg" \ -CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg" \ +CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \ +CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \ LDFLAGS="-fPIC" \ LIBS="-L%{_libdir}/mysql -lhdhomerun $LIBS" \ ASFLAGS=-fPIC @@ -238,6 +242,14 @@ %{_datadir}/pixmaps/xbmc.png %changelog +* Mon Aug 30 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-21 +- Fix python 2.7 patch + +* Sun Aug 29 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-20 +- Add -D__STDC_CONSTANT_MACROS for building with ffmpeg > 0.6 + as per: http://forum.xbmc.org/showthread.php?t=75800 +- Add patch for Python 2.7 + * Wed Aug 25 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-19 - Default to using /var/run/lirc/lircd (#1325)

13 years, 7 months

1
0
0 / 0

rpms/xbmc/devel xbmc-9.11-python2.7.patch, 1.1, 1.2 xbmc.spec, 1.7, 1.8

by Alex Lancaster

Author: alexlan Update of /cvs/free/rpms/xbmc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv15454 Modified Files: xbmc-9.11-python2.7.patch xbmc.spec Log Message: Fix python 2.7 patch xbmc-9.11-python2.7.patch: configure.in | 12 ++++++++---- xbmc/lib/libPython/XBPyThread.cpp | 5 ++++- xbmc/lib/libPython/XBPyThread.h | 4 +++- xbmc/lib/libPython/XBPython.cpp | 4 +++- xbmc/lib/libPython/linux/Makefile.in | 5 ++++- xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h | 4 +++- xbmc/lib/libPython/xbmcmodule/PythonPlayer.h | 4 +++- xbmc/lib/libPython/xbmcmodule/PythonSettings.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/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/language.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/xbmcguimodule.cpp | 5 ++++- xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp | 4 +++- 39 files changed, 125 insertions(+), 42 deletions(-) Index: xbmc-9.11-python2.7.patch =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc-9.11-python2.7.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xbmc-9.11-python2.7.patch 30 Aug 2010 02:57:12 -0000 1.1 +++ xbmc-9.11-python2.7.patch 30 Aug 2010 07:09:17 -0000 1.2 @@ -495,6 +495,36 @@ #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> +Index: xbmc/lib/libPython/xbmcmodule/language.h +=================================================================== +--- xbmc/lib/libPython/xbmcmodule/language.h.orig 2010-08-30 02:53:36.545418596 -0400 ++++ xbmc/lib/libPython/xbmcmodule/language.h 2010-08-30 02:54:07.381668564 -0400 +@@ -25,7 +25,9 @@ + #include "config.h" + #endif + #if (defined USE_EXTERNAL_PYTHON) +- #if (defined HAVE_LIBPYTHON2_6) ++ #if (defined HAVE_LIBPYTHON2_7) ++ #include <python2.7/Python.h> ++ #elif (defined HAVE_LIBPYTHON2_6) + #include <python2.6/Python.h> + #elif (defined HAVE_LIBPYTHON2_5) + #include <python2.5/Python.h> +Index: xbmc/lib/libPython/xbmcmodule/PythonSettings.h +=================================================================== +--- xbmc/lib/libPython/xbmcmodule/PythonSettings.h.orig 2010-08-30 03:02:55.131669137 -0400 ++++ xbmc/lib/libPython/xbmcmodule/PythonSettings.h 2010-08-30 03:03:18.218294899 -0400 +@@ -25,7 +25,9 @@ + #include "config.h" + #endif + #if (defined USE_EXTERNAL_PYTHON) +- #if (defined HAVE_LIBPYTHON2_6) ++ #if (defined HAVE_LIBPYTHON2_7) ++ #include <python2.7/Python.h> ++ #elif (defined HAVE_LIBPYTHON2_6) + #include <python2.6/Python.h> + #elif (defined HAVE_LIBPYTHON2_5) + #include <python2.5/Python.h> Index: xbmc/lib/libPython/XBPyThread.h =================================================================== --- xbmc/lib/libPython/XBPyThread.h (revision 32022) Index: xbmc.spec =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xbmc.spec 30 Aug 2010 02:57:12 -0000 1.7 +++ xbmc.spec 30 Aug 2010 07:09:18 -0000 1.8 @@ -1,6 +1,6 @@ Name: xbmc Version: 9.11 -Release: 20%{?dist} +Release: 21%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{version}-patched.tar.xz @@ -242,6 +242,9 @@ %{_datadir}/pixmaps/xbmc.png %changelog +* Mon Aug 30 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-21 +- Fix python 2.7 patch + * Sun Aug 29 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-20 - Add -D__STDC_CONSTANT_MACROS for building with ffmpeg > 0.6 as per: http://forum.xbmc.org/showthread.php?t=75800

13 years, 7 months

1
0
0 / 0

rpms/xtables-addons/F-13 .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 xtables-addons-userspace.patch, 1.3, 1.4 xtables-addons.spec, 1.5, 1.6

by Chen Lei

Author: supercyper Update of /cvs/free/rpms/xtables-addons/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv2227 Modified Files: .cvsignore sources xtables-addons-userspace.patch xtables-addons.spec Log Message: Update to 1.28 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xtables-addons/F-13/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 31 May 2010 02:13:29 -0000 1.4 +++ .cvsignore 30 Aug 2010 03:49:40 -0000 1.5 @@ -1 +1 @@ -xtables-addons-1.27.tar.xz +xtables-addons-1.28.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xtables-addons/F-13/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 31 May 2010 02:13:29 -0000 1.5 +++ sources 30 Aug 2010 03:49:40 -0000 1.6 @@ -1 +1 @@ -f4f65ce5361d7f8c0908ca3db37fa8ee xtables-addons-1.27.tar.xz +b94fe23370a1294b985e9a06a0f9d129 xtables-addons-1.28.tar.xz xtables-addons-userspace.patch: Makefile.am | 1 - configure.ac | 47 ----------------------------------------------- extensions/Makefile.am | 22 ---------------------- 3 files changed, 70 deletions(-) Index: xtables-addons-userspace.patch =================================================================== RCS file: /cvs/free/rpms/xtables-addons/F-13/xtables-addons-userspace.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xtables-addons-userspace.patch 31 May 2010 02:13:29 -0000 1.3 +++ xtables-addons-userspace.patch 30 Aug 2010 03:49:40 -0000 1.4 @@ -61,8 +61,9 @@ AC_SUBST([regular_CFLAGS]) -AC_SUBST([kbuilddir]) AC_SUBST([xtlibdir]) - AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans - extensions/Makefile extensions/ACCOUNT/Makefile + AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans geoip/Makefile + extensions/Makefile extensions/ACCOUNT/Makefile + extensions/ipset/Makefile extensions/pknock/Makefile]) diff -urP xtables-addons-1.27.org/extensions/Makefile.am xtables-addons-1.27/extensions/Makefile.am --- xtables-addons-1.27.org/extensions/Makefile.am 2010-05-31 09:47:58.363361712 +0800 +++ xtables-addons-1.27/extensions/Makefile.am 2010-05-31 10:02:08.845363738 +0800 Index: xtables-addons.spec =================================================================== RCS file: /cvs/free/rpms/xtables-addons/F-13/xtables-addons.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xtables-addons.spec 31 May 2010 02:13:29 -0000 1.5 +++ xtables-addons.spec 30 Aug 2010 03:49:40 -0000 1.6 @@ -1,6 +1,6 @@ Name: xtables-addons Summary: Extensions targets and matches for iptables -Version: 1.27 +Version: 1.28 Release: 1%{?dist} # The entire source code is GPLv2 except ACCOUNT/libxt_ACCOUNT_cl.* which is LGPLv2 License: GPLv2 and LGPLv2 @@ -38,15 +38,27 @@ %setup -q %patch0 -p1 + %build ./autogen.sh %configure -with-xtlibdir=/%{_lib}/xtables +if [ -e /%{_lib}/xtables/libxt_CHECKSUM.so ]; then + sed -i 's/build_CHECKSUM=m/build_CHECKSUM=/' mconfig +fi +if [ -e /%{_lib}/xtables/libxt_TEE.so ]; then + sed -i 's/build_TEE=m/build_TEE=/' mconfig +fi make V=1 %{?_smp_mflags} %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install +# We add xt_geoip database scripts manually +rm -rf %{buildroot}%{_libexecdir} +rm -f geoip/{Makefile*,.gitignore} +chmod 0644 geoip/* + # move ipset to /sbin install -d %{buildroot}/sbin mv %{buildroot}/%{_sbindir}/ipset %{buildroot}/sbin @@ -79,7 +91,7 @@ %files %defattr(-,root,root,-) -%doc LICENSE README doc/* +%doc LICENSE README doc/* geoip %attr(0755,root,root) %{_initddir}/* %config(noreplace) %{_sysconfdir}/sysconfig/* /%{_lib}/xtables/*.so @@ -89,6 +101,12 @@ %{_mandir}/man?/* %changelog +* Sun Jul 25 2010 Chen Lei <supercyper(a)163.com> - 1.28-1 +- update to 1.28 + +* Mon Jun 28 2010 Chen Lei <supercyper(a)163.com> - 1.27-2 +- rebuild for kernel 2.6.35 + * Mon May 31 2010 Chen Lei <supercyper(a)163.com> - 1.27-1 - update to 1.27

13 years, 7 months

1
0
0 / 0

rpms/xtables-addons/F-12 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xtables-addons-userspace.patch, 1.3, 1.4 xtables-addons.spec, 1.4, 1.5

by Chen Lei

Author: supercyper Update of /cvs/free/rpms/xtables-addons/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv2210 Modified Files: .cvsignore sources xtables-addons-userspace.patch xtables-addons.spec Log Message: Update to 1.28 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xtables-addons/F-12/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 31 May 2010 02:27:04 -0000 1.5 +++ .cvsignore 30 Aug 2010 03:49:40 -0000 1.6 @@ -1 +1 @@ -xtables-addons-1.27.tar.xz +xtables-addons-1.28.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xtables-addons/F-12/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 31 May 2010 02:27:04 -0000 1.5 +++ sources 30 Aug 2010 03:49:40 -0000 1.6 @@ -1 +1 @@ -f4f65ce5361d7f8c0908ca3db37fa8ee xtables-addons-1.27.tar.xz +b94fe23370a1294b985e9a06a0f9d129 xtables-addons-1.28.tar.xz xtables-addons-userspace.patch: Makefile.am | 1 - configure.ac | 47 ----------------------------------------------- extensions/Makefile.am | 22 ---------------------- 3 files changed, 70 deletions(-) Index: xtables-addons-userspace.patch =================================================================== RCS file: /cvs/free/rpms/xtables-addons/F-12/xtables-addons-userspace.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xtables-addons-userspace.patch 31 May 2010 02:27:04 -0000 1.3 +++ xtables-addons-userspace.patch 30 Aug 2010 03:49:40 -0000 1.4 @@ -61,8 +61,9 @@ AC_SUBST([regular_CFLAGS]) -AC_SUBST([kbuilddir]) AC_SUBST([xtlibdir]) - AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans - extensions/Makefile extensions/ACCOUNT/Makefile + AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans geoip/Makefile + extensions/Makefile extensions/ACCOUNT/Makefile + extensions/ipset/Makefile extensions/pknock/Makefile]) diff -urP xtables-addons-1.27.org/extensions/Makefile.am xtables-addons-1.27/extensions/Makefile.am --- xtables-addons-1.27.org/extensions/Makefile.am 2010-05-31 09:47:58.363361712 +0800 +++ xtables-addons-1.27/extensions/Makefile.am 2010-05-31 10:02:08.845363738 +0800 Index: xtables-addons.spec =================================================================== RCS file: /cvs/free/rpms/xtables-addons/F-12/xtables-addons.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xtables-addons.spec 31 May 2010 02:27:04 -0000 1.4 +++ xtables-addons.spec 30 Aug 2010 03:49:40 -0000 1.5 @@ -1,6 +1,6 @@ Name: xtables-addons Summary: Extensions targets and matches for iptables -Version: 1.27 +Version: 1.28 Release: 1%{?dist} # The entire source code is GPLv2 except ACCOUNT/libxt_ACCOUNT_cl.* which is LGPLv2 License: GPLv2 and LGPLv2 @@ -38,15 +38,27 @@ %setup -q %patch0 -p1 + %build ./autogen.sh %configure -with-xtlibdir=/%{_lib}/xtables +if [ -e /%{_lib}/xtables/libxt_CHECKSUM.so ]; then + sed -i 's/build_CHECKSUM=m/build_CHECKSUM=/' mconfig +fi +if [ -e /%{_lib}/xtables/libxt_TEE.so ]; then + sed -i 's/build_TEE=m/build_TEE=/' mconfig +fi make V=1 %{?_smp_mflags} %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install +# We add xt_geoip database scripts manually +rm -rf %{buildroot}%{_libexecdir} +rm -f geoip/{Makefile*,.gitignore} +chmod 0644 geoip/* + # move ipset to /sbin install -d %{buildroot}/sbin mv %{buildroot}/%{_sbindir}/ipset %{buildroot}/sbin @@ -79,7 +91,7 @@ %files %defattr(-,root,root,-) -%doc LICENSE README doc/* +%doc LICENSE README doc/* geoip %attr(0755,root,root) %{_initddir}/* %config(noreplace) %{_sysconfdir}/sysconfig/* /%{_lib}/xtables/*.so @@ -89,6 +101,12 @@ %{_mandir}/man?/* %changelog +* Sun Jul 25 2010 Chen Lei <supercyper(a)163.com> - 1.28-1 +- update to 1.28 + +* Mon Jun 28 2010 Chen Lei <supercyper(a)163.com> - 1.27-2 +- rebuild for kernel 2.6.35 + * Mon May 31 2010 Chen Lei <supercyper(a)163.com> - 1.27-1 - update to 1.27

13 years, 7 months

1
0
0 / 0

rpms/xtables-addons/devel .cvsignore, 1.1, 1.2 sources, 1.2, 1.3 xtables-addons-userspace.patch, 1.1, 1.2 xtables-addons.spec, 1.1, 1.2

by Chen Lei

Author: supercyper Update of /cvs/free/rpms/xtables-addons/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv2119 Modified Files: .cvsignore sources xtables-addons-userspace.patch xtables-addons.spec Log Message: Update to 1.28 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xtables-addons/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Apr 2010 20:53:12 -0000 1.1 +++ .cvsignore 30 Aug 2010 03:49:00 -0000 1.2 @@ -0,0 +1 @@ +xtables-addons-1.28.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xtables-addons/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Jun 2010 09:40:00 -0000 1.2 +++ sources 30 Aug 2010 03:49:00 -0000 1.3 @@ -1 +1 @@ -f4f65ce5361d7f8c0908ca3db37fa8ee xtables-addons-1.27.tar.xz +b94fe23370a1294b985e9a06a0f9d129 xtables-addons-1.28.tar.xz xtables-addons-userspace.patch: Makefile.am | 1 - configure.ac | 47 ----------------------------------------------- extensions/Makefile.am | 22 ---------------------- 3 files changed, 70 deletions(-) Index: xtables-addons-userspace.patch =================================================================== RCS file: /cvs/free/rpms/xtables-addons/devel/xtables-addons-userspace.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xtables-addons-userspace.patch 28 Jun 2010 09:40:23 -0000 1.1 +++ xtables-addons-userspace.patch 30 Aug 2010 03:49:00 -0000 1.2 @@ -61,8 +61,9 @@ AC_SUBST([regular_CFLAGS]) -AC_SUBST([kbuilddir]) AC_SUBST([xtlibdir]) - AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans - extensions/Makefile extensions/ACCOUNT/Makefile + AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans geoip/Makefile + extensions/Makefile extensions/ACCOUNT/Makefile + extensions/ipset/Makefile extensions/pknock/Makefile]) diff -urP xtables-addons-1.27.org/extensions/Makefile.am xtables-addons-1.27/extensions/Makefile.am --- xtables-addons-1.27.org/extensions/Makefile.am 2010-05-31 09:47:58.363361712 +0800 +++ xtables-addons-1.27/extensions/Makefile.am 2010-05-31 10:02:08.845363738 +0800 Index: xtables-addons.spec =================================================================== RCS file: /cvs/free/rpms/xtables-addons/devel/xtables-addons.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xtables-addons.spec 28 Jun 2010 09:40:23 -0000 1.1 +++ xtables-addons.spec 30 Aug 2010 03:49:00 -0000 1.2 @@ -1,7 +1,7 @@ Name: xtables-addons Summary: Extensions targets and matches for iptables -Version: 1.27 -Release: 2%{?dist} +Version: 1.28 +Release: 1%{?dist} # The entire source code is GPLv2 except ACCOUNT/libxt_ACCOUNT_cl.* which is LGPLv2 License: GPLv2 and LGPLv2 Group: System Environment/Base @@ -37,19 +37,28 @@ %prep %setup -q %patch0 -p1 -if [ -e /%{_lib}/xtables/libxt_TEE.so ]; then - sed -i 's/build_TEE=m/build_TEE=/' mconfig -fi + %build ./autogen.sh %configure -with-xtlibdir=/%{_lib}/xtables +if [ -e /%{_lib}/xtables/libxt_CHECKSUM.so ]; then + sed -i 's/build_CHECKSUM=m/build_CHECKSUM=/' mconfig +fi +if [ -e /%{_lib}/xtables/libxt_TEE.so ]; then + sed -i 's/build_TEE=m/build_TEE=/' mconfig +fi make V=1 %{?_smp_mflags} %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install +# We add xt_geoip database scripts manually +rm -rf %{buildroot}%{_libexecdir} +rm -f geoip/{Makefile*,.gitignore} +chmod 0644 geoip/* + # move ipset to /sbin install -d %{buildroot}/sbin mv %{buildroot}/%{_sbindir}/ipset %{buildroot}/sbin @@ -82,7 +91,7 @@ %files %defattr(-,root,root,-) -%doc LICENSE README doc/* +%doc LICENSE README doc/* geoip %attr(0755,root,root) %{_initddir}/* %config(noreplace) %{_sysconfdir}/sysconfig/* /%{_lib}/xtables/*.so @@ -92,6 +101,9 @@ %{_mandir}/man?/* %changelog +* Sun Jul 25 2010 Chen Lei <supercyper(a)163.com> - 1.28-1 +- update to 1.28 + * Mon Jun 28 2010 Chen Lei <supercyper(a)163.com> - 1.27-2 - rebuild for kernel 2.6.35

13 years, 7 months

1
0
0 / 0

rpms/xbmc/devel xbmc-9.11-python2.7.patch, NONE, 1.1 xbmc.spec, 1.6, 1.7

by Alex Lancaster

Author: alexlan Update of /cvs/free/rpms/xbmc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv18414 Modified Files: xbmc.spec Added Files: xbmc-9.11-python2.7.patch Log Message: - Add -D__STDC_CONSTANT_MACROS for building with ffmpeg > 0.6 as per: http://forum.xbmc.org/showthread.php?t=75800 - Add patch for Python 2.7 xbmc-9.11-python2.7.patch: configure.in | 12 ++++++++---- xbmc/lib/libPython/XBPyThread.cpp | 5 ++++- xbmc/lib/libPython/XBPyThread.h | 4 +++- xbmc/lib/libPython/XBPython.cpp | 4 +++- xbmc/lib/libPython/linux/Makefile.in | 5 ++++- xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.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/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/xbmcguimodule.cpp | 5 ++++- xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp | 4 +++- 37 files changed, 119 insertions(+), 40 deletions(-) --- NEW FILE xbmc-9.11-python2.7.patch --- Index: xbmc/lib/libPython/linux/Makefile.in =================================================================== --- xbmc/lib/libPython/linux/Makefile.in.orig 2010-08-29 21:38:20.939294072 -0400 +++ xbmc/lib/libPython/linux/Makefile.in 2010-08-29 21:39:46.832294131 -0400 @@ -2,7 +2,10 @@ SHELL=/bin/bash SYSDIR=../../../../system/python -ifeq (@USE_PYTHON2_6@,1) +ifeq (@USE_PYTHON2_7@,1) + PYVERSION=python2.7 + SO=python27-$(ARCH).so +else ifeq (@USE_PYTHON2_6@,1) PYVERSION=python2.6 SO=python26-$(ARCH).so else ifeq (@USE_PYTHON2_5@,1) Index: xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp (working copy) @@ -24,7 +24,9 @@ #endif #include "winxml.h" #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/dialog.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/dialog.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/dialog.h (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp (working copy) @@ -23,7 +23,10 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #include <python2.7/structmember.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #include <python2.6/structmember.h> #elif (defined HAVE_LIBPYTHON2_5) Index: xbmc/lib/libPython/xbmcmodule/keyboard.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/keyboard.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/keyboard.h (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp (working copy) @@ -26,7 +26,9 @@ #include "Util.h" #include "pyplaylist.h" #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controllist.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controllist.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controllist.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/winxml.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/winxml.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/winxml.cpp (working copy) @@ -24,7 +24,9 @@ #endif #include "winxml.h" #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controllabel.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controllabel.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controllabel.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/action.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/action.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/action.h (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controlimage.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlimage.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlimage.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/infotagvideo.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/infotagvideo.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/infotagvideo.h (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/control.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/control.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/control.h (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controlgroup.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlgroup.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlgroup.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/infotagmusic.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/infotagmusic.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/infotagmusic.h (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controltextbox.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controltextbox.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controltextbox.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/listitem.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/listitem.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/listitem.h (working copy) @@ -25,7 +25,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/dialog.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/dialog.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/dialog.cpp (working copy) @@ -24,7 +24,9 @@ #endif #include "dialog.h" #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/player.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/player.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/player.h (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/PythonPlayer.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/PythonPlayer.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/PythonPlayer.h (working copy) @@ -25,7 +25,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controlprogress.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlprogress.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlprogress.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controlspin.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlspin.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlspin.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controlbutton.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlbutton.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlbutton.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/window.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/window.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/window.h (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/pyplaylist.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/pyplaylist.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/pyplaylist.h (working copy) @@ -25,7 +25,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h (working copy) @@ -26,7 +26,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/winxml.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/winxml.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/winxml.h (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/listitem.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/listitem.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/listitem.cpp (working copy) @@ -23,7 +23,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/xbmcmodule/pyutil.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/pyutil.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/pyutil.h (working copy) @@ -25,7 +25,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/XBPyThread.h =================================================================== --- xbmc/lib/libPython/XBPyThread.h (revision 32022) +++ xbmc/lib/libPython/XBPyThread.h (working copy) @@ -26,7 +26,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: xbmc/lib/libPython/XBPyThread.cpp =================================================================== --- xbmc/lib/libPython/XBPyThread.cpp (revision 32022) +++ xbmc/lib/libPython/XBPyThread.cpp (working copy) @@ -24,7 +24,10 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #include <python2.7/osdefs.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #include <python2.6/osdefs.h> #elif (defined HAVE_LIBPYTHON2_5) Index: xbmc/lib/libPython/XBPython.cpp =================================================================== --- xbmc/lib/libPython/XBPython.cpp (revision 32022) +++ xbmc/lib/libPython/XBPython.cpp (working copy) @@ -24,7 +24,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> Index: configure.in =================================================================== --- configure.in (revision 32022) +++ configure.in (working copy) @@ -636,18 +636,21 @@ # External Python if test "$use_external_libraries" = "yes" || test "$use_external_python" = "yes"; then - AC_CHECK_LIB([python2.6], [main],, + AC_CHECK_LIB([python2.7], [main],, + [AC_CHECK_LIB([python2.6], [main],, [AC_CHECK_LIB([python2.5], [main],, [AC_CHECK_LIB([python2.4], [main],, - [AC_MSG_ERROR($missing_library)] )] )] ) + [AC_MSG_ERROR($missing_library)] )] )] )] ) # Test again, but this time just set some variables we need in Makefiles - AC_CHECK_LIB([python2.6], [main],[USE_PYTHON2_6=1], + AC_CHECK_LIB([python2.7], [main],[USE_PYTHON2_7=1], + [AC_CHECK_LIB([python2.6], [main],[USE_PYTHON2_6=1], [AC_CHECK_LIB([python2.5], [main],[USE_PYTHON2_5=1], [AC_CHECK_LIB([python2.4], [main],[USE_PYTHON2_4=1], - [AC_MSG_ERROR($missing_library)] )] )] ) + [AC_MSG_ERROR($missing_library)] )] )] )] ) AC_MSG_NOTICE($external_python_enabled) + test "$USE_PYTHON2_7" && AC_MSG_NOTICE([Using Python 2.7]) test "$USE_PYTHON2_6" && AC_MSG_NOTICE([Using Python 2.6]) test "$USE_PYTHON2_5" && AC_MSG_NOTICE([Using Python 2.5]) test "$USE_PYTHON2_4" && AC_MSG_NOTICE([Using Python 2.4]) @@ -1032,6 +1035,7 @@ AC_SUBST(USE_EXTERNAL_LIBOGG) AC_SUBST(USE_EXTERNAL_LIBWAVPACK) AC_SUBST(USE_EXTERNAL_PYTHON) +AC_SUBST(USE_PYTHON2_7) AC_SUBST(USE_PYTHON2_6) AC_SUBST(USE_PYTHON2_5) AC_SUBST(USE_PYTHON2_4) Index: xbmc.spec =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xbmc.spec 29 Aug 2010 05:25:01 -0000 1.6 +++ xbmc.spec 30 Aug 2010 02:57:12 -0000 1.7 @@ -1,6 +1,6 @@ Name: xbmc Version: 9.11 -Release: 19%{?dist} +Release: 20%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{version}-patched.tar.xz @@ -69,6 +69,9 @@ # an attempt to force hdhomerun to be external Patch26: xbmc-9.11-hdhomerun.patch +# search for Python 2.7 as well +Patch27: xbmc-9.11-python2.7.patch + ExcludeArch: ppc64 Buildroot: %{_tmppath}/%{name}-%{version} Summary: Media center @@ -177,6 +180,7 @@ %patch24 -p1 %patch25 -p1 %patch26 -p1 -b .hdhomerun +%patch27 -p0 # Prevent rerunning the autotools. touch -r xbmc/screensavers/rsxs-0.9/aclocal.m4 \ @@ -197,8 +201,8 @@ --disable-webserver \ SVN_REV=26017 \ CPPFLAGS="-I/usr/include/ffmpeg" \ -CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg" \ -CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg" \ +CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \ +CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \ LDFLAGS="-fPIC" \ LIBS="-L%{_libdir}/mysql -lhdhomerun $LIBS" \ ASFLAGS=-fPIC @@ -238,6 +242,11 @@ %{_datadir}/pixmaps/xbmc.png %changelog +* Sun Aug 29 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-20 +- Add -D__STDC_CONSTANT_MACROS for building with ffmpeg > 0.6 + as per: http://forum.xbmc.org/showthread.php?t=75800 +- Add patch for Python 2.7 + * Wed Aug 25 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-19 - Default to using /var/run/lirc/lircd (#1325)

13 years, 7 months

1
0
0 / 0

rpms/mythtv/devel mythplugins-compile_fixes_for_qt_4_7.patch, NONE, 1.1 mythtv-compile_fixes_for_qt_4_7.patch, NONE, 1.1 mythtv.spec, 1.74, 1.75 sources, 1.47, 1.48

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv17962 Modified Files: mythtv.spec sources Added Files: mythplugins-compile_fixes_for_qt_4_7.patch mythtv-compile_fixes_for_qt_4_7.patch Log Message: * Sun Aug 29 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.24-0.1.svn.r25946 - Update to svn trunk, revision 25985 - Patch in Qt 4.7 build fix patches from mythtv trac ticket #8572 mythplugins-compile_fixes_for_qt_4_7.patch: mythnetvision/mythnetvision/netsearch.cpp | 6 +++--- mythvideo/mythvideo/videodlg.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE mythplugins-compile_fixes_for_qt_4_7.patch --- --- mythnetvision/mythnetvision/netsearch.cpp | 6 3 + 3 - 0 ! mythvideo/mythvideo/videodlg.h | 2 1 + 1 - 0 ! 2 files changed, 4 insertions(+), 4 deletions(-) Index: mythplugins/mythvideo/mythvideo/videodlg.h =================================================================== --- mythplugins.orig/mythvideo/mythvideo/videodlg.h 2010-06-05 19:38:22.000000000 -0400 +++ mythplugins/mythvideo/mythvideo/videodlg.h 2010-07-01 22:26:25.000000000 -0400 @@ -153,7 +153,7 @@ QString RemoteImageCheck(QString host, QString filename); QString GetCoverImage(MythGenericTree *node); QString GetFirstImage(MythGenericTree *node, QString type, - QString gpnode = NULL, int levels = 0); + QString gpnode = QString(), int levels = 0); QString GetImageFromFolder(Metadata *metadata); QString GetScreenshot(MythGenericTree *node); QString GetBanner(MythGenericTree *node); Index: mythplugins/mythnetvision/mythnetvision/netsearch.cpp =================================================================== --- mythplugins.orig/mythnetvision/mythnetvision/netsearch.cpp 2010-06-05 19:38:22.000000000 -0400 +++ mythplugins/mythnetvision/mythnetvision/netsearch.cpp 2010-07-01 22:29:30.000000000 -0400 @@ -38,9 +38,9 @@ m_downloadable(NULL), m_progress(NULL), m_busyPopup(NULL), m_okPopup(NULL), m_popupStack(), m_netSearch(NULL), - m_reply(NULL), m_currentSearch(NULL), - m_currentGrabber(0), m_currentCmd(NULL), - m_currentDownload(NULL), m_pagenum(0), + m_reply(NULL), m_currentSearch(QString()), + m_currentGrabber(0), m_currentCmd(QString()), + m_currentDownload(QString()), m_pagenum(0), m_lock(QMutex::Recursive) { m_mythXML = GetMythXMLURL(); mythtv-compile_fixes_for_qt_4_7.patch: libmyth/audiooutputbase.cpp | 2 +- libmyth/mythdeque.h | 2 +- libmythtv/recordingprofile.h | 2 +- libmythtv/tv_rec.h | 2 +- libmythupnp/eventing.h | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) --- NEW FILE mythtv-compile_fixes_for_qt_4_7.patch --- --- libs/libmyth/audiooutputbase.cpp | 2 1 + 1 - 0 ! libs/libmyth/mythdeque.h | 2 1 + 1 - 0 ! libs/libmythtv/recordingprofile.h | 2 1 + 1 - 0 ! libs/libmythtv/tv_rec.h | 2 1 + 1 - 0 ! libs/libmythupnp/eventing.h | 4 2 + 2 - 0 ! 5 files changed, 6 insertions(+), 6 deletions(-) Index: mythtv/libs/libmythupnp/eventing.h =================================================================== --- mythtv.orig/libs/libmythupnp/eventing.h 2010-01-10 08:49:06.000000000 -0500 +++ mythtv/libs/libmythupnp/eventing.h 2010-07-01 22:34:54.000000000 -0400 @@ -233,7 +233,7 @@ { SVMap::iterator it = m_map.find(sName); if (it == m_map.end()) - return T(0); + return T(); StateVariable< T > *pVariable = dynamic_cast< StateVariable< T > *>( *it ); @@ -241,7 +241,7 @@ if (pVariable != NULL) return pVariable->GetValue(); - return T(0); + return T(); } uint BuildNotifyBody(QTextStream &ts, TaskTime ttLastNotified) const; Index: mythtv/libs/libmyth/audiooutputbase.cpp =================================================================== --- mythtv.orig/libs/libmyth/audiooutputbase.cpp 2010-07-01 20:06:22.000000000 -0400 +++ mythtv/libs/libmyth/audiooutputbase.cpp 2010-07-01 22:34:54.000000000 -0400 @@ -75,7 +75,7 @@ source_bytes_per_frame(0), needs_upmix(false), needs_downmix(false), surround_mode(QUALITY_LOW), old_stretchfactor(1.0f), - volume(80), volumeControl(NULL), + volume(80), volumeControl(QString()), processing(false), Index: mythtv/libs/libmyth/mythdeque.h =================================================================== --- mythtv.orig/libs/libmyth/mythdeque.h 2009-09-11 15:07:19.000000000 -0400 +++ mythtv/libs/libmyth/mythdeque.h 2010-07-01 22:34:54.000000000 -0400 @@ -19,7 +19,7 @@ T dequeue() { if (deque<T>::empty()) - return (T)(0); + return T(); T item = deque<T>::front(); deque<T>::pop_front(); return item; Index: mythtv/libs/libmythtv/recordingprofile.h =================================================================== --- mythtv.orig/libs/libmythtv/recordingprofile.h 2010-05-16 14:58:08.000000000 -0400 +++ mythtv/libs/libmythtv/recordingprofile.h 2010-07-01 22:34:54.000000000 -0400 @@ -84,7 +84,7 @@ public: // initializers - RecordingProfile(QString profName = NULL); + RecordingProfile(QString profName = QString()); virtual void loadByID(int id); virtual bool loadByType(const QString &name, const QString &cardtype); virtual bool loadByGroup(const QString &name, const QString &group); Index: mythtv/libs/libmythtv/tv_rec.h =================================================================== --- mythtv.orig/libs/libmythtv/tv_rec.h 2010-05-16 14:58:08.000000000 -0400 +++ mythtv/libs/libmythtv/tv_rec.h 2010-07-01 22:34:54.000000000 -0400 @@ -93,7 +93,7 @@ class TuningRequest { public: - TuningRequest(uint f) : + TuningRequest(uint f = 0) : flags(f), program(NULL), channel(QString::null), input(QString::null), majorChan(0), minorChan(0), progNum(-1) {;} TuningRequest(uint f, RecordingInfo *p) : Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- mythtv.spec 29 Aug 2010 19:35:56 -0000 1.74 +++ mythtv.spec 30 Aug 2010 02:52:25 -0000 1.75 @@ -65,7 +65,7 @@ %define desktop_vendor RPMFusion # SVN Revision number and branch ID -%define _svnrev r25946 +%define _svnrev r25985 %define branch trunk # @@ -130,9 +130,12 @@ ################################################################################ Source0: http://www.mythtv.org/mc/mythtv-%{version}.tar.bz2 -#Patch0: mythtv-%{version}-svnfixes.patch Source1: http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2 +#Patch0: mythtv-%{version}-svnfixes.patch #Patch1: mythplugins-%{version}-svnfixes.patch +# http://svn.mythtv.org/trac/ticket/8572 +Patch2: mythtv-compile_fixes_for_qt_4_7.patch +Patch3: mythplugins-compile_fixes_for_qt_4_7.patch Source10: PACKAGE-LICENSING Source101: mythbackend.sysconfig.in Source102: mythbackend.init.in @@ -856,6 +859,7 @@ cd mythtv-%{version} #patch0 -p1 +%patch2 -p1 # Drop execute permissions on contrib bits, since they'll be %doc find contrib/ -type f -exec chmod -x "{}" \; @@ -905,6 +909,7 @@ cd mythplugins-%{version} #patch1 -p1 +%patch3 -p1 # Fix /mnt/store -> /var/lib/mythmusic cd mythmusic @@ -1492,6 +1497,10 @@ %changelog * Sun Aug 29 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.24-0.1.svn.r25946 +- Update to svn trunk, revision 25985 +- Patch in Qt 4.7 build fix patches from mythtv trac ticket #8572 + +* Sun Aug 29 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.24-0.1.svn.r25946 - Update to svn trunk, revision 25946 - Add new crystalhd dependency Index: sources =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- sources 29 Aug 2010 19:31:12 -0000 1.47 +++ sources 30 Aug 2010 02:52:25 -0000 1.48 @@ -1,4 +1,4 @@ be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png -41f4bee41d2bcb824cbc41c547c1c6b8 mythplugins-0.24.tar.bz2 -c0096d14c2012ab2bfe8fda06b13f7ef mythtv-0.24.tar.bz2 +21ba14769f757377794b818800e8c4db mythplugins-0.24.tar.bz2 +2e716caf76cae79535da1a8863a7e557 mythtv-0.24.tar.bz2

13 years, 7 months

1
0
0 / 0

rpms/xtables-addons-kmod/F-13 .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 xtables-addons-kmod.spec, 1.22, 1.23

by Chen Lei

Author: supercyper Update of /cvs/free/rpms/xtables-addons-kmod/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv17080 Modified Files: .cvsignore sources xtables-addons-kmod.spec Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xtables-addons-kmod/F-13/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 31 May 2010 02:32:43 -0000 1.4 +++ .cvsignore 30 Aug 2010 02:43:25 -0000 1.5 @@ -1 +1 @@ -xtables-addons-1.27.tar.xz +xtables-addons-1.28.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xtables-addons-kmod/F-13/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 31 May 2010 02:32:43 -0000 1.5 +++ sources 30 Aug 2010 02:43:25 -0000 1.6 @@ -1 +1 @@ -f4f65ce5361d7f8c0908ca3db37fa8ee xtables-addons-1.27.tar.xz +b94fe23370a1294b985e9a06a0f9d129 xtables-addons-1.28.tar.xz Index: xtables-addons-kmod.spec =================================================================== RCS file: /cvs/free/rpms/xtables-addons-kmod/F-13/xtables-addons-kmod.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- xtables-addons-kmod.spec 28 Aug 2010 18:51:25 -0000 1.22 +++ xtables-addons-kmod.spec 30 Aug 2010 02:43:25 -0000 1.23 @@ -3,14 +3,14 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -%define buildforkernels newest -#define buildforkernels current +#define buildforkernels newest +%define buildforkernels current #define buildforkernels akmods Name: xtables-addons-kmod Summary: Kernel module (kmod) for xtables-addons -Version: 1.27 -Release: 1%{?dist}.7 +Version: 1.28 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Kernel URL: http://xtables-addons.sourceforge.net @@ -46,6 +46,12 @@ %build for kernel_version in %{?kernel_versions} ; do + if grep -q 'XT_TARGET_TEE=m' %{_usrsrc}/kernels/${kernel_version%%___*}/.config; then + sed -i 's/build_TEE=m/build_TEE=/' _kmod_build_${kernel_version%%___*}/mconfig + fi + if grep -q 'XT_TARGET_CHECKSUM=m' %{_usrsrc}/kernels/${kernel_version%%___*}/.config; then + sed -i 's/build_CHECKSUM=m/build_CHECKSUM=/' _kmod_build_${kernel_version%%___*}/mconfig + fi export XA_ABSTOPSRCDIR=${PWD}/_kmod_build_${kernel_version%%___*} make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" M=${PWD}/_kmod_build_${kernel_version%%___*}/extensions modules done @@ -63,28 +69,12 @@ %clean rm -rf %{buildroot} - %changelog -* Sat Aug 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.27-1.7 -- rebuild for new kernel - -* Fri Aug 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.27-1.6 -- rebuild for new kernel +* Sun Jul 25 2010 Chen Lei <supercyper(a)163.com> - 1.28-1 +- update to 1.28 -* Wed Aug 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.27-1.5 -- rebuild for new kernel - -* Sun Aug 08 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.27-1.4 -- rebuild for new kernel - -* Tue Jul 27 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.27-1.3 -- rebuild for new kernel - -* Wed Jul 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.27-1.2 -- rebuild for new kernel - -* Fri Jun 18 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.27-1.1 -- rebuild for new kernel +* Mon Jun 28 2010 Chen Lei <supercyper(a)163.com> - 1.27-2 +- rebuild for kernel 2.6.35 * Mon May 31 2010 Chen Lei <supercyper(a)163.com> - 1.27-1 - update to 1.27

13 years, 7 months

1
0
0 / 0

rpms/xtables-addons-kmod/F-12 .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 xtables-addons-kmod.spec, 1.17, 1.18

by Chen Lei

Author: supercyper Update of /cvs/free/rpms/xtables-addons-kmod/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv17043 Modified Files: .cvsignore sources xtables-addons-kmod.spec Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xtables-addons-kmod/F-12/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 31 May 2010 02:56:08 -0000 1.4 +++ .cvsignore 30 Aug 2010 02:43:19 -0000 1.5 @@ -1 +1 @@ -xtables-addons-1.27.tar.xz +xtables-addons-1.28.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xtables-addons-kmod/F-12/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 31 May 2010 02:56:08 -0000 1.5 +++ sources 30 Aug 2010 02:43:19 -0000 1.6 @@ -1 +1 @@ -f4f65ce5361d7f8c0908ca3db37fa8ee xtables-addons-1.27.tar.xz +b94fe23370a1294b985e9a06a0f9d129 xtables-addons-1.28.tar.xz Index: xtables-addons-kmod.spec =================================================================== RCS file: /cvs/free/rpms/xtables-addons-kmod/F-12/xtables-addons-kmod.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- xtables-addons-kmod.spec 20 Aug 2010 07:16:04 -0000 1.17 +++ xtables-addons-kmod.spec 30 Aug 2010 02:43:19 -0000 1.18 @@ -3,14 +3,14 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -%define buildforkernels newest -#define buildforkernels current +#define buildforkernels newest +%define buildforkernels current #define buildforkernels akmods Name: xtables-addons-kmod Summary: Kernel module (kmod) for xtables-addons -Version: 1.27 -Release: 1%{?dist}.4 +Version: 1.28 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Kernel URL: http://xtables-addons.sourceforge.net @@ -46,6 +46,12 @@ %build for kernel_version in %{?kernel_versions} ; do + if grep -q 'XT_TARGET_TEE=m' %{_usrsrc}/kernels/${kernel_version%%___*}/.config; then + sed -i 's/build_TEE=m/build_TEE=/' _kmod_build_${kernel_version%%___*}/mconfig + fi + if grep -q 'XT_TARGET_CHECKSUM=m' %{_usrsrc}/kernels/${kernel_version%%___*}/.config; then + sed -i 's/build_CHECKSUM=m/build_CHECKSUM=/' _kmod_build_${kernel_version%%___*}/mconfig + fi export XA_ABSTOPSRCDIR=${PWD}/_kmod_build_${kernel_version%%___*} make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" M=${PWD}/_kmod_build_${kernel_version%%___*}/extensions modules done @@ -63,19 +69,12 @@ %clean rm -rf %{buildroot} - %changelog -* Fri Aug 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.27-1.4 -- rebuild for new kernel - -* Tue Jul 27 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.27-1.3 -- rebuild for new kernel +* Sun Jul 25 2010 Chen Lei <supercyper(a)163.com> - 1.28-1 +- update to 1.28 -* Wed Jul 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.27-1.2 -- rebuild for new kernel - -* Fri Jun 18 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.27-1.1 -- rebuild for new kernel +* Mon Jun 28 2010 Chen Lei <supercyper(a)163.com> - 1.27-2 +- rebuild for kernel 2.6.35 * Mon May 31 2010 Chen Lei <supercyper(a)163.com> - 1.27-1 - update to 1.27

13 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits August 2010