[arch-commits] Commit in pyvorbis/repos (12 files)

Jelle van der Waa jelle at nymeria.archlinux.org
Fri Jul 4 16:23:05 UTC 2014


    Date: Friday, July 4, 2014 @ 18:23:05
  Author: jelle
Revision: 114928

archrelease: copy trunk to community-i686, community-x86_64

Added:
  pyvorbis/repos/community-i686/PKGBUILD
    (from rev 114927, pyvorbis/trunk/PKGBUILD)
  pyvorbis/repos/community-i686/pyogg-ticket2-fix.patch
    (from rev 114927, pyvorbis/trunk/pyogg-ticket2-fix.patch)
  pyvorbis/repos/community-i686/pyvorbis-1.4-python2.5.patch
    (from rev 114927, pyvorbis/trunk/pyvorbis-1.4-python2.5.patch)
  pyvorbis/repos/community-x86_64/PKGBUILD
    (from rev 114927, pyvorbis/trunk/PKGBUILD)
  pyvorbis/repos/community-x86_64/pyogg-ticket2-fix.patch
    (from rev 114927, pyvorbis/trunk/pyogg-ticket2-fix.patch)
  pyvorbis/repos/community-x86_64/pyvorbis-1.4-python2.5.patch
    (from rev 114927, pyvorbis/trunk/pyvorbis-1.4-python2.5.patch)
Deleted:
  pyvorbis/repos/community-i686/PKGBUILD
  pyvorbis/repos/community-i686/pyogg-ticket2-fix.patch
  pyvorbis/repos/community-i686/pyvorbis-1.4-python2.5.patch
  pyvorbis/repos/community-x86_64/PKGBUILD
  pyvorbis/repos/community-x86_64/pyogg-ticket2-fix.patch
  pyvorbis/repos/community-x86_64/pyvorbis-1.4-python2.5.patch

-----------------------------------------------+
 /PKGBUILD                                     |   60 ++++++++++++
 /pyogg-ticket2-fix.patch                      |   54 ++++++++++
 /pyvorbis-1.4-python2.5.patch                 |  120 ++++++++++++++++++++++++
 community-i686/PKGBUILD                       |   30 ------
 community-i686/pyogg-ticket2-fix.patch        |   27 -----
 community-i686/pyvorbis-1.4-python2.5.patch   |   60 ------------
 community-x86_64/PKGBUILD                     |   30 ------
 community-x86_64/pyogg-ticket2-fix.patch      |   27 -----
 community-x86_64/pyvorbis-1.4-python2.5.patch |   60 ------------
 9 files changed, 234 insertions(+), 234 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-07-04 16:22:52 UTC (rev 114927)
+++ community-i686/PKGBUILD	2014-07-04 16:23:05 UTC (rev 114928)
@@ -1,30 +0,0 @@
-# $Id$
-# Contributor: Jason Chu <jason at archlinux.org>
-# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=pyvorbis
-pkgver=1.4
-pkgrel=6
-pkgdesc="Python vorbis wrapper library"
-url="http://ekyo.nerim.net/software/pyogg/index.html" 
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('python2' 'libvorbis' 'pyogg>=1.3-3')
-source=(http://ekyo.nerim.net/software/pyogg/${pkgname}-${pkgver}.tar.gz
-	pyvorbis-1.4-python2.5.patch
-	pyogg-ticket2-fix.patch)
-md5sums=('b4921e792c0a74f75b9d3057df10ee7c'
-	 'f971a6f0ebb6cb7fe00dfc1f778b2d0d'
-	 '3547bba78916ef9030bff6fe67194714')
-
-build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	patch -Np0 -i ${srcdir}/pyvorbis-1.4-python2.5.patch || return 1
-	patch -Np0 -i ${srcdir}/pyogg-ticket2-fix.patch || return 1
-	python2 ./config_unix.py --prefix=/usr
-}
-
-package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	python2 setup.py install --root=${pkgdir}
-}

Copied: pyvorbis/repos/community-i686/PKGBUILD (from rev 114927, pyvorbis/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-07-04 16:23:05 UTC (rev 114928)
@@ -0,0 +1,30 @@
+# $Id$
+# Contributor: Jason Chu <jason at archlinux.org>
+# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=pyvorbis
+pkgver=1.4
+pkgrel=7
+pkgdesc="Python vorbis wrapper library"
+url="http://ekyo.nerim.net/software/pyogg/index.html" 
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('python2' 'libvorbis' 'pyogg>=1.3-3')
+source=(http://ekyo.nerim.net/software/pyogg/${pkgname}-${pkgver}.tar.gz
+	pyvorbis-1.4-python2.5.patch
+	pyogg-ticket2-fix.patch)
+md5sums=('b4921e792c0a74f75b9d3057df10ee7c'
+	 'f971a6f0ebb6cb7fe00dfc1f778b2d0d'
+	 '3547bba78916ef9030bff6fe67194714')
+
+build() {
+	cd ${srcdir}/${pkgname}-${pkgver}
+	patch -Np0 -i ${srcdir}/pyvorbis-1.4-python2.5.patch
+	patch -Np0 -i ${srcdir}/pyogg-ticket2-fix.patch
+	python2 ./config_unix.py --prefix=/usr
+}
+
+package() {
+	cd ${srcdir}/${pkgname}-${pkgver}
+	python2 setup.py install --root=${pkgdir}
+}

Deleted: community-i686/pyogg-ticket2-fix.patch
===================================================================
--- community-i686/pyogg-ticket2-fix.patch	2014-07-04 16:22:52 UTC (rev 114927)
+++ community-i686/pyogg-ticket2-fix.patch	2014-07-04 16:23:05 UTC (rev 114928)
@@ -1,27 +0,0 @@
---- src/pyvorbisfile.c	2007-05-14 22:41:05.000000000 +0400
-+++ src/pyvorbisfile.c.new	2007-05-14 22:45:20.000000000 +0400
-@@ -173,9 +173,7 @@
-   if (ret == NULL) {
-     PyObject_Del(newobj);
-     return NULL;
--  } else
--    Py_DECREF(ret);
--
-+  }
-   return (PyObject *) newobj;
- }
- 
-@@ -191,10 +189,10 @@
-        close */
-     Py_DECREF(py_self->py_file);
-   } else {
--    /* Otherwise, we opened the file and should close it. */
--    fclose(py_self->c_file);
-+    /* Do NOT close the file -- ov_open() takes ownership of the FILE*,
-+       and ov_close() is responsible for closing it. */
-   }
--
-+  free(py_self->ovf);
-   PyObject_Del(self);
- }
- 

Copied: pyvorbis/repos/community-i686/pyogg-ticket2-fix.patch (from rev 114927, pyvorbis/trunk/pyogg-ticket2-fix.patch)
===================================================================
--- community-i686/pyogg-ticket2-fix.patch	                        (rev 0)
+++ community-i686/pyogg-ticket2-fix.patch	2014-07-04 16:23:05 UTC (rev 114928)
@@ -0,0 +1,27 @@
+--- src/pyvorbisfile.c	2007-05-14 22:41:05.000000000 +0400
++++ src/pyvorbisfile.c.new	2007-05-14 22:45:20.000000000 +0400
+@@ -173,9 +173,7 @@
+   if (ret == NULL) {
+     PyObject_Del(newobj);
+     return NULL;
+-  } else
+-    Py_DECREF(ret);
+-
++  }
+   return (PyObject *) newobj;
+ }
+ 
+@@ -191,10 +189,10 @@
+        close */
+     Py_DECREF(py_self->py_file);
+   } else {
+-    /* Otherwise, we opened the file and should close it. */
+-    fclose(py_self->c_file);
++    /* Do NOT close the file -- ov_open() takes ownership of the FILE*,
++       and ov_close() is responsible for closing it. */
+   }
+-
++  free(py_self->ovf);
+   PyObject_Del(self);
+ }
+ 

Deleted: community-i686/pyvorbis-1.4-python2.5.patch
===================================================================
--- community-i686/pyvorbis-1.4-python2.5.patch	2014-07-04 16:22:52 UTC (rev 114927)
+++ community-i686/pyvorbis-1.4-python2.5.patch	2014-07-04 16:23:05 UTC (rev 114928)
@@ -1,60 +0,0 @@
---- src/pyvorbisinfo.c	2007-03-13 01:23:23.000000000 +0200
-+++ src/pyvorbisinfo.c.new	2007-03-13 01:29:36.000000000 +0200
-@@ -134,7 +134,7 @@
- static void
- py_ov_info_dealloc(PyObject *self)
- {
--  PyMem_DEL(self);
-+  PyObject_Del(self);
- }
- 
- #define CMP_RET(x) \
-@@ -418,7 +418,7 @@
-     free(ovc_self->vc);
-   }
- 
--  PyMem_DEL(self);
-+  PyObject_Del(self);
- }
- 
- 
---- src/pyvorbiscodec.c	2003-05-13 11:17:13.000000000 +0300
-+++ src/pyvorbiscodec.c.new	2007-03-13 01:31:38.000000000 +0200
-@@ -118,7 +118,7 @@
- {
-   vorbis_dsp_clear(PY_DSP(self));
-   Py_XDECREF(((py_dsp *)self)->parent);
--  PyMem_DEL(self);
-+  PyObject_Del(self);
- }
- 
- static PyObject*
-@@ -447,7 +447,7 @@
- {
-   vorbis_block_clear(PY_BLOCK(self));
-   Py_XDECREF(((py_block *)self)->parent);
--  PyMem_DEL(self);
-+  PyObject_Del(self);
- }
- 
- static PyObject*
---- src/pyvorbisfile.c	2003-12-19 09:11:02.000000000 +0200
-+++ src/pyvorbisfile.c.new	2007-03-13 01:31:19.000000000 +0200
-@@ -171,7 +171,7 @@
- 
-   ret = py_ov_open(newobj, args);
-   if (ret == NULL) {
--    PyMem_DEL(newobj);
-+    PyObject_Del(newobj);
-     return NULL;
-   } else
-     Py_DECREF(ret);
-@@ -195,7 +195,7 @@
-     fclose(py_self->c_file);
-   }
- 
--  PyMem_DEL(self);
-+  PyObject_Del(self);
- }
- 
- static PyObject *

Copied: pyvorbis/repos/community-i686/pyvorbis-1.4-python2.5.patch (from rev 114927, pyvorbis/trunk/pyvorbis-1.4-python2.5.patch)
===================================================================
--- community-i686/pyvorbis-1.4-python2.5.patch	                        (rev 0)
+++ community-i686/pyvorbis-1.4-python2.5.patch	2014-07-04 16:23:05 UTC (rev 114928)
@@ -0,0 +1,60 @@
+--- src/pyvorbisinfo.c	2007-03-13 01:23:23.000000000 +0200
++++ src/pyvorbisinfo.c.new	2007-03-13 01:29:36.000000000 +0200
+@@ -134,7 +134,7 @@
+ static void
+ py_ov_info_dealloc(PyObject *self)
+ {
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ #define CMP_RET(x) \
+@@ -418,7 +418,7 @@
+     free(ovc_self->vc);
+   }
+ 
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ 
+--- src/pyvorbiscodec.c	2003-05-13 11:17:13.000000000 +0300
++++ src/pyvorbiscodec.c.new	2007-03-13 01:31:38.000000000 +0200
+@@ -118,7 +118,7 @@
+ {
+   vorbis_dsp_clear(PY_DSP(self));
+   Py_XDECREF(((py_dsp *)self)->parent);
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ static PyObject*
+@@ -447,7 +447,7 @@
+ {
+   vorbis_block_clear(PY_BLOCK(self));
+   Py_XDECREF(((py_block *)self)->parent);
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ static PyObject*
+--- src/pyvorbisfile.c	2003-12-19 09:11:02.000000000 +0200
++++ src/pyvorbisfile.c.new	2007-03-13 01:31:19.000000000 +0200
+@@ -171,7 +171,7 @@
+ 
+   ret = py_ov_open(newobj, args);
+   if (ret == NULL) {
+-    PyMem_DEL(newobj);
++    PyObject_Del(newobj);
+     return NULL;
+   } else
+     Py_DECREF(ret);
+@@ -195,7 +195,7 @@
+     fclose(py_self->c_file);
+   }
+ 
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ static PyObject *

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-07-04 16:22:52 UTC (rev 114927)
+++ community-x86_64/PKGBUILD	2014-07-04 16:23:05 UTC (rev 114928)
@@ -1,30 +0,0 @@
-# $Id$
-# Contributor: Jason Chu <jason at archlinux.org>
-# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=pyvorbis
-pkgver=1.4
-pkgrel=6
-pkgdesc="Python vorbis wrapper library"
-url="http://ekyo.nerim.net/software/pyogg/index.html" 
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('python2' 'libvorbis' 'pyogg>=1.3-3')
-source=(http://ekyo.nerim.net/software/pyogg/${pkgname}-${pkgver}.tar.gz
-	pyvorbis-1.4-python2.5.patch
-	pyogg-ticket2-fix.patch)
-md5sums=('b4921e792c0a74f75b9d3057df10ee7c'
-	 'f971a6f0ebb6cb7fe00dfc1f778b2d0d'
-	 '3547bba78916ef9030bff6fe67194714')
-
-build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	patch -Np0 -i ${srcdir}/pyvorbis-1.4-python2.5.patch || return 1
-	patch -Np0 -i ${srcdir}/pyogg-ticket2-fix.patch || return 1
-	python2 ./config_unix.py --prefix=/usr
-}
-
-package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	python2 setup.py install --root=${pkgdir}
-}

Copied: pyvorbis/repos/community-x86_64/PKGBUILD (from rev 114927, pyvorbis/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-07-04 16:23:05 UTC (rev 114928)
@@ -0,0 +1,30 @@
+# $Id$
+# Contributor: Jason Chu <jason at archlinux.org>
+# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=pyvorbis
+pkgver=1.4
+pkgrel=7
+pkgdesc="Python vorbis wrapper library"
+url="http://ekyo.nerim.net/software/pyogg/index.html" 
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('python2' 'libvorbis' 'pyogg>=1.3-3')
+source=(http://ekyo.nerim.net/software/pyogg/${pkgname}-${pkgver}.tar.gz
+	pyvorbis-1.4-python2.5.patch
+	pyogg-ticket2-fix.patch)
+md5sums=('b4921e792c0a74f75b9d3057df10ee7c'
+	 'f971a6f0ebb6cb7fe00dfc1f778b2d0d'
+	 '3547bba78916ef9030bff6fe67194714')
+
+build() {
+	cd ${srcdir}/${pkgname}-${pkgver}
+	patch -Np0 -i ${srcdir}/pyvorbis-1.4-python2.5.patch
+	patch -Np0 -i ${srcdir}/pyogg-ticket2-fix.patch
+	python2 ./config_unix.py --prefix=/usr
+}
+
+package() {
+	cd ${srcdir}/${pkgname}-${pkgver}
+	python2 setup.py install --root=${pkgdir}
+}

Deleted: community-x86_64/pyogg-ticket2-fix.patch
===================================================================
--- community-x86_64/pyogg-ticket2-fix.patch	2014-07-04 16:22:52 UTC (rev 114927)
+++ community-x86_64/pyogg-ticket2-fix.patch	2014-07-04 16:23:05 UTC (rev 114928)
@@ -1,27 +0,0 @@
---- src/pyvorbisfile.c	2007-05-14 22:41:05.000000000 +0400
-+++ src/pyvorbisfile.c.new	2007-05-14 22:45:20.000000000 +0400
-@@ -173,9 +173,7 @@
-   if (ret == NULL) {
-     PyObject_Del(newobj);
-     return NULL;
--  } else
--    Py_DECREF(ret);
--
-+  }
-   return (PyObject *) newobj;
- }
- 
-@@ -191,10 +189,10 @@
-        close */
-     Py_DECREF(py_self->py_file);
-   } else {
--    /* Otherwise, we opened the file and should close it. */
--    fclose(py_self->c_file);
-+    /* Do NOT close the file -- ov_open() takes ownership of the FILE*,
-+       and ov_close() is responsible for closing it. */
-   }
--
-+  free(py_self->ovf);
-   PyObject_Del(self);
- }
- 

Copied: pyvorbis/repos/community-x86_64/pyogg-ticket2-fix.patch (from rev 114927, pyvorbis/trunk/pyogg-ticket2-fix.patch)
===================================================================
--- community-x86_64/pyogg-ticket2-fix.patch	                        (rev 0)
+++ community-x86_64/pyogg-ticket2-fix.patch	2014-07-04 16:23:05 UTC (rev 114928)
@@ -0,0 +1,27 @@
+--- src/pyvorbisfile.c	2007-05-14 22:41:05.000000000 +0400
++++ src/pyvorbisfile.c.new	2007-05-14 22:45:20.000000000 +0400
+@@ -173,9 +173,7 @@
+   if (ret == NULL) {
+     PyObject_Del(newobj);
+     return NULL;
+-  } else
+-    Py_DECREF(ret);
+-
++  }
+   return (PyObject *) newobj;
+ }
+ 
+@@ -191,10 +189,10 @@
+        close */
+     Py_DECREF(py_self->py_file);
+   } else {
+-    /* Otherwise, we opened the file and should close it. */
+-    fclose(py_self->c_file);
++    /* Do NOT close the file -- ov_open() takes ownership of the FILE*,
++       and ov_close() is responsible for closing it. */
+   }
+-
++  free(py_self->ovf);
+   PyObject_Del(self);
+ }
+ 

Deleted: community-x86_64/pyvorbis-1.4-python2.5.patch
===================================================================
--- community-x86_64/pyvorbis-1.4-python2.5.patch	2014-07-04 16:22:52 UTC (rev 114927)
+++ community-x86_64/pyvorbis-1.4-python2.5.patch	2014-07-04 16:23:05 UTC (rev 114928)
@@ -1,60 +0,0 @@
---- src/pyvorbisinfo.c	2007-03-13 01:23:23.000000000 +0200
-+++ src/pyvorbisinfo.c.new	2007-03-13 01:29:36.000000000 +0200
-@@ -134,7 +134,7 @@
- static void
- py_ov_info_dealloc(PyObject *self)
- {
--  PyMem_DEL(self);
-+  PyObject_Del(self);
- }
- 
- #define CMP_RET(x) \
-@@ -418,7 +418,7 @@
-     free(ovc_self->vc);
-   }
- 
--  PyMem_DEL(self);
-+  PyObject_Del(self);
- }
- 
- 
---- src/pyvorbiscodec.c	2003-05-13 11:17:13.000000000 +0300
-+++ src/pyvorbiscodec.c.new	2007-03-13 01:31:38.000000000 +0200
-@@ -118,7 +118,7 @@
- {
-   vorbis_dsp_clear(PY_DSP(self));
-   Py_XDECREF(((py_dsp *)self)->parent);
--  PyMem_DEL(self);
-+  PyObject_Del(self);
- }
- 
- static PyObject*
-@@ -447,7 +447,7 @@
- {
-   vorbis_block_clear(PY_BLOCK(self));
-   Py_XDECREF(((py_block *)self)->parent);
--  PyMem_DEL(self);
-+  PyObject_Del(self);
- }
- 
- static PyObject*
---- src/pyvorbisfile.c	2003-12-19 09:11:02.000000000 +0200
-+++ src/pyvorbisfile.c.new	2007-03-13 01:31:19.000000000 +0200
-@@ -171,7 +171,7 @@
- 
-   ret = py_ov_open(newobj, args);
-   if (ret == NULL) {
--    PyMem_DEL(newobj);
-+    PyObject_Del(newobj);
-     return NULL;
-   } else
-     Py_DECREF(ret);
-@@ -195,7 +195,7 @@
-     fclose(py_self->c_file);
-   }
- 
--  PyMem_DEL(self);
-+  PyObject_Del(self);
- }
- 
- static PyObject *

Copied: pyvorbis/repos/community-x86_64/pyvorbis-1.4-python2.5.patch (from rev 114927, pyvorbis/trunk/pyvorbis-1.4-python2.5.patch)
===================================================================
--- community-x86_64/pyvorbis-1.4-python2.5.patch	                        (rev 0)
+++ community-x86_64/pyvorbis-1.4-python2.5.patch	2014-07-04 16:23:05 UTC (rev 114928)
@@ -0,0 +1,60 @@
+--- src/pyvorbisinfo.c	2007-03-13 01:23:23.000000000 +0200
++++ src/pyvorbisinfo.c.new	2007-03-13 01:29:36.000000000 +0200
+@@ -134,7 +134,7 @@
+ static void
+ py_ov_info_dealloc(PyObject *self)
+ {
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ #define CMP_RET(x) \
+@@ -418,7 +418,7 @@
+     free(ovc_self->vc);
+   }
+ 
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ 
+--- src/pyvorbiscodec.c	2003-05-13 11:17:13.000000000 +0300
++++ src/pyvorbiscodec.c.new	2007-03-13 01:31:38.000000000 +0200
+@@ -118,7 +118,7 @@
+ {
+   vorbis_dsp_clear(PY_DSP(self));
+   Py_XDECREF(((py_dsp *)self)->parent);
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ static PyObject*
+@@ -447,7 +447,7 @@
+ {
+   vorbis_block_clear(PY_BLOCK(self));
+   Py_XDECREF(((py_block *)self)->parent);
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ static PyObject*
+--- src/pyvorbisfile.c	2003-12-19 09:11:02.000000000 +0200
++++ src/pyvorbisfile.c.new	2007-03-13 01:31:19.000000000 +0200
+@@ -171,7 +171,7 @@
+ 
+   ret = py_ov_open(newobj, args);
+   if (ret == NULL) {
+-    PyMem_DEL(newobj);
++    PyObject_Del(newobj);
+     return NULL;
+   } else
+     Py_DECREF(ret);
+@@ -195,7 +195,7 @@
+     fclose(py_self->c_file);
+   }
+ 
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ static PyObject *




More information about the arch-commits mailing list