[SCM] Python bindings for the SFML Library branch, master, updated. upstream/1.5-33-gc9c248f
Christoph Egger
Christoph.Egger at gmx.de
Sun Jul 11 19:15:59 UTC 2010
The following commit has been merged in the master branch:
commit c9c248f66129c4577c9028926e5e5e5c94647bef
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date: Sun Jul 11 21:16:00 2010 +0200
1.5-2 I forgot to commit + installing examples
diff --git a/debian/changelog b/debian/changelog
index 1281010..ac1c98a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,28 @@
+python-sfml (1.5-3) unstable; urgency=low
+
+ * Install examples (Closes: #588743)
+
+ -- Christoph Egger <christoph at debian.org> Sun, 11 Jul 2010 21:11:55 +0200
+
+python-sfml (1.5-2) unstable; urgency=low
+
+ * Update for SFML 1.6
+ * Change my E-Mail Address
+ * Switch to source 3.0 (quilt)
+ * Bump debhelper compat from 6 to 7
+ * Bump standards Version from .3 to .4 (no changes)
+
+ -- Christoph Egger <christoph at debian.org> Sun, 09 May 2010 11:56:17 +0200
+
python-sfml (1.5-1) unstable; urgency=low
* New Upstream Version
* Bump standards Version to 3.8.3
- * replace (C) by © in Copyright
+ * replace (C) by © in Copyright
* Take patch from Ubuntu to build with python 2.6
* Needs minimum python Version for python.mk
- -- Christoph Egger <debian at christoph-egger.org> Mon, 24 Aug 2009 00:16:36 +0200
+ -- Christoph Egger <christoph at debian.org> Sun, 09 May 2010 11:29:39 +0200
python-sfml (1.4-1) unstable; urgency=low
@@ -22,7 +38,7 @@ python-sfml (1.3-1) unstable; urgency=low
* Adding README.source as there is now some work needed
[ Gonéri Le Bouder ]
- * avoid an useless linking on libpthread.so.0 by using LDFLAGS=-Wl,--as-needed
+ * avoid an useless linking on libpthread.so.0 by using LDFLAGS=-Wl,--as-needed
-- Christoph Egger <Christoph.Egger at gmx.de> Tue, 08 Jul 2008 17:03:04 +0200
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..29a7b06
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+python/MANIFEST.in
diff --git a/debian/compat b/debian/compat
index 1e8b314..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/debian/control b/debian/control
index 5124a9e..c871a56 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: python-sfml
Section: python
Priority: extra
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Christoph Egger <debian at christoph-egger.org>
-Build-Depends: debhelper (>= 6), python-support (>= 0.6), libsfml-dev (>= 1.5),
+Uploaders: Christoph Egger <christoph at debian.org>
+Build-Depends: debhelper (>= 7), python-support (>= 0.6), libsfml-dev (>= 1.6),
python-all-dev, libglew1.5-dev, python (>= 2.5.4-1~)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-games/python-sfml.git/
Vcs-Browser: http://git.debian.org/?p=pkg-games/python-sfml.git
Homepage: http://www.sfml-dev.org
@@ -17,7 +17,7 @@ Provides: ${python:Provides}
Description: Simple and Fast multimedia library - Python Bindings
SFML is an modern multimedia library offering a wide range
of subsystems useful to produce an multimedia application.
- It offers OpenGL integration for hardware accelerated Graphics,
+ It offers OpenGL integration for hardware accelerated Graphics,
Windowing and input support, audio and network facilities and
supports besides GNU/Linux MS Windows and Mac OS X, too
.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..734249e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+sfml-1.6
diff --git a/debian/patches/sfml-1.6 b/debian/patches/sfml-1.6
new file mode 100644
index 0000000..0344310
--- /dev/null
+++ b/debian/patches/sfml-1.6
@@ -0,0 +1,108 @@
+diff --git a/python/src/Image.cpp b/python/src/Image.cpp
+index b9e33b9..745cbc2 100644
+--- a/python/src/Image.cpp
++++ b/python/src/Image.cpp
+@@ -233,20 +233,15 @@ static PyObject *
+ PySfImage_GetTexCoords(PySfImage* self, PyObject *args)
+ {
+ PySfIntRect *RectArg = NULL;
+- bool Adjust = false;
+- PyObject *AdjustObj = NULL;
+
+- if (!PyArg_ParseTuple(args, "O!|O:Image.GetTextCoords", &PySfIntRectType, &RectArg, &AdjustObj))
++ if (!PyArg_ParseTuple(args, "O!:Image.GetTextCoords", &PySfIntRectType, &RectArg))
+ return NULL;
+
+- if (AdjustObj != NULL)
+- Adjust = PyBool_AsBool(AdjustObj);
+-
+ PySfFloatRect *Rect;
+
+ Rect = GetNewPySfFloatRect();
+ Rect->Owner = true;
+- Rect->obj = new sf::FloatRect(self->obj->GetTexCoords(*(RectArg->obj), Adjust));
++ Rect->obj = new sf::FloatRect(self->obj->GetTexCoords(*(RectArg->obj)));
+ PySfFloatRectUpdateSelf(Rect);
+
+ return (PyObject *)Rect;
+@@ -303,9 +298,8 @@ Create the image from the current contents of the given window. Return True if c
+ {"SetSmooth", (PyCFunction)PySfImage_SetSmooth, METH_VARARGS, "SetSmooth(Smooth)\nEnable or disable image smooth filter."},
+ {"GetWidth", (PyCFunction)PySfImage_GetWidth, METH_NOARGS, "GetWidth()\nReturn the width of the image."},
+ {"GetHeight", (PyCFunction)PySfImage_GetHeight, METH_NOARGS, "GetHeight()\nReturn the height of the image."},
+- {"GetTexCoords", (PyCFunction)PySfImage_GetTexCoords, METH_VARARGS, "GetTexCoords(Rect, Adjust=True)\nConvert a subrect expressed in pixels, into float texture coordinates. Returns texture coordinates corresponding to the sub-rectangle (sf.FloatRect instance)\n\
+- Rect : Sub-rectangle of image to convert\n\
+- Adjust : Pass true to apply the half-texel adjustment"},
++ {"GetTexCoords", (PyCFunction)PySfImage_GetTexCoords, METH_VARARGS, "GetTexCoords(Rect)\nConvert a subrect expressed in pixels, into float texture coordinates. Returns texture coordinates corresponding to the sub-rectangle (sf.FloatRect instance)\n\
++ Rect : Sub-rectangle of image to convert"},
+ {"GetValidTextureSize", (PyCFunction)PySfImage_GetValidTextureSize, METH_STATIC | METH_O, "GetValidTextureSize(Size)\nGet a valid texture size according to hardware support. Returns valid nearest size (greater than or equal to specified size).\n\
+ Size : Size to convert"},
+ {NULL} /* Sentinel */
+diff --git a/python/src/Joy.cpp b/python/src/Joy.cpp
+index 7f20f68..fdce88c 100644
+--- a/python/src/Joy.cpp
++++ b/python/src/Joy.cpp
+@@ -101,5 +101,14 @@ void PySfJoy_InitConst()
+ obj = PyLong_FromLong(sf::Joy::AxisPOV);
+ PyDict_SetItemString(PySfJoyType.tp_dict, "AxisPOV", obj);
+ Py_DECREF(obj);
++ obj = PyLong_FromLong(sf::Joy::Count);
++ PyDict_SetItemString(PySfJoyType.tp_dict, "Count", obj);
++ Py_DECREF(obj);
++ obj = PyLong_FromLong(sf::Joy::AxisCount);
++ PyDict_SetItemString(PySfJoyType.tp_dict, "AxisCount", obj);
++ Py_DECREF(obj);
++ obj = PyLong_FromLong(sf::Joy::ButtonCount);
++ PyDict_SetItemString(PySfJoyType.tp_dict, "ButtonCount", obj);
++ Py_DECREF(obj);
+ }
+
+diff --git a/python/src/Mouse.cpp b/python/src/Mouse.cpp
+index d0165ef..f2fe209 100644
+--- a/python/src/Mouse.cpp
++++ b/python/src/Mouse.cpp
+@@ -95,5 +95,8 @@ void PySfMouse_InitConst()
+ obj = PyLong_FromLong(sf::Mouse::XButton2);
+ PyDict_SetItemString(PySfMouseType.tp_dict, "XButton2", obj);
+ Py_DECREF(obj);
++ obj = PyLong_FromLong(sf::Mouse::ButtonCount);
++ PyDict_SetItemString(PySfMouseType.tp_dict, "ButtonCount", obj);
++ Py_DECREF(obj);
+ }
+
+diff --git a/python/src/Window.cpp b/python/src/Window.cpp
+index 7f32370..a15c735 100644
+--- a/python/src/Window.cpp
++++ b/python/src/Window.cpp
+@@ -151,7 +151,9 @@ PySfWindow_init(PySfWindow *self, PyObject *args, PyObject *kwds)
+ PySfWindowSettings *Params;
+
+ if (args != NULL)
+- {
++ {
++ if (PyTuple_Size(args) == 0)
++ return 0;
+ if (PyArg_ParseTuple(args, "l|O!:Window.__new__", &Handle, &PySfWindowSettingsType, &Params))
+ return 0;
+ PyErr_Clear();
+@@ -227,7 +229,7 @@ PySfWindow_GetSettings(PySfWindow *self)
+ {
+ PySfWindowSettings *Settings;
+ Settings = GetNewPySfWindowSettings();
+- Settings->obj = (sf::WindowSettings *)&self->obj->GetSettings();
++ Settings->obj = new sf::WindowSettings(self->obj->GetSettings());
+ Settings->DepthBits = Settings->obj->DepthBits;
+ Settings->StencilBits = Settings->obj->StencilBits;
+ Settings->AntialiasingLevel = Settings->obj->AntialiasingLevel;
+diff --git a/python/src/main.cpp b/python/src/main.cpp
+index 91944ff..a7547f0 100644
+--- a/python/src/main.cpp
++++ b/python/src/main.cpp
+@@ -281,7 +281,7 @@ initsf(void)
+ Py_INCREF(&PySfListenerType);
+ PyModule_AddObject(m, "Listener", (PyObject *)&PySfListenerType);
+
+- PyModule_AddStringConstant(m, "Version", "1.5");
++ PyModule_AddStringConstant(m, "Version", "1.6");
+
+ PySfColor_InitConst();
+ PySfKey_InitConst();
diff --git a/debian/rules b/debian/rules
index c6a95c1..901acfd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,7 @@ binary-arch: build install
dh_testroot
dh_installchangelogs
dh_installdocs
+ dh_installexamples
dh_pysupport
dh_installman
dh_link
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
Python bindings for the SFML Library
More information about the Pkg-games-commits
mailing list