rpms/pigment/F-7 pigment-0.3.1-r606.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pigment.spec, 1.1, 1.2 sources, 1.2, 1.3

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/pigment/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13256

Modified Files:
	.cvsignore pigment.spec sources 
Added Files:
	pigment-0.3.1-r606.patch 
Log Message:
Update to 0.3.1.


pigment-0.3.1-r606.patch:

--- NEW FILE pigment-0.3.1-r606.patch ---
Index: /trunk/ChangeLog
===================================================================
--- /trunk/ChangeLog (revision 602)
+++ /trunk/ChangeLog (revision 606)
@@ -1,2 +1,9 @@
+2007-08-22  Loïc Molinari  <loic at fluendo.com>
+
+	* libs/pypgm/pgm/pgm.override:
+	* libs/pypgm/pgm/pgmviewport.override:
+	Added correct arg type to overrided function definitions.
+	fixes #147
+
 === release 0.3.1 ===
 
Index: /trunk/libs/pypgm/pgm/pgm.override
===================================================================
--- /trunk/libs/pypgm/pgm/pgm.override (revision 571)
+++ /trunk/libs/pypgm/pgm/pgm.override (revision 606)
@@ -256,5 +256,5 @@
 override pgm_main_iteration noargs
 static PyObject *
-_wrap_pgm_main_iteration ()
+_wrap_pgm_main_iteration (PyObject *self)
 {
   pyg_begin_allow_threads;
@@ -267,8 +267,7 @@
 
 %%
-override pgm_main_quit args
-static PyObject *
-_wrap_pgm_main_quit (PyObject *self,
-                     PyObject *args)
+override pgm_main_quit noargs
+static PyObject *
+_wrap_pgm_main_quit (PyObject *self)
 {
   pgm_main_quit ();
Index: /trunk/libs/pypgm/pgm/pgmviewport.override
===================================================================
--- /trunk/libs/pypgm/pgm/pgmviewport.override (revision 592)
+++ /trunk/libs/pypgm/pgm/pgmviewport.override (revision 606)
@@ -747,5 +747,5 @@
 
 %%
-override pgm_viewport_set_icon
+override pgm_viewport_set_icon kwargs
 static PyObject *
 _wrap_pgm_viewport_set_icon (PyGObject *self,
@@ -938,32 +938,36 @@
 
 %%
-override pgm_viewport_set_canvas
-static PyObject *
-_wrap_pgm_viewport_set_canvas(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "canvas", NULL };
-    PyObject  *py_canvas;
-    gint ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:PgmViewport.set_canvas", kwlist, &py_canvas))
-        return NULL;
-    
-    if (!pygobject_check (py_canvas, &PyPgmCanvas_Type))
-      {
-        if (py_canvas == Py_None)
-            ret = pgm_viewport_set_canvas(PGM_VIEWPORT(self->obj), NULL);
-        else
-          {
-            PyErr_SetString (PyExc_TypeError, "a pgm.Canvas or None object is required");
-            return NULL;
-          }
-      }
-    else
-      {
-        PyGObject *canvas = (PyGObject*) py_canvas;
-        ret = pgm_viewport_set_canvas(PGM_VIEWPORT(self->obj), 
-                                      PGM_CANVAS(canvas->obj));
-      }
-    
-    return pyg_enum_from_gtype(PGM_TYPE_ERROR, ret);
-}
+override pgm_viewport_set_canvas kwargs
+static PyObject *
+_wrap_pgm_viewport_set_canvas (PyGObject *self,
+                               PyObject *args,
+                               PyObject *kwargs)
+{
+  static char *kwlist[] = { "canvas", NULL };
+  PyObject  *py_canvas;
+  gint ret;
+
+  if (!PyArg_ParseTupleAndKeywords (args, kwargs,"O:PgmViewport.set_canvas",
+                                    kwlist, &py_canvas))
+    return NULL;
+
+  if (!pygobject_check (py_canvas, &PyPgmCanvas_Type))
+    {
+      if (py_canvas == Py_None)
+        ret = pgm_viewport_set_canvas (PGM_VIEWPORT (self->obj), NULL);
+      else
+        {
+          PyErr_SetString (PyExc_TypeError,
+                           "a pgm.Canvas or None object is required");
+          return NULL;
+        }
+    }
+  else
+    {
+      PyGObject *canvas = (PyGObject*) py_canvas;
+      ret = pgm_viewport_set_canvas (PGM_VIEWPORT (self->obj),
+                                     PGM_CANVAS (canvas->obj));
+    }
+
+  return pyg_enum_from_gtype (PGM_TYPE_ERROR, ret);
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pigment/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 May 2007 08:53:44 -0000	1.2
+++ .cvsignore	22 Aug 2007 13:08:05 -0000	1.3
@@ -1 +1 @@
-pigment-0.1.5.tar.gz
+pigment-0.3.1.tar.gz


Index: pigment.spec
===================================================================
RCS file: /cvs/extras/rpms/pigment/F-7/pigment.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pigment.spec	2 May 2007 08:53:44 -0000	1.1
+++ pigment.spec	22 Aug 2007 13:08:05 -0000	1.2
@@ -3,12 +3,13 @@
 
 Summary: Media Center Toolkit
 Name: pigment
-Version: 0.1.5
-Release: 1%{?dist}
-License: GPL
+Version: 0.3.1
+Release: 2%{?dist}
+License: LGPLv2+
 Group: Applications/Multimedia
 URL: http://elisa.fluendo.com/
 Source: http://elisa.fluendo.com/static/download/pigment/pigment-%{version}.tar.gz
+Patch0: pigment-0.3.1-r606.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
@@ -18,7 +19,10 @@
 BuildRequires: gstreamer-devel
 BuildRequires: gstreamer-plugins-base-devel
 BuildRequires: mesa-libGLU-devel
-BuildRequires: gtk-doc
+Buildrequires: check
+#BuildRequires: gtk-doc
+# For make check
+BuildRequires: gstreamer-python, pygtk2
 
 %description
 Pigment is a toolkit for writing Media Center software.
@@ -28,7 +32,9 @@
 Summary: Development libraries and include files for Pigment
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: glib2-devel, pkgconfig, gtk-doc
+Requires: glib2-devel
+Requires: pkgconfig
+#Requires: gtk-doc
 
 %description devel
 Pigment is a toolkit for writing Media Center software.
@@ -39,14 +45,17 @@
 
 %prep
 %setup -q
+%patch0 -p2
 
 
 %build
-%configure --enable-gtk-doc
-# Get rid of the /usr/lib64 RPATH on 64bit
+# Disable --enable-gtk-doc since it would require ugly hacks (as of 0.3.1)
+%configure
+# Get rid of the /usr/lib64 RPATH on 64bit (still as of 0.3.1)
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-%{__make} %{?_smp_mflags}
+# Parallel make fails (still as of 0.3.1), so remove %{?_smp_mflags}
+%{__make}
 
 
 %install
@@ -56,6 +65,12 @@
 find %{buildroot} -name '*.la' -exec rm -f {} \;
 
 
+#check
+# It would be useful to run this, unfortunately the python checks try to
+# "import gtk.gdk" and fail because of "RuntimeError: could not open display"
+#{__make} check
+
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -67,22 +82,33 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING FAQ LICENSE* README TODO
+%doc AUTHORS ChangeLog COPYING README TODO
 %{_libdir}/*.so.*
-%{_libdir}/pigment-0.1/
+%{_libdir}/pigment-0.3/
 %{python_sitelib}/pgm/
+%{python_sitelib}/pypgmtools/
 %{python_sitearch}/*.so
 
 %files devel
 %defattr(-,root,root,-)
-%doc docs/reference/html/*
-%{_includedir}/pigment-0.1/
+#doc docs/pgm/
+%{_includedir}/pigment-0.3/
 %{_libdir}/*.so
-%{_libdir}/pkgconfig/pigment-render-0.1.pc
-%{_datadir}/gtk-doc/html/pigment-render/
+%{_libdir}/pkgconfig/pigment-0.3.pc
+#{_datadir}/gtk-doc/html/pigment-render/
 
 
 %changelog
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 0.3.1-2
+- Include r606 patch to fix pigment bug #147 (segfaults with python bits).
+
+* Sat Aug  4 2007 Matthias Saou <http://freshrpms.net/> 0.3.1-1
+- Update to 0.3.1.
+- Correct License field from "GPL" to "LGPLv2+".
+- Disable gtk-doc because it tries to link to libpigment directly, which isn't
+  yet available.
+- Add new "check" build requirement.
+
 * Mon Apr 16 2007 Matthias Saou <http://freshrpms.net/> 0.1.5-1
 - Update to 0.1.5.
 - Get rid of the /usr/lib64 RPATH on 64bit.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pigment/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 May 2007 08:53:44 -0000	1.2
+++ sources	22 Aug 2007 13:08:05 -0000	1.3
@@ -1 +1 @@
-d39000c031e35d5a5835343161ce4bf8  pigment-0.1.5.tar.gz
+a46ed37282da90cde306f26b7c87e8e6  pigment-0.3.1.tar.gz