[arch-commits] Commit in renpy/repos (20 files)

Maxime Gauduin alucryd at archlinux.org
Sun Oct 30 17:51:39 UTC 2016


    Date: Sunday, October 30, 2016 @ 17:51:38
  Author: alucryd
Revision: 194033

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

Added:
  renpy/repos/community-i686/PKGBUILD
    (from rev 194032, renpy/trunk/PKGBUILD)
  renpy/repos/community-i686/renpy
    (from rev 194032, renpy/trunk/renpy)
  renpy/repos/community-i686/renpy-ffmpeg30.patch
    (from rev 194032, renpy/trunk/renpy-ffmpeg30.patch)
  renpy/repos/community-i686/renpy.desktop
    (from rev 194032, renpy/trunk/renpy.desktop)
  renpy/repos/community-i686/renpy.png
    (from rev 194032, renpy/trunk/renpy.png)
  renpy/repos/community-x86_64/PKGBUILD
    (from rev 194032, renpy/trunk/PKGBUILD)
  renpy/repos/community-x86_64/renpy
    (from rev 194032, renpy/trunk/renpy)
  renpy/repos/community-x86_64/renpy-ffmpeg30.patch
    (from rev 194032, renpy/trunk/renpy-ffmpeg30.patch)
  renpy/repos/community-x86_64/renpy.desktop
    (from rev 194032, renpy/trunk/renpy.desktop)
  renpy/repos/community-x86_64/renpy.png
    (from rev 194032, renpy/trunk/renpy.png)
Deleted:
  renpy/repos/community-i686/PKGBUILD
  renpy/repos/community-i686/renpy
  renpy/repos/community-i686/renpy-ffmpeg30.patch
  renpy/repos/community-i686/renpy.desktop
  renpy/repos/community-i686/renpy.png
  renpy/repos/community-x86_64/PKGBUILD
  renpy/repos/community-x86_64/renpy
  renpy/repos/community-x86_64/renpy-ffmpeg30.patch
  renpy/repos/community-x86_64/renpy.desktop
  renpy/repos/community-x86_64/renpy.png

---------------------------------------+
 /PKGBUILD                             |  150 +++++++++++++++++++++++++
 /renpy                                |    6 +
 /renpy-ffmpeg30.patch                 |  188 ++++++++++++++++++++++++++++++++
 /renpy.desktop                        |   18 +++
 community-i686/PKGBUILD               |   78 -------------
 community-i686/renpy                  |    3 
 community-i686/renpy-ffmpeg30.patch   |   94 ----------------
 community-i686/renpy.desktop          |    9 -
 community-x86_64/PKGBUILD             |   78 -------------
 community-x86_64/renpy                |    3 
 community-x86_64/renpy-ffmpeg30.patch |   94 ----------------
 community-x86_64/renpy.desktop        |    9 -
 12 files changed, 362 insertions(+), 368 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2016-10-30 17:51:14 UTC (rev 194032)
+++ community-i686/PKGBUILD	2016-10-30 17:51:38 UTC (rev 194033)
@@ -1,78 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Cravix <dr.neemous at gmail.com>
-# Contributor: AlexanderR <rvacheva at nxt.ru>
-# Contributor: zhn <zhangn1985 at gmail.com>
-
-pkgbase=renpy
-pkgname=('renpy' 'renpy-demos')
-pkgver=6.99.8
-pkgrel=3
-pkgdesc="The Ren'Py Visual Novel Engine"
-arch=('i686' 'x86_64')
-url='http://www.renpy.org'
-license=('MIT')
-depends=('ffmpeg' 'glew' 'python2-pygame-sdl2')
-makedepends=('cython2')
-source=("http://www.renpy.org/dl/${pkgver}/renpy-${pkgver}-source.tar.bz2"
-        'renpy'
-        'renpy.desktop'
-        'renpy.png'
-        'renpy-ffmpeg30.patch')
-sha256sums=('0eb0c763bf7e977db06039c69751f1ed5e69c4b738f7f6d975e99e8729eff58e'
-            'd12cccb8d5acbe28f6740d7efc58ceb78fb4f303a50724a43c47812d51897c6a'
-            'fccde3461617a098a78d938d9db782d403eda410a84ab52825a597498ab95834'
-            '611edc07a40ccb8e04e8858847fc1d2a066d29c2ed54e5b357880a0605818dc5'
-            'c2d27a3f6b74f874a790ce6c12e9d4b718784478d8a8aa23c879d186f60a25ab')
-
-prepare() {
-  cd renpy-${pkgver}-source
-
-  patch -Np1 -i ../renpy-ffmpeg30.patch
-  sed 's/python/python2/' -i renpy.py launcher/game/tkaskdir.py
-}
-
-build() {
-  cd renpy-${pkgver}-source
-
-  export RENPY_CYTHON='cython2'
-
-  python2 module/setup.py build
-}
-
-package_renpy() {
-  optdepends=('renpy-demos: Tutorial and The Question demos'
-              'tk: Set projects directory')
-  replaces=('python-renpy' 'python2-renpy')
-
-  cd renpy-${pkgver}-source
-
-  python2 module/setup.py install --root="${pkgdir}" --prefix='/usr' --optimize='1'
-
-  install -dm 755 "${pkgdir}"/usr/{bin,share/{applications,pixmaps,renpy,doc}}
-
-  cp -dr --no-preserve='ownership' doc launcher renpy renpy.py templates "${pkgdir}"/usr/share/renpy/
-  ln -s /usr/share/renpy/doc "${pkgdir}"/usr/share/doc/renpy
-
-  install -m 755 ../renpy "${pkgdir}"/usr/bin/
-  install -m 644 ../renpy.desktop "${pkgdir}"/usr/share/applications/
-  install -m 644 ../renpy.png "${pkgdir}"/usr/share/pixmaps/
-
-  install -dm 755 "${pkgdir}"/usr/share/licenses/renpy
-  install -m 644 LICENSE.txt "${pkgdir}"/usr/share/licenses/renpy/
-}
-
-package_renpy-demos() {
-  depends=('renpy')
-
-  cd renpy-${pkgver}-source
-
-  install -dm 755 "${pkgdir}"/usr/share/renpy
-
-  cp -dr --no-preserve='ownership' the_question tutorial "${pkgdir}"/usr/share/renpy/
-
-  install -dm 755 "${pkgdir}"/usr/share/licenses
-  ln -s renpy "${pkgdir}"/usr/share/licenses/renpy-demos
-}
-
-# vim: ts=2 sw=2 et:

Copied: renpy/repos/community-i686/PKGBUILD (from rev 194032, renpy/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2016-10-30 17:51:38 UTC (rev 194033)
@@ -0,0 +1,75 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Cravix <dr.neemous at gmail.com>
+# Contributor: AlexanderR <rvacheva at nxt.ru>
+# Contributor: zhn <zhangn1985 at gmail.com>
+
+pkgbase=renpy
+pkgname=('renpy' 'renpy-demos')
+pkgver=6.99.11
+pkgrel=1
+pkgdesc="The Ren'Py Visual Novel Engine"
+arch=('i686' 'x86_64')
+url='http://www.renpy.org'
+license=('MIT')
+depends=('ffmpeg' 'glew' 'python2-pygame-sdl2')
+makedepends=('cython2')
+source=("http://www.renpy.org/dl/${pkgver}/renpy-${pkgver}-source.tar.bz2"
+        'renpy'
+        'renpy.desktop'
+        'renpy.png')
+sha256sums=('25237ff5cf1960d8772ae803f0ecb7b45b993953ed2ccb8d6d7b1d7755b55bad'
+            'd12cccb8d5acbe28f6740d7efc58ceb78fb4f303a50724a43c47812d51897c6a'
+            'fccde3461617a098a78d938d9db782d403eda410a84ab52825a597498ab95834'
+            '611edc07a40ccb8e04e8858847fc1d2a066d29c2ed54e5b357880a0605818dc5')
+
+prepare() {
+  cd renpy-${pkgver}-source
+
+  sed 's/python/python2/' -i renpy.py launcher/game/tkaskdir.py
+}
+
+build() {
+  cd renpy-${pkgver}-source
+
+  export RENPY_CYTHON='cython2'
+
+  python2 module/setup.py build
+}
+
+package_renpy() {
+  optdepends=('renpy-demos: Tutorial and The Question demos'
+              'tk: Set projects directory')
+  replaces=('python-renpy' 'python2-renpy')
+
+  cd renpy-${pkgver}-source
+
+  python2 module/setup.py install --root="${pkgdir}" --prefix='/usr' --optimize='1'
+
+  install -dm 755 "${pkgdir}"/usr/{bin,share/{applications,pixmaps,renpy,doc}}
+
+  cp -dr --no-preserve='ownership' doc launcher renpy renpy.py templates "${pkgdir}"/usr/share/renpy/
+  ln -s /usr/share/renpy/doc "${pkgdir}"/usr/share/doc/renpy
+
+  install -m 755 ../renpy "${pkgdir}"/usr/bin/
+  install -m 644 ../renpy.desktop "${pkgdir}"/usr/share/applications/
+  install -m 644 ../renpy.png "${pkgdir}"/usr/share/pixmaps/
+
+  install -dm 755 "${pkgdir}"/usr/share/licenses/renpy
+  install -m 644 LICENSE.txt "${pkgdir}"/usr/share/licenses/renpy/
+}
+
+package_renpy-demos() {
+  depends=('renpy')
+
+  cd renpy-${pkgver}-source
+
+  install -dm 755 "${pkgdir}"/usr/share/renpy
+
+  cp -dr --no-preserve='ownership' the_question tutorial "${pkgdir}"/usr/share/renpy/
+
+  install -dm 755 "${pkgdir}"/usr/share/licenses
+  ln -s renpy "${pkgdir}"/usr/share/licenses/renpy-demos
+}
+
+# vim: ts=2 sw=2 et:

Deleted: community-i686/renpy
===================================================================
--- community-i686/renpy	2016-10-30 17:51:14 UTC (rev 194032)
+++ community-i686/renpy	2016-10-30 17:51:38 UTC (rev 194033)
@@ -1,3 +0,0 @@
-#!/usr/bin/sh
-
-exec python2 /usr/share/renpy/renpy.py "$@"

Copied: renpy/repos/community-i686/renpy (from rev 194032, renpy/trunk/renpy)
===================================================================
--- community-i686/renpy	                        (rev 0)
+++ community-i686/renpy	2016-10-30 17:51:38 UTC (rev 194033)
@@ -0,0 +1,3 @@
+#!/usr/bin/sh
+
+exec python2 /usr/share/renpy/renpy.py "$@"

Deleted: community-i686/renpy-ffmpeg30.patch
===================================================================
--- community-i686/renpy-ffmpeg30.patch	2016-10-30 17:51:14 UTC (rev 194032)
+++ community-i686/renpy-ffmpeg30.patch	2016-10-30 17:51:38 UTC (rev 194033)
@@ -1,94 +0,0 @@
-From 4aac7ca5a59960ec776e3c4cd74a30f269342502 Mon Sep 17 00:00:00 2001
-From: Markus Koschany <apo at debian.org>
-Date: Wed, 27 Jan 2016 00:43:37 +0100
-Subject: [PATCH] ffmpeg
-
----
- module/ffdecode.c | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/module/ffdecode.c b/module/ffdecode.c
-index 71704cf..085000d 100644
---- a/module/ffdecode.c
-+++ b/module/ffdecode.c
-@@ -103,8 +103,8 @@ typedef struct VideoState {
-        compensation */
- 
- #ifndef HAS_RESAMPLE
--    uint8_t audio_buf1[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2] __attribute__ ((aligned (16))) ;
--    uint8_t audio_buf2[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2] __attribute__ ((aligned (16))) ;
-+    uint8_t audio_buf1[(192000 * 3) / 2] __attribute__ ((aligned (16))) ;
-+    uint8_t audio_buf2[(192000 * 3) / 2] __attribute__ ((aligned (16))) ;
- #else
-     uint8_t *audio_buf1;
- #endif
-@@ -583,7 +583,7 @@ static int video_refresh(void *opaque)
- 
- 		is->first_frame = 0;
- 
--		av_free(vp->frame);
-+		av_frame_free(&vp->frame);
- 		vp->frame = NULL;
- 
- 		/* update queue size and signal for next picture */
-@@ -635,13 +635,13 @@ static void alloc_picture(void *opaque, PyObject *pysurf)
- 
-     pixel = SDL_MapRGBA(surf->format, 1, 2, 3, 4);
-     if (bytes[0] == 4 && bytes[1] == 1) {
--        vp->fmt = PIX_FMT_ARGB;
-+        vp->fmt = AV_PIX_FMT_ARGB;
-     } else if (bytes[0] == 4 && bytes[1] == 3) {
--        vp->fmt = PIX_FMT_ABGR;
-+        vp->fmt = AV_PIX_FMT_ABGR;
-     } else if (bytes[0] == 1) {
--        vp->fmt = PIX_FMT_RGBA;
-+        vp->fmt = AV_PIX_FMT_RGBA;
-     } else {
--        vp->fmt = PIX_FMT_BGRA;
-+        vp->fmt = AV_PIX_FMT_BGRA;
-     }
- 
-     pixel = SDL_MapRGBA(surf->format, 0, 0, 0, 255);
-@@ -764,7 +764,7 @@ static int video_thread(void *arg)
-     double pts;
- 
-     for(;;) {
--        frame = avcodec_alloc_frame();
-+        frame = av_frame_alloc();
- 
-         while (is->paused && !is->videoq.abort_request) {
-             SDL_Delay(2);
-@@ -824,10 +824,10 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
-             int resample_changed, audio_resample;
- 
-             if (!is->frame) {
--                if (!(is->frame = avcodec_alloc_frame()))
-+                if (!(is->frame = av_frame_alloc()))
-                     return AVERROR(ENOMEM);
-             } else
--                avcodec_get_frame_defaults(is->frame);
-+                av_frame_unref(is->frame);
- 
-             if (flush_complete)
-                 break;
-@@ -1244,9 +1244,9 @@ static int stream_component_open(VideoState *is, int stream_index)
-     /* prepare audio output */
-     if (enc->codec_type == AVMEDIA_TYPE_AUDIO) {
-         if (enc->channels > 0) {
--            enc->request_channels = FFMIN(2, enc->channels);
-+            enc->request_channel_layout = av_get_default_channel_layout(FFMIN(2, enc->channels));
-         } else {
--            enc->request_channels = 2;
-+            enc->request_channel_layout = av_get_default_channel_layout(2);
-         }
-     }
- 
-@@ -1653,7 +1653,7 @@ void ffpy_stream_close(VideoState *is)
-     for(i=0; i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
-         vp = &is->pictq[i];
-         if (vp->frame) {
--            av_free(vp->frame);
-+            av_frame_free(&vp->frame);
-         }
-     }
- 

Copied: renpy/repos/community-i686/renpy-ffmpeg30.patch (from rev 194032, renpy/trunk/renpy-ffmpeg30.patch)
===================================================================
--- community-i686/renpy-ffmpeg30.patch	                        (rev 0)
+++ community-i686/renpy-ffmpeg30.patch	2016-10-30 17:51:38 UTC (rev 194033)
@@ -0,0 +1,94 @@
+From 4aac7ca5a59960ec776e3c4cd74a30f269342502 Mon Sep 17 00:00:00 2001
+From: Markus Koschany <apo at debian.org>
+Date: Wed, 27 Jan 2016 00:43:37 +0100
+Subject: [PATCH] ffmpeg
+
+---
+ module/ffdecode.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/module/ffdecode.c b/module/ffdecode.c
+index 71704cf..085000d 100644
+--- a/module/ffdecode.c
++++ b/module/ffdecode.c
+@@ -103,8 +103,8 @@ typedef struct VideoState {
+        compensation */
+ 
+ #ifndef HAS_RESAMPLE
+-    uint8_t audio_buf1[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2] __attribute__ ((aligned (16))) ;
+-    uint8_t audio_buf2[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2] __attribute__ ((aligned (16))) ;
++    uint8_t audio_buf1[(192000 * 3) / 2] __attribute__ ((aligned (16))) ;
++    uint8_t audio_buf2[(192000 * 3) / 2] __attribute__ ((aligned (16))) ;
+ #else
+     uint8_t *audio_buf1;
+ #endif
+@@ -583,7 +583,7 @@ static int video_refresh(void *opaque)
+ 
+ 		is->first_frame = 0;
+ 
+-		av_free(vp->frame);
++		av_frame_free(&vp->frame);
+ 		vp->frame = NULL;
+ 
+ 		/* update queue size and signal for next picture */
+@@ -635,13 +635,13 @@ static void alloc_picture(void *opaque, PyObject *pysurf)
+ 
+     pixel = SDL_MapRGBA(surf->format, 1, 2, 3, 4);
+     if (bytes[0] == 4 && bytes[1] == 1) {
+-        vp->fmt = PIX_FMT_ARGB;
++        vp->fmt = AV_PIX_FMT_ARGB;
+     } else if (bytes[0] == 4 && bytes[1] == 3) {
+-        vp->fmt = PIX_FMT_ABGR;
++        vp->fmt = AV_PIX_FMT_ABGR;
+     } else if (bytes[0] == 1) {
+-        vp->fmt = PIX_FMT_RGBA;
++        vp->fmt = AV_PIX_FMT_RGBA;
+     } else {
+-        vp->fmt = PIX_FMT_BGRA;
++        vp->fmt = AV_PIX_FMT_BGRA;
+     }
+ 
+     pixel = SDL_MapRGBA(surf->format, 0, 0, 0, 255);
+@@ -764,7 +764,7 @@ static int video_thread(void *arg)
+     double pts;
+ 
+     for(;;) {
+-        frame = avcodec_alloc_frame();
++        frame = av_frame_alloc();
+ 
+         while (is->paused && !is->videoq.abort_request) {
+             SDL_Delay(2);
+@@ -824,10 +824,10 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
+             int resample_changed, audio_resample;
+ 
+             if (!is->frame) {
+-                if (!(is->frame = avcodec_alloc_frame()))
++                if (!(is->frame = av_frame_alloc()))
+                     return AVERROR(ENOMEM);
+             } else
+-                avcodec_get_frame_defaults(is->frame);
++                av_frame_unref(is->frame);
+ 
+             if (flush_complete)
+                 break;
+@@ -1244,9 +1244,9 @@ static int stream_component_open(VideoState *is, int stream_index)
+     /* prepare audio output */
+     if (enc->codec_type == AVMEDIA_TYPE_AUDIO) {
+         if (enc->channels > 0) {
+-            enc->request_channels = FFMIN(2, enc->channels);
++            enc->request_channel_layout = av_get_default_channel_layout(FFMIN(2, enc->channels));
+         } else {
+-            enc->request_channels = 2;
++            enc->request_channel_layout = av_get_default_channel_layout(2);
+         }
+     }
+ 
+@@ -1653,7 +1653,7 @@ void ffpy_stream_close(VideoState *is)
+     for(i=0; i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
+         vp = &is->pictq[i];
+         if (vp->frame) {
+-            av_free(vp->frame);
++            av_frame_free(&vp->frame);
+         }
+     }
+ 

Deleted: community-i686/renpy.desktop
===================================================================
--- community-i686/renpy.desktop	2016-10-30 17:51:14 UTC (rev 194032)
+++ community-i686/renpy.desktop	2016-10-30 17:51:38 UTC (rev 194033)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Ren'Py
-GenericName=renpy
-Comment=Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell interactive stories that run on computers and mobile devices.
-Icon=renpy
-Exec=renpy
-Categories=Game;AdventureGame;

Copied: renpy/repos/community-i686/renpy.desktop (from rev 194032, renpy/trunk/renpy.desktop)
===================================================================
--- community-i686/renpy.desktop	                        (rev 0)
+++ community-i686/renpy.desktop	2016-10-30 17:51:38 UTC (rev 194033)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Ren'Py
+GenericName=renpy
+Comment=Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell interactive stories that run on computers and mobile devices.
+Icon=renpy
+Exec=renpy
+Categories=Game;AdventureGame;

Deleted: community-i686/renpy.png
===================================================================
(Binary files differ)

Copied: renpy/repos/community-i686/renpy.png (from rev 194032, renpy/trunk/renpy.png)
===================================================================
(Binary files differ)

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2016-10-30 17:51:14 UTC (rev 194032)
+++ community-x86_64/PKGBUILD	2016-10-30 17:51:38 UTC (rev 194033)
@@ -1,78 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Cravix <dr.neemous at gmail.com>
-# Contributor: AlexanderR <rvacheva at nxt.ru>
-# Contributor: zhn <zhangn1985 at gmail.com>
-
-pkgbase=renpy
-pkgname=('renpy' 'renpy-demos')
-pkgver=6.99.8
-pkgrel=3
-pkgdesc="The Ren'Py Visual Novel Engine"
-arch=('i686' 'x86_64')
-url='http://www.renpy.org'
-license=('MIT')
-depends=('ffmpeg' 'glew' 'python2-pygame-sdl2')
-makedepends=('cython2')
-source=("http://www.renpy.org/dl/${pkgver}/renpy-${pkgver}-source.tar.bz2"
-        'renpy'
-        'renpy.desktop'
-        'renpy.png'
-        'renpy-ffmpeg30.patch')
-sha256sums=('0eb0c763bf7e977db06039c69751f1ed5e69c4b738f7f6d975e99e8729eff58e'
-            'd12cccb8d5acbe28f6740d7efc58ceb78fb4f303a50724a43c47812d51897c6a'
-            'fccde3461617a098a78d938d9db782d403eda410a84ab52825a597498ab95834'
-            '611edc07a40ccb8e04e8858847fc1d2a066d29c2ed54e5b357880a0605818dc5'
-            'c2d27a3f6b74f874a790ce6c12e9d4b718784478d8a8aa23c879d186f60a25ab')
-
-prepare() {
-  cd renpy-${pkgver}-source
-
-  patch -Np1 -i ../renpy-ffmpeg30.patch
-  sed 's/python/python2/' -i renpy.py launcher/game/tkaskdir.py
-}
-
-build() {
-  cd renpy-${pkgver}-source
-
-  export RENPY_CYTHON='cython2'
-
-  python2 module/setup.py build
-}
-
-package_renpy() {
-  optdepends=('renpy-demos: Tutorial and The Question demos'
-              'tk: Set projects directory')
-  replaces=('python-renpy' 'python2-renpy')
-
-  cd renpy-${pkgver}-source
-
-  python2 module/setup.py install --root="${pkgdir}" --prefix='/usr' --optimize='1'
-
-  install -dm 755 "${pkgdir}"/usr/{bin,share/{applications,pixmaps,renpy,doc}}
-
-  cp -dr --no-preserve='ownership' doc launcher renpy renpy.py templates "${pkgdir}"/usr/share/renpy/
-  ln -s /usr/share/renpy/doc "${pkgdir}"/usr/share/doc/renpy
-
-  install -m 755 ../renpy "${pkgdir}"/usr/bin/
-  install -m 644 ../renpy.desktop "${pkgdir}"/usr/share/applications/
-  install -m 644 ../renpy.png "${pkgdir}"/usr/share/pixmaps/
-
-  install -dm 755 "${pkgdir}"/usr/share/licenses/renpy
-  install -m 644 LICENSE.txt "${pkgdir}"/usr/share/licenses/renpy/
-}
-
-package_renpy-demos() {
-  depends=('renpy')
-
-  cd renpy-${pkgver}-source
-
-  install -dm 755 "${pkgdir}"/usr/share/renpy
-
-  cp -dr --no-preserve='ownership' the_question tutorial "${pkgdir}"/usr/share/renpy/
-
-  install -dm 755 "${pkgdir}"/usr/share/licenses
-  ln -s renpy "${pkgdir}"/usr/share/licenses/renpy-demos
-}
-
-# vim: ts=2 sw=2 et:

Copied: renpy/repos/community-x86_64/PKGBUILD (from rev 194032, renpy/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2016-10-30 17:51:38 UTC (rev 194033)
@@ -0,0 +1,75 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Cravix <dr.neemous at gmail.com>
+# Contributor: AlexanderR <rvacheva at nxt.ru>
+# Contributor: zhn <zhangn1985 at gmail.com>
+
+pkgbase=renpy
+pkgname=('renpy' 'renpy-demos')
+pkgver=6.99.11
+pkgrel=1
+pkgdesc="The Ren'Py Visual Novel Engine"
+arch=('i686' 'x86_64')
+url='http://www.renpy.org'
+license=('MIT')
+depends=('ffmpeg' 'glew' 'python2-pygame-sdl2')
+makedepends=('cython2')
+source=("http://www.renpy.org/dl/${pkgver}/renpy-${pkgver}-source.tar.bz2"
+        'renpy'
+        'renpy.desktop'
+        'renpy.png')
+sha256sums=('25237ff5cf1960d8772ae803f0ecb7b45b993953ed2ccb8d6d7b1d7755b55bad'
+            'd12cccb8d5acbe28f6740d7efc58ceb78fb4f303a50724a43c47812d51897c6a'
+            'fccde3461617a098a78d938d9db782d403eda410a84ab52825a597498ab95834'
+            '611edc07a40ccb8e04e8858847fc1d2a066d29c2ed54e5b357880a0605818dc5')
+
+prepare() {
+  cd renpy-${pkgver}-source
+
+  sed 's/python/python2/' -i renpy.py launcher/game/tkaskdir.py
+}
+
+build() {
+  cd renpy-${pkgver}-source
+
+  export RENPY_CYTHON='cython2'
+
+  python2 module/setup.py build
+}
+
+package_renpy() {
+  optdepends=('renpy-demos: Tutorial and The Question demos'
+              'tk: Set projects directory')
+  replaces=('python-renpy' 'python2-renpy')
+
+  cd renpy-${pkgver}-source
+
+  python2 module/setup.py install --root="${pkgdir}" --prefix='/usr' --optimize='1'
+
+  install -dm 755 "${pkgdir}"/usr/{bin,share/{applications,pixmaps,renpy,doc}}
+
+  cp -dr --no-preserve='ownership' doc launcher renpy renpy.py templates "${pkgdir}"/usr/share/renpy/
+  ln -s /usr/share/renpy/doc "${pkgdir}"/usr/share/doc/renpy
+
+  install -m 755 ../renpy "${pkgdir}"/usr/bin/
+  install -m 644 ../renpy.desktop "${pkgdir}"/usr/share/applications/
+  install -m 644 ../renpy.png "${pkgdir}"/usr/share/pixmaps/
+
+  install -dm 755 "${pkgdir}"/usr/share/licenses/renpy
+  install -m 644 LICENSE.txt "${pkgdir}"/usr/share/licenses/renpy/
+}
+
+package_renpy-demos() {
+  depends=('renpy')
+
+  cd renpy-${pkgver}-source
+
+  install -dm 755 "${pkgdir}"/usr/share/renpy
+
+  cp -dr --no-preserve='ownership' the_question tutorial "${pkgdir}"/usr/share/renpy/
+
+  install -dm 755 "${pkgdir}"/usr/share/licenses
+  ln -s renpy "${pkgdir}"/usr/share/licenses/renpy-demos
+}
+
+# vim: ts=2 sw=2 et:

Deleted: community-x86_64/renpy
===================================================================
--- community-x86_64/renpy	2016-10-30 17:51:14 UTC (rev 194032)
+++ community-x86_64/renpy	2016-10-30 17:51:38 UTC (rev 194033)
@@ -1,3 +0,0 @@
-#!/usr/bin/sh
-
-exec python2 /usr/share/renpy/renpy.py "$@"

Copied: renpy/repos/community-x86_64/renpy (from rev 194032, renpy/trunk/renpy)
===================================================================
--- community-x86_64/renpy	                        (rev 0)
+++ community-x86_64/renpy	2016-10-30 17:51:38 UTC (rev 194033)
@@ -0,0 +1,3 @@
+#!/usr/bin/sh
+
+exec python2 /usr/share/renpy/renpy.py "$@"

Deleted: community-x86_64/renpy-ffmpeg30.patch
===================================================================
--- community-x86_64/renpy-ffmpeg30.patch	2016-10-30 17:51:14 UTC (rev 194032)
+++ community-x86_64/renpy-ffmpeg30.patch	2016-10-30 17:51:38 UTC (rev 194033)
@@ -1,94 +0,0 @@
-From 4aac7ca5a59960ec776e3c4cd74a30f269342502 Mon Sep 17 00:00:00 2001
-From: Markus Koschany <apo at debian.org>
-Date: Wed, 27 Jan 2016 00:43:37 +0100
-Subject: [PATCH] ffmpeg
-
----
- module/ffdecode.c | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/module/ffdecode.c b/module/ffdecode.c
-index 71704cf..085000d 100644
---- a/module/ffdecode.c
-+++ b/module/ffdecode.c
-@@ -103,8 +103,8 @@ typedef struct VideoState {
-        compensation */
- 
- #ifndef HAS_RESAMPLE
--    uint8_t audio_buf1[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2] __attribute__ ((aligned (16))) ;
--    uint8_t audio_buf2[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2] __attribute__ ((aligned (16))) ;
-+    uint8_t audio_buf1[(192000 * 3) / 2] __attribute__ ((aligned (16))) ;
-+    uint8_t audio_buf2[(192000 * 3) / 2] __attribute__ ((aligned (16))) ;
- #else
-     uint8_t *audio_buf1;
- #endif
-@@ -583,7 +583,7 @@ static int video_refresh(void *opaque)
- 
- 		is->first_frame = 0;
- 
--		av_free(vp->frame);
-+		av_frame_free(&vp->frame);
- 		vp->frame = NULL;
- 
- 		/* update queue size and signal for next picture */
-@@ -635,13 +635,13 @@ static void alloc_picture(void *opaque, PyObject *pysurf)
- 
-     pixel = SDL_MapRGBA(surf->format, 1, 2, 3, 4);
-     if (bytes[0] == 4 && bytes[1] == 1) {
--        vp->fmt = PIX_FMT_ARGB;
-+        vp->fmt = AV_PIX_FMT_ARGB;
-     } else if (bytes[0] == 4 && bytes[1] == 3) {
--        vp->fmt = PIX_FMT_ABGR;
-+        vp->fmt = AV_PIX_FMT_ABGR;
-     } else if (bytes[0] == 1) {
--        vp->fmt = PIX_FMT_RGBA;
-+        vp->fmt = AV_PIX_FMT_RGBA;
-     } else {
--        vp->fmt = PIX_FMT_BGRA;
-+        vp->fmt = AV_PIX_FMT_BGRA;
-     }
- 
-     pixel = SDL_MapRGBA(surf->format, 0, 0, 0, 255);
-@@ -764,7 +764,7 @@ static int video_thread(void *arg)
-     double pts;
- 
-     for(;;) {
--        frame = avcodec_alloc_frame();
-+        frame = av_frame_alloc();
- 
-         while (is->paused && !is->videoq.abort_request) {
-             SDL_Delay(2);
-@@ -824,10 +824,10 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
-             int resample_changed, audio_resample;
- 
-             if (!is->frame) {
--                if (!(is->frame = avcodec_alloc_frame()))
-+                if (!(is->frame = av_frame_alloc()))
-                     return AVERROR(ENOMEM);
-             } else
--                avcodec_get_frame_defaults(is->frame);
-+                av_frame_unref(is->frame);
- 
-             if (flush_complete)
-                 break;
-@@ -1244,9 +1244,9 @@ static int stream_component_open(VideoState *is, int stream_index)
-     /* prepare audio output */
-     if (enc->codec_type == AVMEDIA_TYPE_AUDIO) {
-         if (enc->channels > 0) {
--            enc->request_channels = FFMIN(2, enc->channels);
-+            enc->request_channel_layout = av_get_default_channel_layout(FFMIN(2, enc->channels));
-         } else {
--            enc->request_channels = 2;
-+            enc->request_channel_layout = av_get_default_channel_layout(2);
-         }
-     }
- 
-@@ -1653,7 +1653,7 @@ void ffpy_stream_close(VideoState *is)
-     for(i=0; i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
-         vp = &is->pictq[i];
-         if (vp->frame) {
--            av_free(vp->frame);
-+            av_frame_free(&vp->frame);
-         }
-     }
- 

Copied: renpy/repos/community-x86_64/renpy-ffmpeg30.patch (from rev 194032, renpy/trunk/renpy-ffmpeg30.patch)
===================================================================
--- community-x86_64/renpy-ffmpeg30.patch	                        (rev 0)
+++ community-x86_64/renpy-ffmpeg30.patch	2016-10-30 17:51:38 UTC (rev 194033)
@@ -0,0 +1,94 @@
+From 4aac7ca5a59960ec776e3c4cd74a30f269342502 Mon Sep 17 00:00:00 2001
+From: Markus Koschany <apo at debian.org>
+Date: Wed, 27 Jan 2016 00:43:37 +0100
+Subject: [PATCH] ffmpeg
+
+---
+ module/ffdecode.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/module/ffdecode.c b/module/ffdecode.c
+index 71704cf..085000d 100644
+--- a/module/ffdecode.c
++++ b/module/ffdecode.c
+@@ -103,8 +103,8 @@ typedef struct VideoState {
+        compensation */
+ 
+ #ifndef HAS_RESAMPLE
+-    uint8_t audio_buf1[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2] __attribute__ ((aligned (16))) ;
+-    uint8_t audio_buf2[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2] __attribute__ ((aligned (16))) ;
++    uint8_t audio_buf1[(192000 * 3) / 2] __attribute__ ((aligned (16))) ;
++    uint8_t audio_buf2[(192000 * 3) / 2] __attribute__ ((aligned (16))) ;
+ #else
+     uint8_t *audio_buf1;
+ #endif
+@@ -583,7 +583,7 @@ static int video_refresh(void *opaque)
+ 
+ 		is->first_frame = 0;
+ 
+-		av_free(vp->frame);
++		av_frame_free(&vp->frame);
+ 		vp->frame = NULL;
+ 
+ 		/* update queue size and signal for next picture */
+@@ -635,13 +635,13 @@ static void alloc_picture(void *opaque, PyObject *pysurf)
+ 
+     pixel = SDL_MapRGBA(surf->format, 1, 2, 3, 4);
+     if (bytes[0] == 4 && bytes[1] == 1) {
+-        vp->fmt = PIX_FMT_ARGB;
++        vp->fmt = AV_PIX_FMT_ARGB;
+     } else if (bytes[0] == 4 && bytes[1] == 3) {
+-        vp->fmt = PIX_FMT_ABGR;
++        vp->fmt = AV_PIX_FMT_ABGR;
+     } else if (bytes[0] == 1) {
+-        vp->fmt = PIX_FMT_RGBA;
++        vp->fmt = AV_PIX_FMT_RGBA;
+     } else {
+-        vp->fmt = PIX_FMT_BGRA;
++        vp->fmt = AV_PIX_FMT_BGRA;
+     }
+ 
+     pixel = SDL_MapRGBA(surf->format, 0, 0, 0, 255);
+@@ -764,7 +764,7 @@ static int video_thread(void *arg)
+     double pts;
+ 
+     for(;;) {
+-        frame = avcodec_alloc_frame();
++        frame = av_frame_alloc();
+ 
+         while (is->paused && !is->videoq.abort_request) {
+             SDL_Delay(2);
+@@ -824,10 +824,10 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
+             int resample_changed, audio_resample;
+ 
+             if (!is->frame) {
+-                if (!(is->frame = avcodec_alloc_frame()))
++                if (!(is->frame = av_frame_alloc()))
+                     return AVERROR(ENOMEM);
+             } else
+-                avcodec_get_frame_defaults(is->frame);
++                av_frame_unref(is->frame);
+ 
+             if (flush_complete)
+                 break;
+@@ -1244,9 +1244,9 @@ static int stream_component_open(VideoState *is, int stream_index)
+     /* prepare audio output */
+     if (enc->codec_type == AVMEDIA_TYPE_AUDIO) {
+         if (enc->channels > 0) {
+-            enc->request_channels = FFMIN(2, enc->channels);
++            enc->request_channel_layout = av_get_default_channel_layout(FFMIN(2, enc->channels));
+         } else {
+-            enc->request_channels = 2;
++            enc->request_channel_layout = av_get_default_channel_layout(2);
+         }
+     }
+ 
+@@ -1653,7 +1653,7 @@ void ffpy_stream_close(VideoState *is)
+     for(i=0; i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
+         vp = &is->pictq[i];
+         if (vp->frame) {
+-            av_free(vp->frame);
++            av_frame_free(&vp->frame);
+         }
+     }
+ 

Deleted: community-x86_64/renpy.desktop
===================================================================
--- community-x86_64/renpy.desktop	2016-10-30 17:51:14 UTC (rev 194032)
+++ community-x86_64/renpy.desktop	2016-10-30 17:51:38 UTC (rev 194033)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Ren'Py
-GenericName=renpy
-Comment=Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell interactive stories that run on computers and mobile devices.
-Icon=renpy
-Exec=renpy
-Categories=Game;AdventureGame;

Copied: renpy/repos/community-x86_64/renpy.desktop (from rev 194032, renpy/trunk/renpy.desktop)
===================================================================
--- community-x86_64/renpy.desktop	                        (rev 0)
+++ community-x86_64/renpy.desktop	2016-10-30 17:51:38 UTC (rev 194033)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Ren'Py
+GenericName=renpy
+Comment=Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell interactive stories that run on computers and mobile devices.
+Icon=renpy
+Exec=renpy
+Categories=Game;AdventureGame;

Deleted: community-x86_64/renpy.png
===================================================================
(Binary files differ)

Copied: renpy/repos/community-x86_64/renpy.png (from rev 194032, renpy/trunk/renpy.png)
===================================================================
(Binary files differ)



More information about the arch-commits mailing list